commit 1fa33039728a9bb9fb5c3a12e1245a2c68277d10
Author: esacpe <esacpe1023>
Date:   Wed Jul 17 21:04:17 2024 +0800

    1

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..85fa010
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="operation-log-aspect-starter" />
+        <module name="common-token-starter" />
+        <module name="common-dynamic-datasource-starter" />
+        <module name="common-generator-starter" />
+        <module name="common-magic-api-starter" />
+        <module name="common-base-starter" />
+        <module name="common-config-starter" />
+        <module name="common-log-base-starter" />
+        <module name="common-core-starter" />
+        <module name="common-redis-starter" />
+        <module name="common-task-starter" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="common-base-starter" target="1.8" />
+      <module name="common-config-starter" target="8" />
+      <module name="common-core-starter" target="8" />
+      <module name="common-dynamic-datasource-starter" target="8" />
+      <module name="common-generator-starter" target="8" />
+      <module name="common-log-base-starter" target="8" />
+      <module name="common-magic-api-starter" target="8" />
+      <module name="common-redis-starter" target="6" />
+      <module name="common-task-starter" target="8" />
+      <module name="common-token-starter" target="8" />
+      <module name="mosty-common" target="1.5" />
+      <module name="operation-log-aspect-starter" target="8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
new file mode 100644
index 0000000..6fec8f4
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
new file mode 100644
index 0000000..9eb8596
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml
new file mode 100644
index 0000000..fa85ae7
--- /dev/null
+++ b/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.hutool:hutool-all:5.7.20">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml b/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
new file mode 100644
index 0000000..6b51017
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:druid:1.2.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.2.8/druid-1.2.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.2.8/druid-1.2.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.2.8/druid-1.2.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
new file mode 100644
index 0000000..725a929
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:druid-spring-boot-starter:1.2.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.2.8/druid-spring-boot-starter-1.2.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.2.8/druid-spring-boot-starter-1.2.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.2.8/druid-spring-boot-starter-1.2.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml
new file mode 100644
index 0000000..fb8e949
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:fastjson:1.2.83">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml b/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml
new file mode 100644
index 0000000..a34ba45
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:transmittable-thread-local:2.11.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml b/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml
new file mode 100644
index 0000000..1755ec4
--- /dev/null
+++ b/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.auth0:java-jwt:3.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml
new file mode 100644
index 0000000..ffb1369
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml
new file mode 100644
index 0000000..2570725
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml
new file mode 100644
index 0000000..fd9a3f6
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml
new file mode 100644
index 0000000..0e93676
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-core:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml
new file mode 100644
index 0000000..0bdbc71
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml b/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml
new file mode 100644
index 0000000..2ca54a7
--- /dev/null
+++ b/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.belerweb:pinyin4j:2.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml
new file mode 100644
index 0000000..a918945
--- /dev/null
+++ b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
new file mode 100644
index 0000000..33c30b4
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml:classmate:1.3.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
new file mode 100644
index 0000000..3aa8175
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml
new file mode 100644
index 0000000..6447563
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.2/jackson-annotations-2.11.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.2/jackson-annotations-2.11.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.2/jackson-annotations-2.11.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
new file mode 100644
index 0000000..42a8d5b
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_7.xml
new file mode 100644
index 0000000..45dbb56
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.7/jackson-annotations-2.8.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.7/jackson-annotations-2.8.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.7/jackson-annotations-2.8.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
new file mode 100644
index 0000000..06441f4
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
new file mode 100644
index 0000000..bd0d979
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml
new file mode 100644
index 0000000..4923956
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.2/jackson-core-2.11.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.2/jackson-core-2.11.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.2/jackson-core-2.11.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
new file mode 100644
index 0000000..fc3ea3f
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml
new file mode 100644
index 0000000..55b3f7b
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
new file mode 100644
index 0000000..08c0010
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
new file mode 100644
index 0000000..567d7e5
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml
new file mode 100644
index 0000000..b007cab
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_1.xml
new file mode 100644
index 0000000..27241b7
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.1/jackson-dataformat-yaml-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.1/jackson-dataformat-yaml-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.1/jackson-dataformat-yaml-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
new file mode 100644
index 0000000..ea31a53
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
new file mode 100644
index 0000000..50b2736
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
new file mode 100644
index 0000000..6eac973
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml b/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml
new file mode 100644
index 0000000..fc5a467
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
new file mode 100644
index 0000000..87f32d8
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.jsqlparser:jsqlparser:4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
new file mode 100644
index 0000000..798310e
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper:5.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml b/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
new file mode 100644
index 0000000..bc88169
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.penggle:kaptcha:2.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
new file mode 100644
index 0000000..d156c18
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.virtuald:curvesapi:1.06">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
new file mode 100644
index 0000000..1c380d0
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.findbugs:jsr305:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
new file mode 100644
index 0000000..848cecd
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.errorprone:error_prone_annotations:2.3.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
new file mode 100644
index 0000000..36e948e
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:failureaccess:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml
new file mode 100644
index 0000000..f349d63
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:guava:29.0-jre">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
new file mode 100644
index 0000000..4e15702
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
new file mode 100644
index 0000000..bacaa45
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.j2objc:j2objc-annotations:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
new file mode 100644
index 0000000..f674d8e
--- /dev/null
+++ b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jhlabs:filters:2.0.235-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
new file mode 100644
index 0000000..bd9061c
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.archaius:archaius-core:0.7.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml b/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml
new file mode 100644
index 0000000..d977a58
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.feign:feign-core:8.14.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml b/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml
new file mode 100644
index 0000000..7b9a4b5
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.feign:feign-slf4j:8.14.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml
new file mode 100644
index 0000000..588dca0
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.hystrix:hystrix-core:1.5.18">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_8_1.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_8_1.xml
new file mode 100644
index 0000000..5b88b8a
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_8_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okhttp3:okhttp:4.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/4.8.1/okhttp-4.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/4.8.1/okhttp-4.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/4.8.1/okhttp-4.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_2_7_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_2_7_0.xml
new file mode 100644
index 0000000..95fd78d
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okio_okio_2_7_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okio:okio:2.7.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/2.7.0/okio-2.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/2.7.0/okio-2.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/2.7.0/okio-2.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml
new file mode 100644
index 0000000..b7e360b
--- /dev/null
+++ b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.vividsolutions:jts:1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
new file mode 100644
index 0000000..97e2291
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:HikariCP:3.4.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
new file mode 100644
index 0000000..9314c36
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:HikariCP:4.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
new file mode 100644
index 0000000..6ce4aae
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:SparseBitSet:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
new file mode 100644
index 0000000..84eb115
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-beanutils:commons-beanutils:1.9.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_12.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_12.xml
new file mode 100644
index 0000000..0953394
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.12/commons-codec-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.12/commons-codec-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.12/commons-codec-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
new file mode 100644
index 0000000..5384f7a
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 0000000..13afda2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
new file mode 100644
index 0000000..772d6fe
--- /dev/null
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-configuration:commons-configuration:1.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
new file mode 100644
index 0000000..3b9dcc0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-fileupload:commons-fileupload:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
new file mode 100644
index 0000000..f8084ec
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_7.xml b/.idea/libraries/Maven__commons_io_commons_io_2_7.xml
new file mode 100644
index 0000000..ded72c9
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.7/commons-io-2.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.7/commons-io-2.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.7/commons-io-2.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
new file mode 100644
index 0000000..2ec8376
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
new file mode 100644
index 0000000..b770f56
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file mode 100644
index 0000000..eab40b3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml
new file mode 100644
index 0000000..efc64b2
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-core:10.10.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml
new file mode 100644
index 0000000..11bde67
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-hystrix:10.10.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml
new file mode 100644
index 0000000..0534476
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign.form:feign-form:3.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml
new file mode 100644
index 0000000..47e101e
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_0_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_0_RELEASE.xml
new file mode 100644
index 0000000..778f95d
--- /dev/null
+++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.3.0.RELEASE/lettuce-core-5.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.3.0.RELEASE/lettuce-core-5.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.3.0.RELEASE/lettuce-core-5.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_1.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_1.xml
new file mode 100644
index 0000000..0db69cb
--- /dev/null
+++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.micrometer:micrometer-core:1.5.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.1/micrometer-core-1.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.1/micrometer-core-1.5.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.1/micrometer-core-1.5.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_minio_minio_8_0_3.xml b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml
new file mode 100644
index 0000000..c8743c4
--- /dev/null
+++ b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.minio:minio:8.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml
new file mode 100644
index 0000000..9247b16
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-buffer:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.49.Final/netty-buffer-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.49.Final/netty-buffer-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.49.Final/netty-buffer-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml
new file mode 100644
index 0000000..68df79d
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-buffer:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml
new file mode 100644
index 0000000..a3b1c84
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.49.Final/netty-codec-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.49.Final/netty-codec-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.49.Final/netty-codec-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml
new file mode 100644
index 0000000..62ec8c2
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_51_Final.xml
new file mode 100644
index 0000000..684d838
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec-dns:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-dns/4.1.51.Final/netty-codec-dns-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-dns/4.1.51.Final/netty-codec-dns-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-dns/4.1.51.Final/netty-codec-dns-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml
new file mode 100644
index 0000000..0219231
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-common:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.49.Final/netty-common-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.49.Final/netty-common-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.49.Final/netty-common-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml
new file mode 100644
index 0000000..36e612e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-common:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml
new file mode 100644
index 0000000..00e798d
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-handler:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.49.Final/netty-handler-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.49.Final/netty-handler-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.49.Final/netty-handler-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml
new file mode 100644
index 0000000..fb10871
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-handler:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml
new file mode 100644
index 0000000..a080e6b
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-resolver:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.49.Final/netty-resolver-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.49.Final/netty-resolver-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.49.Final/netty-resolver-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml
new file mode 100644
index 0000000..0281c5e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-resolver:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_51_Final.xml
new file mode 100644
index 0000000..2b6768c
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-resolver-dns:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver-dns/4.1.51.Final/netty-resolver-dns-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver-dns/4.1.51.Final/netty-resolver-dns-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver-dns/4.1.51.Final/netty-resolver-dns-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml
new file mode 100644
index 0000000..f0b7741
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-transport:4.1.49.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.49.Final/netty-transport-4.1.49.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.49.Final/netty-transport-4.1.49.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.49.Final/netty-transport-4.1.49.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml
new file mode 100644
index 0000000..425736e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-transport:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_4_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_4_RELEASE.xml
new file mode 100644
index 0000000..eb81c2f
--- /dev/null
+++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.projectreactor:reactor-core:3.3.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.4.RELEASE/reactor-core-3.3.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.4.RELEASE/reactor-core-3.3.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.4.RELEASE/reactor-core-3.3.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml
new file mode 100644
index 0000000..a5baba9
--- /dev/null
+++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.5.RELEASE/reactor-core-3.3.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.5.RELEASE/reactor-core-3.3.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.5.RELEASE/reactor-core-3.3.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava2_rxjava_2_2_19.xml b/.idea/libraries/Maven__io_reactivex_rxjava2_rxjava_2_2_19.xml
new file mode 100644
index 0000000..4b5c378
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxjava2_rxjava_2_2_19.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex.rxjava2:rxjava:2.2.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava2/rxjava/2.2.19/rxjava-2.2.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava2/rxjava/2.2.19/rxjava-2.2.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava2/rxjava/2.2.19/rxjava-2.2.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml
new file mode 100644
index 0000000..27eb537
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex:rxjava:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.2.0/rxjava-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.2.0/rxjava-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.2.0/rxjava-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml
new file mode 100644
index 0000000..64855d8
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-core:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml
new file mode 100644
index 0000000..c271a62
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-schema:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml
new file mode 100644
index 0000000..c43a6ab
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spi:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml
new file mode 100644
index 0000000..5060ed3
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spring-web:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml
new file mode 100644
index 0000000..3838245
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger2:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml
new file mode 100644
index 0000000..830eefd
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-common:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml
new file mode 100644
index 0000000..bd002c8
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-ui:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml
new file mode 100644
index 0000000..ffd56aa
--- /dev/null
+++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-annotations:1.5.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml
new file mode 100644
index 0000000..000ff27
--- /dev/null
+++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-models:1.5.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
new file mode 100644
index 0000000..cba9dd2
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
new file mode 100644
index 0000000..e66afb9
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
new file mode 100644
index 0000000..e74f3ab
--- /dev/null
+++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.annotation:javax.annotation-api:1.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_cache_cache_api_1_0_0.xml b/.idea/libraries/Maven__javax_cache_cache_api_1_0_0.xml
new file mode 100644
index 0000000..4ff335f
--- /dev/null
+++ b/.idea/libraries/Maven__javax_cache_cache_api_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.cache:cache-api:1.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/cache/cache-api/1.0.0/cache-api-1.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/cache/cache-api/1.0.0/cache-api-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/cache/cache-api/1.0.0/cache-api-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
new file mode 100644
index 0000000..c24f7e3
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_7.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_7.xml
new file mode 100644
index 0000000..5589596
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.10.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.7/byte-buddy-1.10.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.7/byte-buddy-1.10.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.7/byte-buddy-1.10.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_9.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_9.xml
new file mode 100644
index 0000000..22f4f74
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.7.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
new file mode 100644
index 0000000..1c71163
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
new file mode 100644
index 0000000..5871c95
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-collections4:4.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
new file mode 100644
index 0000000..7c25fef
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
new file mode 100644
index 0000000..28b8682
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.12.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
new file mode 100644
index 0000000..ebfe0a8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-math3:3.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml
new file mode 100644
index 0000000..5a2fa29
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-text:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
new file mode 100644
index 0000000..9cb68a2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
new file mode 100644
index 0000000..b475675
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_2.xml
new file mode 100644
index 0000000..35caff2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
new file mode 100644
index 0000000..8ad4996
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_2.xml
new file mode 100644
index 0000000..5788de2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
new file mode 100644
index 0000000..57e6ac4
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
new file mode 100644
index 0000000..c706d5b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
new file mode 100644
index 0000000..905ca0c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
new file mode 100644
index 0000000..93d965d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
new file mode 100644
index 0000000..5272a36
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-cache:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
new file mode 100644
index 0000000..4578d1b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-config-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
new file mode 100644
index 0000000..e699787
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
new file mode 100644
index 0000000..aa3fdcf
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
new file mode 100644
index 0000000..77a90b8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
new file mode 100644
index 0000000..dddd497
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
new file mode 100644
index 0000000..ece1eae
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml
new file mode 100644
index 0000000..c1049dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-ehcache:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
new file mode 100644
index 0000000..b7a65df
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-event:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
new file mode 100644
index 0000000..499eb00
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-lang:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
new file mode 100644
index 0000000..7e39935
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
new file mode 100644
index 0000000..6a30056
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
new file mode 100644
index 0000000..ea2816e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity-engine-core:2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
new file mode 100644
index 0000000..0695d4b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml
new file mode 100644
index 0000000..d0ca705
--- /dev/null
+++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjweaver:1.9.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml
new file mode 100644
index 0000000..6d622d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.checkerframework:checker-qual:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
new file mode 100644
index 0000000..ae5020d
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish:jakarta.el:3.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml
new file mode 100644
index 0000000..6908885
--- /dev/null
+++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hdrhistogram:HdrHistogram:2.1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
new file mode 100644
index 0000000..04cc804
--- /dev/null
+++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hdrhistogram:HdrHistogram:2.1.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml
new file mode 100644
index 0000000..6d045ad
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
new file mode 100644
index 0000000..09c4cf0
--- /dev/null
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.javassist:javassist:3.21.0-GA">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
new file mode 100644
index 0000000..5f7dd01
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_2_0_9_Final.xml b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_2_0_9_Final.xml
new file mode 100644
index 0000000..ee45f31
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_2_0_9_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.9.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/2.0.9.Final/jboss-marshalling-2.0.9.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/2.0.9.Final/jboss-marshalling-2.0.9.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling/2.0.9.Final/jboss-marshalling-2.0.9.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_2_0_9_Final.xml b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_2_0_9_Final.xml
new file mode 100644
index 0000000..9f3ba0d
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_2_0_9_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/2.0.9.Final/jboss-marshalling-river-2.0.9.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/2.0.9.Final/jboss-marshalling-river-2.0.9.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/marshalling/jboss-marshalling-river/2.0.9.Final/jboss-marshalling-river-2.0.9.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml
new file mode 100644
index 0000000..e2c8297
--- /dev/null
+++ b/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains:annotations:13.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
new file mode 100644
index 0000000..3b29150
--- /dev/null
+++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.72">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml
new file mode 100644
index 0000000..bbe5288
--- /dev/null
+++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_70.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.70/kotlin-stdlib-common-1.3.70.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.70/kotlin-stdlib-common-1.3.70-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.70/kotlin-stdlib-common-1.3.70-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jodd_jodd_bean_5_0_13.xml b/.idea/libraries/Maven__org_jodd_jodd_bean_5_0_13.xml
new file mode 100644
index 0000000..33b8f60
--- /dev/null
+++ b/.idea/libraries/Maven__org_jodd_jodd_bean_5_0_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jodd:jodd-bean:5.0.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-bean/5.0.13/jodd-bean-5.0.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-bean/5.0.13/jodd-bean-5.0.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-bean/5.0.13/jodd-bean-5.0.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jodd_jodd_core_5_0_13.xml b/.idea/libraries/Maven__org_jodd_jodd_core_5_0_13.xml
new file mode 100644
index 0000000..735d215
--- /dev/null
+++ b/.idea/libraries/Maven__org_jodd_jodd_core_5_0_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jodd:jodd-core:5.0.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-core/5.0.13/jodd-core-5.0.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-core/5.0.13/jodd-core-5.0.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jodd/jodd-core/5.0.13/jodd-core-5.0.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
new file mode 100644
index 0000000..bf68169
--- /dev/null
+++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.latencyutils:LatencyUtils:2.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
new file mode 100644
index 0000000..87cb599
--- /dev/null
+++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mapstruct:mapstruct:1.2.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
new file mode 100644
index 0000000..fab1459
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis:3.5.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
new file mode 100644
index 0000000..a359305
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis-spring:2.0.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
new file mode 100644
index 0000000..879dc41
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
new file mode 100644
index 0000000..8161289
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
new file mode 100644
index 0000000..8503cb4
--- /dev/null
+++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.16.18">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
new file mode 100644
index 0000000..9843fa4
--- /dev/null
+++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.18.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
new file mode 100644
index 0000000..f17253b
--- /dev/null
+++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.reactivestreams:reactive-streams:1.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_redisson_redisson_3_13_3.xml b/.idea/libraries/Maven__org_redisson_redisson_3_13_3.xml
new file mode 100644
index 0000000..fae323d
--- /dev/null
+++ b/.idea/libraries/Maven__org_redisson_redisson_3_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.redisson:redisson:3.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson/3.13.3/redisson-3.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson/3.13.3/redisson-3.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson/3.13.3/redisson-3.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_redisson_redisson_spring_boot_starter_3_13_3.xml b/.idea/libraries/Maven__org_redisson_redisson_spring_boot_starter_3_13_3.xml
new file mode 100644
index 0000000..009c3e8
--- /dev/null
+++ b/.idea/libraries/Maven__org_redisson_redisson_spring_boot_starter_3_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.redisson:redisson-spring-boot-starter:3.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-boot-starter/3.13.3/redisson-spring-boot-starter-3.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-boot-starter/3.13.3/redisson-spring-boot-starter-3.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-boot-starter/3.13.3/redisson-spring-boot-starter-3.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_redisson_redisson_spring_data_23_3_13_3.xml b/.idea/libraries/Maven__org_redisson_redisson_spring_data_23_3_13_3.xml
new file mode 100644
index 0000000..e16ba79
--- /dev/null
+++ b/.idea/libraries/Maven__org_redisson_redisson_spring_data_23_3_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.redisson:redisson-spring-data-23:3.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-data-23/3.13.3/redisson-spring-data-23-3.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-data-23/3.13.3/redisson-spring-data-23-3.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/redisson/redisson-spring-data-23/3.13.3/redisson-spring-data-23-3.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
new file mode 100644
index 0000000..d8b2fb5
--- /dev/null
+++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.reflections:reflections:0.9.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
new file mode 100644
index 0000000..27229ce
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml
new file mode 100644
index 0000000..4fd913d
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
new file mode 100644
index 0000000..20e8163
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml
new file mode 100644
index 0000000..6545f77
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.26">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
new file mode 100644
index 0000000..02b6812
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..90f25ec
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..158ddd9
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..4eaf24b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-actuator:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.3.0.RELEASE/spring-boot-actuator-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.3.0.RELEASE/spring-boot-actuator-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.3.0.RELEASE/spring-boot-actuator-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..304d350
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.0.RELEASE/spring-boot-actuator-autoconfigure-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.0.RELEASE/spring-boot-actuator-autoconfigure-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.0.RELEASE/spring-boot-actuator-autoconfigure-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_12_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_12_RELEASE.xml
new file mode 100644
index 0000000..45fdc55
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_12_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.12.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.12.RELEASE/spring-boot-autoconfigure-1.5.12.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.12.RELEASE/spring-boot-autoconfigure-1.5.12.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.12.RELEASE/spring-boot-autoconfigure-1.5.12.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..04b7e81
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..d547da6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_5.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_5.xml
new file mode 100644
index 0000000..3f8b8a7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.4.5/spring-boot-autoconfigure-2.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.4.5/spring-boot-autoconfigure-2.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.4.5/spring-boot-autoconfigure-2.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..cad03dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..0cfdca9
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..c2ad696
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.3.0.RELEASE/spring-boot-starter-actuator-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.3.0.RELEASE/spring-boot-starter-actuator-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.3.0.RELEASE/spring-boot-starter-actuator-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..3a5b31d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.3.2.RELEASE/spring-boot-starter-aop-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.3.2.RELEASE/spring-boot-starter-aop-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.3.2.RELEASE/spring-boot-starter-aop-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..59fabda
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.3.0.RELEASE/spring-boot-starter-data-redis-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.3.0.RELEASE/spring-boot-starter-data-redis-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.3.0.RELEASE/spring-boot-starter-data-redis-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_5.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_5.xml
new file mode 100644
index 0000000..ab882ae
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.4.5/spring-boot-starter-jdbc-2.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.4.5/spring-boot-starter-jdbc-2.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.4.5/spring-boot-starter-jdbc-2.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_0.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_0.xml
new file mode 100644
index 0000000..5206606
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.5.0/spring-boot-starter-jdbc-2.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.5.0/spring-boot-starter-jdbc-2.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.5.0/spring-boot-starter-jdbc-2.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..b2bec55
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..b4b9a36
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..30cfcb1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..2aed09e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..a04fca2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.3.2.RELEASE/spring-boot-starter-validation-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.3.2.RELEASE/spring-boot-starter-validation-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.3.2.RELEASE/spring-boot-starter-validation-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..af10dc8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_5.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_5.xml
new file mode 100644
index 0000000..bd16337
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.4.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.4.5/spring-boot-starter-websocket-2.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.4.5/spring-boot-starter-websocket-2.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.4.5/spring-boot-starter-websocket-2.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..1f971e4
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..eccd43a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..a02663e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..8e81cfb
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.0.RELEASE/spring-data-commons-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.0.RELEASE/spring-data-commons-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.0.RELEASE/spring-data-commons-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..1052151
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.0.RELEASE/spring-data-keyvalue-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.0.RELEASE/spring-data-keyvalue-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.0.RELEASE/spring-data-keyvalue-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_0_RELEASE.xml
new file mode 100644
index 0000000..b9546e7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.0.RELEASE/spring-data-redis-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.0.RELEASE/spring-data-redis-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.0.RELEASE/spring-data-redis-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
new file mode 100644
index 0000000..fbc0452
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
new file mode 100644
index 0000000..7e6f096
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..e31c2b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..000f9ff
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_9_RELEASE.xml
new file mode 100644
index 0000000..f98ea8c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:4.0.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.0.9.RELEASE/spring-beans-4.0.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.0.9.RELEASE/spring-beans-4.0.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.0.9.RELEASE/spring-beans-4.0.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ca7aa33
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_6.xml
new file mode 100644
index 0000000..49a8b7f
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.6/spring-beans-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.6/spring-beans-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.6/spring-beans-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_7.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_7.xml
new file mode 100644
index 0000000..eca6183
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.3.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.7/spring-beans-5.3.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.7/spring-beans-5.3.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.7/spring-beans-5.3.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_9_RELEASE.xml
new file mode 100644
index 0000000..802cb82
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:4.0.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.0.9.RELEASE/spring-context-4.0.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.0.9.RELEASE/spring-context-4.0.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.0.9.RELEASE/spring-context-4.0.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..3194e8e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..4a53bcf
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.6.RELEASE/spring-context-support-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.6.RELEASE/spring-context-support-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.6.RELEASE/spring-context-support-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..44ad8a8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..e7d5de5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_6.xml
new file mode 100644
index 0000000..33a8f45
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.6/spring-core-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.6/spring-core-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.6/spring-core-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..2d2456d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..b148bc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..4fea859
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_6.xml
new file mode 100644
index 0000000..005d9a6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.6/spring-jcl-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.6/spring-jcl-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.6/spring-jcl-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_6.xml
new file mode 100644
index 0000000..17ca07b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.6/spring-jdbc-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.6/spring-jdbc-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.6/spring-jdbc-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_7.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_7.xml
new file mode 100644
index 0000000..235b6d5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:5.3.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.7/spring-jdbc-5.3.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.7/spring-jdbc-5.3.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.7/spring-jdbc-5.3.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_6.xml
new file mode 100644
index 0000000..0aa1739
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-messaging:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.3.6/spring-messaging-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.3.6/spring-messaging-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.3.6/spring-messaging-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..5cfaf2a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.6.RELEASE/spring-oxm-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.6.RELEASE/spring-oxm-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.6.RELEASE/spring-oxm-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml
new file mode 100644
index 0000000..a77080c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.6.RELEASE/spring-tx-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.6.RELEASE/spring-tx-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.6.RELEASE/spring-tx-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_6.xml
new file mode 100644
index 0000000..ce9d784
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.6/spring-tx-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.6/spring-tx-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.6/spring-tx-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_7.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_7.xml
new file mode 100644
index 0000000..765d963
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:5.3.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.7/spring-tx-5.3.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.7/spring-tx-5.3.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.7/spring-tx-5.3.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml
new file mode 100644
index 0000000..b8a2414
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:5.1.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ae46cf0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..d584e24
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_6.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_6.xml
new file mode 100644
index 0000000..6940ffa
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-websocket:5.3.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.3.6/spring-websocket-5.3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.3.6/spring-websocket-5.3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.3.6/spring-websocket-5.3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml
new file mode 100644
index 0000000..d22b326
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml
new file mode 100644
index 0000000..58fbee2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml
new file mode 100644
index 0000000..be2a716
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml
new file mode 100644
index 0000000..5eedcb2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-editor:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml b/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml
new file mode 100644
index 0000000..87ef154
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-script:1.8.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
new file mode 100644
index 0000000..e998675
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.26">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..4361200
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..0671122
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/common-base-starter/common-base-starter.iml" filepath="$PROJECT_DIR$/common-base-starter/common-base-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-config-starter/common-config-starter.iml" filepath="$PROJECT_DIR$/common-config-starter/common-config-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-core-starter/common-core-starter.iml" filepath="$PROJECT_DIR$/common-core-starter/common-core-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-dynamic-datasource-starter/common-dynamic-datasource-starter.iml" filepath="$PROJECT_DIR$/common-dynamic-datasource-starter/common-dynamic-datasource-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-generator-starter/common-generator-starter.iml" filepath="$PROJECT_DIR$/common-generator-starter/common-generator-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-log-base-starter/common-log-base-starter.iml" filepath="$PROJECT_DIR$/common-log-base-starter/common-log-base-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-magic-api-starter/common-magic-api-starter.iml" filepath="$PROJECT_DIR$/common-magic-api-starter/common-magic-api-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-redis-starter/common-redis-starter.iml" filepath="$PROJECT_DIR$/common-redis-starter/common-redis-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-task-starter/common-task-starter.iml" filepath="$PROJECT_DIR$/common-task-starter/common-task-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common-token-starter/common-token-starter.iml" filepath="$PROJECT_DIR$/common-token-starter/common-token-starter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-common.iml" filepath="$PROJECT_DIR$/mosty-common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/operation-log-aspect-starter/operation-log-aspect-starter.iml" filepath="$PROJECT_DIR$/operation-log-aspect-starter/operation-log-aspect-starter.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..5259ae3
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8852332f-a297-42f8-81a9-f42884ceb80c" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="localRepository" value="C:\Users\zy\.m2\repository" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.6.2" />
+        <option name="userSettingsFile" value="C:\tools\apache-maven-3.6.2\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="ProjectId" id="2jJHqMNB2aZupeScLibCaGD7ivW" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+  </component>
+  <component name="RebelAgentSelection">
+    <selection>jr</selection>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8852332f-a297-42f8-81a9-f42884ceb80c" name="Default Changelist" comment="" />
+      <created>1721098449559</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1721098449559</updated>
+      <workItem from="1721098452643" duration="3215000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="740" y="271" key="FileChooserDialogImpl" timestamp="1721098534421">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="740" y="271" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1721098534421" />
+    <state width="1877" height="494" key="GridCell.Tab.0.bottom" timestamp="1721200690405">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="494" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1721200690405" />
+    <state width="1877" height="494" key="GridCell.Tab.0.center" timestamp="1721200690405">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="494" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1721200690405" />
+    <state width="1877" height="494" key="GridCell.Tab.0.left" timestamp="1721200690405">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="494" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1721200690405" />
+    <state width="1877" height="494" key="GridCell.Tab.0.right" timestamp="1721200690405">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="494" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1721200690405" />
+    <state x="461" y="158" key="SettingsEditor" timestamp="1721098535925">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="461" y="158" key="SettingsEditor/0.0.1920.1032@0.0.1920.1032" timestamp="1721098535925" />
+    <state width="498" height="582" key="SwitcherDM" timestamp="1721198506992">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="498" height="582" key="SwitcherDM/0.0.1920.1032@0.0.1920.1032" timestamp="1721198506992" />
+    <state x="626" y="233" width="745" height="566" key="find.popup" timestamp="1721196734317">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="626" y="233" width="745" height="566" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1721196734317" />
+    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup" timestamp="1721198270976">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="623" y="223" width="672" height="678" key="search.everywhere.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1721198270976" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/common-base-starter/common-base-starter.iml b/common-base-starter/common-base-starter.iml
new file mode 100644
index 0000000..7ef687b
--- /dev/null
+++ b/common-base-starter/common-base-starter.iml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson:3.13.3" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.19" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.9.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-data-23:3.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-base-starter/pom.xml b/common-base-starter/pom.xml
new file mode 100644
index 0000000..112cc3e
--- /dev/null
+++ b/common-base-starter/pom.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-base-starter</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <redisson.version>3.13.3</redisson.version>
+        <springfox-version>2.8.0</springfox-version>
+    </properties>
+    <dependencies>
+
+        <!--velocity代码生成使用模板 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!--swagger-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${springfox-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${springfox-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.caspar-chen</groupId>
+            <artifactId>swagger-ui-layer</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.20</version>
+        </dependency>
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+            <version>2.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>${redisson.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>2.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/Desensitization.java b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/Desensitization.java
new file mode 100644
index 0000000..18fa8e6
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/Desensitization.java
@@ -0,0 +1,113 @@
+package com.mosty.common.base.autoconfig;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+
+/**
+ *  脱敏类
+ * @author kevin
+ * @date 2022/3/8 11:10 PM
+ * @since 1.0.0
+ */
+@SuppressWarnings("unused")
+public class Desensitization {
+
+    /**
+     *  手机类型脱敏
+     * @author kevin
+     * @date 2022/3/8 11:13 PM
+     * @since 1.0.0
+     */
+    public static class Phone extends JsonSerializer<String> {
+        @Override
+        public void serialize(String value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            if (StringUtils.isEmpty(value)) {
+                jsonGenerator.writeObject(value);
+                return;
+            }
+            String trim = value.trim();
+            if (trim.length() == 11) {
+                String phone = trim.replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2");
+                jsonGenerator.writeObject(phone);
+                return;
+            }
+            jsonGenerator.writeObject(value);
+        }
+    }
+
+    /**
+     *  银行卡号类型脱敏
+     * @author kevin
+     * @date 2022/3/8 11:13 PM
+     * @since 1.0.0
+     */
+    public static class BankCard extends JsonSerializer<String> {
+
+        @Override
+        public void serialize(String value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            if (StringUtils.isEmpty(value)) {
+                jsonGenerator.writeObject(value);
+                return;
+            }
+            String trim = value.trim();
+            String phone = trim.replaceAll("(\\d{6})\\d*(\\d{4})", "$1****$2");
+            jsonGenerator.writeObject(phone);
+        }
+    }
+
+    /**
+     *  身份证号类型脱敏
+     * @author kevin
+     * @date 2022/3/8 11:13 PM
+     * @since 1.0.0
+     */
+    public static class IdentityCard extends JsonSerializer<String> {
+
+        @Override
+        public void serialize(String value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            if (StringUtils.isEmpty(value)) {
+                jsonGenerator.writeObject(value);
+                return;
+            }
+            String trim = value.trim();
+            String phone = trim.replaceAll("(\\d{6})\\d*(\\w{4})", "$1****$2");
+            jsonGenerator.writeObject(phone);
+        }
+    }
+
+    /**
+     *  姓名类型脱敏
+     * @author kevin
+     * @date 2022/3/8 11:13 PM
+     * @since 1.0.0
+     */
+    public static class FullName extends JsonSerializer<String> {
+
+        @Override
+        public void serialize(String value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            if (StringUtils.isEmpty(value) || value.length() == 1 || value.trim().length() == 1) {
+                jsonGenerator.writeObject(value);
+                return;
+            }
+            String trim = value.trim();
+            if (trim.length() == 2) {
+                jsonGenerator.writeObject(value.charAt(0) + "*");
+                return;
+            }
+            StringBuilder stringBuffer = new StringBuilder();
+            for (int i = 0; i < value.length(); i++) {
+                if (i == 0 || i == value.length() - 1) {
+                    stringBuffer.append(value.charAt(i));
+                } else {
+                    stringBuffer.append("*");
+                }
+            }
+            jsonGenerator.writeObject(stringBuffer.toString());
+        }
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/JacksonCustomizerConfig.java b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/JacksonCustomizerConfig.java
new file mode 100644
index 0000000..a2b95fb
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/JacksonCustomizerConfig.java
@@ -0,0 +1,88 @@
+//package com.mosty.common.base.autoconfig;
+//
+//import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+//import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+//import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+//import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+//import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+//import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.convert.converter.Converter;
+//import org.springframework.stereotype.Component;
+//
+//import java.time.LocalDate;
+//import java.time.LocalDateTime;
+//import java.time.LocalTime;
+//import java.time.format.DateTimeFormatter;
+//
+///**
+// *  全局： 序列化,反序列化,格式处理
+// * @author kevin
+// * @date 2022/3/28 2:37 PM
+// * @since 1.0.0
+// */
+//@Slf4j
+//@Configuration
+//public class JacksonCustomizerConfig {
+//
+//    @Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}")
+//    private String localDateTimePattern;
+//
+//    @Value("${spring.jackson.local-date-format:yyyy-MM-dd}")
+//    private String localDatePattern;
+//
+//    @Value("${spring.jackson.local-time-format:HH:mm:ss}")
+//    private String localTimePattern;
+//
+//    @Bean
+//    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
+//        return builder -> {
+//            builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(localDateTimePattern)));
+//            builder.serializerByType(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(localDatePattern)));
+//            builder.serializerByType(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(localTimePattern)));
+//            builder.deserializerByType(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(localDateTimePattern)));
+//            builder.deserializerByType(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(localDatePattern)));
+//            builder.deserializerByType(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(localTimePattern)));
+//        };
+//    }
+//
+//  	/**
+//     * 时间LocalDateTime转换
+//     */
+//    @Component
+//    public static class LocalDateTimeConverter implements Converter<String, LocalDateTime> {
+//        @Override
+//        public LocalDateTime convert(String source) {
+//            if (StringUtils.isBlank(source)) {
+//                return null;
+//            }
+//            if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
+//                return LocalDateTime.parse(source, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//            }
+//            throw new IllegalArgumentException("Invalid value '" + source + "'");
+//        }
+//    }
+//
+//    /**
+//     * 时间LocalDate转换
+//     */
+//    @Component
+//    public static class LocalDateConverter implements Converter<String, LocalDate> {
+//        @Override
+//        public LocalDate convert(String source) {
+//            if (StringUtils.isBlank(source)) {
+//                return null;
+//            }
+//            if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
+//                return LocalDate.parse(source, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+//            }
+//            throw new IllegalArgumentException("Invalid value '" + source + "'");
+//        }
+//    }
+//
+//}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.java b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.java
new file mode 100644
index 0000000..a795c08
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.java
@@ -0,0 +1,87 @@
+package com.mosty.common.base.autoconfig.swagger;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_HEADER;
+
+/**
+ *  swagger 配置、自动装配类类
+ * {@link ComponentScan} 具体扫描地址可以更改为：
+ *  {@link ComponentScan({"com.mosty.common.config.controller","..."})}
+ *
+ * @author kevin
+ * @date 2022/1/22 5:47 PM
+ * @since 1.0.0
+ */
+@Configuration
+@EnableSwagger2
+@ComponentScan({"com.mosty.common"})
+@SuppressWarnings("unused")
+public class SwaggerConfig {
+
+    /** swagger基础扫描包 */
+    private static final String SWAGGER_SCAN_BASE_PACKAGE = "com.mosty";
+
+    /** swagger默认关闭，则没有配置也保证不会启动报错 */
+    @Value("${swagger.enable:true}")
+    private Boolean swaggerEnable;
+    @Value("${swagger.title:mosty}")
+    private String title;
+    @Value("${swagger.host:127.0.0.1}")
+    private String host;
+    @Value("${swagger.port:9999}")
+    private String port;
+    @Value("${swagger.version:1.0.0}")
+    private String version;
+    @Value("${swagger.name:基础服务}")
+    private String name;
+    @Value("${swagger.url:''}")
+    private String url;
+    @Value("${swagger.email:''}")
+    private String email;
+    @Value("${spring.application.name}")
+    private String serviceName;
+
+    @Bean
+    public Docket createRestApi() {
+        if (swaggerEnable) {
+            List<Parameter> parameters = new ArrayList<>();
+            parameters.add(new ParameterBuilder()
+                    .name(TOKEN_HEADER)
+                    .description("令牌")
+                    .modelRef(new ModelRef("string"))
+                    .parameterType("header")
+                    .required(false)
+                    .build());
+
+            return new Docket(DocumentationType.SWAGGER_2)
+                    .host(host + ":" + port)
+                    .apiInfo(
+                            new ApiInfoBuilder().title(serviceName).description(serviceName)
+                            .version(version).contact(new Contact(name, url, email)).build())
+                    .globalOperationParameters(parameters)
+                    .select()
+                    .apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE))
+                    .paths(PathSelectors.any())
+                    .build();
+        }
+        return new Docket(DocumentationType.SWAGGER_2).enable(false);
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/Constants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/Constants.java
new file mode 100644
index 0000000..d46f493
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/Constants.java
@@ -0,0 +1,114 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 通用常量信息
+ *
+ * @author ruoyi
+ */
+public class Constants {
+    /**
+     * UTF-8 字符集
+     */
+    public static final String UTF8 = "UTF-8";
+
+    /**
+     * GBK 字符集
+     */
+    public static final String GBK = "GBK";
+
+    /**
+     * http请求
+     */
+    public static final String HTTP = "http://";
+
+    /**
+     * https请求
+     */
+    public static final String HTTPS = "https://";
+
+    /**
+     * 通用成功标识
+     */
+    public static final String SUCCESS = "0";
+
+    /**
+     * 通用失败标识
+     */
+    public static final String FAIL = "1";
+
+    /**
+     * 登录成功
+     */
+    public static final String LOGIN_SUCCESS = "Success";
+
+    /**
+     * 注销
+     */
+    public static final String LOGOUT = "Logout";
+
+    /**
+     * 注册
+     */
+    public static final String REGISTER = "Register";
+
+    /**
+     * 登录失败
+     */
+    public static final String LOGIN_FAIL = "Error";
+
+    /**
+     * 系统用户授权缓存
+     */
+    public static final String SYS_AUTH_CACHE = "sys-authCache";
+
+    /**
+     * 参数管理 cache name
+     */
+    public static final String SYS_CONFIG_CACHE = "sys-config";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache name
+     */
+    public static final String SYS_DICT_CACHE = "sys-dict";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * RMI 远程方法调用
+     */
+    public static final String LOOKUP_RMI = "rmi:";
+
+    /**
+     * LDAP 远程方法调用
+     */
+    public static final String LOOKUP_LDAP = "ldap:";
+
+    /**
+     * LDAPS 远程方法调用
+     */
+    public static final String LOOKUP_LDAPS = "ldaps:";
+
+    /**
+     * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
+     */
+    public static final String[] JOB_WHITELIST_STR = {"com.ruoyi"};
+
+    /**
+     * 定时任务违规的字符
+     */
+    public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+            "org.springframework", "org.apache", "com.ruoyi.common.utils.file"};
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/GenConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/GenConstants.java
new file mode 100644
index 0000000..a8b5079
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/GenConstants.java
@@ -0,0 +1,176 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 代码生成通用常量
+ *
+ * @author ruoyi
+ */
+public class GenConstants {
+    /**
+     * 单表（增删改查）
+     */
+    public static final String TPL_CRUD = "crud";
+
+    /**
+     * 树表（增删改查）
+     */
+    public static final String TPL_TREE = "tree";
+
+    /**
+     * 主子表（增删改查）
+     */
+    public static final String TPL_SUB = "sub";
+
+    /**
+     * 树编码字段
+     */
+    public static final String TREE_CODE = "treeCode";
+
+    /**
+     * 树父编码字段
+     */
+    public static final String TREE_PARENT_CODE = "treeParentCode";
+
+    /**
+     * 树名称字段
+     */
+    public static final String TREE_NAME = "treeName";
+
+    /**
+     * 上级菜单ID字段
+     */
+    public static final String PARENT_MENU_ID = "parentMenuId";
+
+    /**
+     * 上级菜单名称字段
+     */
+    public static final String PARENT_MENU_NAME = "parentMenuName";
+
+    /**
+     * 数据库字符串类型
+     */
+    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+
+    /**
+     * 数据库文本类型
+     */
+    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+
+    /**
+     * 数据库时间类型
+     */
+    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+
+    /**
+     * 数据库数字类型
+     */
+    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bit", "bigint", "float", "double", "decimal"};
+
+    /**
+     * 页面不需要编辑字段
+     */
+    public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
+
+    /**
+     * 页面不需要显示的列表字段
+     */
+    public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time"};
+
+    /**
+     * 页面不需要查询字段
+     */
+    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark"};
+
+    /**
+     * Entity基类字段
+     */
+    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
+
+    /**
+     * Tree基类字段
+     */
+    public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
+
+    /**
+     * 文本框
+     */
+    public static final String HTML_INPUT = "input";
+
+    /**
+     * 文本域
+     */
+    public static final String HTML_TEXTAREA = "textarea";
+
+    /**
+     * 下拉框
+     */
+    public static final String HTML_SELECT = "select";
+
+    /**
+     * 单选框
+     */
+    public static final String HTML_RADIO = "radio";
+
+    /**
+     * 复选框
+     */
+    public static final String HTML_CHECKBOX = "checkbox";
+
+    /**
+     * 日期控件
+     */
+    public static final String HTML_DATETIME = "datetime";
+
+    /**
+     * 上传控件
+     */
+    public static final String HTML_UPLOAD = "upload";
+
+    /**
+     * 富文本控件
+     */
+    public static final String HTML_SUMMERNOTE = "summernote";
+
+    /**
+     * 字符串类型
+     */
+    public static final String TYPE_STRING = "String";
+
+    /**
+     * 整型
+     */
+    public static final String TYPE_INTEGER = "Integer";
+
+    /**
+     * 长整型
+     */
+    public static final String TYPE_LONG = "Long";
+
+    /**
+     * 浮点型
+     */
+    public static final String TYPE_DOUBLE = "Double";
+
+    /**
+     * 高精度计算类型
+     */
+    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /**
+     * 时间类型
+     */
+    public static final String TYPE_DATE = "Date";
+
+    /**
+     * 模糊查询
+     */
+    public static final String QUERY_LIKE = "LIKE";
+
+    /**
+     * 需要
+     */
+    public static final String REQUIRE = "1";
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/OnlineStatus.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/OnlineStatus.java
new file mode 100644
index 0000000..a065c2f
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/OnlineStatus.java
@@ -0,0 +1,23 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 用户会话
+ *
+ * @author ruoyi
+ */
+public enum OnlineStatus {
+    /**
+     * 用户状态
+     */
+    on_line("在线"), off_line("离线");
+
+    private final String info;
+
+    private OnlineStatus(String info) {
+        this.info = info;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/PermissionConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/PermissionConstants.java
new file mode 100644
index 0000000..c9aeee0
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/PermissionConstants.java
@@ -0,0 +1,38 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 权限通用常量
+ *
+ * @author ruoyi
+ */
+public class PermissionConstants {
+    /**
+     * 新增权限
+     */
+    public static final String ADD_PERMISSION = "add";
+
+    /**
+     * 修改权限
+     */
+    public static final String EDIT_PERMISSION = "edit";
+
+    /**
+     * 删除权限
+     */
+    public static final String REMOVE_PERMISSION = "remove";
+
+    /**
+     * 导出权限
+     */
+    public static final String EXPORT_PERMISSION = "export";
+
+    /**
+     * 显示权限
+     */
+    public static final String VIEW_PERMISSION = "view";
+
+    /**
+     * 查询权限
+     */
+    public static final String LIST_PERMISSION = "list";
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/ScheduleConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/ScheduleConstants.java
new file mode 100644
index 0000000..b8cc821
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/ScheduleConstants.java
@@ -0,0 +1,56 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 任务调度通用常量
+ *
+ * @author ruoyi
+ */
+public class ScheduleConstants {
+    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
+
+    /**
+     * 执行目标key
+     */
+    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
+
+    /**
+     * 默认
+     */
+    public static final String MISFIRE_DEFAULT = "0";
+
+    /**
+     * 立即触发执行
+     */
+    public static final String MISFIRE_IGNORE_MISFIRES = "1";
+
+    /**
+     * 触发一次执行
+     */
+    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
+
+    /**
+     * 不触发立即执行
+     */
+    public static final String MISFIRE_DO_NOTHING = "3";
+
+    public enum Status {
+        /**
+         * 正常
+         */
+        NORMAL("0"),
+        /**
+         * 暂停
+         */
+        PAUSE("1");
+
+        private String value;
+
+        private Status(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/ShiroConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/ShiroConstants.java
new file mode 100644
index 0000000..3c0fcba
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/ShiroConstants.java
@@ -0,0 +1,78 @@
+package com.mosty.common.base.constant;
+
+/**
+ * Shiro通用常量
+ *
+ * @author ruoyi
+ */
+public class ShiroConstants {
+    /**
+     * 当前登录的用户
+     */
+    public static final String CURRENT_USER = "currentUser";
+
+    /**
+     * 用户名字段
+     */
+    public static final String CURRENT_USERNAME = "username";
+
+    /**
+     * 锁定屏幕字段
+     */
+    public static final String LOCK_SCREEN = "lockscreen";
+
+    /**
+     * 消息key
+     */
+    public static final String MESSAGE = "message";
+
+    /**
+     * 错误key
+     */
+    public static final String ERROR = "errorMsg";
+
+    /**
+     * 编码格式
+     */
+    public static final String ENCODING = "UTF-8";
+
+    /**
+     * 当前在线会话
+     */
+    public static final String ONLINE_SESSION = "online_session";
+
+    /**
+     * 验证码key
+     */
+    public static final String CURRENT_CAPTCHA = "captcha";
+
+    /**
+     * 验证码开关
+     */
+    public static final String CURRENT_ENABLED = "captchaEnabled";
+
+    /**
+     * 验证码类型
+     */
+    public static final String CURRENT_TYPE = "captchaType";
+
+    /**
+     * 验证码
+     */
+    public static final String CURRENT_VALIDATECODE = "validateCode";
+
+    /**
+     * 验证码错误
+     */
+    public static final String CAPTCHA_ERROR = "captchaError";
+
+    /**
+     * 登录记录缓存
+     */
+    public static final String LOGINRECORDCACHE = "loginRecordCache";
+
+    /**
+     * 系统活跃用户缓存
+     */
+    public static final String SYS_USERCACHE = "sys-userCache";
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/SystemConfigConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/SystemConfigConstants.java
new file mode 100644
index 0000000..05dda1b
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/SystemConfigConstants.java
@@ -0,0 +1,26 @@
+package com.mosty.common.base.constant;
+
+/**
+ *  系统配置相关
+ * @author kevin
+ * @date 2022/3/21 10:46 PM
+ * @since 1.0.0
+ */
+public class SystemConfigConstants {
+
+    // token请求的 Header头 key
+    public static final String TOKEN_HEADER = "Authorization";
+
+    // token加密key
+    public static final String TOKEN_KEY = "RVvjAORWxgmDyvGP8RkD7HuaYEuekN7rXyaDaLn2jbk6OJvFupTXzicR883pFUmI";
+
+    // token 主题
+    public static final String TOKEN_ISSUER = "mosty-admin";
+
+    // token redis的key
+    public static final String TOKEN_PREFIX = "token:";
+
+    // redis中缓存的所有用户的登录信息
+//    public static final String USER_INFO_LIST = "user_info_list:";
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/UserConstants.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/UserConstants.java
new file mode 100644
index 0000000..cf59650
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/UserConstants.java
@@ -0,0 +1,148 @@
+package com.mosty.common.base.constant;
+
+/**
+ * 用户常量信息
+ *
+ * @author ruoyi
+ */
+public class UserConstants {
+
+    /**
+     * 平台内系统用户的唯一标志
+     */
+    public static final String SYS_USER = "SYS_USER";
+
+    /**
+     * 正常状态
+     */
+    public static final String NORMAL = "0";
+
+    /**
+     * 异常状态
+     */
+    public static final String EXCEPTION = "1";
+
+    /**
+     * 用户封禁状态
+     */
+    public static final String USER_DISABLE = "1";
+
+    /**
+     * 角色封禁状态
+     */
+    public static final String ROLE_DISABLE = "1";
+
+    /**
+     * 部门正常状态
+     */
+    public static final String DEPT_NORMAL = "0";
+
+    /**
+     * 部门停用状态
+     */
+    public static final String DEPT_DISABLE = "1";
+
+    /**
+     * 字典正常状态
+     */
+    public static final String DICT_NORMAL = "0";
+
+    /**
+     * 是否为系统默认（是）
+     */
+    public static final String YES = "Y";
+
+    /**
+     * 用户名长度限制
+     */
+    public static final int USERNAME_MIN_LENGTH = 2;
+    public static final int USERNAME_MAX_LENGTH = 20;
+
+    /**
+     * 登录名称是否唯一的返回结果码
+     */
+    public final static String USER_NAME_UNIQUE = "0";
+    public final static String USER_NAME_NOT_UNIQUE = "1";
+
+    /**
+     * 手机号码是否唯一的返回结果
+     */
+    public final static String USER_PHONE_UNIQUE = "0";
+    public final static String USER_PHONE_NOT_UNIQUE = "1";
+
+    /**
+     * e-mail 是否唯一的返回结果
+     */
+    public final static String USER_EMAIL_UNIQUE = "0";
+    public final static String USER_EMAIL_NOT_UNIQUE = "1";
+
+    /**
+     * 部门名称是否唯一的返回结果码
+     */
+    public final static String DEPT_NAME_UNIQUE = "0";
+    public final static String DEPT_NAME_NOT_UNIQUE = "1";
+
+    /**
+     * 角色名称是否唯一的返回结果码
+     */
+    public final static String ROLE_NAME_UNIQUE = "0";
+    public final static String ROLE_NAME_NOT_UNIQUE = "1";
+
+    /**
+     * 岗位名称是否唯一的返回结果码
+     */
+    public final static String POST_NAME_UNIQUE = "0";
+    public final static String POST_NAME_NOT_UNIQUE = "1";
+
+    /**
+     * 角色权限是否唯一的返回结果码
+     */
+    public final static String ROLE_KEY_UNIQUE = "0";
+    public final static String ROLE_KEY_NOT_UNIQUE = "1";
+
+    /**
+     * 岗位编码是否唯一的返回结果码
+     */
+    public final static String POST_CODE_UNIQUE = "0";
+    public final static String POST_CODE_NOT_UNIQUE = "1";
+
+    /**
+     * 菜单名称是否唯一的返回结果码
+     */
+    public final static String MENU_NAME_UNIQUE = "0";
+    public final static String MENU_NAME_NOT_UNIQUE = "1";
+
+    /**
+     * 字典类型是否唯一的返回结果码
+     */
+    public final static String DICT_TYPE_UNIQUE = "0";
+    public final static String DICT_TYPE_NOT_UNIQUE = "1";
+
+    /**
+     * 参数键名是否唯一的返回结果码
+     */
+    public final static String CONFIG_KEY_UNIQUE = "0";
+    public final static String CONFIG_KEY_NOT_UNIQUE = "1";
+
+    /**
+     * 密码长度限制
+     */
+    public static final int PASSWORD_MIN_LENGTH = 5;
+    public static final int PASSWORD_MAX_LENGTH = 20;
+
+    /**
+     * 用户类型
+     */
+    public static final String SYSTEM_USER_TYPE = "00";
+    public static final String REGISTER_USER_TYPE = "01";
+
+    /**
+     * 手机号码格式限制
+     */
+    public static final String MOBILE_PHONE_NUMBER_PATTERN = "^0{0,1}(13[0-9]|15[0-9]|14[0-9]|18[0-9])[0-9]{8}$";
+
+    /**
+     * 邮箱格式限制
+     */
+    public static final String EMAIL_PATTERN = "^((([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+(\\.([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(\\\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.)+(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.?";
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/ConfigKeyEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/ConfigKeyEnum.java
new file mode 100644
index 0000000..2a6ef0a
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/ConfigKeyEnum.java
@@ -0,0 +1,21 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  系统配置key
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum ConfigKeyEnum {
+    /** 密码等级 */
+    PASSWORD_LEVEL("password.level", "密码等级");
+
+
+    /** key */
+    public final String code;
+
+    /** 描述 */
+    public final String desc;
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DeletedEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DeletedEnum.java
new file mode 100644
index 0000000..fe5bbcd
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DeletedEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  数据是否删除标识
+ * @author kevin
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum DeletedEnum {
+
+    /** 正常状态 */
+    NATURE(0, "正常状态"),
+
+    /** 注销状态 */
+    DELETED(1, "注销状态");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DictTypeEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DictTypeEnum.java
new file mode 100644
index 0000000..b2e3499
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/DictTypeEnum.java
@@ -0,0 +1,27 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  字典类型枚举
+ *
+ * @author kevin
+ * @date 2022/2/20 3:52 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum DictTypeEnum {
+
+    /** 正常字典 */
+    NATURE(1, "正常字典【列表】"),
+
+    /** 树型字典 */
+    TREE(2, "树型结构");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/MenuTypeEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/MenuTypeEnum.java
new file mode 100644
index 0000000..600fcef
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/MenuTypeEnum.java
@@ -0,0 +1,43 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  菜单类型枚举
+ * @author kevin
+ * @date 2022/2/22 12:53 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum MenuTypeEnum {
+
+    MENU_GROUP(1, "菜单组"),
+    MENU(2, "菜单"),
+    PAGE(3, "页面"),
+    RESOURCE(4, "资源"),
+    ;
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+    /**
+     * 根据编码匹配菜单类型
+     * @param code 编码
+     * @return 菜单类型枚举
+     */
+    public static MenuTypeEnum valueOf(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (MenuTypeEnum menuTypeEnum : MenuTypeEnum.values()) {
+            if (menuTypeEnum.code.equals(code)) {
+                return menuTypeEnum;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PasswordLevelEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PasswordLevelEnum.java
new file mode 100644
index 0000000..de93501
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PasswordLevelEnum.java
@@ -0,0 +1,22 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  密码等级和对应规则
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum PasswordLevelEnum {
+
+    /** 密码等级 */
+    PASSWORD_LEVEL_ONE(1, "");
+
+
+    /** 等级 */
+    public final Integer code;
+
+    /** 规则 */
+    public final String rule;
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PermissionLevelEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PermissionLevelEnum.java
new file mode 100644
index 0000000..5220bda
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/constant/enums/PermissionLevelEnum.java
@@ -0,0 +1,38 @@
+package com.mosty.common.base.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum PermissionLevelEnum {
+
+
+    /**
+     * 全部
+     */
+    ALL("1", "全部"),
+
+    /**
+     * 部门及以下
+     */
+    DEPT_AND_CHILD("2", "部门及以下"),
+    /**
+     * 部门
+     */
+    DEPT("3", "仅部门权限"),
+    /**
+     * 部门及以下
+     */
+    ONESELF("4", "仅查看本人");
+
+
+    /**
+     * 等级
+     */
+    public String level;
+
+    /**
+     * 描述
+     */
+    public String desc;
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/data/scope/DataScope.java b/common-base-starter/src/main/java/com/mosty/common/base/data/scope/DataScope.java
new file mode 100644
index 0000000..5f7ffdc
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/data/scope/DataScope.java
@@ -0,0 +1,24 @@
+package com.mosty.common.base.data.scope;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限过滤注解
+ *
+ * @author ruoyi
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope {
+
+    /**
+     * 部门表的别名
+     */
+    String deptAlias() default "";
+
+    /**
+     * 用户表的别名
+     */
+    String userAlias() default "";
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/BaseController.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/BaseController.java
new file mode 100644
index 0000000..1546ef1
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/BaseController.java
@@ -0,0 +1,207 @@
+package com.mosty.common.base.domain;
+
+import com.github.pagehelper.PageInfo;
+import com.mosty.common.base.domain.page.PageUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * web层通用数据处理
+ *
+ * @author ruoyi
+ */
+@Slf4j
+public class BaseController {
+
+    /**
+     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder) {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
+            @Override
+            public void setAsText(String text) {
+                try {
+                    setValue(DateUtils.parseDate(text));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage() {
+        PageUtils.startPage();
+    }
+//
+//    /**
+//     * 设置请求排序数据
+//     */
+//    protected void startOrderBy()
+//    {
+//        PageDomain pageDomain = TableSupport.buildPageRequest();
+//        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+//        {
+//            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+//            PageHelper.orderBy(orderBy);
+//        }
+//    }
+//
+//    /**
+//     * 获取request
+//     */
+//    public HttpServletRequest getRequest()
+//    {
+//        return ServletUtils.getRequest();
+//    }
+//
+//    /**
+//     * 获取response
+//     */
+//    public HttpServletResponse getResponse()
+//    {
+//        return ServletUtils.getResponse();
+//    }
+//
+//    /**
+//     * 获取session
+//     */
+//    public HttpSession getSession()
+//    {
+//        return getRequest().getSession();
+//    }
+//
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    protected TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+//
+//    /**
+//     * 响应返回结果
+//     *
+//     * @param rows 影响行数
+//     * @return 操作结果
+//     */
+//    protected AjaxResult toAjax(int rows)
+//    {
+//        return rows > 0 ? success() : error();
+//    }
+//
+//    /**
+//     * 响应返回结果
+//     *
+//     * @param result 结果
+//     * @return 操作结果
+//     */
+//    protected AjaxResult toAjax(boolean result)
+//    {
+//        return result ? success() : error();
+//    }
+//
+//    /**
+//     * 返回成功
+//     */
+//    public AjaxResult success()
+//    {
+//        return AjaxResult.success();
+//    }
+//
+//    /**
+//     * 返回失败消息
+//     */
+//    public AjaxResult error()
+//    {
+//        return AjaxResult.error();
+//    }
+//
+//    /**
+//     * 返回成功消息
+//     */
+//    public AjaxResult success(String message)
+//    {
+//        return AjaxResult.success(message);
+//    }
+//
+//    /**
+//     * 返回成功数据
+//     */
+//    public static AjaxResult success(Object data)
+//    {
+//        return AjaxResult.success("操作成功", data);
+//    }
+//
+//    /**
+//     * 返回失败消息
+//     */
+//    public AjaxResult error(String message)
+//    {
+//        return AjaxResult.error(message);
+//    }
+//
+//    /**
+//     * 返回错误码消息
+//     */
+//    public AjaxResult error(Type type, String message)
+//    {
+//        return new AjaxResult(type, message);
+//    }
+//
+//    /**
+//     * 页面跳转
+//     */
+//    public String redirect(String url)
+//    {
+//        return StringUtils.format("redirect:{}", url);
+//    }
+//
+//    /**
+//     * 获取用户缓存信息
+//     */
+//    public SysUser getSysUser()
+//    {
+//        return ShiroUtils.getSysUser();
+//    }
+//
+//    /**
+//     * 设置用户缓存信息
+//     */
+//    public void setSysUser(SysUser user)
+//    {
+//        ShiroUtils.setSysUser(user);
+//    }
+//
+//    /**
+//     * 获取登录用户id
+//     */
+//    public Long getUserId()
+//    {
+//        return getSysUser().getUserId();
+//    }
+//
+//    /**
+//     * 获取登录用户名
+//     */
+//    public String getLoginName()
+//    {
+//        return getSysUser().getLoginName();
+//    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/CxSelect.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/CxSelect.java
new file mode 100644
index 0000000..015c5d0
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/CxSelect.java
@@ -0,0 +1,60 @@
+package com.mosty.common.base.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * CxSelect树结构实体类
+ *
+ * @author ruoyi
+ */
+public class CxSelect implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据值字段名称
+     */
+    private String v;
+
+    /**
+     * 数据标题字段名称
+     */
+    private String n;
+
+    /**
+     * 子集数据字段名称
+     */
+    private List<CxSelect> s;
+
+    public CxSelect() {
+    }
+
+    public CxSelect(String v, String n) {
+        this.v = v;
+        this.n = n;
+    }
+
+    public List<CxSelect> getS() {
+        return s;
+    }
+
+    public void setN(String n) {
+        this.n = n;
+    }
+
+    public String getN() {
+        return n;
+    }
+
+    public void setS(List<CxSelect> s) {
+        this.s = s;
+    }
+
+    public String getV() {
+        return v;
+    }
+
+    public void setV(String v) {
+        this.v = v;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/ResponseResult.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/ResponseResult.java
new file mode 100644
index 0000000..3f0bf53
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/ResponseResult.java
@@ -0,0 +1,99 @@
+package com.mosty.common.base.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ *  基础请求返回类
+ * @author kevin
+ * @date 2022/1/22 8:29 PM
+ * @since 1.0.0
+ */
+@Data
+@SuppressWarnings("unused")
+public class ResponseResult<T> implements Serializable {
+
+    /** 调用成功编码 */
+    private static final int SUCCESS_CODE = 10000;
+
+    /** 调用失败编码 */
+    private static final int FAIL_CODE = -1;
+
+    /** 编号 */
+    private int code = SUCCESS_CODE;
+
+    /** 消息 */
+    private String message;
+
+    /** 数据 */
+    private T data;
+
+    public ResponseResult() {
+    }
+
+    public ResponseResult(T data) {
+        this.message = "OK";
+        this.data = data;
+    }
+
+    public ResponseResult(int code, String msg) {
+        this.code = code;
+        this.message = msg;
+        this.data = null;
+    }
+
+    public ResponseResult(int code, String msg, T data) {
+        this.code = code;
+        this.message = msg;
+        this.data = data;
+    }
+
+    public static <T> ResponseResult<T> success() {
+        return new ResponseResult(SUCCESS_CODE, "OK", null);
+    }
+
+    public static <T> ResponseResult<T> success(int code, String message, T data) {
+        return new ResponseResult(code, message, data);
+    }
+
+    public static <T> ResponseResult<T> success(String message, T data) {
+        return new ResponseResult(SUCCESS_CODE, message, data);
+    }
+
+    public static <T> ResponseResult<T> success(T data) {
+        return new ResponseResult(SUCCESS_CODE, "OK", data);
+    }
+
+    public static <T> ResponseResult<T> fail(String message) {
+        return new ResponseResult(FAIL_CODE, message, (Object)null);
+    }
+
+    public static <T> ResponseResult<T> fail(int code, String message) {
+        return new ResponseResult(code, message, (Object)null);
+    }
+
+    public static <T> ResponseResult<T> fail(int code, String message, T t) {
+        return new ResponseResult(code, message, t);
+    }
+
+    public boolean isSuccess() {
+        return SUCCESS_CODE == code;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass())  {
+            return false;
+        }
+        ResponseResult<?> that = (ResponseResult<?>) o;
+        return Objects.equals(code, that.code) && Objects.equals(message, that.message) && Objects.equals(data, that.data);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, message, data);
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/TableDataInfo.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/TableDataInfo.java
new file mode 100644
index 0000000..ca35811
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/TableDataInfo.java
@@ -0,0 +1,82 @@
+package com.mosty.common.base.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 表格分页数据对象
+ *
+ * @author ruoyi
+ */
+public class TableDataInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总记录数
+     */
+    private long total;
+
+    /**
+     * 列表数据
+     */
+    private List<?> rows;
+
+    /**
+     * 消息状态码
+     */
+    private int code;
+
+    /**
+     * 消息内容
+     */
+    private String msg;
+
+    /**
+     * 表格数据对象
+     */
+    public TableDataInfo() {
+    }
+
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<?> list, int total) {
+        this.rows = list;
+        this.total = total;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public List<?> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<?> rows) {
+        this.rows = rows;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageDomain.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageDomain.java
new file mode 100644
index 0000000..43e8e09
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageDomain.java
@@ -0,0 +1,86 @@
+package com.mosty.common.base.domain.page;
+
+
+import com.mosty.common.base.util.StringUtils;
+
+/**
+ * 分页数据
+ *
+ * @author ruoyi
+ */
+public class PageDomain {
+    /**
+     * 当前记录起始索引
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页显示记录数
+     */
+    private Integer pageSize;
+
+    /**
+     * 排序列
+     */
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    private String isAsc = "asc";
+
+    /**
+     * 分页参数合理化
+     */
+    private Boolean reasonable = true;
+
+    public String getOrderBy() {
+        if (StringUtils.isEmpty(orderByColumn)) {
+            return "";
+        }
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByColumn() {
+        return orderByColumn;
+    }
+
+    public void setOrderByColumn(String orderByColumn) {
+        this.orderByColumn = orderByColumn;
+    }
+
+    public String getIsAsc() {
+        return isAsc;
+    }
+
+    public void setIsAsc(String isAsc) {
+        this.isAsc = isAsc;
+    }
+
+    public Boolean getReasonable() {
+        if (StringUtils.isNull(reasonable)) {
+            return Boolean.TRUE;
+        }
+        return reasonable;
+    }
+
+    public void setReasonable(Boolean reasonable) {
+        this.reasonable = reasonable;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageUtils.java
new file mode 100644
index 0000000..28861e7
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/PageUtils.java
@@ -0,0 +1,27 @@
+package com.mosty.common.base.domain.page;
+
+import com.github.pagehelper.PageHelper;
+
+import java.util.Objects;
+
+/**
+ * 分页工具类
+ *
+ * @author ruoyi
+ */
+public class PageUtils extends PageHelper {
+
+    /**
+     * 设置请求分页数据
+     */
+    public static void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (!Objects.isNull(pageNum) && !Objects.isNull(pageSize)) {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            Boolean reasonable = pageDomain.getReasonable();
+            PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/page/ServletUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/ServletUtils.java
new file mode 100644
index 0000000..6d1d269
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/ServletUtils.java
@@ -0,0 +1,156 @@
+package com.mosty.common.base.domain.page;
+
+import cn.hutool.core.convert.Convert;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+/**
+ * 客户端工具类
+ *
+ * @author ruoyi
+ */
+public class ServletUtils {
+    /**
+     * 定义移动端请求的所有可能类型
+     */
+    private final static String[] agent = {"Android", "iPhone", "iPod", "iPad", "Windows Phone", "MQQBrowser"};
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name) {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name, String defaultValue) {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name) {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name) {
+        return Convert.toBool(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
+        return Convert.toBool(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取request
+     */
+    public static HttpServletRequest getRequest() {
+        return getRequestAttributes().getRequest();
+    }
+
+    /**
+     * 获取response
+     */
+    public static HttpServletResponse getResponse() {
+        return getRequestAttributes().getResponse();
+    }
+
+    /**
+     * 获取session
+     */
+    public static HttpSession getSession() {
+        return getRequest().getSession();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes() {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        return (ServletRequestAttributes) attributes;
+    }
+
+    /**
+     * 将字符串渲染到客户端
+     *
+     * @param response 渲染对象
+     * @param string   待渲染的字符串
+     * @return null
+     */
+    public static String renderString(HttpServletResponse response, String string) {
+        try {
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            response.getWriter().print(string);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 是否是Ajax异步请求
+     *
+     * @param request
+     */
+//    public static boolean isAjaxRequest(HttpServletRequest request) {
+//        String accept = request.getHeader("accept");
+//        if (accept != null && accept.indexOf("application/json") != -1) {
+//            return true;
+//        }
+//
+//        String xRequestedWith = request.getHeader("X-Requested-With");
+//        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+//            return true;
+//        }
+//
+//        String uri = request.getRequestURI();
+//        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
+//            return true;
+//        }
+//
+//        String ajax = request.getParameter("__ajax");
+//        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) {
+//            return true;
+//        }
+//        return false;
+//    }
+
+    /**
+     * 判断User-Agent 是不是来自于手机
+     */
+    public static boolean checkAgentIsMobile(String ua) {
+        boolean flag = false;
+        if (!ua.contains("Windows NT") || (ua.contains("Windows NT") && ua.contains("compatible; MSIE 9.0;"))) {
+            // 排除 苹果桌面系统
+            if (!ua.contains("Windows NT") && !ua.contains("Macintosh")) {
+                for (String item : agent) {
+                    if (ua.contains(item)) {
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return flag;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/page/SqlUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/SqlUtil.java
new file mode 100644
index 0000000..17f5a06
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/SqlUtil.java
@@ -0,0 +1,53 @@
+package com.mosty.common.base.domain.page;
+
+import com.mosty.common.base.exception.BusinessException;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * sql操作工具类
+ *
+ * @author ruoyi
+ */
+public class SqlUtil {
+    /**
+     * 定义常用的 sql关键字
+     */
+    public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
+
+    /**
+     * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
+     */
+    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
+
+    /**
+     * 检查字符，防止注入绕过
+     */
+    public static String escapeOrderBySql(String value) {
+        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
+            throw new BusinessException("参数不符合规范，不能进行查询");
+        }
+        return value;
+    }
+
+    /**
+     * 验证 order by 语法是否符合规范
+     */
+    public static boolean isValidOrderBySql(String value) {
+        return value.matches(SQL_PATTERN);
+    }
+
+    /**
+     * SQL关键字检查
+     */
+    public static void filterKeyword(String value) {
+        if (StringUtils.isEmpty(value)) {
+            return;
+        }
+        String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
+        for (int i = 0; i < sqlKeywords.length; i++) {
+            if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1) {
+                throw new BusinessException("参数存在SQL注入风险");
+            }
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/domain/page/TableSupport.java b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/TableSupport.java
new file mode 100644
index 0000000..70b28ac
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/domain/page/TableSupport.java
@@ -0,0 +1,51 @@
+package com.mosty.common.base.domain.page;
+
+
+/**
+ * 表格数据处理
+ *
+ * @author ruoyi
+ */
+public class TableSupport {
+    /**
+     * 当前记录起始索引
+     */
+    public static final String PAGE_NUM = "pageNum";
+
+    /**
+     * 每页显示记录数
+     */
+    public static final String PAGE_SIZE = "pageSize";
+
+    /**
+     * 排序列
+     */
+    public static final String ORDER_BY_COLUMN = "orderByColumn";
+
+    /**
+     * 排序的方向 "desc" 或者 "asc".
+     */
+    public static final String IS_ASC = "isAsc";
+
+    /**
+     * 分页参数合理化
+     */
+    public static final String REASONABLE = "reasonable";
+
+    /**
+     * 封装分页对象
+     */
+    public static PageDomain getPageDomain() {
+        PageDomain pageDomain = new PageDomain();
+        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
+        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
+        pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
+        pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
+        pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
+        return pageDomain;
+    }
+
+    public static PageDomain buildPageRequest() {
+        return getPageDomain();
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BaseEntity.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BaseEntity.java
new file mode 100644
index 0000000..3c687e4
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BaseEntity.java
@@ -0,0 +1,141 @@
+package com.mosty.common.base.entity.log;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ *
+ * @author ruoyi
+ */
+public class BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+    /**
+     * 创建者id
+     */
+    private Long createBy;
+
+    /**
+     * 创建者名称
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者id
+     */
+    private Long updateBy;
+
+    /**
+     * 更新者名称
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params;
+
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams() {
+        if (params == null) {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BusinessType.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BusinessType.java
new file mode 100644
index 0000000..f6fabbb
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/BusinessType.java
@@ -0,0 +1,38 @@
+package com.mosty.common.base.entity.log;
+
+/**
+ * 业务操作类型
+ * 
+ * @author ruoyi
+ */
+public enum BusinessType {
+    // 其它
+    OTHER,
+
+    // 新增
+    INSERT,
+
+    // 修改
+    UPDATE,
+
+    // 删除
+    DELETE,
+
+    // 授权
+    GRANT,
+
+    // 导出
+    EXPORT,
+
+    // 导入
+    IMPORT,
+
+    // 强退
+    FORCE,
+
+    // 生成代码
+    GENCODE,
+    
+    // 清空
+    CLEAN,
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/CharsetKit.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/CharsetKit.java
new file mode 100644
index 0000000..83c945d
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/CharsetKit.java
@@ -0,0 +1,87 @@
+package com.mosty.common.base.entity.log;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 字符集工具类
+ * 
+ * @author ruoyi
+ */
+public class CharsetKit
+{
+    /** ISO-8859-1 */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+    /** UTF-8 */
+    public static final String UTF_8 = "UTF-8";
+    /** GBK */
+    public static final String GBK = "GBK";
+
+    /** ISO-8859-1 */
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    /** UTF-8 */
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    /** GBK */
+    public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+    /**
+     * 转换为Charset对象
+     * 
+     * @param charset 字符集，为空则返回默认字符集
+     * @return Charset
+     */
+    public static Charset charset(String charset)
+    {
+        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     * 
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, String srcCharset, String destCharset)
+    {
+        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     * 
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    {
+        if (null == srcCharset)
+        {
+            srcCharset = StandardCharsets.ISO_8859_1;
+        }
+
+        if (null == destCharset)
+        {
+            destCharset = StandardCharsets.UTF_8;
+        }
+
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        {
+            return source;
+        }
+        return new String(source.getBytes(srcCharset), destCharset);
+    }
+
+    /**
+     * @return 系统字符集编码
+     */
+    public static String systemCharset()
+    {
+        return Charset.defaultCharset().name();
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Convert.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Convert.java
new file mode 100644
index 0000000..73ac91f
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Convert.java
@@ -0,0 +1,1013 @@
+package com.mosty.common.base.entity.log;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+
+/**
+ * 类型转换器
+ * 
+ * @author ruoyi
+ */
+public class Convert
+{
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static String toStr(Object value, String defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof String)
+        {
+            return (String) value;
+        }
+        return value.toString();
+    }
+
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static String toStr(Object value)
+    {
+        return toStr(value, null);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Character toChar(Object value, Character defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Character)
+        {
+            return (Character) value;
+        }
+
+        final String valueStr = toStr(value, null);
+        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Character toChar(Object value)
+    {
+        return toChar(value, null);
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Byte toByte(Object value, Byte defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Byte)
+        {
+            return (Byte) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).byteValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Byte.parseByte(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Byte toByte(Object value)
+    {
+        return toByte(value, null);
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Short toShort(Object value, Short defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Short)
+        {
+            return (Short) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).shortValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Short.parseShort(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Short toShort(Object value)
+    {
+        return toShort(value, null);
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Number toNumber(Object value, Number defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Number)
+        {
+            return (Number) value;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return NumberFormat.getInstance().parse(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Number toNumber(Object value)
+    {
+        return toNumber(value, null);
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Integer toInt(Object value, Integer defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Integer)
+        {
+            return (Integer) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).intValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Integer.parseInt(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Integer toInt(Object value)
+    {
+        return toInt(value, null);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String str)
+    {
+        return toIntArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str)
+    {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param split 分隔符
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Integer[] {};
+        }
+        String[] arr = str.split(split);
+        final Integer[] ints = new Integer[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Integer v = toInt(arr[i], 0);
+            ints[i] = v;
+        }
+        return ints;
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Long[] {};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Long v = toLong(arr[i], null);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str)
+    {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str)
+    {
+        return str.split(split);
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Long toLong(Object value, Long defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Long)
+        {
+            return (Long) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).longValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).longValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Long toLong(Object value)
+    {
+        return toLong(value, null);
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Double toDouble(Object value, Double defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Double)
+        {
+            return (Double) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).doubleValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).doubleValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Double toDouble(Object value)
+    {
+        return toDouble(value, null);
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Float toFloat(Object value, Float defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Float)
+        {
+            return (Float) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).floatValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Float.parseFloat(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Float toFloat(Object value)
+    {
+        return toFloat(value, null);
+    }
+
+    /**
+     * 转换为boolean<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value, Boolean defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Boolean)
+        {
+            return (Boolean) value;
+        }
+        String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        valueStr = valueStr.trim().toLowerCase();
+        switch (valueStr)
+        {
+            case "true":
+            case "yes":
+            case "ok":
+            case "1":
+                return true;
+            case "false":
+            case "no":
+            case "0":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为boolean<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value)
+    {
+        return toBool(value, null);
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @param defaultValue 默认值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (clazz.isAssignableFrom(value.getClass()))
+        {
+            @SuppressWarnings("unchecked")
+            E myE = (E) value;
+            return myE;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Enum.valueOf(clazz, valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value)
+    {
+        return toEnum(clazz, value, null);
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigInteger)
+        {
+            return (BigInteger) value;
+        }
+        if (value instanceof Long)
+        {
+            return BigInteger.valueOf((Long) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigInteger(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value)
+    {
+        return toBigInteger(value, null);
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigDecimal)
+        {
+            return (BigDecimal) value;
+        }
+        if (value instanceof Long)
+        {
+            return new BigDecimal((Long) value);
+        }
+        if (value instanceof Double)
+        {
+            return BigDecimal.valueOf((Double) value);
+        }
+        if (value instanceof Integer)
+        {
+            return new BigDecimal((Integer) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigDecimal(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value)
+    {
+        return toBigDecimal(value, null);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @return 字符串
+     */
+    public static String utf8Str(Object obj)
+    {
+        return str(obj, CharsetKit.CHARSET_UTF_8);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charsetName 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, String charsetName)
+    {
+        return str(obj, Charset.forName(charsetName));
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, Charset charset)
+    {
+        if (null == obj)
+        {
+            return null;
+        }
+
+        if (obj instanceof String)
+        {
+            return (String) obj;
+        }
+        else if (obj instanceof byte[] || obj instanceof Byte[])
+        {
+            if (obj instanceof byte[])
+            {
+                return str((byte[]) obj, charset);
+            }
+            else
+            {
+                Byte[] bytes = (Byte[]) obj;
+                int length = bytes.length;
+                byte[] dest = new byte[length];
+                for (int i = 0; i < length; i++)
+                {
+                    dest[i] = bytes[i];
+                }
+                return str(dest, charset);
+            }
+        }
+        else if (obj instanceof ByteBuffer)
+        {
+            return str((ByteBuffer) obj, charset);
+        }
+        return obj.toString();
+    }
+
+    /**
+     * 将byte数组转为字符串
+     *
+     * @param bytes byte数组
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(byte[] bytes, String charset)
+    {
+        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+    }
+
+    /**
+     * 解码字节码
+     *
+     * @param data 字符串
+     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
+     * @return 解码后的字符串
+     */
+    public static String str(byte[] data, Charset charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        if (null == charset)
+        {
+            return new String(data);
+        }
+        return new String(data, charset);
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, String charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        return str(data, Charset.forName(charset));
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, Charset charset)
+    {
+        if (null == charset)
+        {
+            charset = Charset.defaultCharset();
+        }
+        return charset.decode(data).toString();
+    }
+
+    // ----------------------------------------------------------------------- 全角半角转换
+    /**
+     * 半角转全角
+     *
+     * @param input String.
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input)
+    {
+        return toSBC(input, null);
+    }
+
+    /**
+     * 半角转全角
+     *
+     * @param input String
+     * @param notConvertSet 不替换的字符集合
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input, Set<Character> notConvertSet)
+    {
+        char[] c = input.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == ' ')
+            {
+                c[i] = '\u3000';
+            }
+            else if (c[i] < '\177')
+            {
+                c[i] = (char) (c[i] + 65248);
+
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 全角转半角
+     *
+     * @param input String.
+     * @return 半角字符串
+     */
+    public static String toDBC(String input)
+    {
+        return toDBC(input, null);
+    }
+
+    /**
+     * 替换全角为半角
+     *
+     * @param text 文本
+     * @param notConvertSet 不替换的字符集合
+     * @return 替换后的字符
+     */
+    public static String toDBC(String text, Set<Character> notConvertSet)
+    {
+        char[] c = text.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == '\u3000')
+            {
+                c[i] = ' ';
+            }
+            else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
+            {
+                c[i] = (char) (c[i] - 65248);
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+     *
+     * @param n 数字
+     * @return 中文大写数字
+     */
+    public static String digitUppercase(double n)
+    {
+        String[] fraction = { "角", "分" };
+        String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
+        String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
+
+        String head = n < 0 ? "负" : "";
+        n = Math.abs(n);
+
+        String s = "";
+        for (int i = 0; i < fraction.length; i++)
+        {
+            // 优化double计算精度丢失问题
+            BigDecimal nNum = new BigDecimal(n);
+            BigDecimal decimal = new BigDecimal(10);
+            BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
+            double d = scale.doubleValue();
+            s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+        }
+        if (s.length() < 1)
+        {
+            s = "整";
+        }
+        int integerPart = (int) Math.floor(n);
+
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++)
+        {
+            String p = "";
+            for (int j = 0; j < unit[1].length && n > 0; j++)
+            {
+                p = digit[integerPart % 10] + unit[1][j] + p;
+                integerPart = integerPart / 10;
+            }
+            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+        }
+        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excel.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excel.java
new file mode 100644
index 0000000..c883bad
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excel.java
@@ -0,0 +1,188 @@
+package com.mosty.common.base.entity.log;
+
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.math.BigDecimal;
+
+/**
+ * 自定义导出Excel数据注解
+ *
+ * @author ruoyi
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Excel {
+    /**
+     * 导出时在excel中排序
+     */
+    public int sort() default Integer.MAX_VALUE;
+
+    /**
+     * 导出到Excel中的名字.
+     */
+    public String name() default "";
+
+    /**
+     * 日期格式, 如: yyyy-MM-dd
+     */
+    public String dateFormat() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    public String readConverterExp() default "";
+
+    /**
+     * 分隔符，读取字符串组内容
+     */
+    public String separator() default ",";
+
+    /**
+     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+     */
+    public int scale() default -1;
+
+    /**
+     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+     */
+    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
+    /**
+     * 导出时在excel中每个列的高度
+     */
+    public double height() default 14;
+
+    /**
+     * 导出时在excel中每个列的宽度
+     */
+    public double width() default 16;
+
+    /**
+     * 文字后缀,如% 90 变成90%
+     */
+    public String suffix() default "";
+
+    /**
+     * 当值为空时,字段的默认值
+     */
+    public String defaultValue() default "";
+
+    /**
+     * 提示信息
+     */
+    public String prompt() default "";
+
+    /**
+     * 设置只能选择不能输入的列内容.
+     */
+    public String[] combo() default {};
+
+    /**
+     * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
+     */
+    public boolean needMerge() default false;
+
+    /**
+     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
+     */
+    public boolean isExport() default true;
+
+    /**
+     * 另一个类中的属性名称,支持多级获取,以小数点隔开
+     */
+    public String targetAttr() default "";
+
+    /**
+     * 是否自动统计数据,在最后追加一行统计数据总和
+     */
+    public boolean isStatistics() default false;
+
+
+    /**
+     * 如果是字典类型，请设置字典的type值
+     * >>>>>>>特别提醒，如若配置该字段，则“combo”和“readConverterExp”不启用
+     */
+    public String dictType() default "";
+
+    /**
+     * 导出类型（0数字 1字符串）
+     */
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出列头背景颜色
+     */
+    public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
+
+    /**
+     * 导出列头字体颜色
+     */
+    public IndexedColors headerColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格背景颜色
+     */
+    public IndexedColors backgroundColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格字体颜色
+     */
+    public IndexedColors color() default IndexedColors.BLACK;
+
+    /**
+     * 导出字段对齐方式
+     */
+    public HorizontalAlignment align() default HorizontalAlignment.CENTER;
+
+    /**
+     * 自定义数据处理器
+     */
+    public Class<?> handler() default ExcelHandlerAdapter.class;
+
+    /**
+     * 自定义数据处理器参数
+     */
+    public String[] args() default {};
+
+    /**
+     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
+     */
+    Type type() default Type.ALL;
+
+    public enum Type
+    {
+        ALL(0), EXPORT(1), IMPORT(2);
+        private final int value;
+
+        Type(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    public enum ColumnType
+    {
+        NUMERIC(0), STRING(1), IMAGE(2);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ExcelHandlerAdapter.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ExcelHandlerAdapter.java
new file mode 100644
index 0000000..2f62ae4
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ExcelHandlerAdapter.java
@@ -0,0 +1,17 @@
+package com.mosty.common.base.entity.log;
+
+/**
+ * Excel数据格式处理适配器
+ *
+ * @author ruoyi
+ */
+public interface ExcelHandlerAdapter {
+    /**
+     * 格式化
+     *
+     * @param value 单元格数据值
+     * @param args  excel注解args参数组
+     * @return 处理后的值
+     */
+    Object format(Object value, String[] args);
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excels.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excels.java
new file mode 100644
index 0000000..3eb5930
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Excels.java
@@ -0,0 +1,18 @@
+package com.mosty.common.base.entity.log;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ *
+ * @author ruoyi
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels {
+
+    Excel[] value();
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Log.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Log.java
new file mode 100644
index 0000000..41684e6
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/Log.java
@@ -0,0 +1,36 @@
+package com.mosty.common.base.entity.log;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *  自定义操作日志记录注解
+ *
+ * @author kevin
+ * @date 2022/1/25 9:10 PM
+ * @since 1.0.0
+ */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log {
+
+    // 模块
+    String title() default "";
+
+    // 功能
+    BusinessType businessType() default BusinessType.OTHER;
+
+    // 操作人类别
+    OperatorType operatorType() default OperatorType.MANAGE;
+
+    // 是否保存请求的参数
+    boolean isSaveRequestData() default true;
+
+    // 是否保存响应的参数
+    boolean isSaveResponseData() default true;
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/LogConst.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/LogConst.java
new file mode 100644
index 0000000..094eb30
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/LogConst.java
@@ -0,0 +1,15 @@
+package com.mosty.common.base.entity.log;
+
+/**
+ * 操作日志静态变量
+ *
+ * @author kevin
+ * @date 2022/1/25 9:36 PM
+ * @since 1.0.0
+ */
+public class LogConst {
+
+    // 操作日志线程池名称
+    public static final String LOG_THREAD_POOL = "OPERATION_LOG";
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/OperatorType.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/OperatorType.java
new file mode 100644
index 0000000..b678431
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/OperatorType.java
@@ -0,0 +1,25 @@
+package com.mosty.common.base.entity.log;
+
+/**
+ *  操作人类别
+ *
+ * @author kevin
+ * @date 2022/1/25 9:10 PM
+ * @since 1.0.0
+ */
+public enum OperatorType {
+    /**
+     * 其它
+     */
+    OTHER,
+
+    /**
+     * 后台用户
+     */
+    MANAGE,
+
+    /**
+     * 手机端用户
+     */
+    MOBILE
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ReflectUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ReflectUtils.java
new file mode 100644
index 0000000..763adaa
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/ReflectUtils.java
@@ -0,0 +1,410 @@
+package com.mosty.common.base.entity.log;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Date;
+
+import com.mosty.common.base.util.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ * 
+ * @author ruoyi
+ */
+@SuppressWarnings("rawtypes")
+public class ReflectUtils
+{
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    private static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName)
+    {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, "."))
+        {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value)
+    {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++)
+        {
+            if (i < names.length - 1)
+            {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+            }
+            else
+            {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                invokeMethodByName(object, setterMethodName, new Object[] { value });
+            }
+        }
+    }
+
+    /**
+     * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E getFieldValue(final Object obj, final String fieldName)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return null;
+        }
+        E result = null;
+        try
+        {
+            result = (E) field.get(obj);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常{}", e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
+     */
+    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return;
+        }
+        try
+        {
+            field.set(obj, value);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符.
+     * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
+     * 同时匹配方法名+参数类型，
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
+            final Object[] args)
+    {
+        if (obj == null || methodName == null)
+        {
+            return null;
+        }
+        Method method = getAccessibleMethod(obj, methodName, parameterTypes);
+        if (method == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符，
+     * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
+     * 只匹配函数名，如果有多个同名函数调用第一个。
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
+    {
+        Method method = getAccessibleMethodByName(obj, methodName, args.length);
+        if (method == null)
+        {
+            // 如果为空不报错，直接返回空。
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            // 类型转换（将参数数据类型转换为目标方法参数类型）
+            Class<?>[] cs = method.getParameterTypes();
+            for (int i = 0; i < cs.length; i++)
+            {
+                if (args[i] != null && !args[i].getClass().equals(cs[i]))
+                {
+                    if (cs[i] == String.class)
+                    {
+                        args[i] = Convert.toStr(args[i]);
+                        if (StringUtils.endsWith((String) args[i], ".0"))
+                        {
+                            args[i] = StringUtils.substringBefore((String) args[i], ".0");
+                        }
+                    }
+                    else if (cs[i] == Integer.class)
+                    {
+                        args[i] = Convert.toInt(args[i]);
+                    }
+                    else if (cs[i] == Long.class)
+                    {
+                        args[i] = Convert.toLong(args[i]);
+                    }
+                    else if (cs[i] == Double.class)
+                    {
+                        args[i] = Convert.toDouble(args[i]);
+                    }
+                    else if (cs[i] == Float.class)
+                    {
+                        args[i] = Convert.toFloat(args[i]);
+                    }
+                    else if (cs[i] == Date.class)
+                    {
+                        if (args[i] instanceof String)
+                        {
+                            args[i] = DateUtils.parseDate(args[i]);
+                        }
+                        else
+                        {
+                            args[i] = DateUtil.getJavaDate((Double) args[i]);
+                        }
+                    }
+                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)
+                    {
+                        args[i] = Convert.toBool(args[i]);
+                    }
+                }
+            }
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     */
+    public static Field getAccessibleField(final Object obj, final String fieldName)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(fieldName, "fieldName can't be blank");
+        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
+        {
+            try
+            {
+                Field field = superClass.getDeclaredField(fieldName);
+                makeAccessible(field);
+                return field;
+            }
+            catch (NoSuchFieldException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 匹配函数名+参数类型。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethod(final Object obj, final String methodName,
+            final Class<?>... parameterTypes)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            try
+            {
+                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
+                makeAccessible(method);
+                return method;
+            }
+            catch (NoSuchMethodException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 只匹配函数名。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            Method[] methods = searchType.getDeclaredMethods();
+            for (Method method : methods)
+            {
+                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
+                {
+                    makeAccessible(method);
+                    return method;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Method method)
+    {
+        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
+                && !method.isAccessible())
+        {
+            method.setAccessible(true);
+        }
+    }
+
+    /**
+     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Field field)
+    {
+        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
+                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
+        {
+            field.setAccessible(true);
+        }
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
+     * 如无法找到, 返回Object.class.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getClassGenricType(final Class clazz)
+    {
+        return getClassGenricType(clazz, 0);
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
+     * 如无法找到, 返回Object.class.
+     */
+    public static Class getClassGenricType(final Class clazz, final int index)
+    {
+        Type genType = clazz.getGenericSuperclass();
+
+        if (!(genType instanceof ParameterizedType))
+        {
+            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+            return Object.class;
+        }
+
+        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+
+        if (index >= params.length || index < 0)
+        {
+            logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
+                    + params.length);
+            return Object.class;
+        }
+        if (!(params[index] instanceof Class))
+        {
+            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+            return Object.class;
+        }
+
+        return (Class) params[index];
+    }
+
+    public static Class<?> getUserClass(Object instance)
+    {
+        if (instance == null)
+        {
+            throw new RuntimeException("Instance must not be null");
+        }
+        Class clazz = instance.getClass();
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
+        {
+            Class<?> superClass = clazz.getSuperclass();
+            if (superClass != null && !Object.class.equals(superClass))
+            {
+                return superClass;
+            }
+        }
+        return clazz;
+
+    }
+
+    /**
+     * 将反射时的checked exception转换为unchecked exception.
+     */
+    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
+    {
+        if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
+                || e instanceof NoSuchMethodException)
+        {
+            return new IllegalArgumentException(msg, e);
+        }
+        else if (e instanceof InvocationTargetException)
+        {
+            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
+        }
+        return new RuntimeException(msg, e);
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SpringUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SpringUtils.java
new file mode 100644
index 0000000..ae19071
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SpringUtils.java
@@ -0,0 +1,114 @@
+package com.mosty.common.base.entity.log;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * spring工具类 方便在非spring管理环境中获取bean
+ * 
+ * @author ruoyi
+ */
+@Component
+public final class SpringUtils implements BeanFactoryPostProcessor
+{
+    /** Spring应用上下文环境 */
+    private static ConfigurableListableBeanFactory beanFactory;
+
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+    {
+        SpringUtils.beanFactory = beanFactory;
+    }
+
+    /**
+     * 获取对象
+     *
+     * @param name
+     * @return Object 一个以所给名字注册的bean的实例
+     * @throws org.springframework.beans.BeansException
+     *
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getBean(String name) throws BeansException
+    {
+        return (T) beanFactory.getBean(name);
+    }
+
+    /**
+     * 获取类型为requiredType的对象
+     *
+     * @param clz
+     * @return
+     * @throws org.springframework.beans.BeansException
+     *
+     */
+    public static <T> T getBean(Class<T> clz) throws BeansException
+    {
+        T result = (T) beanFactory.getBean(clz);
+        return result;
+    }
+
+    /**
+     * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+     *
+     * @param name
+     * @return boolean
+     */
+    public static boolean containsBean(String name)
+    {
+        return beanFactory.containsBean(name);
+    }
+
+    /**
+     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+     *
+     * @param name
+     * @return boolean
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.isSingleton(name);
+    }
+
+    /**
+     * @param name
+     * @return Class 注册对象的类型
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getType(name);
+    }
+
+    /**
+     * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+     *
+     * @param name
+     * @return
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getAliases(name);
+    }
+
+    /**
+     * 获取aop代理对象
+     * 
+     * @param invoker
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker)
+    {
+        return (T) AopContext.currentProxy();
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/StringUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/StringUtils.java
new file mode 100644
index 0000000..ee4eb5c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/StringUtils.java
@@ -0,0 +1,562 @@
+package com.mosty.common.base.entity.log;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import cn.hutool.core.text.StrFormatter;
+import com.mosty.common.base.constant.Constants;
+import org.springframework.util.AntPathMatcher;
+
+/**
+ * 字符串工具类
+ * 
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils
+{
+    /** 空字符串 */
+    private static final String NULLSTR = "";
+
+    /** 下划线 */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     * 
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue)
+    {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     * 
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll)
+    {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     * 
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll)
+    {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     * 
+     * @param objects 要判断的对象数组
+     ** @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects)
+    {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     * 
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects)
+    {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     * 
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map)
+    {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     * 
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map)
+    {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     * 
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str)
+    {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     * 
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str)
+    {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     * 
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     * 
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     * 
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object)
+    {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str)
+    {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     * 
+     * @param str 字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (start > str.length())
+        {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     * 
+     * @param str 字符串
+     * @param start 开始
+     * @param end 结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (end < 0)
+        {
+            end = str.length() + end;
+        }
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (end > str.length())
+        {
+            end = str.length();
+        }
+
+        if (start > end)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (end < 0)
+        {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 判断是否为空，并且不是空白字符
+     * 
+     * @param str 要判断的value
+     * @return 结果
+     */
+    public static boolean hasText(String str)
+    {
+        return (str != null && !str.isEmpty() && containsText(str));
+    }
+
+    private static boolean containsText(CharSequence str)
+    {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++)
+        {
+            if (!Character.isWhitespace(str.charAt(i)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     * 
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params)
+    {
+        if (isEmpty(params) || isEmpty(template))
+        {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+    /**
+     * 是否为http(s)://开头
+     * 
+     * @param link 链接
+     * @return 结果
+     */
+    public static boolean ishttp(String link)
+    {
+        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+    }
+
+    /**
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     *
+     * @param collection 给定的集合
+     * @param array 给定的数组
+     * @return boolean 结果
+     */
+    public static boolean containsAny(Collection<String> collection, String... array)
+    {
+        if (isEmpty(collection) || isEmpty(array))
+        {
+            return false;
+        }
+        else
+        {
+            for (String str : array)
+            {
+                if (collection.contains(str))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char c = str.charAt(i);
+            if (i > 0)
+            {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            }
+            else
+            {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1))
+            {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     * 
+     * @param str 验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs)
+    {
+        if (str != null && strs != null)
+        {
+            for (String s : strs)
+            {
+                if (str.equalsIgnoreCase(trim(s)))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     * 
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name)
+    {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty())
+        {
+            // 没必要转换
+            return "";
+        }
+        else if (!name.contains("_"))
+        {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels)
+        {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty())
+            {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如：user_name->userName
+     */
+    public static String toCamelCase(String s)
+    {
+        if (s == null)
+        {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1)
+        {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR)
+            {
+                upperCase = true;
+            }
+            else if (upperCase)
+            {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            }
+            else
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     * 
+     * @param str 指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs)
+    {
+        if (isEmpty(str) || isEmpty(strs))
+        {
+            return false;
+        }
+        for (String pattern : strs)
+        {
+            if (isMatch(pattern, str))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置: 
+     * ? 表示单个字符; 
+     * * 表示一层路径内的任意字符串，不可跨层级; 
+     * ** 表示任意层路径;
+     * 
+     * @param pattern 匹配规则
+     * @param url 需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url)
+    {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj)
+    {
+        return (T) obj;
+    }
+
+    /**
+     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+     * 
+     * @param num 数字对象
+     * @param size 字符串指定长度
+     * @return 返回数字的字符串格式，该字符串为指定长度。
+     */
+    public static final String padl(final Number num, final int size)
+    {
+        return padl(num.toString(), size, '0');
+    }
+
+    /**
+     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+     * 
+     * @param s 原始字符串
+     * @param size 字符串指定长度
+     * @param c 用于补齐的字符
+     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+     */
+    public static final String padl(final String s, final int size, final char c)
+    {
+        final StringBuilder sb = new StringBuilder(size);
+        if (s != null)
+        {
+            final int len = s.length();
+            if (s.length() <= size)
+            {
+                for (int i = size - len; i > 0; i--)
+                {
+                    sb.append(c);
+                }
+                sb.append(s);
+            }
+            else
+            {
+                return s.substring(len - size, len);
+            }
+        }
+        else
+        {
+            for (int i = size; i > 0; i--)
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SysOperLog.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SysOperLog.java
new file mode 100644
index 0000000..3adc0dd
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/log/SysOperLog.java
@@ -0,0 +1,96 @@
+package com.mosty.common.base.entity.log;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.validation.annotation.Validated;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表", description = "")
+@TableName("sys_oper_log")
+@Validated
+public class SysOperLog implements Serializable {
+
+    private static final long serialVersionUID = 2222248015038776527L;
+
+    @Excel(name = "操作序号", cellType = Excel.ColumnType.NUMERIC)
+    private Long operId;
+
+    @Excel(name = "模块名称")
+    @ApiModelProperty(value = "模块名称")
+    private String mkmc;
+
+    @Excel(name = "操作模块")
+    @ApiModelProperty(value = "操作模块")
+    private String title;
+
+    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+    @ApiModelProperty(value = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+    private Integer businessType;
+
+    @Excel(name = "请求方法")
+    @ApiModelProperty(value = "请求方法")
+    private String method;
+
+    @Excel(name = "请求方式")
+    private String requestMethod;
+
+    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+    private Integer operatorType;
+
+    @Excel(name = "操作人员")
+    @ApiModelProperty(value = "操作人员")
+    private String operName;
+
+    @Excel(name = "操作人员ID")
+    @ApiModelProperty(value = "操作人员ID")
+    private String operUserId;
+
+    @Excel(name = "操作人员身份证号")
+    @ApiModelProperty(value = "操作人员身份证号")
+    private String operSfzh;
+
+    @Excel(name = "部门ID")
+    private String ssbmid;
+
+    @Excel(name = "部门代码")
+    private String ssbmdm;
+
+    @Excel(name = "部门名称")
+    private String ssbm;
+
+    @Excel(name = "请求地址")
+    private String operUrl;
+
+    @Excel(name = "操作地址")
+    private String operIp;
+
+    @Excel(name = "请求参数")
+    private String operParam;
+
+    @Excel(name = "返回参数")
+    private String jsonResult;
+
+    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+    private Integer status;
+
+    @Excel(name = "错误消息")
+    private String errorMsg;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date operTime = new Date();
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/entity/realm/SysUser.java b/common-base-starter/src/main/java/com/mosty/common/base/entity/realm/SysUser.java
new file mode 100644
index 0000000..186f3e1
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/entity/realm/SysUser.java
@@ -0,0 +1,380 @@
+package com.mosty.common.base.entity.realm;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.mosty.common.base.entity.log.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import com.mosty.common.base.entity.log.Excels;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author ruoyi
+ */
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = Excel.ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Excel.Type.IMPORT)
+    private Long deptId;
+
+    /** 部门父ID */
+    private Long parentId;
+
+    /** 角色ID */
+    private Long roleId;
+
+    /** 登录名称 */
+    @Excel(name = "登录名称")
+    private String loginName;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 用户类型 */
+    private String userType;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 盐加密 */
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Excel.Type.EXPORT)
+    private String loginIp;
+
+    /** 最后登录时间 */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
+    private Date loginDate;
+
+    /** 密码最后更新时间 */
+    private Date pwdUpdateDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
+    })
+//    private SysDept dept;
+//
+//    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    public SysUser()
+    {
+
+    }
+
+    public SysUser(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+//    @Xss(message = "登录账号不能包含脚本字符")
+//    @NotBlank(message = "登录账号不能为空")
+//    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
+    public String getLoginName()
+    {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName)
+    {
+        this.loginName = loginName;
+    }
+
+//    @Xss(message = "用户昵称不能包含脚本字符")
+//    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserType()
+    {
+        return userType;
+    }
+
+    public void setUserType(String userType)
+    {
+        this.userType = userType;
+    }
+
+//    @Email(message = "邮箱格式不正确")
+//    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+//    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    @JsonIgnore
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getSalt()
+    {
+        return salt;
+    }
+
+    public void setSalt(String salt)
+    {
+        this.salt = salt;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    public Date getPwdUpdateDate()
+    {
+        return pwdUpdateDate;
+    }
+
+    public void setPwdUpdateDate(Date pwdUpdateDate)
+    {
+        this.pwdUpdateDate = pwdUpdateDate;
+    }
+
+//    public SysDept getDept()
+//    {
+//        if (dept == null)
+//        {
+//            dept = new SysDept();
+//        }
+//        return dept;
+//    }
+//
+//    public void setDept(SysDept dept)
+//    {
+//        this.dept = dept;
+//    }
+//
+//    public List<SysRole> getRoles()
+//    {
+//        return roles;
+//    }
+//
+//    public void setRoles(List<SysRole> roles)
+//    {
+//        this.roles = roles;
+//    }
+
+    public Long[] getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(Long[] roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public Long[] getPostIds()
+    {
+        return postIds;
+    }
+
+    public void setPostIds(Long[] postIds)
+    {
+        this.postIds = postIds;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("loginName", getLoginName())
+            .append("userName", getUserName())
+            .append("userType", getUserType())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("salt", getSalt())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+//            .append("dept", getDept())
+//			.append("roles", getRoles())
+            .toString();
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/Asserts.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/Asserts.java
new file mode 100644
index 0000000..6095fe0
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/Asserts.java
@@ -0,0 +1,97 @@
+package com.mosty.common.base.exception;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+
+/**
+ * 断言，快速业务异常
+ * @author kevin
+ * @date 2022/4/28 1:49 下午
+ * @since 1.0.0
+ */
+@SuppressWarnings("unused")
+public class Asserts {
+
+    private Asserts() {
+    }
+
+
+    public static void directThrow(RuntimeException exception) {
+        throw exception;
+    }
+
+    /**
+     *  断言 抛出 {@link BusinessExceptionEnum} 对应的业务异常
+     * @param expression 表达式
+     * @param message 异常信息
+     */
+    public static void checkAuth(boolean expression, String message) {
+        if (expression) {
+            throw new BusinessException(HttpStatus.UNAUTHORIZED.value(), message);
+        }
+    }
+
+    /**
+     *  断言 抛出 {@link BusinessExceptionEnum} 对应的业务异常
+     * @param expression 表达式
+     * @param message 异常信息
+     * @param args 参数信息
+     */
+    public static void checkAuth(boolean expression, String message, Object... args) {
+        if (expression) {
+            throw new BusinessException(HttpStatus.UNAUTHORIZED.value(), String.format(message, args));
+        }
+    }
+
+    public static void check(boolean expression, String message) {
+        if (expression) {
+            throw new BusinessException(message);
+        }
+    }
+
+    /**
+     * 断言 抛出 {@link BusinessExceptionEnum} 对应的业务异常
+     * @param expression 表达式
+     * @param exceptionEnum 业务异常
+     */
+    public static void check(boolean expression, BusinessExceptionEnum exceptionEnum) {
+        check(expression, exceptionEnum.message);
+    }
+
+    public static void check(boolean expression, RuntimeException e) {
+        if (expression) {
+            throw e;
+        }
+    }
+
+    public static void check(boolean expression, String message, Object... args) {
+        if (expression) {
+            throw new BusinessException(String.format(message, args));
+        }
+    }
+
+    public static void check(boolean expression, String message, Object arg) {
+        if (expression) {
+            throw new BusinessException(String.format(message, arg));
+        }
+    }
+
+    public static void notNull(Object object, String name) {
+        if (object == null) {
+            throw new BusinessException(name + " is null");
+        }
+    }
+
+    public static void notEmpty(CharSequence s, String name) {
+        if (StringUtils.isEmpty(s)) {
+            throw new BusinessException(name + " is empty");
+        }
+    }
+
+    public static void notBlank(CharSequence s, String name) {
+        if (StringUtils.isBlank(s)) {
+            throw new BusinessException(name + " is blank");
+        }
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessException.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessException.java
new file mode 100644
index 0000000..6bd9a3d
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessException.java
@@ -0,0 +1,51 @@
+package com.mosty.common.base.exception;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *  业务异常处理器
+ * @author kevin
+ * @date 2022/1/22 4:38 PM
+ * @since 1.0.0
+ */
+@Data
+@SuppressWarnings("unused")
+@EqualsAndHashCode(callSuper = true)
+public class BusinessException extends RuntimeException {
+
+    /** 异常编码 */
+    private Integer code;
+
+    /**
+     * 数据
+     */
+    private Object data;
+
+    public BusinessException(String message) {
+        super(message);
+    }
+
+    public BusinessException(String message, Object data) {
+        super(message);
+        this.data = data;
+    }
+
+    public BusinessException(Integer code, String message, Object data) {
+        super(message);
+        this.code = code;
+        this.data = data;
+    }
+
+    public BusinessException(Integer code, String message) {
+        super(message);
+        this.code = code;
+        this.data = null;
+    }
+
+    public BusinessException(String message, Throwable arg) {
+        super(message, arg);
+    }
+
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessExceptionEnum.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessExceptionEnum.java
new file mode 100644
index 0000000..2df7d91
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessExceptionEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.base.exception;
+
+
+/**
+ *  业务异常枚举, code 为{@code 0} 表示默认值
+ *
+ * @author hongmin.li
+ * @date 2021/8/17 10:55
+ * @since 1.6.5
+ */
+public enum BusinessExceptionEnum {
+
+    /** 门店功能配置获取异常 */
+    STORE_FUNCTION_EXCEPTION(0, "获取换货比例远程服务异常"),
+    ;
+
+    public final int code;
+
+    public final String message;
+
+    BusinessExceptionEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessStatus.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessStatus.java
new file mode 100644
index 0000000..912c36e
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/BusinessStatus.java
@@ -0,0 +1,19 @@
+package com.mosty.common.base.exception;
+
+/**
+ * 操作状态
+ * 
+ * @author ruoyi
+ *
+ */
+public enum BusinessStatus {
+    /**
+     * 成功
+     */
+    SUCCESS,
+
+    /**
+     * 失败
+     */
+    FAIL,
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/MostyExceptionHandler.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/MostyExceptionHandler.java
new file mode 100644
index 0000000..0e6c6cd
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/MostyExceptionHandler.java
@@ -0,0 +1,76 @@
+package com.mosty.common.base.exception;
+
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *  全局异常处理
+ * @author kevin
+ * @date 2022/2/22 1:50 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@Component
+@SuppressWarnings("unused")
+@ControllerAdvice(basePackages = "com.mosty")
+public class MostyExceptionHandler {
+
+    /**
+     *  业务异常捕获
+     *  需要使用spring mvc的全局异常拦截器处理
+     * @param throwable 全局异常
+     * @return 信息体
+     */
+    @ResponseBody
+    @ExceptionHandler(Throwable.class)
+    public ResponseResult<String> throwableHandler(Throwable throwable) {
+        throwable.printStackTrace();
+        log.warn("throwable异常：message={}", throwable.getMessage());
+        log.warn("throwable异常：stack={}", throwable.getStackTrace());
+        return ResponseResult.fail("系统异常，请稍后重试");
+    }
+
+    /**
+     *  spring valid框架验证器异常捕获
+     *  需要使用spring mvc的全局异常拦截器处理
+     * @param validException 验证异常
+     * @return 信息体
+     */
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseResult<String> validHandler(MethodArgumentNotValidException validException) {
+        StringBuilder sb = new StringBuilder();
+        List<ObjectError> allErrors = validException.getBindingResult().getAllErrors();
+        String message = allErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(";"));
+        log.warn("调用接口验证异常：message={}", message);
+        return ResponseResult.fail(message);
+    }
+
+    /**
+     *  业务异常捕获
+     *  需要使用spring mvc的全局异常拦截器处理
+     * @param businessException 业务异常
+     * @return 信息体
+     */
+    @ResponseBody
+    @ExceptionHandler(BusinessException.class)
+    public ResponseResult<String> businessHandler(BusinessException businessException) {
+        log.warn("业务异常：message={}", businessException.getMessage());
+        if (businessException.getCode() != null) {
+            return ResponseResult.fail(businessException.getCode(), businessException.getMessage());
+        }
+        return ResponseResult.fail(businessException.getMessage());
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/ServiceException.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/ServiceException.java
new file mode 100644
index 0000000..f81734c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/ServiceException.java
@@ -0,0 +1,50 @@
+package com.mosty.common.base.exception;
+
+/**
+ * 业务异常
+ *
+ * @author ruoyi
+ */
+public final class ServiceException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误提示
+     */
+    private String message;
+
+    /**
+     * 错误明细，内部调试错误
+     * <p>
+     */
+    private String detailMessage;
+
+    /**
+     * 空构造方法，避免反序列化问题
+     */
+    public ServiceException() {
+    }
+
+    public ServiceException(String message) {
+        this.message = message;
+    }
+
+    public String getDetailMessage() {
+        return detailMessage;
+    }
+
+    public ServiceException setDetailMessage(String detailMessage) {
+        this.detailMessage = detailMessage;
+        return this;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public ServiceException setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/exception/UtilException.java b/common-base-starter/src/main/java/com/mosty/common/base/exception/UtilException.java
new file mode 100644
index 0000000..c80ca24
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/exception/UtilException.java
@@ -0,0 +1,26 @@
+package com.mosty.common.base.exception;
+
+/**
+ * 工具类异常
+ * 
+ * @author ruoyi
+ */
+public class UtilException extends RuntimeException
+{
+    private static final long serialVersionUID = 8247610319171014183L;
+
+    public UtilException(Throwable e)
+    {
+        super(e.getMessage(), e);
+    }
+
+    public UtilException(String message)
+    {
+        super(message);
+    }
+
+    public UtilException(String message, Throwable throwable)
+    {
+        super(message, throwable);
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/AopTargetUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/AopTargetUtils.java
new file mode 100644
index 0000000..ff6405a
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/AopTargetUtils.java
@@ -0,0 +1,48 @@
+package com.mosty.common.base.lock.optimistic;
+
+import org.springframework.aop.framework.AdvisedSupport;
+import org.springframework.aop.framework.AopProxy;
+import org.springframework.aop.support.AopUtils;
+
+import java.lang.reflect.Field;
+
+public class AopTargetUtils {
+	
+		/** 
+		 * 递归获取代理的 目标对象
+		 * @param proxy 代理对象 
+		 * @return 目标对象
+		 * @throws Exception 
+		 */
+		public static Object getTarget(Object proxy) throws Exception {
+			if (!AopUtils.isAopProxy(proxy)) {
+				return proxy;
+			}
+			if (AopUtils.isJdkDynamicProxy(proxy)) {
+				proxy = getJdkDynamicProxyTargetObject(proxy);
+			} else {
+				proxy = getCglibProxyTargetObject(proxy);
+			}
+			return getTarget(proxy);
+		}
+	
+		private static Object getCglibProxyTargetObject(Object proxy) throws Exception {
+			Field h = proxy.getClass().getDeclaredField("CGLIB$CALLBACK_0");
+			h.setAccessible(true);
+			Object dynamicAdvisedInterceptor = h.get(proxy);
+			Field advised = dynamicAdvisedInterceptor.getClass().getDeclaredField("advised");
+			advised.setAccessible(true);
+			Object target = ((AdvisedSupport) advised.get(dynamicAdvisedInterceptor)).getTargetSource().getTarget();
+			return target;
+		}
+	
+		private static Object getJdkDynamicProxyTargetObject(Object proxy) throws Exception {
+			Field h = proxy.getClass().getSuperclass().getDeclaredField("h");
+			h.setAccessible(true);
+			AopProxy aopProxy = (AopProxy) h.get(proxy);
+			Field advised = aopProxy.getClass().getDeclaredField("advised");
+			advised.setAccessible(true);
+			Object target = ((AdvisedSupport) advised.get(aopProxy)).getTargetSource().getTarget();
+			return target;
+		}
+	}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.java
new file mode 100644
index 0000000..728b059
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.java
@@ -0,0 +1,32 @@
+package com.mosty.common.base.lock.optimistic;
+
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.support.AbstractApplicationContext;
+
+import java.lang.annotation.*;
+
+
+/**
+ *  允许启动乐观锁自定义插件
+ *
+ * @author kevin
+ * @date 2020/8/11 0:03
+ * @since 1.0.0
+ * @see AbstractApplicationContext#refresh()
+ * @see AbstractApplicationContext {@code invokeBeanFactoryPostProcessors(ConfigurableListableBeanFactory) }
+ * @see org.springframework.context.annotation
+ *      {@code ConfigurationClassParser#processImports(ConfigurationClass, ConfigurationClassParser.SourceClass, Collection, boolean)}
+ *
+ * @see OptimisticLockException 需要关注跑出的检查异常，后面根据业务给予处理
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Configuration
+//@Import(OptimisticLockConfiguration.class)
+@Deprecated
+public @interface EnableOptimisticLock {
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLock.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLock.java
new file mode 100644
index 0000000..35a6f1a
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLock.java
@@ -0,0 +1,300 @@
+//package com.mosty.common.base.lock.optimistic;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.ibatis.binding.MapperMethod;
+//import org.apache.ibatis.executor.Executor;
+//import org.apache.ibatis.executor.parameter.ParameterHandler;
+//import org.apache.ibatis.executor.statement.StatementHandler;
+//import org.apache.ibatis.mapping.BoundSql;
+//import org.apache.ibatis.mapping.MappedStatement;
+//import org.apache.ibatis.mapping.ParameterMapping;
+//import org.apache.ibatis.mapping.SqlCommandType;
+//import org.apache.ibatis.plugin.*;
+//import org.apache.ibatis.reflection.MetaObject;
+//import org.apache.ibatis.reflection.SystemMetaObject;
+//import org.apache.ibatis.session.Configuration;
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.apache.ibatis.type.JdbcType;
+//import org.apache.ibatis.type.TypeException;
+//import org.apache.ibatis.type.TypeHandler;
+//
+//import java.lang.reflect.Proxy;
+//import java.sql.Connection;
+//import java.sql.PreparedStatement;
+//import java.sql.SQLException;
+//import java.util.Objects;
+//import java.util.Properties;
+//import java.util.regex.Pattern;
+//
+//
+///**
+// *  Mybatis 自定义插件，{@link OptimisticLock} 就是一个{@link Plugin}
+// *
+// *  使用：1、如果某些 Mapper 不想使用乐观锁，可以在Mapper.xml 中不添加 乐观锁字段即可，如：
+// *              <update id="update" parameterType="com.quanyou.qup.config.service.entity.ConfOrderApprove">
+// *                  UPDATE CONF_ORDER_APPROVE
+// *                  <set>
+// *                      <if test="orderTypeCode != null">ORDER_TYPE_CODE = #{orderTypeCode},</if>
+// *                      <if test="receiveOrgCode != null">RECEIVE_ORG_CODE = #{receiveOrgCode},</if>
+// *                      <!-- 不添加该乐观锁字段即可 -->
+// *                      <if test="objectVersionNumber != null">OBJECT_VERSION_NUMBER = #{objectVersionNumber},</if>
+// *                  </set>
+// *                  WHERE ID = #{id}
+// *              </update>
+// *      2、业务端自行根据update的条数进行处理（给用户相应的提示等）或不处理（可能update本身就可能不会修改任何数据）
+// *      3、乐观锁的字段类型必须为{@link Long} ，可以对乐观锁的数据库的java pojo字段进行定义，【注意： OptimisticLock只能放在SqlInterceptor和ResultInterceptor之后】如下：
+// *      <plugins>
+// * 		    <plugin interceptor="com.quanyou.qup.query.interceptor.SqlInterceptor"/>
+// * 		    <plugin interceptor="com.quanyou.qup.query.interceptor.ResultInterceptor"/>
+// * 		    <plugin interceptor="com.quanyou.qup.middle.common.lock.optimistic.OptimisticLock">
+// * 		        <!-- 定义数据库字段名称 -->
+// * 			    <property name="VERSION_COLUMN" value="OBJECT_VERSION_NUMBER"/>
+// * 			    <!-- 定义ORM实体的字段名称 -->
+// * 			    <property name="VERSION_POJO" value="objectVersionNumber"/>
+// * 		    </plugin>
+// * 	    </plugins>
+// *
+// *  每一个拦截器可以拦截下面的四种，当前只拦截了三种
+// * Executor (update, query, flushStatements, commit, rollback, getTransaction, close, isClosed)
+// * ParameterHandler (getParameterObject, setParameters)
+// * ResultSetHandler (handleResultSets, handleOutputParameters)
+// * StatementHandler (prepare, parameterize, batch, update, query)
+// *
+// * @author kevin
+// * @date 2020/8/10 22:14
+// * @since 1.0.0
+// * @see org.apache.ibatis.session.Configuration#interceptorChain
+// * @see Plugin#signatureMap 其中：Map<Class<?>, Set<Method>> Class 为所有需要实现乐观锁的Mapper，Set<Method>集合为需要乐观锁的方法集合【原则上是所有写的方法】
+// * @see Invocation#proceed() 直接执行被代理对象的方法
+// * @see MappedStatement 对应每个mapper中的<select>、<delete> 象等封装对
+// */
+//@SuppressWarnings("ALL")
+//@Slf4j
+//@Intercepts({
+//        @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}),
+//        @Signature(type = ParameterHandler.class, method = "setParameters", args = {PreparedStatement.class}),
+//        @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})
+//})
+//public class OptimisticLock implements Interceptor {
+//
+//    /**
+//     *  乐观锁对应的数据库字段
+//     */
+//    private String VERSION_COLUMN = "OBJECT_VERSION_NUMBER";
+//
+//    /**
+//     * 乐观锁的java pojo 字段
+//     */
+//    private String VERSION_POJO = "objectVersionNumber";
+//
+//    /** {@link Executor} 拦截的方法 */
+//    private static final String EXECUTOR_MATHOD = "update";
+//
+//    /** @link ParameterHandler} 拦截的方法 */
+//    private static final String PARAMETER_HANDLER_METHOD = "setParameters";
+//
+//    /** {@link StatementHandler} 拦截的方法 */
+//    private static final String STATEMENT_HANDLER_METHOD = "prepare";
+//
+//    /**
+//     *  允许传入 Properties初始化参数
+//     * @param properties 默认不需要传入
+//     */
+//    @Override
+//    public void setProperties(Properties properties) {
+//        String versionColumn = properties.getProperty("VERSION_COLUMN");
+//        String versionPojo = properties.getProperty("VERSION_POJO");
+//        if (versionColumn != null && versionColumn.trim().length() > 0) {
+//            log.info("set OptimisticLock VERSION_COLUMN = {}", versionColumn);
+//            VERSION_COLUMN = versionColumn;
+//        }
+//        if (versionPojo != null && versionPojo.trim().length() > 0) {
+//            log.info("set OptimisticLock VERSION_POJO = {}", versionPojo);
+//            VERSION_POJO = versionPojo;
+//        }
+//    }
+//
+//    @Override
+//    public Object intercept(Invocation invocation) throws Throwable {
+//        String methodName = invocation.getMethod().getName();
+//
+//        /*if (!flag) {
+//            synchronized (OptimisticLock.class) {
+//                super.initFilterSkipListMap();
+//                flag = true;
+//            }
+//        }
+//        // 过滤器不为空才来判断是否过滤，提高效率
+//        if (filterNotEmpty) {
+//            final Object target = invocation.getTarget();
+//            if (target instanceof DefaultParameterHandler) {
+//                DefaultParameterHandler parameterHandler = (DefaultParameterHandler) target;
+//                final Field field = parameterHandler.getClass().getDeclaredField("mappedStatement");
+//                field.setAccessible(true);
+//                final MappedStatement mappedStatement = (MappedStatement) field.get(parameterHandler);
+//                final String id = mappedStatement.getId();
+//                String currentClazz = id.substring(0, id.lastIndexOf("."));
+//                if (super.shouldSkip(currentClazz)) {
+//                    return target;
+//                }
+//            }
+//            final Object[] args1 = invocation.getArgs();
+//            if (args1 != null) {
+//                for (Object arg : args1) {
+//                    if (arg instanceof MappedStatement) {
+//                        MappedStatement mappedStatement = (MappedStatement) arg;
+//                        final String id = mappedStatement.getId();
+//                        String currentClazz = id.substring(0, id.lastIndexOf("."));
+//                        if (super.shouldSkip(currentClazz)) {
+//                            return target;
+//                        }
+//                    }
+//                }
+//            }
+//        }*/
+//
+//        if (EXECUTOR_MATHOD.equals(methodName)) {
+//            Object[] args = invocation.getArgs();
+//            // 查看乐观锁执行结果是否正确
+//            if (args != null && args[0] instanceof MappedStatement) {
+//                MappedStatement mappedStatement = (MappedStatement) args[0];
+//                if (mappedStatement.getSqlCommandType() == SqlCommandType.UPDATE) {
+//                    return invocation.proceed();
+//                /*Object param = invocation.getArgs()[1];
+//                BoundSql boundSql = mappedStatement.getBoundSql(param);
+//                String sql = boundSql.getSql();
+//                String paramJson = JSON.toJSONString(param);
+//                if (result == 0) {
+//                    throw new OptimisticLockException("[触发乐观锁，更新失败], 失败SQL: " + sql + ", 参数: " + paramJson);
+//                }
+//
+//                return result;*/
+//                }
+//            }
+//        } else if (PARAMETER_HANDLER_METHOD.equals(methodName)) {
+//            // 设置乐观锁入参
+//            setParamters(invocation);
+//        } else if (STATEMENT_HANDLER_METHOD.equals(methodName)) {
+//            // 为sql拼乐观锁字段
+//            updateSqlAppendVersion(invocation);
+//        }
+//
+//        // 最后执行jdk被代理方法的调用
+//        return invocation.proceed();
+//    }
+//
+//    /**
+//     *  拼接 乐观锁的sql
+//     * @param invocation 代理信息
+//     */
+//    private void updateSqlAppendVersion(Invocation invocation) {
+//        MetaObject metaObject;StatementHandler routingHandler = (StatementHandler)processTarget(invocation.getTarget());
+//        metaObject = SystemMetaObject.forObject(routingHandler);
+//        MetaObject hm = metaObject.metaObjectForProperty("delegate");
+//        String originalSql = (String)hm.getValue("boundSql.sql");
+//        boolean locker = resolve(hm, this.VERSION_COLUMN);
+//        if (!locker) {
+//            return;
+//        }
+//
+//        String builder = new StringBuilder().append(originalSql).append(" AND ").append(this.VERSION_COLUMN).append(" = ?").toString();
+//        hm.setValue("boundSql.sql", builder);
+//    }
+//
+//    /**
+//     *  设置乐观锁入参值
+//     *
+//     * @param invocation 代理信息
+//     */
+//    private void setParamters(Invocation invocation) {
+//        MetaObject metaObject;
+//        ParameterHandler handler = (ParameterHandler)processTarget(invocation.getTarget());
+//        metaObject = SystemMetaObject.forObject(handler);
+//        boolean locker = resolve(metaObject, this.VERSION_COLUMN);
+//        if (!locker) {
+//            return;
+//        }
+//
+//        BoundSql boundSql = (BoundSql)metaObject.getValue("boundSql");
+//        Object parameterObject = boundSql.getParameterObject();
+//        if (parameterObject instanceof MapperMethod.ParamMap) {
+//            MapperMethod.ParamMap<?> paramMap = (MapperMethod.ParamMap)parameterObject;
+//            if (!paramMap.containsKey(this.VERSION_POJO)) {
+//                throw new TypeException("All the primitive type parameters must add MyBatis's @Param Annotaion");
+//            }
+//        }
+//
+//        Configuration configuration = ((MappedStatement)metaObject.getValue("mappedStatement")).getConfiguration();
+//        MetaObject pm = configuration.newMetaObject(parameterObject);
+//        Object value = pm.getValue(this.VERSION_POJO);
+//        ParameterMapping versionMapping = (new ParameterMapping.Builder(configuration, this.VERSION_POJO, Object.class)).build();
+//        TypeHandler typeHandler = versionMapping.getTypeHandler();
+//        JdbcType jdbcType = versionMapping.getJdbcType();
+//        if (value == null && jdbcType == null) {
+//            jdbcType = configuration.getJdbcTypeForNull();
+//        }
+//
+//        int versionLocation = boundSql.getParameterMappings().size() + 1;
+//
+//        try {
+//            PreparedStatement ps = (PreparedStatement)invocation.getArgs()[0];
+//            typeHandler.setParameter(ps, versionLocation, value, jdbcType);
+//        } catch (SQLException | TypeException var16) {
+//            throw new TypeException("set parameter 'version' faild, Cause: " + var16, var16);
+//        }
+//
+//        if (!Objects.equals(value.getClass(), Long.class) && Objects.equals(value.getClass(), Long.TYPE) && log.isDebugEnabled()) {
+//            log.error("[[[[[[[[[[[-> [Optimistic Loker] <-]]]]]]]]]]]property type error, the type of version property must be Long or long.");
+//        }
+//
+//        pm.setValue(this.VERSION_POJO, (Long)value + 1L);
+//    }
+//
+//    /**
+//     *  在 {@link SqlSessionFactory#openSession(boolean)} 时, 对 {@link Executor} 的包装【模式】后的包装类型，
+//     *  再使用责任链{@link InterceptorChain} 进行层层动态代理，返回代理对象
+//     * @param obj 当前obj为{@link Executor} 或者 动态代理过的对象
+//     * @return 当前代理后的对象
+//     */
+//    @Override
+//    public Object plugin(Object target) {
+//        if (target instanceof Executor || target instanceof StatementHandler || target instanceof ParameterHandler) {
+//            // 执行jdk动态代理
+//            return Plugin.wrap(target, this);
+//        }
+//        return target;
+//    }
+//
+//    /**
+//     *  递归： 获取真正被代理的对象
+//     * @param target 代理对象
+//     * @return 最底层的被代理对象
+//     */
+//    public static Object processTarget(Object target) {
+//        if (Proxy.isProxyClass(target.getClass())) {
+//            MetaObject mo = SystemMetaObject.forObject(target);
+//            return processTarget(mo.getValue("h.target"));
+//        } else if (!(target instanceof StatementHandler) && !(target instanceof ParameterHandler)) {
+//            if (log.isDebugEnabled()) {
+//                log.error("Optimistic Lock plugin plugin init faild.");
+//            }
+//            throw new RuntimeException("Optimistic Lock plugin init faild.");
+//        } else {
+//            return target;
+//        }
+//    }
+//
+//    /**
+//     *  我们的数据库字段都有乐观锁字段，不用验证
+//     *
+//     *  判断当前是否存现乐观锁字段
+//     * @param mo 调用前的对象
+//     * @param versionColumn 乐观锁列
+//     * @return 是否包含乐观锁字段
+//     */
+//    private static boolean resolve(MetaObject mo, String versionColumn) {
+//        String originalSql = (String)mo.getValue("boundSql.sql");
+//        MappedStatement ms = (MappedStatement)mo.getValue("mappedStatement");
+//        return Objects.equals(ms.getSqlCommandType(), SqlCommandType.UPDATE) ? Pattern.matches("[\\s\\S]*?" + versionColumn + "[\\s\\S]*?=[\\s\\S]*?\\?[\\s\\S]*?", originalSql.toUpperCase()) : false;
+//    }
+//}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockConfiguration.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockConfiguration.java
new file mode 100644
index 0000000..e1d57ae
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockConfiguration.java
@@ -0,0 +1,32 @@
+//package com.mosty.common.base.lock.optimistic;
+//
+//import org.springframework.beans.factory.config.BeanDefinition;
+//import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Role;
+//
+//
+///**
+// *  乐观锁配置
+// *
+// * @author kevin
+// * @date 2020/8/11 0:06
+// * @since 1.0.0
+// */
+////@Configuration
+//@AutoConfigureOrder(value = Integer.MIN_VALUE)
+//public class OptimisticLockConfiguration {
+//
+//    /**
+//     *  依赖注入 乐观锁插件的Bean
+//     * @return 乐观锁插件
+//     */
+//    @Bean(name = "optimisticLock")
+//    @ConditionalOnMissingBean(OptimisticLock.class)
+//    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+//    public OptimisticLock initOptimisticLock() {
+//        return new OptimisticLock();
+//    }
+//
+//}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockException.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockException.java
new file mode 100644
index 0000000..0f57e71
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/optimistic/OptimisticLockException.java
@@ -0,0 +1,20 @@
+package com.mosty.common.base.lock.optimistic;
+
+/**
+ *  乐观锁更新异常
+ *
+ * @author kevin
+ * @date 2020/8/11 9:26
+ * @since 1.0.0
+ */
+public class OptimisticLockException extends Exception {
+
+    /**
+     *  异常信息【sql】
+     */
+    private String message;
+
+    public OptimisticLockException(String message) {
+        this.message = message;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/CallBack.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/CallBack.java
new file mode 100644
index 0000000..a4e8260
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/CallBack.java
@@ -0,0 +1,17 @@
+package com.mosty.common.base.lock.redisson;
+
+/**
+ *  分布式锁回调任务
+ * @author kevin
+ * @date 2022/1/24 11:18 PM
+ * @since 1.0.0
+ */
+@FunctionalInterface
+public interface CallBack<V> {
+
+    /**
+     * 需要回调执行的方法体
+     * @return 执行结果
+     */
+    V callBack();
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/RedisConcurrentException.java b/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/RedisConcurrentException.java
new file mode 100644
index 0000000..a0cbafd
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/lock/redisson/RedisConcurrentException.java
@@ -0,0 +1,18 @@
+package com.mosty.common.base.lock.redisson;
+
+
+/**
+ *  Redisson 分布式锁获取失败异常
+ * @author kevin
+ * @date 2020/11/20 10:18
+ * @since 1.0.0
+ */
+public class RedisConcurrentException extends RuntimeException {
+
+    private static final String ERROR_MESSAGE = "分布式锁并发获取超时，调用者自行捕获处理";
+
+    public RedisConcurrentException() {
+        super(ERROR_MESSAGE);
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/mybatis/MybatisConfig.java b/common-base-starter/src/main/java/com/mosty/common/base/mybatis/MybatisConfig.java
new file mode 100644
index 0000000..549b009
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/mybatis/MybatisConfig.java
@@ -0,0 +1,45 @@
+package com.mosty.common.base.mybatis;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MybatisConfig {
+
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        return interceptor;
+    }
+
+    /**
+     * 注册mybatis plus的分页插件
+     * 分页插件，自动识别数据库类型
+     */
+    public PaginationInnerInterceptor paginationInterceptor() {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        // 设置最大单页限制数量，默认 500 条，-1 不受限制
+        paginationInnerInterceptor.setMaxLimit(-1L);
+        // 分页合理化
+        paginationInnerInterceptor.setOverflow(true);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 乐观锁插件
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/system/config/EnableSystemConfig.java b/common-base-starter/src/main/java/com/mosty/common/base/system/config/EnableSystemConfig.java
new file mode 100644
index 0000000..a14893c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/system/config/EnableSystemConfig.java
@@ -0,0 +1,21 @@
+package com.mosty.common.base.system.config;
+
+import com.mosty.common.base.timeconsume.TimeConsume;
+import com.mosty.common.base.timeconsume.TimeConsumeActionConfig;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
+
+/**
+ *  系统配置启动类
+ * @author kevin
+ * @date 2022/2/4 11:10 AM
+ * @since 1.0.0
+ */
+@Inherited
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Import(TimeConsumeActionConfig.class)
+public @interface EnableSystemConfig {
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/threadpool/SimpleThreadPool.java b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/SimpleThreadPool.java
new file mode 100644
index 0000000..013ebe6
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/SimpleThreadPool.java
@@ -0,0 +1,176 @@
+package com.mosty.common.base.threadpool;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ *  线程池工具类
+ * @author kevin
+ * @date 2022/1/25 8:48 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@Component
+@SuppressWarnings("ALL")
+public class SimpleThreadPool extends ThreadPoolInit implements EnvironmentAware {
+
+    /**
+     * 默认最大的超时时间
+     */
+    private static int DEFAULT_TIMEOUT = 50000;
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        // 执行父类中的环境设置
+        super.setEnvironment(environment);
+
+        String[] activeProfiles = environment.getActiveProfiles();
+        if (activeProfiles == null) {
+            return;
+        }
+        String pro = "prod";
+        for (String activeProfile : activeProfiles) {
+            if (pro.equals(activeProfile)) {
+                if (log.isInfoEnabled()) {
+                    log.info("active spring profile prod");
+                }
+                DEFAULT_TIMEOUT = 2000;
+            }
+        }
+        if (log.isInfoEnabled()) {
+            log.info("SimpleThreadPool DEFAULT_TIMEOUT = {} ms", DEFAULT_TIMEOUT);
+        }
+    }
+
+    /**
+     *  执行没有返回值的任务
+     * @param key 线程池枚举
+     * @param runnable 任务
+     */
+    public static void execute(String key, Runnable runnable) {
+        if (!THREAD_POOL_EXECUTOR_MAP.containsKey(key)) {
+            throw new IllegalArgumentException("未找到线程池：" + key);
+        }
+        // 执行任务
+        THREAD_POOL_EXECUTOR_MAP.get(key).execute(runnable);
+    }
+
+    /**
+     * 执行有返回值任务
+     *
+     * @param key 线程池名称
+     * @param callable 需要执行的任务可变数组
+     * @param <T> 任务类型
+     * @return 任务结果
+     */
+    public static <T> List<Future<T>> execute(String key, Callable<T>... callable) {
+        if (callable == null || callable.length == 0) {
+            throw new IllegalArgumentException("任务不能为空！");
+        }
+        List<Callable<T>> taskList = Arrays.stream(callable).collect(Collectors.toList());
+        return executeAll(key, taskList);
+    }
+
+    /**
+     * 批量执行并行任务, 使用默认的最大超时时间，单位毫秒
+     * @param key 线程池名称
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static <T> List<Future<T>> executeAll(String key, List<Callable<T>> callableList) {
+        return executeAll(key, DEFAULT_TIMEOUT, callableList);
+    }
+
+    /**
+     * 批量执行并行任务, 使用默认的最大超时时间，单位毫秒
+     * @param key 线程池名称
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static <T> List<Future<T>> executeAll(ExecutorService service, List<Callable<T>> callableList) {
+        return executeAll(service, DEFAULT_TIMEOUT, callableList);
+    }
+
+    /**
+     * 批量执行并行任务
+     * @param key 线程池名称
+     * @param maxTimeout 最大超时时间，没有取默认值，单位2000毫秒
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static <T> List<Future<T>> executeAll(ExecutorService service, int maxTimeout, List<Callable<T>> callableList) {
+        try {
+            return service.invokeAll(callableList, maxTimeout, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            log.error("线程池批量执行任务异常失败", e);
+        } catch (Exception e) {
+            log.error("线程池批量执行任务异常失败", e);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 批量执行并行任务
+     * @param key 线程池名称
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static <T> List<Future<T>> executeAllUntil(String key, List<Callable<T>> callableList) {
+        if (!THREAD_POOL_EXECUTOR_MAP.containsKey(key)) {
+            throw new IllegalArgumentException("未配置线程池" + key);
+        }
+        try {
+            return THREAD_POOL_EXECUTOR_MAP.get(key).invokeAll(callableList);
+        } catch (InterruptedException e) {
+            log.error("线程池批量执行任务异常失败", e);
+        } catch (Exception e) {
+            log.error("线程池批量执行任务异常失败", e);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 批量执行并行任务
+     * @param key 线程池名称
+     * @param maxTimeout 最大超时时间，没有取默认值，单位2000毫秒
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static <T> List<Future<T>> executeAll(String key, int maxTimeout, List<Callable<T>> callableList) {
+        if (!THREAD_POOL_EXECUTOR_MAP.containsKey(key)) {
+            throw new IllegalArgumentException("未配置线程池" + key);
+        }
+        try {
+            return THREAD_POOL_EXECUTOR_MAP.get(key).invokeAll(callableList, maxTimeout, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            log.error("线程池批量执行任务异常失败", e);
+        } catch (Exception e) {
+            log.error("线程池批量执行任务异常失败", e);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @param key 线程池名称
+     * @param callableList 任务列表
+     * @return 结果
+     */
+    public static void executeRunnable(String key, Runnable... r) {
+        if (!THREAD_POOL_EXECUTOR_MAP.containsKey(key)) {
+            throw new IllegalArgumentException("未配置线程池" + key);
+        }
+        ThreadPoolExecutor executor = THREAD_POOL_EXECUTOR_MAP.get(key);
+        for (int i = 0; i < r.length; i++) {
+            executor.submit(r[i]);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPool.java b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPool.java
new file mode 100644
index 0000000..efc6968
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPool.java
@@ -0,0 +1,20 @@
+package com.mosty.common.base.threadpool;
+
+import java.util.List;
+
+/**
+ *  线程池定义
+ * @author kevin
+ * @date 2020/8/23 13:43
+ * @since 1.0.0
+ */
+@FunctionalInterface
+public interface ThreadPool {
+
+    /**
+     * 添加线程池
+     * @return 线程池定义对象
+     */
+    List<ThreadPoolEntity> appendThreadPool();
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolEntity.java b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolEntity.java
new file mode 100644
index 0000000..1e8ba12
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolEntity.java
@@ -0,0 +1,78 @@
+package com.mosty.common.base.threadpool;
+
+import lombok.AllArgsConstructor;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.TimeUnit;
+
+/**
+ *  线程池定义类
+ * @author kevin
+ * @date 2020/8/23 13:53
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public final class ThreadPoolEntity {
+
+    /**
+     *  先池名称
+     */
+    public final String taskName;
+
+    /**
+     * 线程池的最大超时时间
+     */
+//    public final int maxTimeout = 2000;
+
+    /**
+     * 线程池任务类型
+     */
+    public final SimpleThreadPool.PoolModel poolModel;
+
+    /**
+     * 是否允许核心线程超时
+     */
+    public final Boolean allowsCoreThreadTimeOut;
+
+    /**
+     * 是否预热核心线程池
+     */
+    public final Boolean preStartAllCoreThreads;
+
+    /**
+     *  线程池说明
+     */
+    public final String detail;
+
+    /**
+     * 核心线程数
+     */
+    public final int corePoolNum;
+
+    /**
+     * 最大线程数
+     */
+    public final int maxPoolNum;
+
+    /**
+     * 超时时间
+     */
+    public final int deleteThreadNum;
+
+    /**
+     * 超时单位
+     */
+    public final TimeUnit deleteTreadUnit;
+
+    /**
+     * 任务队列，没有特殊理由不能使用无界队列
+     */
+    public final BlockingQueue<Runnable> blockingQueue;
+
+    /**
+     * 拒绝策略
+     */
+    public final RejectedExecutionHandler rejectedExecutionHandler;
+
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolInit.java b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolInit.java
new file mode 100644
index 0000000..6461c5e
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/ThreadPoolInit.java
@@ -0,0 +1,188 @@
+package com.mosty.common.base.threadpool;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.threads.TaskQueue;
+import org.apache.tomcat.util.threads.TaskThreadFactory;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
+
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *  线程池定义和初始化和订单打印线程状态数据
+ *
+ * @author kevin
+ * @date 2020/8/23 14:23
+ * @since 1.0.0
+ */
+@Slf4j
+public class ThreadPoolInit implements EnvironmentAware {
+
+    /**
+     *  线程池容器
+     */
+    public static final Map<String, ThreadPoolExecutor> THREAD_POOL_EXECUTOR_MAP = new ConcurrentHashMap<>(16);
+
+    /**
+     * 是否打印，后续可以做成 Zookeeper Watch， Nacos 配置回调等开关，所以当前不使用{@code final} 关键字
+     */
+    private static Boolean printThreadPoolInfoInterval = Boolean.FALSE;
+
+    /**
+     * 定时执行任务的单线程， 所有任务公用
+     * 当前使用的有： 打印线程信息，装运点等定时刷新任务
+     */
+    public static final ScheduledExecutorService SINGLE_POOL = Executors.newSingleThreadScheduledExecutor();
+
+    static {
+        // 初始化线程池
+        ServiceLoader<ThreadPool> load = ServiceLoader.load(ThreadPool.class);
+        load.forEach(threadPool -> threadPool.appendThreadPool().forEach(SimpleThreadPool::putThreadPool));
+    }
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        String[] activeProfiles = environment.getActiveProfiles();
+        String pro = "dev";
+        for (String activeProfile : activeProfiles) {
+            if (pro.equals(activeProfile)) {
+                return;
+            }
+        }
+        // 初始化线程池状态信息订单打印
+        if (printThreadPoolInfoInterval) {
+            printScheduledThreadStats();
+        }
+    }
+
+    /**
+     * 线程池类型， 只是作为标识当前任务是CPU型还是IO型为主
+     */
+    @SuppressWarnings("unused")
+    public enum PoolModel {
+        /** io型 */
+        IO,
+        /** CPU型 */
+        CPU,
+        /** io型，Tomcat扩展的 juc线程池 */
+        FAST_IO
+
+    }
+
+    /**
+     *  线程工厂
+     */
+    static class DefaultThreadFactory implements ThreadFactory {
+
+        /**
+         *  定义线程组
+         */
+        static ThreadGroup threadGroup;
+
+        /**
+         *  定义每个线程池中每个线程的名称后缀数字
+         */
+        static final AtomicInteger THREAD_NUMBER = new AtomicInteger(1);
+
+        /**
+         *  定义每个线程词的名称前缀
+         */
+        static String namePrefix;
+
+        public DefaultThreadFactory(String name) {
+            final SecurityManager securityManager = System.getSecurityManager();
+            threadGroup = (securityManager != null) ? securityManager.getThreadGroup() : Thread.currentThread().getThreadGroup();
+            namePrefix = name + "-thread-";
+        }
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            Thread thread = new Thread(threadGroup, runnable, namePrefix + THREAD_NUMBER.getAndIncrement(), 0);
+            if (thread.isDaemon()) {
+                thread.setDaemon(false);
+            }
+            if(thread.getPriority() != Thread.NORM_PRIORITY){
+                thread.setPriority(Thread.NORM_PRIORITY);
+            }
+            return thread;
+        }
+    }
+
+    /**
+     * 启动打印线程
+     */
+    private static void printScheduledThreadStats() {
+        SINGLE_POOL.scheduleAtFixedRate(() -> THREAD_POOL_EXECUTOR_MAP.forEach((name, threadPool) -> {
+            log.info("{} Pool Size: {} , Active Threads: {}, Number of Tasks Completed:{} , Number of Tasks in Queue: {}", name, threadPool.getPoolSize(),
+                    threadPool.getActiveCount(), threadPool.getCompletedTaskCount(), threadPool.getQueue().size());
+        }), 0, 5, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 注册打印日志信息
+     * @param name 线程池名称
+     * @param start 启始打印时间
+     * @param interval 间隔打印时间
+     */
+    public static void printScheduledThreadStats(String name, long start, long interval) {
+        SINGLE_POOL.scheduleAtFixedRate(() -> {
+            ThreadPoolExecutor threadPool = THREAD_POOL_EXECUTOR_MAP.get(name);
+            log.info("{} Pool Size: {} , Active Threads: {}, Number of Tasks Completed:{} , Number of Tasks in Queue: {}", name, threadPool.getPoolSize(),
+                    threadPool.getActiveCount(), threadPool.getCompletedTaskCount(), threadPool.getQueue().size());
+        }, start, interval, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 往线程池容器中放入线程池池
+     * @param threadPoolEntity 线程池定义对象
+     */
+    public static void putThreadPool(ThreadPoolEntity threadPoolEntity) {
+        ThreadPoolExecutor threadPoolExecutor = getThreadPoolExecutor(threadPoolEntity);
+        log.info("name: {}, threadPoolExecutor = {}", threadPoolEntity.taskName, threadPoolExecutor);
+        THREAD_POOL_EXECUTOR_MAP.put(threadPoolEntity.taskName, threadPoolExecutor);
+    }
+
+    /**
+     *  根据枚举获取线程池
+     * @param entity 线程池枚举
+     */
+    private static ThreadPoolExecutor getThreadPoolExecutor(ThreadPoolEntity entity) {
+        ThreadPoolExecutor executor;
+        if (entity.poolModel == PoolModel.FAST_IO) {
+            if (!(entity.blockingQueue instanceof TaskQueue)) {
+                throw new RuntimeException("PoolModel.FAST_IO 类型的线程池，只能创建 " + TaskQueue.class.getName() + " 类型的队列！");
+            }
+            TaskQueue taskQueue = (TaskQueue)entity.blockingQueue;
+            org.apache.tomcat.util.threads.ThreadPoolExecutor threadPoolExecutor = new org.apache.tomcat.util.threads.ThreadPoolExecutor(entity.corePoolNum, entity.maxPoolNum, entity.deleteThreadNum,
+                    entity.deleteTreadUnit,  taskQueue, new TaskThreadFactory(entity.taskName, false, 5), entity.rejectedExecutionHandler);
+            // 设置父类，用于判断线程的对列表是否真的满了
+            taskQueue.setParent(threadPoolExecutor);
+            executor = threadPoolExecutor;
+
+            log.info("init ThreadPoolExecutorImpl and TaskQueue！");
+        } else {
+            executor = new ThreadPoolExecutor(entity.corePoolNum, entity.maxPoolNum, entity.deleteThreadNum, entity.deleteTreadUnit,
+                    entity.blockingQueue, new DefaultThreadFactory(entity.taskName), entity.rejectedExecutionHandler);
+            // 是否预热核心线程
+            if (entity.preStartAllCoreThreads) {
+                executor.prestartAllCoreThreads();
+            }
+
+            log.info("init ThreadPoolExecutor and {}！", entity.blockingQueue.getClass().getSimpleName());
+        }
+
+        try {
+            // 是否允许核心线程超时
+            if (entity.allowsCoreThreadTimeOut) {
+                executor.allowsCoreThreadTimeOut();
+            }
+        } catch (NullPointerException e) {
+            log.error("初始化线程池错误:" + e);
+        }
+        return executor;
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/threadpool/log/OperationLogThreadPool.java b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/log/OperationLogThreadPool.java
new file mode 100644
index 0000000..91d4457
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/threadpool/log/OperationLogThreadPool.java
@@ -0,0 +1,49 @@
+package com.mosty.common.base.threadpool.log;
+
+import com.mosty.common.base.threadpool.SimpleThreadPool;
+import com.mosty.common.base.threadpool.ThreadPoolEntity;
+import com.mosty.common.base.threadpool.ThreadPoolInit;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.*;
+
+import static com.mosty.common.base.entity.log.LogConst.LOG_THREAD_POOL;
+
+/**
+ * 操作日志线程池 单体服务、基础微服务、普通微服务都需要
+ * @author kevin
+ * @date 2022/1/25 8:40 PM
+ * @since 1.0.0
+ */
+@Component
+@AutoConfigureAfter(SimpleThreadPool.class)
+public class OperationLogThreadPool implements InitializingBean {
+
+    /**
+     * 操作日志核心和最大线程数，可以根据并发量调整生效，默认单线程
+     */
+    @Value("${operation-log.thread-pool.thread-mum:1}")
+    private int threadNum;
+
+    /**
+     * 操作日志最大队列数，可以根据并发量调整生效， 默认1000
+     */
+    @Value("${operation-log.thread-pool.log-queue-size:1000}")
+    private int logQueueSize;
+
+    private OperationLogThreadPool() {
+
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        SimpleThreadPool.putThreadPool(new ThreadPoolEntity(LOG_THREAD_POOL, ThreadPoolInit.PoolModel.IO,
+                false, true, "操作日志线程池",
+                threadNum, threadNum, 0, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(logQueueSize), new ThreadPoolExecutor.DiscardOldestPolicy()));
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/EnableTimeConsume.java b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/EnableTimeConsume.java
new file mode 100644
index 0000000..5da2aa6
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/EnableTimeConsume.java
@@ -0,0 +1,19 @@
+package com.mosty.common.base.timeconsume;
+
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
+
+/**
+ *  开启方法耗时， 默认打印的监控名称{@link TimeConsume#taskName()} 为： 方法所在类名#方法名称
+ * @author kevin
+ * @date 2020/8/23 10:14
+ * @since 1.0.0
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@Import(TimeConsumeActionConfig.class)
+public @interface EnableTimeConsume {
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsume.java b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsume.java
new file mode 100644
index 0000000..bcbd166
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsume.java
@@ -0,0 +1,40 @@
+package com.mosty.common.base.timeconsume;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *  耗时打印标记
+ *
+ *  如果使用总开关{@link EnableTimeConsume} 的关闭不起作用需要：
+ *
+ *  @ComponentScan(value = "com.quanyou.qup",
+ *         excludeFilters = {@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE,
+ *                 value = {TimeConsumeActionConfig.class})})
+ *
+ * @author kevin
+ * @date 2020/8/23 10:24
+ * @since 1.0.0
+ */
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TimeConsume {
+
+    /**
+     * 任务名称，用于记录时间
+     *
+     * @return taskName 任务名称
+     */
+    String taskName() default "";
+
+    /**
+     * 打印时间消耗, 一般在执行流程的最后一步打印
+     * 为防止流氓扫描注入，开关失效
+     *
+     * @return 是否打印日志
+     */
+    boolean print() default true;
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeAction.java b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeAction.java
new file mode 100644
index 0000000..23157d6
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeAction.java
@@ -0,0 +1,116 @@
+package com.mosty.common.base.timeconsume;
+
+import com.alibaba.ttl.TransmittableThreadLocal;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Method;
+import java.util.Stack;
+
+
+/**
+ *  统计方法执行时间，可以支持注解的方法嵌套，自己保证会被动态代理切中
+ * @author kevin
+ * @date 2020/8/23 10:25
+ * @since 1.0.0
+ * @see org.springframework.context.annotation.EnableAspectJAutoProxy
+ */
+@Aspect
+@Slf4j
+public class TimeConsumeAction {
+
+    /**
+     * 名称分割符
+     */
+    private static final String SEPARATOR_NAME = "#";
+
+    /**
+     * 每个耗时的间隔符
+     */
+    private static final String SEPARATOR = " ; ";
+
+    /**
+     *  方法调用计时器
+     */
+    private static final ThreadLocal<Stack<TimeConsumeStopWatch>> MONITOR_THREAD_LOCAL = TransmittableThreadLocal.withInitial(Stack::new);
+
+    /**
+     * 耗时日志叠加
+     */
+    private static final ThreadLocal<StringBuilder> LOG_THREAD_LOCAL = TransmittableThreadLocal.withInitial(() -> new StringBuilder(128));
+
+    /**
+     * 只切面 TimeConsume 注解标注的方法
+     */
+    @Pointcut("@annotation(com.mosty.common.base.timeconsume.TimeConsume)")
+    private void timeConsumeAspect() {
+    }
+
+    /**
+     *  Aop环绕
+     * @param pjp 切入点信息
+     * @return 代理对象
+     * @throws Throwable 执行异常
+     */
+    @Around("timeConsumeAspect()")
+    public Object around(ProceedingJoinPoint pjp) throws Throwable {
+        TimeConsume timeConsume = getTimeConsume(pjp);
+        if (timeConsume.print()) {
+            String taskName = StringUtils.hasLength(timeConsume.taskName()) ? getDefaultName(pjp) : timeConsume.taskName();
+            TimeConsumeStopWatch stopWatch = new TimeConsumeStopWatch(taskName);
+            stopWatch.start(taskName);
+            MONITOR_THREAD_LOCAL.get().push(stopWatch);
+        }
+        return pjp.proceed();
+    }
+
+    /**
+     *  Aop后置方法
+     * @param pjp 切入点信息
+     */
+    @After("timeConsumeAspect()")
+    public void after(JoinPoint pjp) {
+        TimeConsume timeConsume = getTimeConsume(pjp);
+        if (timeConsume.print()) {
+            TimeConsumeStopWatch stopWatch = MONITOR_THREAD_LOCAL.get().pop();
+            stopWatch.stop();
+            LOG_THREAD_LOCAL.get().append(stopWatch.shortSummary()).append(SEPARATOR);
+
+            // 最外层（可能多个）出时，调用remove方法进行gc防止内存溢出
+            if (MONITOR_THREAD_LOCAL.get().empty()) {
+                log.info(LOG_THREAD_LOCAL.get().toString());
+                MONITOR_THREAD_LOCAL.remove();
+                LOG_THREAD_LOCAL.remove();
+            }
+        }
+    }
+
+    /**
+     *  获取默认task名称
+     * @param pjp 切入点信息
+     * @return 默认task名称
+     */
+    private String getDefaultName(JoinPoint pjp) {
+        MethodSignature methodSignature = (MethodSignature) pjp.getSignature();
+        return methodSignature.getDeclaringType().getSimpleName() + SEPARATOR_NAME + methodSignature.getMethod().getName();
+    }
+
+    /**
+     *  获取注解的参数信息
+     * @param pjp 切入点信息
+     * @return 注解信息
+     */
+    private TimeConsume getTimeConsume(JoinPoint pjp) {
+        MethodSignature methodSignature = (MethodSignature) pjp.getSignature();
+        Method method = methodSignature.getMethod();
+        return method.getAnnotation(TimeConsume.class);
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.java b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.java
new file mode 100644
index 0000000..ec5643c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.common.base.timeconsume;
+
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+/**
+ *  根据策略启动是否加载
+ * @author kevin
+ * @date 2022/1/19 9:39 PM
+ * @since 1.0.0
+ */
+public class TimeConsumeActionConfig {
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "time.consume", name = "enable", havingValue = "true")
+    public TimeConsumeAction timeConsumeAction() {
+        return new TimeConsumeAction();
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.java b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.java
new file mode 100644
index 0000000..be4429a
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.java
@@ -0,0 +1,33 @@
+package com.mosty.common.base.timeconsume;
+
+import org.springframework.util.StopWatch;
+
+
+/**
+ *  方法调用耗时的计时器
+ * @author kevin
+ * @date 2020/8/23 10:14
+ * @since 1.0.0
+ */
+public class TimeConsumeStopWatch extends StopWatch {
+
+    /**
+     *  无参数构造，让父类处理
+     */
+    public TimeConsumeStopWatch() {
+        super();
+    }
+
+    /**
+     *  有参数构造，让父类处理
+     * @param id 计时器名称
+     */
+    public TimeConsumeStopWatch(String id) {
+        super(id);
+    }
+
+    @Override
+    public String shortSummary() {
+        return "'" + this.getId() + "': " + this.getTotalTimeMillis() /*/ 1000000*/ + "ms";
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/token/MostyContext.java b/common-base-starter/src/main/java/com/mosty/common/base/token/MostyContext.java
new file mode 100644
index 0000000..3fa799e
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/token/MostyContext.java
@@ -0,0 +1,19 @@
+package com.mosty.common.base.token;
+
+/**
+ *  当前登陆用户信息上下文
+ *
+ * @author kevin
+ * @date 2022/2/6 3:05 PM
+ * @since 1.0.0
+ */
+public class MostyContext {
+
+    /**
+     * 登陆用户的上下文信息
+     */
+    private static final ThreadLocal<MostyUserInfo> USER_INFO_CONTEXT = ThreadLocal.withInitial(() -> null);
+
+
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/token/MostyUserInfo.java b/common-base-starter/src/main/java/com/mosty/common/base/token/MostyUserInfo.java
new file mode 100644
index 0000000..07503dc
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/token/MostyUserInfo.java
@@ -0,0 +1,40 @@
+package com.mosty.common.base.token;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ *  当前用户登陆信息
+ * @author kevin
+ * @date 2022/2/6 3:06 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class MostyUserInfo {
+
+    /**
+     * 所属公司
+     */
+    private Long companyId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户所属部门（用户有多个部门时，是当前用户选择切换的部门）
+     */
+    private Long deptId;
+
+
+
+//    private List<UserRole>
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/Base64Util.java b/common-base-starter/src/main/java/com/mosty/common/base/util/Base64Util.java
new file mode 100644
index 0000000..1fd12bc
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/Base64Util.java
@@ -0,0 +1,28 @@
+package com.mosty.common.base.util;
+
+import org.springframework.util.Base64Utils;
+
+public class Base64Util {
+    /**
+     * BASE64解密
+     *
+     * @param key
+     * @return
+     * @throws Exception
+     */
+    public static byte[] decryptBASE64(byte[] key) throws Exception {
+        return Base64Utils.decode(key);
+    }
+
+    /**
+     * BASE64加密
+     *
+     * @param key
+     * @return
+     * @throws Exception
+     */
+    public static String encryptBASE64(byte[] key) throws Exception {
+        return new String(Base64Utils.encode(key));
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/BeanValidators.java b/common-base-starter/src/main/java/com/mosty/common/base/util/BeanValidators.java
new file mode 100644
index 0000000..524704c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/BeanValidators.java
@@ -0,0 +1,24 @@
+package com.mosty.common.base.util;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;
+
+/**
+ * bean对象属性验证
+ * 
+ * @author ruoyi
+ */
+public class BeanValidators
+{
+    public static void validateWithException(Validator validator, Object object, Class<?>... groups)
+            throws ConstraintViolationException
+    {
+        Set<ConstraintViolation<Object>> constraintViolations = validator.validate(object, groups);
+        if (!constraintViolations.isEmpty())
+        {
+            throw new ConstraintViolationException(constraintViolations);
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/ChineseCharacterUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/util/ChineseCharacterUtil.java
new file mode 100644
index 0000000..8efe9d4
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/ChineseCharacterUtil.java
@@ -0,0 +1,127 @@
+package com.mosty.common.base.util;
+
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 获取首字母工具
+ *
+ * @author
+ * @Date
+ */
+public class ChineseCharacterUtil {
+
+    /**
+     *  获取汉字首字母或全拼大写字母
+     *
+     * @param chinese 汉字
+     * @param isFull  是否全拼 true:表示全拼 false表示：首字母
+     *
+     * @return 全拼或者首字母大写字符窜
+     */
+    public static String getUpperCase(String chinese,boolean isFull){
+        return convertHanzi2Pinyin(chinese,isFull).toUpperCase();
+    }
+
+    /**
+     * 获取汉字首字母或全拼小写字母
+     *
+     * @param chinese 汉字
+     * @param isFull 是否全拼 true:表示全拼 false表示：首字母
+     *
+     * @return 全拼或者首字母小写字符窜
+     */
+    public static  String getLowerCase(String chinese,boolean isFull){
+        return convertHanzi2Pinyin(chinese,isFull).toLowerCase();
+    }
+
+    /**
+     * 将汉字转成拼音
+     * <P>
+     * 取首字母或全拼
+     *
+     * @param hanzi 汉字字符串
+     * @param isFull 是否全拼 true:表示全拼 false表示：首字母
+     *
+     * @return 拼音
+     */
+    private static String convertHanzi2Pinyin(String hanzi,boolean isFull){
+        /***
+         * ^[\u2E80-\u9FFF]+$ 匹配所有东亚区的语言
+         * ^[\u4E00-\u9FFF]+$ 匹配简体和繁体
+         * ^[\u4E00-\u9FA5]+$ 匹配简体
+         */
+        String regExp="^[\u4E00-\u9FFF]+$";
+        StringBuffer sb=new StringBuffer();
+        if(hanzi==null||"".equals(hanzi.trim())){
+            return "";
+        }
+        String pinyin="";
+        for(int i=0;i<hanzi.length();i++){
+            char unit=hanzi.charAt(i);
+            //是汉字，则转拼音
+            if(match(String.valueOf(unit),regExp)){
+                pinyin=convertSingleHanzi2Pinyin(unit);
+                if(isFull){
+                    sb.append(pinyin);
+                }
+                else{
+                    sb.append(pinyin.charAt(0));
+                }
+            }else{
+                sb.append(unit);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 将单个汉字转成拼音
+     *
+     * @param hanzi 汉字字符
+     *
+     * @return 拼音
+     */
+    private static String convertSingleHanzi2Pinyin(char hanzi){
+        HanyuPinyinOutputFormat outputFormat = new HanyuPinyinOutputFormat();
+        outputFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+        String[] res;
+        StringBuffer sb=new StringBuffer();
+        try {
+            res = PinyinHelper.toHanyuPinyinStringArray(hanzi,outputFormat);
+            sb.append(res[0]);//对于多音字，只用第一个拼音
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return sb.toString();
+    }
+
+    /***
+     * 匹配
+     * <P>
+     * 根据字符和正则表达式进行匹配
+     *
+     * @param str 源字符串
+     * @param regex 正则表达式
+     *
+     * @return true：匹配成功  false：匹配失败
+     */
+    private static boolean match(String str,String regex){
+        Pattern pattern= Pattern.compile(regex);
+        Matcher matcher=pattern.matcher(str);
+        return matcher.find();
+    }
+
+    /**
+     * 测试方法
+     */
+    public static void main(String[] args) {
+        System.out.println(convertHanzi2Pinyin("刘二牛",false).toLowerCase());
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/DateUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/DateUtils.java
new file mode 100644
index 0000000..10b8480
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/DateUtils.java
@@ -0,0 +1,221 @@
+package com.mosty.common.base.util;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+/**
+ * 时间工具类
+ *
+ * @author ruoyi
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    public static String MM_DD = "MM-dd";
+    public static String YY_MM = "yy-MM";
+
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date LocalDateTimeToDate(LocalDateTime localDateTime) {
+        Date date = Date.from(localDateTime.atZone(ZoneOffset.ofHours(8)).toInstant());
+        return date;
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate() {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime() {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow() {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format) {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date) {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date) {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts) {
+        try {
+            return new SimpleDateFormat(format).parse(ts);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePathString() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, YYYY_MM_DD);
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            return parseDate(str.toString(), parsePatterns);
+        } catch (ParseException e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate() {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算相差天数
+     */
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
+        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+    }
+
+    /**
+     * 计算两个时间差
+     */
+    public static String getDatePoor(Date endDate, Date nowDate) {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+
+    /**
+     * 取得指定的下一个日期<br>
+     * <p>
+     * 注意：按月运算时，如果运算后当月没有该日，则为当月的最后一天
+     * </p>
+     *
+     * @param startDate 开始日期
+     * @param nextType  运算类型（Y=年数；M=月数；D=天数；H=小时数；m=分钟数；S=秒数）
+     * @param nextStep  运算长度（为负数指取以前的日期）
+     * @return java.util.Date
+     */
+    public static Date getNextDate(Date startDate, String nextType,
+                                   int nextStep) {
+        Date endDate = startDate;
+        if (startDate != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            if ("Y".equals(nextType)) {
+                calendar.add(Calendar.YEAR, nextStep);
+            } else if ("M".equals(nextType)) {
+                calendar.add(Calendar.MONTH, nextStep);
+            } else if ("D".equals(nextType)) {
+                calendar.add(Calendar.DATE, nextStep);
+            } else if ("H".equals(nextType)) {
+                calendar.add(Calendar.HOUR, nextStep);
+            } else if ("m".equals(nextType)) {
+                calendar.add(Calendar.MINUTE, nextStep);
+            } else if ("S".equals(nextType)) {
+                calendar.add(Calendar.SECOND, nextStep);
+            }
+            endDate = calendar.getTime();
+        }
+        return endDate;
+    }
+
+
+    /**
+     * 增加 LocalDateTime ==> Date
+     */
+    public static Date toDate(LocalDateTime temporalAccessor)
+    {
+        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 增加 LocalDate ==> Date
+     */
+    public static Date toDate(LocalDate temporalAccessor)
+    {
+        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/DistributedLockUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/util/DistributedLockUtil.java
new file mode 100644
index 0000000..df889b2
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/DistributedLockUtil.java
@@ -0,0 +1,256 @@
+package com.mosty.common.base.util;
+
+import com.alibaba.ttl.TransmittableThreadLocal;
+import com.mosty.common.base.lock.redisson.CallBack;
+import com.mosty.common.base.lock.redisson.RedisConcurrentException;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StopWatch;
+import org.springframework.util.StringUtils;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+/**
+ *  分布式锁（设置超时时间，就一直进行获取）
+ *
+ *  <p>
+ *  1、可以在{@link CacheConfig} 中添加自己的枚举信息，调用：
+ *      {@link DistributedLockUtil#invokeInLock(CallBack, CacheConfig, String...)} 或者 {@link DistributedLockUtil#getInstance()#invokeInLock(CallBack, String...)}
+ *
+ *  2、也可以不使用枚举：
+ *  {@link DistributedLockUtil#getInstance()#setPrefix(String)#invokeInLock(CallBack, String...)} 调用前可以设置超时 {@link #setTimeout(long, long)}
+ *
+ * @author kevin
+ * @date 2020/9/1 20:05
+ * @since 1.0.0
+ */
+@SuppressWarnings("unused")
+@Slf4j
+public class DistributedLockUtil {
+
+    /**
+     * redisson 客户端
+     */
+    private static volatile RedissonClient redissonClient;
+
+    /**
+     * 前缀参数
+     */
+    private static final ThreadLocal<Parameter> PREFIX_PARAMETER = TransmittableThreadLocal.withInitial(() -> null);
+
+    private DistributedLockUtil() {
+    }
+
+    private static class Singleton {
+        private static final DistributedLockUtil INSTANCE = new DistributedLockUtil();
+    }
+    public static DistributedLockUtil getInstance() {
+        return Singleton.INSTANCE;
+    }
+    
+    /**
+     * 获取 redisson 客户端
+     * @return redisson
+     */
+    private static RedissonClient getRedissonClient() {
+        if (redissonClient == null) {
+            synchronized (DistributedLockUtil.class) {
+                if (redissonClient == null) {
+                     redissonClient = SpringIocContext.getBean(RedissonClient.class);
+                }
+            }
+        }
+        return redissonClient;
+    }
+
+    /**
+     * 添加前缀信息
+     * @param prefix 前缀
+     * @return 当前单利对象
+     */
+    public DistributedLockUtil setPrefix(String prefix) {
+        Parameter parameter = PREFIX_PARAMETER.get();
+        if (parameter == null) {
+            PREFIX_PARAMETER.set(new Parameter(prefix));
+            return this;
+        }
+        parameter.setPrefix(prefix);
+        return this;
+    }
+
+    /**
+     * 设置获取的超时时间
+     * @param waitTime 最大等待获取锁时间
+     * @param leaseTime 任务执行时间
+     * @return 当前单利对象
+     */
+    public DistributedLockUtil setTimeout(long waitTime, long leaseTime) {
+        Parameter parameter = PREFIX_PARAMETER.get();
+        if (parameter == null) {
+            PREFIX_PARAMETER.set(new Parameter(waitTime, leaseTime));
+            return this;
+        }
+        parameter.setWaitTime(waitTime);
+        parameter.setLeaseTime(leaseTime);
+        return this;
+    }
+
+    /**
+     * 设置获取的超时时间
+     * @param cacheConfig 缓存配置
+     * @return 当前单利对象
+     */
+    public DistributedLockUtil setCacheConfig(CacheConfig cacheConfig) {
+        Parameter parameter = PREFIX_PARAMETER.get();
+        if (parameter == null) {
+            PREFIX_PARAMETER.set(new Parameter(cacheConfig));
+            return this;
+        }
+        parameter.setCacheConfig(cacheConfig);
+        return this;
+    }
+
+    /**
+     * 使用单利对象调用该方法 在排序的分布式锁中，执行操作
+     *
+     *  调用前需要调用{@link #setPrefix(String)} 或者 {@link #setCacheConfig(CacheConfig)} 也可以调用{@link #setTimeout(long, long)}
+     *
+     * @param method 需要回调执行的方法体
+     * @param lockKey 缓存key列表
+     * @param <V> 回调返回值
+     * @return 回调返回信息
+     */
+    public <V> V invokeInLock(CallBack<V> method, String... lockKey) {
+        Parameter parameter = PREFIX_PARAMETER.get();
+        if (parameter == null || (parameter.getCacheConfig() == null && StringUtils.hasLength(parameter.getPrefix()))) {
+            throw new RuntimeException("请先调用setPrefix或setCacheConfig方法！");
+        }
+        try {
+            return invokeInLock(method, null, lockKey);
+        } finally {
+            PREFIX_PARAMETER.remove();
+        }
+    }
+
+    /**
+     * 在排序的分布式锁中，执行操作
+     * @param method 需要回调执行的方法体
+     * @param cacheConfig 可以为null， 则自己带前置传入
+     * @param lockKey 缓存key列表
+     * @param <V> 回调返回值
+     * @return 回调返回信息
+     */
+    public static <V> V invokeInLock(CallBack<V> method, @Nullable CacheConfig cacheConfig, String... lockKey) throws RedisConcurrentException {
+        Parameter parameter = PREFIX_PARAMETER.get();
+        if (lockKey == null || (cacheConfig == null && parameter == null)) {
+            throw new RuntimeException("请求参数不能为空！");
+        }
+        boolean hasCacheConfig = cacheConfig == null;
+        final String prefix = hasCacheConfig ? parameter.getPrefix() : cacheConfig.cachePrefix;
+        long waitTime = hasCacheConfig ? parameter.getWaitTime() : cacheConfig.waitTime;
+        long leaseTime = hasCacheConfig ? parameter.getLeaseTime() : cacheConfig.leaseTime;
+
+        // 获取批量的分布式锁
+        RLock[] rLocks = Arrays.stream(lockKey)
+                .distinct()
+                // 进行排序，防止获取分布式锁时死锁
+                .sorted()
+                // 组装获取锁
+                .map(key -> getRedissonClient().getLock(prefix + key))
+                .toArray(RLock[]::new);
+        RLock lock = redissonClient.getMultiLock(rLocks);
+
+        // 加锁
+        boolean isLock = false;
+        StopWatch stopWatch = new StopWatch(prefix);
+        try {
+            isLock = waitTime == 0 ? lock.tryLock() : lock.tryLock(waitTime, leaseTime, TimeUnit.MILLISECONDS);
+            stopWatch.start();
+        } catch (InterruptedException e) {
+            log.error("获取分布式锁失败！");
+        }
+        V result = null;
+        if (isLock) {
+            try {
+                // 在加锁的情况下执行回调任务
+                result = method.callBack();
+            } finally {
+                // 最终进行解锁, stopWatch.stop放前面一定保证调用
+                try {
+                    stopWatch.stop();
+                    lock.unlock();
+                } catch (Exception e) {
+                    log.error("分布式锁超时【续命锁也超时】，已经自动解锁！");
+                } finally {
+                    log.info("分布式锁日志：锁前缀 {} 设置的等待锁时间为 {} MILLISECONDS， 执行时间为 {} MILLISECONDS, 执行时间时间信息: {}！", prefix, waitTime, leaseTime, stopWatch.shortSummary());
+                }
+            }
+        } else {
+            throw new RedisConcurrentException();
+        }
+        return result;
+    }
+
+    /**
+     *  缓存前缀
+     * @author kevin
+     * @date 2020/9/2 10:04
+     * @since 1.0.0
+     */
+    public enum CacheConfig {
+
+        /** 预销售分布式锁前缀 获取等待时间5秒 执行最大超时 5分钟*/
+        PRE_SELL("PRE_SELL_LOCK_", 50000, 300000);
+
+        /** 缓存前缀 */
+        public String cachePrefix;
+
+        /** 最大等待获取锁时间(毫秒) */
+        public long waitTime;
+
+        /** 任务执行时间(毫秒) */
+        public long leaseTime;
+
+        CacheConfig(String cachePrefix, long waitTime, long leaseTime) {
+            this.cachePrefix = cachePrefix;
+            this.waitTime = waitTime;
+            this.leaseTime = leaseTime;
+        }
+    }
+
+    /**
+     * 前置配置参数
+     */
+    @Data
+    private static class Parameter {
+        /** 前缀 */
+        private String prefix;
+
+        /** 缓存枚举 */
+        private CacheConfig cacheConfig;
+
+        /** 最大等待获取锁时间(毫秒) */
+        private long waitTime;
+
+        /** 任务执行时间(毫秒)  */
+        private long leaseTime;
+
+        public Parameter(String prefix) {
+            this.prefix = prefix;
+        }
+
+        public Parameter(CacheConfig cacheConfig) {
+            this.cacheConfig = cacheConfig;
+        }
+
+        public Parameter(long waitTime, long leaseTime) {
+            this.waitTime = waitTime;
+            this.leaseTime = leaseTime;
+        }
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/FileTypeUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/FileTypeUtils.java
new file mode 100644
index 0000000..b4a7575
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/FileTypeUtils.java
@@ -0,0 +1,94 @@
+package com.mosty.common.base.util;
+
+import java.io.File;
+import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.shaded.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 文件类型工具类
+ *
+ * @author ruoyi
+ */
+public class FileTypeUtils
+{
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     * 
+     * @param file 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(File file)
+    {
+        if (null == file)
+        {
+            return StringUtils.EMPTY;
+        }
+        return getFileType(file.getName());
+    }
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param fileName 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(String fileName)
+    {
+        int separatorIndex = fileName.lastIndexOf(".");
+        if (separatorIndex < 0)
+        {
+            return "";
+        }
+        return fileName.substring(separatorIndex + 1).toLowerCase();
+    }
+
+    /**
+     * 获取文件名的后缀
+     * 
+     * @param file 表单文件
+     * @return 后缀名
+     */
+    public static final String getExtension(MultipartFile file)
+    {
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (StringUtils.isEmpty(extension))
+        {
+            extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
+        }
+        return extension;
+    }
+
+    /**
+     * 获取文件类型
+     * 
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "JPG";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "GIF";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "JPG";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "BMP";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/ImageUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/ImageUtils.java
new file mode 100644
index 0000000..992df2c
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/ImageUtils.java
@@ -0,0 +1,84 @@
+package com.mosty.common.base.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 图片处理工具类
+ *
+ * @author ruoyi
+ */
+public class ImageUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
+
+    public static byte[] getImage(String imagePath)
+    {
+        InputStream is = getFile(imagePath);
+        try
+        {
+            return IOUtils.toByteArray(is);
+        }
+        catch (Exception e)
+        {
+            log.error("图片加载异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
+    public static InputStream getFile(String imagePath)
+    {
+        try
+        {
+            byte[] result = readFile(imagePath);
+            result = Arrays.copyOf(result, result.length);
+            return new ByteArrayInputStream(result);
+        }
+        catch (Exception e)
+        {
+            log.error("获取图片异常 {}", e);
+        }
+        return null;
+    }
+
+    /**
+     * 读取文件为字节数据
+     * 
+     * @param url 地址
+     * @return 字节数据
+     */
+    public static byte[] readFile(String url)
+    {
+        InputStream in = null;
+        try
+        {
+            // 网络地址
+            URL urlObj = new URL(url);
+            URLConnection urlConnection = urlObj.openConnection();
+            urlConnection.setConnectTimeout(30 * 1000);
+            urlConnection.setReadTimeout(60 * 1000);
+            urlConnection.setDoInput(true);
+            in = urlConnection.getInputStream();
+            return IOUtils.toByteArray(in);
+        }
+        catch (Exception e)
+        {
+            log.error("访问文件异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(in);
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/IpUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/util/IpUtil.java
new file mode 100644
index 0000000..dc85a1f
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/IpUtil.java
@@ -0,0 +1,195 @@
+package com.mosty.common.base.util;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * 获取IP工具类
+ *
+ * @author kevin
+ * @date 2022/2/16 11:15 PM
+ * @since 1.0.0
+ */
+public class IpUtil {
+
+    /**
+     * 获取ip地址
+     * @return ip地址
+     */
+    public static String getIpAddress() {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (requestAttributes == null) {
+            return "";
+        }
+        HttpServletRequest request = requestAttributes.getRequest();
+        return getIpAddress(request);
+    }
+
+    /**
+     * 获取ip地址
+     * @param request http请求
+     * @return IP地址
+     */
+    public static String getIpAddress(HttpServletRequest request) {
+        if (request == null) {
+            return "unknown";
+        }
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+            System.out.println("Proxy-Client-IP ip: " + ip);
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+            System.out.println("WL-Proxy-Client-IP ip: " + ip);
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+            System.out.println("HTTP_CLIENT_IP ip: " + ip);
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+            System.out.println("HTTP_X_FORWARDED_FOR ip: " + ip);
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Real-IP");
+            System.out.println("X-Real-IP ip: " + ip);
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+            System.out.println("getRemoteAddr ip: " + ip);
+        }
+        return ip;
+    }
+
+    public static boolean internalIp(String ip) {
+        byte[] addr = textToNumericFormatV4(ip);
+        return internalIp(addr) || "127.0.0.1".equals(ip);
+    }
+
+    private static boolean internalIp(byte[] addr) {
+        if (StringUtils.isNull(addr) || addr.length < 2) {
+            return true;
+        }
+        final byte b0 = addr[0];
+        final byte b1 = addr[1];
+        // 10.x.x.x/8
+        final byte SECTION_1 = 0x0A;
+        // 172.16.x.x/12
+        final byte SECTION_2 = (byte) 0xAC;
+        final byte SECTION_3 = (byte) 0x10;
+        final byte SECTION_4 = (byte) 0x1F;
+        // 192.168.x.x/16
+        final byte SECTION_5 = (byte) 0xC0;
+        final byte SECTION_6 = (byte) 0xA8;
+        switch (b0) {
+            case SECTION_1:
+                return true;
+            case SECTION_2:
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
+                    return true;
+                }
+            case SECTION_5:
+                switch (b1) {
+                    case SECTION_6:
+                        return true;
+                }
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 将IPv4地址转换成字节
+     *
+     * @param text IPv4地址
+     * @return byte 字节
+     */
+    public static byte[] textToNumericFormatV4(String text) {
+        if (text.length() == 0) {
+            return null;
+        }
+
+        byte[] bytes = new byte[4];
+        String[] elements = text.split("\\.", -1);
+        try {
+            long l;
+            int i;
+            switch (elements.length) {
+                case 1:
+                    l = Long.parseLong(elements[0]);
+                    if ((l < 0L) || (l > 4294967295L)) {
+                        return null;
+                    }
+                    bytes[0] = (byte) (int) (l >> 24 & 0xFF);
+                    bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 2:
+                    l = Integer.parseInt(elements[0]);
+                    if ((l < 0L) || (l > 255L)) {
+                        return null;
+                    }
+                    bytes[0] = (byte) (int) (l & 0xFF);
+                    l = Integer.parseInt(elements[1]);
+                    if ((l < 0L) || (l > 16777215L)) {
+                        return null;
+                    }
+                    bytes[1] = (byte) (int) (l >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 3:
+                    for (i = 0; i < 2; ++i) {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L)) {
+                            return null;
+                        }
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    l = Integer.parseInt(elements[2]);
+                    if ((l < 0L) || (l > 65535L)) {
+                        return null;
+                    }
+                    bytes[2] = (byte) (int) (l >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 4:
+                    for (i = 0; i < 4; ++i) {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L)) {
+                            return null;
+                        }
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    break;
+                default:
+                    return null;
+            }
+        } catch (NumberFormatException e) {
+            return null;
+        }
+        return bytes;
+    }
+
+    public static String getHostIp() {
+        try {
+            return InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+        }
+        return "127.0.0.1";
+    }
+
+    public static String getHostName() {
+        try {
+            return InetAddress.getLocalHost().getHostName();
+        } catch (UnknownHostException e) {
+        }
+        return "未知";
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/LocalDateTimeUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/LocalDateTimeUtils.java
new file mode 100644
index 0000000..c7aac67
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/LocalDateTimeUtils.java
@@ -0,0 +1,44 @@
+package com.mosty.common.base.util;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.TemporalAdjusters;
+
+public class LocalDateTimeUtils {
+    /**
+     * 获取当天最早时间
+     * @return
+     */
+    public static LocalDateTime todayStart(){
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+        return today_start;
+    }
+
+    /**
+     * 获取当天最晚时间
+     * @return
+     */
+    public static LocalDateTime todayEnd(){
+        LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+        return today_end;
+    }
+
+    /**
+     * 往前几天
+     * @return
+     */
+    public static LocalDateTime daysStart(Integer day){
+        LocalDateTime now = LocalDateTime.now().minusDays(day);
+        return now;
+    }
+
+    /**
+     * 往后几天
+     * @return
+     */
+    public static LocalDateTime daysEnd(Integer day){
+        LocalDateTime now = LocalDateTime.now().plusDays(day);
+        return now;
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/Md5Utils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/Md5Utils.java
new file mode 100644
index 0000000..0493937
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/Md5Utils.java
@@ -0,0 +1,53 @@
+package com.mosty.common.base.util;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.security.MessageDigest;
+
+/**
+ * Md5加密方法
+ *
+ * @author ruoyi
+ */
+@Slf4j
+public class Md5Utils {
+
+    private static byte[] md5(String s) {
+        MessageDigest algorithm;
+        try {
+            algorithm = MessageDigest.getInstance("MD5");
+            algorithm.reset();
+            algorithm.update(s.getBytes("UTF-8"));
+            byte[] messageDigest = algorithm.digest();
+            return messageDigest;
+        } catch (Exception e) {
+            log.error("MD5 Error...", e);
+        }
+        return null;
+    }
+
+    private static final String toHex(byte hash[]) {
+        if (hash == null) {
+            return null;
+        }
+        StringBuffer buf = new StringBuffer(hash.length * 2);
+        int i;
+
+        for (i = 0; i < hash.length; i++) {
+            if ((hash[i] & 0xff) < 0x10) {
+                buf.append("0");
+            }
+            buf.append(Long.toString(hash[i] & 0xff, 16));
+        }
+        return buf.toString();
+    }
+
+    public static String hash(String s) {
+        try {
+            return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
+        } catch (Exception e) {
+            log.error("not supported charset...{}", e);
+            return s;
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/MimeTypeUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/MimeTypeUtils.java
new file mode 100644
index 0000000..9f1f3d2
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/MimeTypeUtils.java
@@ -0,0 +1,59 @@
+package com.mosty.common.base.util;
+
+/**
+ * 媒体类型工具类
+ * 
+ * @author ruoyi
+ */
+public class MimeTypeUtils
+{
+    public static final String IMAGE_PNG = "image/png";
+
+    public static final String IMAGE_JPG = "image/jpg";
+
+    public static final String IMAGE_JPEG = "image/jpeg";
+
+    public static final String IMAGE_BMP = "image/bmp";
+
+    public static final String IMAGE_GIF = "image/gif";
+
+    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+            "asf", "rm", "rmvb" };
+
+    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+
+    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+            // 图片
+            "bmp", "gif", "jpg", "jpeg", "png",
+            // word excel powerpoint
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+            // 压缩文件
+            "rar", "zip", "gz", "bz2",
+            // 视频格式
+            "mp4", "avi", "rmvb",
+            // pdf
+            "pdf" };
+
+    public static String getExtension(String prefix)
+    {
+        switch (prefix)
+        {
+            case IMAGE_PNG:
+                return "png";
+            case IMAGE_JPG:
+                return "jpg";
+            case IMAGE_JPEG:
+                return "jpeg";
+            case IMAGE_BMP:
+                return "bmp";
+            case IMAGE_GIF:
+                return "gif";
+            default:
+                return "";
+        }
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/PasswordUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/util/PasswordUtil.java
new file mode 100644
index 0000000..61995d5
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/PasswordUtil.java
@@ -0,0 +1,79 @@
+package com.mosty.common.base.util;
+
+import java.security.MessageDigest;
+
+/**
+ * @author：xingquanxiang createTime：2020/1/10 18:47
+ * description: 加密加盐工具类， 带加密 和 校验
+ */
+public class PasswordUtil {
+    /**
+     * md5加密处理
+     * @param s
+     * @return
+     */
+    private static String md5(String s) {
+        try {
+            //MessageDigest是封装md5算法的工具对象还支持SHA算法
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            //通过digest拿到的任意字符串,得到的bates都是等长的
+            byte[] bytes = md.digest(s.getBytes("utf-8"));
+            return toHex(bytes);
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    private static String toHex(byte[] bytes) {
+        //toHex的字符串把二进制转换成十六进制
+        final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray();
+        StringBuilder ret = new StringBuilder(bytes.length * 2);
+        //循环判断是为了补位操作
+        for (int i=0; i<bytes.length; i++) {
+            ret.append(HEX_DIGITS[(bytes[i] >> 4) & 0x0f]);
+            ret.append(HEX_DIGITS[bytes[i] & 0x0f]);
+        }
+        return ret.toString();
+    }
+
+
+    /**
+     * 对密码进行加密加盐操作
+     * @param password
+     * @return
+     */
+    public static String encode(String password,String salt){
+        //加密
+        String hexPwd = md5(password);
+        //加盐操作
+        StringBuilder builder = new StringBuilder(hexPwd);
+        builder.insert(18, salt);
+        //返回加密加盐后的字符串
+        return builder.toString();
+    }
+
+    /**
+     * 校对密码是否匹配，匹配则返回true
+     * @param password
+     * @param dbPassword
+     * @return
+     */
+    public static boolean match(String password, String dbPassword){
+        StringBuilder builder = new StringBuilder(dbPassword);
+        //去盐操作，生成md5加密后原始字符
+        builder.replace(18, 26, "");
+        //加密新密码，生成md5加密字符
+        password = md5(password);
+        //校对加密字符与原始字符是否匹配
+        return password.equals(builder.toString());
+    }
+
+    public static void main(String[] args) {
+
+        boolean match = match("123456", "E10ADC3949BA59ABBEntcqRM9U56E057F20F883E");
+        System.out.println(match);
+
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/RandomUtil.java b/common-base-starter/src/main/java/com/mosty/common/base/util/RandomUtil.java
new file mode 100644
index 0000000..58262e9
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/RandomUtil.java
@@ -0,0 +1,126 @@
+package com.mosty.common.base.util;
+
+import java.util.Random;
+
+public class RandomUtil {
+    public static final String ALLCHAR = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    public static final String LETTERCHAR = "abcdefghijkllmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    /**
+     * 返回一个定长的随机字符串(只包含大小写字母、数字)
+     *
+     * @param length
+     *            随机字符串长度
+     * @return 随机字符串
+     */
+    public static String generateString(int length) {
+        StringBuffer sb = new StringBuffer();
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            sb.append(ALLCHAR.charAt(random.nextInt(ALLCHAR.length())));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 返回一个定长的随机纯字母字符串(只包含大小写字母)
+     *
+     * @param length
+     *            随机字符串长度
+     * @return 随机字符串
+     */
+    public static String generateMixString(int length) {
+        StringBuffer sb = new StringBuffer();
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            sb.append(ALLCHAR.charAt(random.nextInt(LETTERCHAR.length())));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 返回一个定长的随机纯大写字母字符串(只包含大小写字母)
+     *
+     * @param length
+     *            随机字符串长度
+     * @return 随机字符串
+     */
+    public static String generateLowerString(int length) {
+        return generateMixString(length).toLowerCase();
+    }
+
+    /**
+     * 返回一个定长的随机纯小写字母字符串(只包含大小写字母)
+     *
+     * @param length
+     *            随机字符串长度
+     * @return 随机字符串
+     */
+    public static String generateUpperString(int length) {
+        return generateMixString(length).toUpperCase();
+    }
+
+    /**
+     * 生成一个定长的纯0字符串
+     *
+     * @param length
+     *            字符串长度
+     * @return 纯0字符串
+     */
+    public static String generateZeroString(int length) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < length; i++) {
+            sb.append('0');
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 根据数字生成一个定长的字符串，长度不够前面补0
+     *
+     * @param num
+     *            数字
+     * @param fixdlenth
+     *            字符串长度
+     * @return 定长的字符串
+     */
+    public static String toFixdLengthString(long num, int fixdlenth) {
+        StringBuffer sb = new StringBuffer();
+        String strNum = String.valueOf(num);
+        if (fixdlenth - strNum.length() >= 0) {
+            sb.append(generateZeroString(fixdlenth - strNum.length()));
+        } else {
+            throw new RuntimeException("将数字" + num + "转化为长度为" + fixdlenth
+                    + "的字符串发生异常！");
+        }
+        sb.append(strNum);
+        return sb.toString();
+    }
+
+    /**
+     * 每次生成的len位数都不相同
+     *
+     * @param param
+     * @return 定长的数字
+     */
+    public static int getNotSimple(int[] param, int len) {
+        Random rand = new Random();
+        for (int i = param.length; i > 1; i--) {
+            int index = rand.nextInt(i);
+            int tmp = param[index];
+            param[index] = param[i - 1];
+            param[i - 1] = tmp;
+        }
+        int result = 0;
+        for (int i = 0; i < len; i++) {
+            result = result * 10 + param[i];
+        }
+        return result;
+    }
+
+    public static void main(String[] args) {
+        System.out.println("返回一个定长的随机字符串(只包含大小写字母、数字):" + generateString(10));
+
+
+    }
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/ServletUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/ServletUtils.java
new file mode 100644
index 0000000..4546805
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/ServletUtils.java
@@ -0,0 +1,180 @@
+package com.mosty.common.base.util;
+
+import cn.hutool.core.convert.Convert;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+/**
+ * 客户端工具类
+ * 
+ * @author ruoyi
+ */
+public class ServletUtils {
+    /**
+     * 定义移动端请求的所有可能类型
+     */
+    private final static String[] agent = { "Android", "iPhone", "iPod", "iPad", "Windows Phone", "MQQBrowser" };
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name)
+    {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name, String defaultValue)
+    {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name)
+    {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue)
+    {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name)
+    {
+        return Convert.toBool(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name, Boolean defaultValue)
+    {
+        return Convert.toBool(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取request
+     */
+    public static HttpServletRequest getRequest()
+    {
+        return getRequestAttributes().getRequest();
+    }
+
+    /**
+     * 获取response
+     */
+    public static HttpServletResponse getResponse()
+    {
+        return getRequestAttributes().getResponse();
+    }
+
+    /**
+     * 获取session
+     */
+    public static HttpSession getSession()
+    {
+        return getRequest().getSession();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes()
+    {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        return (ServletRequestAttributes) attributes;
+    }
+
+    /**
+     * 将字符串渲染到客户端
+     * 
+     * @param response 渲染对象
+     * @param string 待渲染的字符串
+     * @return null
+     */
+    public static String renderString(HttpServletResponse response, String string)
+    {
+        try
+        {
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            response.getWriter().print(string);
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 是否是Ajax异步请求
+     * 
+     * @param request
+     */
+    public static boolean isAjaxRequest(HttpServletRequest request)
+    {
+        String accept = request.getHeader("accept");
+        if (accept != null && accept.indexOf("application/json") != -1)
+        {
+            return true;
+        }
+
+        String xRequestedWith = request.getHeader("X-Requested-With");
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+        {
+            return true;
+        }
+
+        String uri = request.getRequestURI();
+        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+        {
+            return true;
+        }
+
+        String ajax = request.getParameter("__ajax");
+        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断User-Agent 是不是来自于手机
+     */
+    public static boolean checkAgentIsMobile(String ua)
+    {
+        boolean flag = false;
+        if (!ua.contains("Windows NT") || (ua.contains("Windows NT") && ua.contains("compatible; MSIE 9.0;")))
+        {
+            // 排除 苹果桌面系统
+            if (!ua.contains("Windows NT") && !ua.contains("Macintosh"))
+            {
+                for (String item : agent)
+                {
+                    if (ua.contains(item))
+                    {
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return flag;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/SpringIocContext.java b/common-base-starter/src/main/java/com/mosty/common/base/util/SpringIocContext.java
new file mode 100644
index 0000000..104fd92
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/SpringIocContext.java
@@ -0,0 +1,81 @@
+package com.mosty.common.base.util;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+/**
+ *  Bean ioc 静态工具类
+ * @author kevin
+ * @date 2020/9/17 13:21
+ * @since 1.0.0
+ */
+@Component
+@SuppressWarnings("unused")
+public class SpringIocContext implements ApplicationContextAware {
+
+    /**
+     * spring IOC容器
+     * @see SpringApplication #createApplicationContext()
+     */
+    public static ApplicationContext applicationContext;
+
+    public SpringIocContext() {
+    }
+
+    @Override
+    public void setApplicationContext(@NonNull ApplicationContext applicationContext) {
+        SpringIocContext.applicationContext = applicationContext;
+    }
+
+    /**
+     * 获取带有 注解的类
+     * @param annotationClass 注解类
+     * @return 标注了注解的Bean
+     */
+    public static Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationClass) {
+        try {
+            return applicationContext.getBeansWithAnnotation(annotationClass);
+        } catch (Exception var2) {
+            return null;
+        }
+    }
+
+    /**
+     * 从ioc容器获取bean
+     * @param beanClass bean {@link Class}
+     * @param <T> 泛型
+     * @return bean对象
+     */
+    public static <T> T getBean(Class<T> beanClass) {
+        return applicationContext.getBean(beanClass);
+    }
+
+    /**
+     * 从ioc容器获取bean
+     * @param beanName bean名称
+     * @return bean对象
+     */
+    public static Object getBean(String beanName) {
+        return applicationContext.getBean(beanName);
+    }
+
+    /**
+     * 获取aop代理对象
+     *
+     * @param invoker
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker)
+    {
+        return (T) AopContext.currentProxy();
+    }
+
+}
diff --git a/common-base-starter/src/main/java/com/mosty/common/base/util/StringUtils.java b/common-base-starter/src/main/java/com/mosty/common/base/util/StringUtils.java
new file mode 100644
index 0000000..c6a414b
--- /dev/null
+++ b/common-base-starter/src/main/java/com/mosty/common/base/util/StringUtils.java
@@ -0,0 +1,478 @@
+package com.mosty.common.base.util;
+
+import org.springframework.util.AntPathMatcher;
+
+import java.util.*;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    /**
+     * 空字符串
+     */
+    private static final String NULLSTR = "";
+
+    /**
+     * 下划线
+     */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue) {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll) {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll) {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     *                * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects) {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects) {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map) {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str) {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object) {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object) {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     *
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object) {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str) {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (start > str.length()) {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @param end   结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (end < 0) {
+            end = str.length() + end;
+        }
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (end > str.length()) {
+            end = str.length();
+        }
+
+        if (start > end) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (end < 0) {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+//    public static String format(String template, Object... params)
+//    {
+//        if (isEmpty(params) || isEmpty(template))
+//        {
+//            return template;
+//        }
+//        return StrFormatter.format(template, params);
+//    }
+
+    /**
+     * 是否为http(s)://开头
+     *
+     * @param link 链接
+     * @return 结果
+     */
+//    public static boolean ishttp(String link)
+//    {
+//        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+//    }
+
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep) {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     *
+     * @param str         字符串
+     * @param sep         分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim        去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str)) {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str)) {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split) {
+            if (filterBlank && StringUtils.isBlank(string)) {
+                continue;
+            }
+            if (trim) {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs                  指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+        if (isEmpty(cs) || isEmpty(searchCharSequences)) {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences) {
+            if (containsIgnoreCase(cs, testStr)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str) {
+        if (str == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (i > 0) {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            } else {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1)) {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str  验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        if (str != null && strs != null) {
+            for (String s : strs) {
+                if (str.equalsIgnoreCase(trim(s))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 删除最后一个字符串
+     *
+     * @param str  输入字符串
+     * @param spit 以什么类型结尾的
+     * @return 截取后的字符串
+     */
+    public static String lastStringDel(String str, String spit) {
+        if (!StringUtils.isEmpty(str) && str.endsWith(spit)) {
+            return str.subSequence(0, str.length() - 1).toString();
+        }
+        return str;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name) {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty()) {
+            // 没必要转换
+            return "";
+        } else if (!name.contains("_")) {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels) {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty()) {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如：user_name->userName
+     */
+    public static String toCamelCase(String s) {
+        if (s == null) {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1) {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR) {
+                upperCase = true;
+            } else if (upperCase) {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str  指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs) {
+        if (isEmpty(str) || isEmpty(strs)) {
+            return false;
+        }
+        for (String pattern : strs) {
+            if (isMatch(pattern, str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url     需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url) {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj) {
+        return (T) obj;
+    }
+}
\ No newline at end of file
diff --git a/common-base-starter/src/main/resources/META-INF/spring.factories b/common-base-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..543b1de
--- /dev/null
+++ b/common-base-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,9 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.base.util.SpringIocContext,\
+com.mosty.common.base.autoconfig.swagger.SwaggerConfig,\
+com.mosty.common.base.threadpool.SimpleThreadPool,\
+com.mosty.common.base.threadpool.log.OperationLogThreadPool,\
+com.mosty.common.base.mybatis.MybatisConfig,\
+com.mosty.common.base.exception.MostyExceptionHandler
+#  ,\
+#com.mosty.common.base.autoconfig.JacksonCustomizerConfig
\ No newline at end of file
diff --git a/common-base-starter/target/classes/META-INF/spring.factories b/common-base-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..543b1de
--- /dev/null
+++ b/common-base-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,9 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.base.util.SpringIocContext,\
+com.mosty.common.base.autoconfig.swagger.SwaggerConfig,\
+com.mosty.common.base.threadpool.SimpleThreadPool,\
+com.mosty.common.base.threadpool.log.OperationLogThreadPool,\
+com.mosty.common.base.mybatis.MybatisConfig,\
+com.mosty.common.base.exception.MostyExceptionHandler
+#  ,\
+#com.mosty.common.base.autoconfig.JacksonCustomizerConfig
\ No newline at end of file
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$BankCard.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$BankCard.class
new file mode 100644
index 0000000..edebe8f
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$BankCard.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$FullName.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$FullName.class
new file mode 100644
index 0000000..3f37c84
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$FullName.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$IdentityCard.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$IdentityCard.class
new file mode 100644
index 0000000..8abf9b7
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$IdentityCard.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$Phone.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$Phone.class
new file mode 100644
index 0000000..5a8c4de
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization$Phone.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization.class
new file mode 100644
index 0000000..405b9be
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/Desensitization.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.class b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.class
new file mode 100644
index 0000000..c950577
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/autoconfig/swagger/SwaggerConfig.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/Constants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/Constants.class
new file mode 100644
index 0000000..e0aaa5c
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/Constants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/GenConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/GenConstants.class
new file mode 100644
index 0000000..728cca9
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/GenConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/OnlineStatus.class b/common-base-starter/target/classes/com/mosty/common/base/constant/OnlineStatus.class
new file mode 100644
index 0000000..6fe9722
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/OnlineStatus.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/PermissionConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/PermissionConstants.class
new file mode 100644
index 0000000..f505730
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/PermissionConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants$Status.class b/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants$Status.class
new file mode 100644
index 0000000..bf6125a
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants$Status.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants.class
new file mode 100644
index 0000000..d261934
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/ScheduleConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/ShiroConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/ShiroConstants.class
new file mode 100644
index 0000000..1124960
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/ShiroConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/SystemConfigConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/SystemConfigConstants.class
new file mode 100644
index 0000000..a51c02d
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/SystemConfigConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/UserConstants.class b/common-base-starter/target/classes/com/mosty/common/base/constant/UserConstants.class
new file mode 100644
index 0000000..bd0a540
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/UserConstants.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/ConfigKeyEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/ConfigKeyEnum.class
new file mode 100644
index 0000000..9b5396e
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/ConfigKeyEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DeletedEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DeletedEnum.class
new file mode 100644
index 0000000..210f6f2
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DeletedEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DictTypeEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DictTypeEnum.class
new file mode 100644
index 0000000..a205c61
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/DictTypeEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/MenuTypeEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/MenuTypeEnum.class
new file mode 100644
index 0000000..fb57d94
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/MenuTypeEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PasswordLevelEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PasswordLevelEnum.class
new file mode 100644
index 0000000..97d7f9f
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PasswordLevelEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PermissionLevelEnum.class b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PermissionLevelEnum.class
new file mode 100644
index 0000000..e997171
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/constant/enums/PermissionLevelEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/data/scope/DataScope.class b/common-base-starter/target/classes/com/mosty/common/base/data/scope/DataScope.class
new file mode 100644
index 0000000..2c0ac51
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/data/scope/DataScope.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController$1.class b/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController$1.class
new file mode 100644
index 0000000..35ac810
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController$1.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController.class b/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController.class
new file mode 100644
index 0000000..c15efb9
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/BaseController.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/CxSelect.class b/common-base-starter/target/classes/com/mosty/common/base/domain/CxSelect.class
new file mode 100644
index 0000000..f1c1758
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/CxSelect.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/ResponseResult.class b/common-base-starter/target/classes/com/mosty/common/base/domain/ResponseResult.class
new file mode 100644
index 0000000..bdce5f8
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/ResponseResult.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/TableDataInfo.class b/common-base-starter/target/classes/com/mosty/common/base/domain/TableDataInfo.class
new file mode 100644
index 0000000..74719f9
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/TableDataInfo.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageDomain.class b/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageDomain.class
new file mode 100644
index 0000000..1ac5865
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageDomain.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageUtils.class b/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageUtils.class
new file mode 100644
index 0000000..753b692
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/page/PageUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/page/ServletUtils.class b/common-base-starter/target/classes/com/mosty/common/base/domain/page/ServletUtils.class
new file mode 100644
index 0000000..3964259
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/page/ServletUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/page/SqlUtil.class b/common-base-starter/target/classes/com/mosty/common/base/domain/page/SqlUtil.class
new file mode 100644
index 0000000..84770f4
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/page/SqlUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/domain/page/TableSupport.class b/common-base-starter/target/classes/com/mosty/common/base/domain/page/TableSupport.class
new file mode 100644
index 0000000..7c369e7
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/domain/page/TableSupport.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/BaseEntity.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/BaseEntity.class
new file mode 100644
index 0000000..625df92
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/BaseEntity.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/BusinessType.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/BusinessType.class
new file mode 100644
index 0000000..695b94d
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/BusinessType.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/CharsetKit.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/CharsetKit.class
new file mode 100644
index 0000000..707d05c
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/CharsetKit.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Convert.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Convert.class
new file mode 100644
index 0000000..3335ac3
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Convert.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$ColumnType.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$ColumnType.class
new file mode 100644
index 0000000..75ac2bd
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$ColumnType.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$Type.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$Type.class
new file mode 100644
index 0000000..586d522
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel$Type.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel.class
new file mode 100644
index 0000000..8aa01aa
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excel.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/ExcelHandlerAdapter.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/ExcelHandlerAdapter.class
new file mode 100644
index 0000000..de0e080
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/ExcelHandlerAdapter.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excels.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excels.class
new file mode 100644
index 0000000..b5a80d7
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Excels.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/Log.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Log.class
new file mode 100644
index 0000000..f935248
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/Log.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/LogConst.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/LogConst.class
new file mode 100644
index 0000000..848825f
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/LogConst.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/OperatorType.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/OperatorType.class
new file mode 100644
index 0000000..a63e131
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/OperatorType.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/ReflectUtils.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/ReflectUtils.class
new file mode 100644
index 0000000..ee5f705
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/ReflectUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/SpringUtils.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/SpringUtils.class
new file mode 100644
index 0000000..cf983d9
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/SpringUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/StringUtils.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/StringUtils.class
new file mode 100644
index 0000000..76262c5
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/StringUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/log/SysOperLog.class b/common-base-starter/target/classes/com/mosty/common/base/entity/log/SysOperLog.class
new file mode 100644
index 0000000..33a19d8
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/log/SysOperLog.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/entity/realm/SysUser.class b/common-base-starter/target/classes/com/mosty/common/base/entity/realm/SysUser.class
new file mode 100644
index 0000000..8375309
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/entity/realm/SysUser.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/Asserts.class b/common-base-starter/target/classes/com/mosty/common/base/exception/Asserts.class
new file mode 100644
index 0000000..9974e8b
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/Asserts.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessException.class b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessException.class
new file mode 100644
index 0000000..d83f23c
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessException.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessExceptionEnum.class b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessExceptionEnum.class
new file mode 100644
index 0000000..c0c0083
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessExceptionEnum.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessStatus.class b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessStatus.class
new file mode 100644
index 0000000..1a4099e
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/BusinessStatus.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/MostyExceptionHandler.class b/common-base-starter/target/classes/com/mosty/common/base/exception/MostyExceptionHandler.class
new file mode 100644
index 0000000..a4a198e
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/MostyExceptionHandler.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/ServiceException.class b/common-base-starter/target/classes/com/mosty/common/base/exception/ServiceException.class
new file mode 100644
index 0000000..2919892
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/ServiceException.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/exception/UtilException.class b/common-base-starter/target/classes/com/mosty/common/base/exception/UtilException.class
new file mode 100644
index 0000000..4a201b1
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/exception/UtilException.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/AopTargetUtils.class b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/AopTargetUtils.class
new file mode 100644
index 0000000..fc8f933
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/AopTargetUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.class b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.class
new file mode 100644
index 0000000..789f8d5
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/EnableOptimisticLock.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/OptimisticLockException.class b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/OptimisticLockException.class
new file mode 100644
index 0000000..f472f78
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/lock/optimistic/OptimisticLockException.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/CallBack.class b/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/CallBack.class
new file mode 100644
index 0000000..5d1a29e
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/CallBack.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/RedisConcurrentException.class b/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/RedisConcurrentException.class
new file mode 100644
index 0000000..041cea7
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/lock/redisson/RedisConcurrentException.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/mybatis/MybatisConfig.class b/common-base-starter/target/classes/com/mosty/common/base/mybatis/MybatisConfig.class
new file mode 100644
index 0000000..996f052
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/mybatis/MybatisConfig.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/system/config/EnableSystemConfig.class b/common-base-starter/target/classes/com/mosty/common/base/system/config/EnableSystemConfig.class
new file mode 100644
index 0000000..d0f0cf2
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/system/config/EnableSystemConfig.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/SimpleThreadPool.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/SimpleThreadPool.class
new file mode 100644
index 0000000..8fb57a8
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/SimpleThreadPool.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPool.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPool.class
new file mode 100644
index 0000000..9fd79f0
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPool.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolEntity.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolEntity.class
new file mode 100644
index 0000000..d22bcb0
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolEntity.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$DefaultThreadFactory.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$DefaultThreadFactory.class
new file mode 100644
index 0000000..7fe6794
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$DefaultThreadFactory.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$PoolModel.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$PoolModel.class
new file mode 100644
index 0000000..22d34d2
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit$PoolModel.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit.class
new file mode 100644
index 0000000..524ff76
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/ThreadPoolInit.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/threadpool/log/OperationLogThreadPool.class b/common-base-starter/target/classes/com/mosty/common/base/threadpool/log/OperationLogThreadPool.class
new file mode 100644
index 0000000..90936a5
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/threadpool/log/OperationLogThreadPool.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/timeconsume/EnableTimeConsume.class b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/EnableTimeConsume.class
new file mode 100644
index 0000000..9bc2436
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/EnableTimeConsume.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsume.class b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsume.class
new file mode 100644
index 0000000..95def1c
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsume.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeAction.class b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeAction.class
new file mode 100644
index 0000000..0606c71
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeAction.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.class b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.class
new file mode 100644
index 0000000..9eba736
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeActionConfig.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.class b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.class
new file mode 100644
index 0000000..1da874a
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/timeconsume/TimeConsumeStopWatch.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/token/MostyContext.class b/common-base-starter/target/classes/com/mosty/common/base/token/MostyContext.class
new file mode 100644
index 0000000..dff7170
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/token/MostyContext.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/token/MostyUserInfo.class b/common-base-starter/target/classes/com/mosty/common/base/token/MostyUserInfo.class
new file mode 100644
index 0000000..343dbfa
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/token/MostyUserInfo.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/Base64Util.class b/common-base-starter/target/classes/com/mosty/common/base/util/Base64Util.class
new file mode 100644
index 0000000..ddac11d
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/Base64Util.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/BeanValidators.class b/common-base-starter/target/classes/com/mosty/common/base/util/BeanValidators.class
new file mode 100644
index 0000000..bba5292
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/BeanValidators.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/ChineseCharacterUtil.class b/common-base-starter/target/classes/com/mosty/common/base/util/ChineseCharacterUtil.class
new file mode 100644
index 0000000..eddb52a
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/ChineseCharacterUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DateUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/DateUtils.class
new file mode 100644
index 0000000..e77bb54
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DateUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$1.class b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$1.class
new file mode 100644
index 0000000..8520d3d
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$1.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$CacheConfig.class b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$CacheConfig.class
new file mode 100644
index 0000000..44213c1
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$CacheConfig.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Parameter.class b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Parameter.class
new file mode 100644
index 0000000..139ffcd
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Parameter.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Singleton.class b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Singleton.class
new file mode 100644
index 0000000..f251079
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil$Singleton.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil.class b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil.class
new file mode 100644
index 0000000..4222a2a
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/DistributedLockUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/FileTypeUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/FileTypeUtils.class
new file mode 100644
index 0000000..026e05e
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/FileTypeUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/ImageUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/ImageUtils.class
new file mode 100644
index 0000000..5d8ef9d
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/ImageUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/IpUtil.class b/common-base-starter/target/classes/com/mosty/common/base/util/IpUtil.class
new file mode 100644
index 0000000..754e851
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/IpUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/LocalDateTimeUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/LocalDateTimeUtils.class
new file mode 100644
index 0000000..0facefc
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/LocalDateTimeUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/Md5Utils.class b/common-base-starter/target/classes/com/mosty/common/base/util/Md5Utils.class
new file mode 100644
index 0000000..eb1b164
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/Md5Utils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/MimeTypeUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/MimeTypeUtils.class
new file mode 100644
index 0000000..d6b7ddb
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/MimeTypeUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/PasswordUtil.class b/common-base-starter/target/classes/com/mosty/common/base/util/PasswordUtil.class
new file mode 100644
index 0000000..85be127
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/PasswordUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/RandomUtil.class b/common-base-starter/target/classes/com/mosty/common/base/util/RandomUtil.class
new file mode 100644
index 0000000..8a77af3
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/RandomUtil.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/ServletUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/ServletUtils.class
new file mode 100644
index 0000000..0a2da97
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/ServletUtils.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/SpringIocContext.class b/common-base-starter/target/classes/com/mosty/common/base/util/SpringIocContext.class
new file mode 100644
index 0000000..3f976db
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/SpringIocContext.class differ
diff --git a/common-base-starter/target/classes/com/mosty/common/base/util/StringUtils.class b/common-base-starter/target/classes/com/mosty/common/base/util/StringUtils.class
new file mode 100644
index 0000000..4cf1c42
Binary files /dev/null and b/common-base-starter/target/classes/com/mosty/common/base/util/StringUtils.class differ
diff --git a/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT-sources.jar b/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..316eb32
Binary files /dev/null and b/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT-sources.jar differ
diff --git a/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT.jar b/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..6cf509c
Binary files /dev/null and b/common-base-starter/target/common-base-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-base-starter/target/maven-archiver/pom.properties b/common-base-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..554f6dd
--- /dev/null
+++ b/common-base-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:08 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-base-starter
diff --git a/common-config-starter/common-config-starter.iml b/common-config-starter/common-config-starter.iml
new file mode 100644
index 0000000..25948b2
--- /dev/null
+++ b/common-config-starter/common-config-starter.iml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-config-starter/pom.xml b/common-config-starter/pom.xml
new file mode 100644
index 0000000..b3a6270
--- /dev/null
+++ b/common-config-starter/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-config-starter</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+<!--            <optional>true</optional>-->
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus</artifactId>-->
+<!--            <version>3.5.1</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>${shiro.version}</version>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/CommonConfigAutoConfiguration.java b/common-config-starter/src/main/java/com/mosty/common/config/CommonConfigAutoConfiguration.java
new file mode 100644
index 0000000..b66b336
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/CommonConfigAutoConfiguration.java
@@ -0,0 +1,18 @@
+package com.mosty.common.config;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  代码生成自动装配
+ * @author kevin
+ * @date 2022/2/3 3:34 PM
+ * @since 1.0.0
+ */
+@Configuration
+@MapperScan("com.mosty.common.config.mapper")
+//@ComponentScan(basePackages = "com.mosty.common.config")
+public class CommonConfigAutoConfiguration {
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/ConfigServiceFactory.java b/common-config-starter/src/main/java/com/mosty/common/config/ConfigServiceFactory.java
new file mode 100644
index 0000000..cbe1827
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/ConfigServiceFactory.java
@@ -0,0 +1,35 @@
+package com.mosty.common.config;
+
+import com.mosty.common.base.util.SpringIocContext;
+import com.mosty.common.config.service.SysDictItemService;
+import com.mosty.common.config.service.SysDictService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+/**
+ *  单体服务或基础微服务 使用的服务工厂
+ * @author kevin
+ * @date 2022/2/9 10:57 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class ConfigServiceFactory implements InitializingBean {
+
+    public static SysDictService sysDictService;
+    public static SysDictItemService sysDictItemService;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+//        ConfigServiceFactory.sysDictService = SpringIocContext.getBean(SysDictService.class);
+//        log.info("需要调用字典服务使用：ConfigServiceFactory.sysDictService");
+//        ConfigServiceFactory.sysDictItemService = SpringIocContext.getBean(SysDictItemService.class);
+//        log.info("需要调用字典明细服务使用：ConfigServiceFactory.sysDictItemService");
+    }
+
+    
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/Excel/DictUtils.java b/common-config-starter/src/main/java/com/mosty/common/config/Excel/DictUtils.java
new file mode 100644
index 0000000..8ce9205
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/Excel/DictUtils.java
@@ -0,0 +1,131 @@
+package com.mosty.common.config.Excel;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.mosty.common.base.constant.Constants;
+import com.mosty.common.base.entity.log.SpringUtils;
+import com.mosty.common.base.entity.log.StringUtils;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.redis.service.RedisService;
+
+/**
+ * 字典工具类
+ *
+ * @author ruoyi
+ */
+public class DictUtils
+{
+    /**
+     * 设置字典缓存
+     *
+     * @param key 参数键
+     * @param dictDatas 字典数据列表
+     */
+    public static void setDictCache(String key, List<SysDictItem> dictDatas)
+    {
+        SpringUtils.getBean(RedisService.class).setCacheObject(getCacheKey(key), dictDatas);
+    }
+
+    /**
+     * 获取字典缓存
+     *
+     * @param key 参数键
+     * @return dictDatas 字典数据列表
+     */
+    public static List<SysDictItem> getDictCache(String key)
+    {
+        Object cacheObj = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
+        if (StringUtils.isNotNull(cacheObj))
+        {
+            List<SysDictItem> dictItems = StringUtils.cast(cacheObj);
+            return dictItems;
+        }
+        return null;
+    }
+
+    /**
+     * 清空字典缓存
+     */
+    public static void clearDictCache()
+    {
+        Collection<String> keys = SpringUtils.getBean(RedisService.class).keys(Constants.SYS_DICT_KEY + "*");
+        SpringUtils.getBean(RedisService.class).deleteObject(keys);
+    }
+
+    /**
+     * 设置cache key
+     *
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    public static String getCacheKey(String configKey)
+    {
+        return Constants.SYS_DICT_KEY + configKey;
+    }
+
+    /**
+     * 根据指定的type ，value 获取 label
+     * @param value
+     * @param type
+     * @param defaultLabel 默认label
+     * @return
+     */
+    public static String getDictLabelByTypeAndValue(String value, String type, String defaultLabel){
+        if (StringUtils.isNotBlank(type) && StringUtils.isNotBlank(value)){
+            for (SysDictItem dict : getDictCache(type)){
+                if (type.equals(dict.getZdbh()) && value.equals(dict.getDm())){
+                    return dict.getZdmc();
+                }
+            }
+        }
+        return defaultLabel;
+    }
+
+    /**
+     * 根据type,label 获取value
+     *
+     * @param label
+     * @param type
+     * @param defaultValue
+     * @return
+     */
+    public static String getDictValueByTypeAndLabel(String label,String type,String defaultValue) {
+        if (StringUtils.isNotBlank(type) && StringUtils.isNotBlank(label)){
+            for (SysDictItem dict : getDictCache(type)){
+                if(type.equals(dict.getZdbh())  && label.equals(dict.getZdmc())) {
+                    return dict.getDm();
+                }
+            }
+        }
+        return defaultValue;
+    }
+
+    /**
+     * 根据 type 将 lable组成 string数组
+     * @param type
+     * @return
+     */
+    public static String[] getLabelArr(String type) {
+        String[] arr0 = new String[0];
+        if (StringUtils.isNotBlank(type)) {
+            List<SysDictItem> dictList = getDictCache(type);
+            String[] strArr = new String[dictList.size()];
+            for (int i = 0 ; i < dictList.size() ; i ++) {
+                strArr[i] = dictList.get(i).getZdmc();
+            }
+            return strArr;
+        }
+        return arr0;
+    }
+
+    /**
+     * 删除指定字典缓存
+     *
+     * @param key 字典键
+     */
+    public static void removeDictCache(String key)
+    {
+        SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key));
+    }
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelExp.java b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelExp.java
new file mode 100644
index 0000000..b05b957
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelExp.java
@@ -0,0 +1,50 @@
+package com.mosty.common.config.Excel;
+
+
+import java.util.List;
+
+public class ExcelExp {
+
+    private String fileName;// sheet的名称
+    private String[] handers;// sheet里的标题
+    private List dataset;// sheet里的数据集
+    private Class clazz;
+
+    public ExcelExp(String fileName, List dataset, Class clazz) {
+        this.fileName = fileName;
+        this.dataset = dataset;
+        this.clazz = clazz;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String[] getHanders() {
+        return handers;
+    }
+
+    public void setHanders(String[] handers) {
+        this.handers = handers;
+    }
+
+    public List getDataset() {
+        return dataset;
+    }
+
+    public void setDataset(List dataset) {
+        this.dataset = dataset;
+    }
+
+    public Class getClazz() {
+        return clazz;
+    }
+
+    public void setClazz(Class clazz) {
+        this.clazz = clazz;
+    }
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtil.java b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtil.java
new file mode 100644
index 0000000..34c82bd
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtil.java
@@ -0,0 +1,1300 @@
+package com.mosty.common.config.Excel;
+
+import com.mosty.common.base.entity.log.*;
+import com.mosty.common.base.entity.log.Excel.ColumnType;
+import com.mosty.common.base.entity.log.Excel.Type;
+import com.mosty.common.base.exception.UtilException;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.base.util.FileTypeUtils;
+import com.mosty.common.base.util.ImageUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+public class ExcelUtil<T> {
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
+
+    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
+
+    public static final String[] FORMULA_STR = {"=", "-", "+", "@"};
+
+    /**
+     * Excel sheet最大行数，默认65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 工作表名称
+     */
+    private String sheetName;
+
+    /**
+     * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
+     */
+    private Type type;
+
+    /**
+     * 工作薄对象
+     */
+    private Workbook wb;
+
+    /**
+     * 工作表对象
+     */
+    private Sheet sheet;
+
+    /**
+     * 样式列表
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 导入导出数据列表
+     */
+    private List<T> list;
+
+    /**
+     * 注解列表
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 当前行号
+     */
+    private int rownum;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 最大高度
+     */
+    private short maxHeight;
+
+    /**
+     * 合并后最后行数
+     */
+    private int subMergedLastRowNum = 0;
+
+    /**
+     * 合并后开始行数
+     */
+    private int subMergedFirstRowNum = 1;
+
+    /**
+     * 对象的子列表方法
+     */
+    private Method subMethod;
+
+    /**
+     * 对象的子列表属性
+     */
+    private List<Field> subFields;
+
+    /**
+     * 统计列表
+     */
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+
+    /**
+     * 数字格式
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
+    /**
+     * 实体对象
+     */
+    public Class<T> clazz;
+
+    /**
+     * 需要排除列属性
+     */
+    public String[] excludeFields;
+
+    public ExcelUtil(Class<T> clazz) {
+        this.clazz = clazz;
+    }
+
+    /**
+     * 隐藏Excel中列属性
+     *
+     * @param fields 列属性名 示例[单个"name"/多个"id","name"]
+     * @throws Exception
+     */
+    public void hideColumn(String... fields) {
+        this.excludeFields = fields;
+    }
+
+    public void init(List<T> list, String sheetName, String title, Type type) {
+        if (list == null) {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        this.title = title;
+        createExcelField();
+        createWorkbook();
+        createTitle();
+        createSubHead();
+    }
+
+    /**
+     * 创建excel第一行标题
+     */
+    public void createTitle() {
+        if (StringUtils.isNotEmpty(title)) {
+            subMergedFirstRowNum++;
+            subMergedLastRowNum++;
+            int titleLastCol = this.fields.size() - 1;
+            if (isSubList()) {
+                titleLastCol = titleLastCol + subFields.size() - 1;
+            }
+            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
+            titleRow.setHeightInPoints(30);
+            Cell titleCell = titleRow.createCell(0);
+            titleCell.setCellStyle(styles.get("title"));
+            titleCell.setCellValue(title);
+            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
+        }
+    }
+
+    /**
+     * 创建对象的子列表名称
+     */
+    public void createSubHead() {
+        if (isSubList()) {
+            subMergedFirstRowNum++;
+            subMergedLastRowNum++;
+            Row subRow = sheet.createRow(rownum);
+            int excelNum = 0;
+            for (Object[] objects : fields) {
+                Excel attr = (Excel) objects[1];
+                Cell headCell1 = subRow.createCell(excelNum);
+                headCell1.setCellValue(attr.name());
+                headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+                excelNum++;
+            }
+            int headFirstRow = excelNum - 1;
+            int headLastRow = headFirstRow + subFields.size() - 1;
+            if (headLastRow > headFirstRow) {
+                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
+            }
+            rownum++;
+        }
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is) {
+        List<T> list = null;
+        try {
+            list = importExcel(is, 0);
+        } catch (Exception e) {
+            log.error("导入Excel异常{}", e.getMessage());
+            throw new UtilException(e.getMessage());
+        } finally {
+            IOUtils.closeQuietly(is);
+        }
+        return list;
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is       输入流
+     * @param titleNum 标题占用行数
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception {
+        return importExcel(StringUtils.EMPTY, is, titleNum);
+    }
+
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param titleNum  标题占用行数
+     * @param is        输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
+        Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
+        if (sheet == null) {
+            throw new IOException("文件sheet不存在");
+        }
+
+        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
+        int rows = sheet.getLastRowNum();
+        if (rows > 0) {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(titleNum);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell)) {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                } else {
+                    cellMap.put(null, i);
+                }
+            }
+            // 有数据时才处理 得到类的所有field.
+            List<Object[]> fields = this.getFields();
+            Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
+            for (Object[] objects : fields) {
+                Excel attr = (Excel) objects[1];
+                Integer column = cellMap.get(attr.name());
+                if (column != null) {
+                    fieldsMap.put(column, objects);
+                }
+            }
+            for (int i = titleNum + 1; i <= rows; i++) {
+                // 从第2行开始取数据,默认第一行是表头.
+                Row row = sheet.getRow(i);
+                // 判断当前行是否是空行
+                if (isRowEmpty(row)) {
+                    continue;
+                }
+                T entity = null;
+                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet()) {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = (Field) entry.getValue()[0];
+                    Excel attr = (Excel) entry.getValue()[1];
+                    // 取得类型,并根据对象类型设置值.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType) {
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0")) {
+                            val = StringUtils.substringBefore(s, ".0");
+                        } else {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat)) {
+                                val = parseDateToStr(dateFormat, val);
+                            } else {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
+                        val = Convert.toInt(val);
+                    } else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
+                        val = Convert.toLong(val);
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
+                        val = Convert.toDouble(val);
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
+                        val = Convert.toFloat(val);
+                    } else if (BigDecimal.class == fieldType) {
+                        val = Convert.toBigDecimal(val);
+                    } else if (Date.class == fieldType) {
+                        if (val instanceof String) {
+                            val = DateUtils.parseDate(val);
+                        } else if (val instanceof Double) {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StringUtils.isNotNull(fieldType)) {
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        } else if (StringUtils.isNotEmpty(attr.dictType())) {
+                            val = getDictValueByTypeAndLabel(String.valueOf(val), attr.dictType());
+                        } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                            val = dataFormatHandlerAdapter(val, attr, null);
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response  返回数据
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) {
+        exportExcel(response, list, sheetName, StringUtils.EMPTY);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response  返回数据
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param title     标题
+     * @return 结果
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        this.init(list, sheetName, title, Type.EXPORT);
+        exportExcel(response);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) {
+        importTemplateExcel(response, sheetName, StringUtils.EMPTY);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @param title     标题
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        this.init(null, sheetName, title, Type.IMPORT);
+        exportExcel(response);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @return 结果
+     */
+    public void exportExcel(HttpServletResponse response) {
+        try {
+            writeSheet();
+            System.out.println(response.getOutputStream());
+            wb.write(response.getOutputStream());
+        } catch (Exception e) {
+            log.error("导出Excel异常{}", e.getMessage());
+        } finally {
+            IOUtils.closeQuietly(wb);
+        }
+    }
+
+    /**
+     * 创建写入数据到Sheet
+     */
+    public void writeSheet() {
+        // 取出一共有多少个sheet.
+        int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
+        for (int index = 0; index < sheetNo; index++) {
+            createSheet(sheetNo, index);
+
+            // 产生一行
+            Row row = sheet.createRow(rownum);
+            int column = 0;
+            // 写入各个字段的列头名称
+            for (Object[] os : fields) {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                if (Collection.class.isAssignableFrom(field.getType())) {
+                    for (Field subField : subFields) {
+                        Excel subExcel = subField.getAnnotation(Excel.class);
+                        this.createHeadCell(subExcel, row, column++);
+                    }
+                } else {
+                    this.createHeadCell(excel, row, column++);
+                }
+            }
+            if (Type.EXPORT.equals(type)) {
+                fillExcelData(index, row);
+                addStatisticsRow();
+            }
+        }
+    }
+
+    /**
+     * 填充excel数据
+     *
+     * @param index 序号
+     * @param row   单元格行
+     */
+    @SuppressWarnings("unchecked")
+    public void fillExcelData(int index, Row row) {
+        int startNo = index * sheetSize;
+        int endNo = Math.min(startNo + sheetSize, list.size());
+        int rowNo = (1 + rownum) - startNo;
+        for (int i = startNo; i < endNo; i++) {
+            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
+            row = sheet.createRow(rowNo);
+            // 得到导出对象.
+            T vo = (T) list.get(i);
+            Collection<?> subList = null;
+            if (isSubList()) {
+                if (isSubListValue(vo)) {
+                    subList = getListCellValue(vo);
+                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
+                } else {
+                    subMergedFirstRowNum++;
+                    subMergedLastRowNum++;
+                }
+            }
+            int column = 0;
+            for (Object[] os : fields) {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) {
+                    boolean subFirst = false;
+                    for (Object obj : subList) {
+                        if (subFirst) {
+                            rowNo++;
+                            row = sheet.createRow(rowNo);
+                        }
+                        List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
+                        int subIndex = 0;
+                        for (Field subField : subFields) {
+                            if (subField.isAnnotationPresent(Excel.class)) {
+                                subField.setAccessible(true);
+                                Excel attr = subField.getAnnotation(Excel.class);
+                                this.addCell(attr, row, (T) obj, subField, column + subIndex);
+                            }
+                            subIndex++;
+                        }
+                        subFirst = true;
+                    }
+                    this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
+                } else {
+                    this.addCell(excel, row, vo, field, column++);
+                }
+            }
+        }
+    }
+
+    /**
+     * 创建表格样式
+     *
+     * @param wb 工作薄对象
+     * @return 样式列表
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb) {
+        // 写入各条记录,每条记录对应excel表中的一行
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font titleFont = wb.createFont();
+        titleFont.setFontName("Arial");
+        titleFont.setFontHeightInPoints((short) 16);
+        titleFont.setBold(true);
+        style.setFont(titleFont);
+        styles.put("title", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font totalFont = wb.createFont();
+        totalFont.setFontName("Arial");
+        totalFont.setFontHeightInPoints((short) 10);
+        style.setFont(totalFont);
+        styles.put("total", style);
+
+        styles.putAll(annotationHeaderStyles(wb, styles));
+
+        styles.putAll(annotationDataStyles(wb));
+
+        return styles;
+    }
+
+    /**
+     * 根据Excel注解创建表格头样式
+     *
+     * @param wb 工作薄对象
+     * @return 自定义样式列表
+     */
+    private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles) {
+        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields) {
+            Excel excel = (Excel) os[1];
+            String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
+            if (!headerStyles.containsKey(key)) {
+                CellStyle style = wb.createCellStyle();
+                style.cloneStyleFrom(styles.get("data"));
+                style.setAlignment(HorizontalAlignment.CENTER);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                style.setFillForegroundColor(excel.headerBackgroundColor().index);
+                style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                Font headerFont = wb.createFont();
+                headerFont.setFontName("Arial");
+                headerFont.setFontHeightInPoints((short) 10);
+                headerFont.setBold(true);
+                headerFont.setColor(excel.headerColor().index);
+                style.setFont(headerFont);
+                headerStyles.put(key, style);
+            }
+        }
+        return headerStyles;
+    }
+
+    /**
+     * 根据Excel注解创建表格列样式
+     *
+     * @param wb 工作薄对象
+     * @return 自定义样式列表
+     */
+    private Map<String, CellStyle> annotationDataStyles(Workbook wb) {
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields) {
+            Excel excel = (Excel) os[1];
+            String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor());
+            if (!styles.containsKey(key)) {
+                CellStyle style = wb.createCellStyle();
+                style.setAlignment(excel.align());
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                style.setBorderRight(BorderStyle.THIN);
+                style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderLeft(BorderStyle.THIN);
+                style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderTop(BorderStyle.THIN);
+                style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderBottom(BorderStyle.THIN);
+                style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                style.setFillForegroundColor(excel.backgroundColor().getIndex());
+                Font dataFont = wb.createFont();
+                dataFont.setFontName("Arial");
+                dataFont.setFontHeightInPoints((short) 10);
+                dataFont.setColor(excel.color().index);
+                style.setFont(dataFont);
+                styles.put(key, style);
+            }
+        }
+        return styles;
+    }
+
+    /**
+     * 创建单元格
+     */
+    public Cell createHeadCell(Excel attr, Row row, int column) {
+        // 创建列
+        Cell cell = row.createCell(column);
+        // 写入列信息
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+        if (isSubList()) {
+            // 填充默认样式，防止合并单元格样式失效
+            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
+            if (attr.needMerge()) {
+                sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
+            }
+        }
+        return cell;
+    }
+
+    /**
+     * 设置单元格信息
+     *
+     * @param value 单元格值
+     * @param attr  注解相关
+     * @param cell  单元格信息
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell) {
+        if (ColumnType.STRING == attr.cellType()) {
+            String cellValue = Convert.toStr(value);
+            // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。
+            if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) {
+                cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
+            }
+            if (value instanceof Collection && StringUtils.equals("[]", cellValue)) {
+                cellValue = StringUtils.EMPTY;
+            }
+            cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
+        } else if (ColumnType.NUMERIC == attr.cellType()) {
+            if (StringUtils.isNotNull(value)) {
+                cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+            }
+        } else if (ColumnType.IMAGE == attr.cellType()) {
+            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
+            String imagePath = Convert.toStr(value);
+            if (StringUtils.isNotEmpty(imagePath)) {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 获取画布
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+        if (sheet.getDrawingPatriarch() == null) {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 获取图片类型,设置图片插入类型
+     */
+    public int getImageType(byte[] value) {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_JPEG;
+        } else if ("PNG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
+    }
+
+    /**
+     * 创建表格样式
+     */
+    public void setDataValidation(Excel attr, Row row, int column) {
+        if (attr.name().indexOf("注：") >= 0) {
+            sheet.setColumnWidth(column, 6000);
+        } else {
+            // 设置列宽
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+        }
+
+        if (StringUtils.isNotEmpty(attr.dictType())) {//有字典 则取字典下拉
+            setPromptOrValidation(sheet, DictUtils.getLabelArr(attr.dictType()), attr.prompt(), 1, 100, column, column);
+        } else if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) {
+            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) {
+                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
+                setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+            } else {
+                // 提示信息或只能选择不能输入的列内容.
+                setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+            }
+        }
+    }
+
+
+    /**
+     * 设置某些列的值只能输入预制的数据,显示下拉框.
+     *
+     * @param sheet    要设置的sheet.
+     * @param textlist 下拉框显示的内容
+     * @param firstRow 开始行
+     * @param endRow   结束行
+     * @param firstCol 开始列
+     * @param endCol   结束列
+     * @return 设置好的sheet.
+     */
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        // 加载下拉列表内容
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        // 数据有效性对象
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+    }
+
+
+    /**
+     * 添加单元格
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
+        Cell cell = null;
+        try {
+            // 设置行高
+            row.setHeight(maxHeight);
+            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
+            if (attr.isExport()) {
+                String dictType = attr.dictType();
+                // 创建cell
+                cell = row.createCell(column);
+                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) {
+                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
+                    sheet.addMergedRegion(cellAddress);
+                }
+                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
+
+                // 用于读取对象中的属性
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(parseDateToStr(dateFormat, value));
+                } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(getDictLabelByTypeAndValue(String.valueOf(value), dictType));
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
+                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                    cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));
+                } else {
+                    // 设置列类型
+                    setCellVo(value, attr, cell);
+                }
+                addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        } catch (Exception e) {
+            log.error("导出Excel失败{}", e);
+        }
+        return cell;
+    }
+
+
+    /**
+     * 根据指定的type ，value 获取 label
+     *
+     * @param value
+     * @param dictType
+     * @return
+     * @throws Exception
+     */
+    public static String getDictLabelByTypeAndValue(String value, String dictType) throws Exception {
+        String label = value;
+        try {
+            label = DictUtils.getDictLabelByTypeAndValue(value, dictType, value);
+        } catch (Exception e) {
+            throw e;
+        }
+        return label;
+    }
+
+    /**
+     * 根据type,label 获取value
+     *
+     * @param propertyValue
+     * @param dictType
+     * @return
+     * @throws Exception
+     */
+    public static String getDictValueByTypeAndLabel(String propertyLabel, String dictType) throws Exception {
+        String value = propertyLabel;
+        try {
+            value = DictUtils.getDictValueByTypeAndLabel(propertyLabel, dictType, propertyLabel);
+        } catch (Exception e) {
+            throw e;
+        }
+        return value;
+    }
+
+    /**
+     * 设置 POI XSSFSheet 单元格提示或选择框
+     *
+     * @param sheet         表单
+     * @param textlist      下拉框显示的内容
+     * @param promptContent 提示内容
+     * @param firstRow      开始行
+     * @param endRow        结束行
+     * @param firstCol      开始列
+     * @param endCol        结束列
+     */
+    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
+                                      int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        if (StringUtils.isNotEmpty(promptContent)) {
+            // 如果设置了提示信息则鼠标放上去提示
+            dataValidation.createPromptBox("", promptContent);
+            dataValidation.setShowPromptBox(true);
+        }
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）.
+     *
+     * @param sheet         要设置的sheet.
+     * @param textlist      下拉框显示的内容
+     * @param promptContent 提示内容
+     * @param firstRow      开始行
+     * @param endRow        结束行
+     * @param firstCol      开始列
+     * @param endCol        结束列
+     */
+    public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
+        String hideSheetName = "combo_" + firstCol + "_" + endCol;
+        Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
+        for (int i = 0; i < textlist.length; i++) {
+            hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
+        }
+        // 创建名称，可被其他单元格引用
+        Name name = wb.createName();
+        name.setNameName(hideSheetName + "_data");
+        name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        // 加载下拉列表内容
+        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        // 数据有效性对象
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        if (StringUtils.isNotEmpty(promptContent)) {
+            // 如果设置了提示信息则鼠标放上去提示
+            dataValidation.createPromptBox("", promptContent);
+            dataValidation.setShowPromptBox(true);
+        }
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+        // 设置hiddenSheet隐藏
+        wb.setSheetHidden(wb.getSheetIndex(hideSheet), true);
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 数据处理器
+     *
+     * @param value 数据值
+     * @param excel 数据注解
+     * @return
+     */
+    public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell) {
+        try {
+            Object instance = excel.handler().newInstance();
+            Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class, Cell.class, Workbook.class});
+            value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
+        } catch (Exception e) {
+            log.error("不能格式化数据 " + excel.handler(), e.getMessage());
+        }
+        return Convert.toStr(value);
+    }
+
+    /**
+     * 合计统计信息
+     */
+    private void addStatisticsData(Integer index, String text, Excel entity) {
+        if (entity != null && entity.isStatistics()) {
+            Double temp = 0D;
+            if (!statistics.containsKey(index)) {
+                statistics.put(index, temp);
+            }
+            try {
+                temp = Double.valueOf(text);
+            } catch (NumberFormatException e) {
+            }
+            statistics.put(index, statistics.get(index) + temp);
+        }
+    }
+
+    /**
+     * 创建统计行
+     */
+    public void addStatisticsRow() {
+        if (statistics.size() > 0) {
+            Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+            Set<Integer> keys = statistics.keySet();
+            Cell cell = row.createCell(0);
+            cell.setCellStyle(styles.get("total"));
+            cell.setCellValue("合计");
+
+            for (Integer key : keys) {
+                cell = row.createCell(key);
+                cell.setCellStyle(styles.get("total"));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+            }
+            statistics.clear();
+        }
+    }
+
+    /**
+     * 获取bean中的属性值
+     *
+     * @param vo    实体对象
+     * @param field 字段
+     * @param excel 注解
+     * @return 最终的属性值
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
+        Object o = field.get(vo);
+        if (StringUtils.isNotEmpty(excel.targetAttr())) {
+            String target = excel.targetAttr();
+            if (target.contains(".")) {
+                String[] targets = target.split("[.]");
+                for (String name : targets) {
+                    o = getValue(o, name);
+                }
+            } else {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 以类的属性的get方法方法形式获取值
+     *
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
+            Class<?> clazz = o.getClass();
+            Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            o = field.get(o);
+        }
+        return o;
+    }
+
+    /**
+     * 得到所有定义字段
+     */
+    private void createExcelField() {
+        this.fields = getFields();
+        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+
+    /**
+     * 获取字段注解信息
+     */
+    public List<Object[]> getFields() {
+        List<Object[]> fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields) {
+            if (!ArrayUtils.contains(this.excludeFields, field.getName())) {
+                // 单注解
+                if (field.isAnnotationPresent(Excel.class)) {
+                    Excel attr = field.getAnnotation(Excel.class);
+                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
+                        field.setAccessible(true);
+                        fields.add(new Object[]{field, attr});
+                    }
+                    if (Collection.class.isAssignableFrom(field.getType())) {
+                        subMethod = getSubMethod(field.getName(), clazz);
+                        ParameterizedType pt = (ParameterizedType) field.getGenericType();
+                        Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
+                        this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+                    }
+                }
+
+                // 多注解
+                if (field.isAnnotationPresent(Excels.class)) {
+                    Excels attrs = field.getAnnotation(Excels.class);
+                    Excel[] excels = attrs.value();
+                    for (Excel attr : excels) {
+                        if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+                                && (attr != null && (attr.type() == Type.ALL || attr.type() == type))) {
+                            field.setAccessible(true);
+                            fields.add(new Object[]{field, attr});
+                        }
+                    }
+                }
+            }
+        }
+        return fields;
+    }
+
+    /**
+     * 根据注解获取最大行高
+     */
+    public short getRowHeight() {
+        double maxHeight = 0;
+        for (Object[] os : this.fields) {
+            Excel excel = (Excel) os[1];
+            maxHeight = Math.max(maxHeight, excel.height());
+        }
+        return (short) (maxHeight * 20);
+    }
+
+    /**
+     * 创建一个工作簿
+     */
+    public void createWorkbook() {
+        this.wb = new SXSSFWorkbook(500);
+        this.sheet = wb.createSheet();
+        wb.setSheetName(0, sheetName);
+        this.styles = createStyles(wb);
+    }
+
+    /**
+     * 创建工作表
+     *
+     * @param sheetNo sheet数量
+     * @param index   序号
+     */
+    public void createSheet(int sheetNo, int index) {
+        // 设置工作表的名称.
+        if (sheetNo > 1 && index > 0) {
+            this.sheet = wb.createSheet();
+            this.createTitle();
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+
+    /**
+     * 获取单元格值
+     *
+     * @param row    获取的行
+     * @param column 获取单元格列号
+     * @return 单元格值
+     */
+    public Object getCellValue(Row row, int column) {
+        if (row == null) {
+            return row;
+        }
+        Object val = "";
+        try {
+            Cell cell = row.getCell(column);
+            if (StringUtils.isNotNull(cell)) {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
+                    val = cell.getNumericCellValue();
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
+                    } else {
+                        if ((Double) val % 1 != 0) {
+                            val = new BigDecimal(val.toString());
+                        } else {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                } else if (cell.getCellType() == CellType.STRING) {
+                    val = cell.getStringCellValue();
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
+                    val = cell.getBooleanCellValue();
+                } else if (cell.getCellType() == CellType.ERROR) {
+                    val = cell.getErrorCellValue();
+                }
+
+            }
+        } catch (Exception e) {
+            return val;
+        }
+        return val;
+    }
+
+    /**
+     * 判断是否是空行
+     *
+     * @param row 判断的行
+     * @return
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 格式化不同类型的日期对象
+     *
+     * @param dateFormat 日期格式
+     * @param val        被格式化的日期对象
+     * @return 格式化后的日期字符
+     */
+    public String parseDateToStr(String dateFormat, Object val) {
+        if (val == null) {
+            return "";
+        }
+        String str;
+        if (val instanceof Date) {
+            str = DateUtils.parseDateToStr(dateFormat, (Date) val);
+        } else if (val instanceof LocalDateTime) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
+        } else if (val instanceof LocalDate) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
+        } else {
+            str = val.toString();
+        }
+        return str;
+    }
+
+    /**
+     * 是否有对象的子列表
+     */
+    public boolean isSubList() {
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0;
+    }
+
+    /**
+     * 是否有对象的子列表，集合不为空
+     */
+    public boolean isSubListValue(T vo) {
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
+    }
+
+    /**
+     * 获取集合的值
+     */
+    public Collection<?> getListCellValue(Object obj) {
+        Object value;
+        try {
+            value = subMethod.invoke(obj, new Object[]{});
+        } catch (Exception e) {
+            return new ArrayList<Object>();
+        }
+        return (Collection<?>) value;
+    }
+
+    /**
+     * 获取对象的子列表方法
+     *
+     * @param name      名称
+     * @param pojoClass 类对象
+     * @return 子列表方法
+     */
+    public Method getSubMethod(String name, Class<?> pojoClass) {
+        StringBuffer getMethodName = new StringBuffer("get");
+        getMethodName.append(name.substring(0, 1).toUpperCase());
+        getMethodName.append(name.substring(1));
+        Method method = null;
+        try {
+            method = pojoClass.getMethod(getMethodName.toString(), new Class[]{});
+        } catch (Exception e) {
+            log.error("获取对象异常{}", e.getMessage());
+        }
+        return method;
+    }
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtilManySheet.java b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtilManySheet.java
new file mode 100644
index 0000000..0a7fe43
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/Excel/ExcelUtilManySheet.java
@@ -0,0 +1,958 @@
+package com.mosty.common.config.Excel;
+
+
+import com.mosty.common.base.entity.log.*;
+import com.mosty.common.base.entity.log.Excel.ColumnType;
+import com.mosty.common.base.entity.log.Excel.Type;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.base.util.FileTypeUtils;
+import com.mosty.common.base.util.ImageUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Excel相关处理
+ *
+ * @author ruoyi
+ */
+public class ExcelUtilManySheet<T> {
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
+
+    /**
+     * Excel sheet最大行数，默认65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 工作表名称
+     */
+    private String sheetName;
+
+    /**
+     * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
+     */
+    private Type type;
+
+    /**
+     * 工作薄对象
+     */
+    private Workbook wb;
+
+    /**
+     * 工作表对象
+     */
+    private Sheet sheet;
+
+    /**
+     * 样式列表
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 导入导出数据列表
+     */
+    private List<T> list;
+
+    /**
+     * 注解列表
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 最大高度
+     */
+    private short maxHeight;
+
+    /**
+     * 统计列表
+     */
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+
+    /**
+     * 数字格式
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
+    /**
+     * 实体对象
+     */
+    public Class<T> clazz;
+
+    public List<ExcelExp> clazzlist;
+
+    public ExcelUtilManySheet(List<ExcelExp> clazzlist) {
+        this.clazzlist = clazzlist;
+    }
+
+    public void init(List<T> list, String sheetName, Type type) {
+        if (list == null) {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        createExcelField();
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is) throws Exception {
+        return importExcel(StringUtils.EMPTY, is);
+    }
+
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param is        输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(String sheetName, InputStream is) throws Exception {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        Sheet sheet = null;
+        if (StringUtils.isNotEmpty(sheetName)) {
+            // 如果指定sheet名,则取指定sheet中的内容.
+            sheet = wb.getSheet(sheetName);
+        } else {
+            // 如果传入的sheet名不存在则默认指向第1个sheet.
+            sheet = wb.getSheetAt(0);
+        }
+
+        if (sheet == null) {
+            throw new IOException("文件sheet不存在");
+        }
+
+        int rows = sheet.getPhysicalNumberOfRows();
+
+        if (rows > 0) {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(0);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell)) {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                } else {
+                    cellMap.put(null, i);
+                }
+            }
+            // 有数据时才处理 得到类的所有field.
+            Field[] allFields = clazz.getDeclaredFields();
+            // 定义一个map用于存放列的序号和field.
+            Map<Integer, Field> fieldsMap = new HashMap<Integer, Field>();
+            for (int col = 0; col < allFields.length; col++) {
+                Field field = allFields[col];
+                Excel attr = field.getAnnotation(Excel.class);
+                if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
+                    // 设置类的私有字段属性可访问.
+                    field.setAccessible(true);
+                    Integer column = cellMap.get(attr.name());
+                    if (column != null) {
+                        fieldsMap.put(column, field);
+                    }
+                }
+            }
+            for (int i = 1; i < rows; i++) {
+                // 从第2行开始取数据,默认第一行是表头.
+                Row row = sheet.getRow(i);
+                T entity = null;
+                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet()) {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = fieldsMap.get(entry.getKey());
+                    // 取得类型,并根据对象类型设置值.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType) {
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0")) {
+                            val = StringUtils.substringBefore(s, ".0");
+                        } else {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat)) {
+                                val = DateUtils.parseDateToStr(dateFormat, (Date) val);
+                            } else {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
+                        val = Convert.toInt(val);
+                    } else if (Long.TYPE == fieldType || Long.class == fieldType) {
+                        val = Convert.toLong(val);
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
+                        val = Convert.toDouble(val);
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
+                        val = Convert.toFloat(val);
+                    } else if (BigDecimal.class == fieldType) {
+                        val = Convert.toBigDecimal(val);
+                    } else if (Date.class == fieldType) {
+                        if (val instanceof String) {
+                            val = DateUtils.parseDate(val);
+                        } else if (val instanceof Double) {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StringUtils.isNotNull(fieldType)) {
+                        Excel attr = field.getAnnotation(Excel.class);
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response  返回数据
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     * @throws IOException
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        this.init(list, sheetName, Type.EXPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response 返回数据
+     * @param list     导出数据集合
+     * @return 结果
+     * @throws IOException
+     */
+    public void exportExcelManySheet(HttpServletResponse response, List<ExcelExp> list) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        try {
+            createWorkbook();
+            for (int index = 0; index < list.size(); index++) {
+                this.clazz = list.get(index).getClazz();
+                this.init(list.get(index).getDataset(), list.get(index).getFileName(), Type.EXPORT);
+                // 取出一共有多少个sheet.
+//                    double sheetNo = Math.ceil(list.size() / sheetSize);
+                createSheetManySheet(index);
+                // 产生一行
+                Row row = sheet.createRow(0);
+                int column = 0;
+                // 写入各个字段的列头名称
+                for (Object[] os : fields) {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Type.EXPORT.equals(type)) {
+                    fillExcelData(index, row);
+                    addStatisticsRow();
+                }
+            }
+            wb.write(response.getOutputStream());
+        } catch (IOException e) {
+            log.error("导出Excel异常{}", e.getMessage());
+        } finally {
+            if (wb != null) {
+                try {
+                    wb.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            if (response.getOutputStream() != null) {
+                try {
+                    response.getOutputStream().close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+//        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        this.init(null, sheetName, Type.IMPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @return 结果
+     */
+    public void exportExcel(OutputStream outputStream) {
+        try {
+            // 取出一共有多少个sheet.
+            double sheetNo = Math.ceil(list.size() / sheetSize);
+            for (int index = 0; index <= sheetNo; index++) {
+                createSheet(sheetNo, index);
+
+                // 产生一行
+                Row row = sheet.createRow(0);
+                int column = 0;
+                // 写入各个字段的列头名称
+                for (Object[] os : fields) {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Type.EXPORT.equals(type)) {
+                    fillExcelData(index, row);
+                    addStatisticsRow();
+                }
+            }
+            wb.write(outputStream);
+        } catch (Exception e) {
+            log.error("导出Excel异常{}", e.getMessage());
+        } finally {
+            if (wb != null) {
+                try {
+                    wb.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 填充excel数据
+     *
+     * @param index 序号
+     * @param row   单元格行
+     */
+    public void fillExcelData(int index, Row row) {
+//        int startNo = index * sheetSize;
+//        int endNo = Math.min(startNo + sheetSize, list.size());
+        for (int i = 0; i < list.size(); i++) {
+            row = sheet.createRow(i + 1);
+            // 得到导出对象.
+            T vo = (T) list.get(i);
+            int column = 0;
+            for (Object[] os : fields) {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                // 设置实体类私有属性可访问
+                field.setAccessible(true);
+                this.addCell(excel, row, vo, field, column++);
+            }
+        }
+    }
+
+    /**
+     * 创建表格样式
+     *
+     * @param wb 工作薄对象
+     * @return 样式列表
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb) {
+        // 写入各条记录,每条记录对应excel表中的一行
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = wb.createFont();
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 10);
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(headerFont);
+        styles.put("header", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font totalFont = wb.createFont();
+        totalFont.setFontName("Arial");
+        totalFont.setFontHeightInPoints((short) 10);
+        style.setFont(totalFont);
+        styles.put("total", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.LEFT);
+        styles.put("data1", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        styles.put("data2", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        styles.put("data3", style);
+
+        return styles;
+    }
+
+    /**
+     * 创建单元格
+     */
+    public Cell createCell(Excel attr, Row row, int column) {
+        // 创建列
+        Cell cell = row.createCell(column);
+        // 写入列信息
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get("header"));
+        return cell;
+    }
+
+    /**
+     * 设置单元格信息
+     *
+     * @param value 单元格值
+     * @param attr  注解相关
+     * @param cell  单元格信息
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell) {
+        if (ColumnType.STRING == attr.cellType()) {
+            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
+        } else if (ColumnType.NUMERIC == attr.cellType()) {
+            cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+        } else if (ColumnType.IMAGE == attr.cellType()) {
+            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
+                    cell.getRow().getRowNum() + 1);
+            String imagePath = Convert.toStr(value);
+            if (StringUtils.isNotEmpty(imagePath)) {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 获取画布
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+        if (sheet.getDrawingPatriarch() == null) {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 获取图片类型,设置图片插入类型
+     */
+    public int getImageType(byte[] value) {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_JPEG;
+        } else if ("PNG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
+    }
+
+    /**
+     * 创建表格样式
+     */
+    public void setDataValidation(Excel attr, Row row, int column) {
+        if (attr.name().indexOf("注：") >= 0) {
+            sheet.setColumnWidth(column, 6000);
+        } else {
+            // 设置列宽
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+        }
+        // 如果设置了提示信息则鼠标放上去提示.
+        if (StringUtils.isNotEmpty(attr.prompt())) {
+            // 这里默认设了2-101列提示.
+            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+        }
+        // 如果设置了combo属性则本列只能选择不能输入
+        if (attr.combo().length > 0) {
+            // 这里默认设了2-101列只能选择不能输入.
+            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+        }
+    }
+
+    /**
+     * 添加单元格
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
+        Cell cell = null;
+        try {
+            // 设置行高
+            row.setHeight(maxHeight);
+            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
+            if (attr.isExport()) {
+                String dictType = attr.dictType();
+                // 创建cell
+                cell = row.createCell(column);
+                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
+                // 用于读取对象中的属性
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(parseDateToStr(dateFormat, value));
+                } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(getDictLabelByTypeAndValue(String.valueOf(value), dictType));
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
+                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                    cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));
+                } else {
+                    // 设置列类型
+                    setCellVo(value, attr, cell);
+                }
+                addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        } catch (Exception e) {
+            log.error("导出Excel失败{}", e);
+        }
+        return cell;
+    }
+
+    /**
+     * 格式化不同类型的日期对象
+     *
+     * @param dateFormat 日期格式
+     * @param val        被格式化的日期对象
+     * @return 格式化后的日期字符
+     */
+    public String parseDateToStr(String dateFormat, Object val) {
+        if (val == null) {
+            return "";
+        }
+        String str;
+        if (val instanceof Date) {
+            str = DateUtils.parseDateToStr(dateFormat, (Date) val);
+        } else if (val instanceof LocalDateTime) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
+        } else if (val instanceof LocalDate) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
+        } else {
+            str = val.toString();
+        }
+        return str;
+    }
+    /**
+     * 根据指定的type ，value 获取 label
+     *
+     * @param value
+     * @param dictType
+     * @return
+     * @throws Exception
+     */
+    public static String getDictLabelByTypeAndValue(String value, String dictType) throws Exception {
+        String label = value;
+        try {
+            label = DictUtils.getDictLabelByTypeAndValue(value, dictType, value);
+        } catch (Exception e) {
+            throw e;
+        }
+        return label;
+    }
+
+    /**
+     * 数据处理器
+     *
+     * @param value 数据值
+     * @param excel 数据注解
+     * @return
+     */
+    public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell) {
+        try {
+            Object instance = excel.handler().newInstance();
+            Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class, Cell.class, Workbook.class});
+            value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
+        } catch (Exception e) {
+            log.error("不能格式化数据 " + excel.handler(), e.getMessage());
+        }
+        return Convert.toStr(value);
+    }
+    /**
+     * 设置 POI XSSFSheet 单元格提示
+     *
+     * @param sheet         表单
+     * @param promptTitle   提示标题
+     * @param promptContent 提示内容
+     * @param firstRow      开始行
+     * @param endRow        结束行
+     * @param firstCol      开始列
+     * @param endCol        结束列
+     */
+    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+                              int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        dataValidation.createPromptBox(promptTitle, promptContent);
+        dataValidation.setShowPromptBox(true);
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 设置某些列的值只能输入预制的数据,显示下拉框.
+     *
+     * @param sheet    要设置的sheet.
+     * @param textlist 下拉框显示的内容
+     * @param firstRow 开始行
+     * @param endRow   结束行
+     * @param firstCol 开始列
+     * @param endCol   结束列
+     * @return 设置好的sheet.
+     */
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        // 加载下拉列表内容
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        // 数据有效性对象
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 合计统计信息
+     */
+    private void addStatisticsData(Integer index, String text, Excel entity) {
+        if (entity != null && entity.isStatistics()) {
+            Double temp = 0D;
+            if (!statistics.containsKey(index)) {
+                statistics.put(index, temp);
+            }
+            try {
+                temp = Double.valueOf(text);
+            } catch (NumberFormatException e) {
+            }
+            statistics.put(index, statistics.get(index) + temp);
+        }
+    }
+
+    /**
+     * 创建统计行
+     */
+    public void addStatisticsRow() {
+        if (statistics.size() > 0) {
+            Cell cell = null;
+            Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+            Set<Integer> keys = statistics.keySet();
+            cell = row.createCell(0);
+            cell.setCellStyle(styles.get("total"));
+            cell.setCellValue("合计");
+
+            for (Integer key : keys) {
+                cell = row.createCell(key);
+                cell.setCellStyle(styles.get("total"));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+            }
+            statistics.clear();
+        }
+    }
+
+    /**
+     * 获取bean中的属性值
+     *
+     * @param vo    实体对象
+     * @param field 字段
+     * @param excel 注解
+     * @return 最终的属性值
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
+        Object o = field.get(vo);
+        if (StringUtils.isNotEmpty(excel.targetAttr())) {
+            String target = excel.targetAttr();
+            if (target.indexOf(".") > -1) {
+                String[] targets = target.split("[.]");
+                for (String name : targets) {
+                    o = getValue(o, name);
+                }
+            } else {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 以类的属性的get方法方法形式获取值
+     *
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
+            Class<?> clazz = o.getClass();
+            Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            o = field.get(o);
+        }
+        return o;
+    }
+
+    /**
+     * 得到所有定义字段
+     */
+    private void createExcelField() {
+        this.fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields) {
+            // 单注解
+            if (field.isAnnotationPresent(Excel.class)) {
+                putToField(field, field.getAnnotation(Excel.class));
+            }
+
+            // 多注解
+            if (field.isAnnotationPresent(Excels.class)) {
+                Excels attrs = field.getAnnotation(Excels.class);
+                Excel[] excels = attrs.value();
+                for (Excel excel : excels) {
+                    putToField(field, excel);
+                }
+            }
+        }
+        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+
+    /**
+     * 根据注解获取最大行高
+     */
+    public short getRowHeight() {
+        double maxHeight = 0;
+        for (Object[] os : this.fields) {
+            Excel excel = (Excel) os[1];
+            maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+        }
+        return (short) (maxHeight * 20);
+    }
+
+    /**
+     * 放到字段集合中
+     */
+    private void putToField(Field field, Excel attr) {
+        if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
+            this.fields.add(new Object[]{field, attr});
+        }
+    }
+
+    /**
+     * 创建一个工作簿
+     */
+    public void createWorkbook() {
+        this.wb = new SXSSFWorkbook(500);
+    }
+
+    /**
+     * 创建工作表
+     *
+     * @param sheetNo sheet数量
+     * @param index   序号
+     */
+    public void createSheet(double sheetNo, int index) {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        // 设置工作表的名称.
+        if (sheetNo == 0) {
+            wb.setSheetName(index, sheetName);
+        } else {
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+
+    /**
+     * 创建工作表
+     *
+     * @param index 序号
+     */
+    public void createSheetManySheet(int index) {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        wb.setSheetName(index, sheetName);
+    }
+
+    /**
+     * 获取单元格值
+     *
+     * @param row    获取的行
+     * @param column 获取单元格列号
+     * @return 单元格值
+     */
+    public Object getCellValue(Row row, int column) {
+        if (row == null) {
+            return row;
+        }
+        Object val = "";
+        try {
+            Cell cell = row.getCell(column);
+            if (StringUtils.isNotNull(cell)) {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
+                    val = cell.getNumericCellValue();
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
+                    } else {
+                        if ((Double) val % 1 != 0) {
+                            val = new BigDecimal(val.toString());
+                        } else {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                } else if (cell.getCellType() == CellType.STRING) {
+                    val = cell.getStringCellValue();
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
+                    val = cell.getBooleanCellValue();
+                } else if (cell.getCellType() == CellType.ERROR) {
+                    val = cell.getErrorCellValue();
+                }
+
+            }
+        } catch (Exception e) {
+            return val;
+        }
+        return val;
+    }
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/config/DictElementConfig.java b/common-config-starter/src/main/java/com/mosty/common/config/config/DictElementConfig.java
new file mode 100644
index 0000000..75f8370
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/config/DictElementConfig.java
@@ -0,0 +1,84 @@
+package com.mosty.common.config.config;
+
+import com.mosty.common.base.util.SpringIocContext;
+import com.mosty.common.config.constant.enums.DictElementEnum;
+import lombok.Data;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import java.lang.reflect.Field;
+
+/**
+ *  字典组件编码配置
+ * @author kevin
+ * @date 2022/2/10 11:08 PM
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+public class DictElementConfig {
+
+    /** 民族 */
+    @Value("${dict.element.nation:nation}")
+    private String nation;
+
+    /** 性别 */
+    @Value("${dict.element.gender:gender}")
+    private String gender;
+
+    /** 血型 */
+    @Value("${dict.element.blood-type:bloodType}")
+    private String bloodType;
+
+    /** 学历 */
+    @Value("${dict.element.education:education}")
+    private String education;
+
+    /** 政治面貌 */
+    @Value("${dict.element.political-outlook:politicalOutlook}")
+    private String politicalOutlook;
+
+    /** 婚姻状况 */
+    @Value("${dict.element.marital-status:maritalStatus}")
+    private String maritalStatus;
+
+    /** 亲属关系 */
+    @Value("${dict.element.relationship:relationship}")
+    private String relationship;
+
+    /** 车辆型号 */
+    @Value("${dict.element.vehicle-model:vehicleModel}")
+    private String vehicleModel;
+
+    /** 车辆颜色 */
+    @Value("${dict.element.vehicle-color:vehicleColor}")
+    private String vehicleColor;
+
+    /** 机动车号牌种类 */
+    @Value("${dict.element.vehicle-number-type:vehicleNumberType}")
+    private String vehicleNumberType;
+
+    /** 车牌号 */
+    @Value("${dict.element.car-number:carNumber}")
+    private String carNumber;
+
+    /** 权限列表 */
+    @Value("${dict.element.permission-list:permissionList}")
+    private String permissionList;
+
+    /**
+     * 获取当前字典的编码
+     * @param elementEnum 组件类型枚举
+     * @return 组件字典编码
+     */
+    @SneakyThrows
+    public static String getDictCode(DictElementEnum elementEnum) {
+        String code = elementEnum.code;
+        DictElementConfig config = SpringIocContext.getBean(DictElementConfig.class);
+        Field codeField = DictElementConfig.class.getDeclaredField(code);
+        return (String)codeField.get(config);
+    }
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/config/SystemConfig.java b/common-config-starter/src/main/java/com/mosty/common/config/config/SystemConfig.java
new file mode 100644
index 0000000..528d00b
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/config/SystemConfig.java
@@ -0,0 +1,21 @@
+package com.mosty.common.config.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  系统配置
+ * @author kevin
+ * @date 2022/3/22 10:22 PM
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+public class SystemConfig {
+
+    /** 密码登陆 */
+    @Value("${config.defaultPassword:123456}")
+    private String defaultPassword;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/constant/enums/DictElementEnum.java b/common-config-starter/src/main/java/com/mosty/common/config/constant/enums/DictElementEnum.java
new file mode 100644
index 0000000..35e8c04
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/constant/enums/DictElementEnum.java
@@ -0,0 +1,39 @@
+package com.mosty.common.config.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+
+/**
+ *  字典组件枚举
+ * @author kevin
+ * @date 2022/2/10 10:33 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum DictElementEnum {
+
+    NATION("nation", "民族"),
+    GENDER("gender", "性别"),
+    BLOOD_TYPE("bloodType", "血型"),
+    EDUCATION("education", "学历"),
+    POLITICAL_OUTLOOK("politicalOutlook", "政治面貌"),
+    MARITAL_STATUS("maritalStatus", "婚姻状况"),
+    RELATIONSHIP("relationship", "亲属关系"),
+    VEHICLE_MODEL("vehicleModel", "车辆型号"),
+    VEHICLE_COLOR("vehicleColor", "车辆颜色"),
+    VEHICLE_NUMBER_TYPE("vehicleNumberType", "机动车号牌种类"),
+    CAR_NUMBER("carNumber", "车牌号"),
+    PERMISSION_LIST("permissionList", "车牌号"),
+    ;
+
+    /**
+     * 字典编码
+     */
+    public final String code;
+
+    /**
+     * 字典描述
+     */
+    public final String desc;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/controller/SysConfigController.java b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysConfigController.java
new file mode 100644
index 0000000..572a062
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysConfigController.java
@@ -0,0 +1,163 @@
+package com.mosty.common.config.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.vo.AddSysConfigVO;
+import com.mosty.common.config.entity.vo.ConfigPage;
+import com.mosty.common.config.entity.vo.DeleteVO;
+import com.mosty.common.config.entity.vo.EditSysConfigVO;
+import com.mosty.common.config.service.SysConfigService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * <p>
+ * 参数配置表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-10
+ */
+@RestController
+@AllArgsConstructor
+@SuppressWarnings("unused")
+@RequestMapping("/sys-config")
+@Api(tags = "系统配置接口")
+public class SysConfigController {
+
+    private final SysConfigService sysConfigService;
+
+    /**
+     * 添加系统配置
+     * @param addSysConfigVO 添加系统配置请求
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addSysConfig")
+    @Log(title = "系统配置功能", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加系统配置", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysConfig(@RequestBody @Valid AddSysConfigVO addSysConfigVO) {
+        SysConfig sysConfig = new SysConfig();
+
+        sysConfig.setPzj(addSysConfigVO.getPzj());
+        sysConfig.setPzz(addSysConfigVO.getPzz());
+        sysConfig.setPzmc(addSysConfigVO.getPzmc());
+        sysConfig.setBz(addSysConfigVO.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+        sysConfig.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysConfig.setXtCjsj(new Date());
+        sysConfig.setXtZhxgsj(new Date());
+        sysConfig.setXtZhxgrid(userInfo.getUserId().toString());
+        sysConfig.setXtZhxgrxm(userInfo.getUserName());
+        sysConfig.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysConfig.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysConfig.setXtLrsj(new Date());
+        sysConfig.setXtLrrid(userInfo.getUserId().toString());
+        sysConfig.setXtLrrxm(userInfo.getUserName());
+        sysConfig.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysConfig.setXtLrrbm(userInfo.getDeptName());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysConfig.setXtLrip(ipAddress);
+        sysConfig.setXtZhxgip(ipAddress);
+
+        sysConfigService.getBaseMapper().insert(sysConfig);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改系统配置
+     * @param editSysConfigVo 系统配置修改请求
+     * @return 修改结果
+     */
+    @JwtSysUser
+    @PostMapping("updateSysConfig")
+    @Log(title = "系统配置功能", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改系统配置信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysConfig(@RequestBody @Valid EditSysConfigVO editSysConfigVo) {
+        Asserts.check(editSysConfigVo.getId() == null, "主键id不能为空！");
+        SysConfig oldSysConfig = sysConfigService.getBaseMapper().selectById(editSysConfigVo.getId());
+        Asserts.check(oldSysConfig == null, "主键为 %s 的系统配置不存在", editSysConfigVo.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        oldSysConfig.setXtZhxgip(ipAddress);
+
+        oldSysConfig.setPzj(editSysConfigVo.getPzj());
+        oldSysConfig.setPzz(editSysConfigVo.getPzz());
+        oldSysConfig.setPzmc(editSysConfigVo.getPzmc());
+        oldSysConfig.setBz(editSysConfigVo.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        oldSysConfig.setXtZhxgsj(new Date());
+        oldSysConfig.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysConfig.setXtZhxgrxm(userInfo.getUserName());
+        oldSysConfig.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysConfig.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysConfigService.getBaseMapper().updateById(oldSysConfig);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除系统配置信息
+     * @param deleteVO 系统配置信息
+     * @return 删除结果
+     */
+    @JwtSysUser
+    @PostMapping("deleteSysConfig")
+    @Log(title = "系统配置功能", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除系统配置信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysConfig(@RequestBody DeleteVO deleteVO) {
+        SysConfig oldSysConfig = sysConfigService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(oldSysConfig == null, "主键为 %s 的系统配置信息不存在", deleteVO.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        oldSysConfig.setXtZhxgip(ipAddress);
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        oldSysConfig.setXtZhxgsj(new Date());
+        oldSysConfig.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysConfig.setXtZhxgrxm(userInfo.getUserName());
+        oldSysConfig.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysConfig.setXtZhxgrbm(userInfo.getDeptName());
+
+        oldSysConfig.setXtZxbz(DeletedEnum.DELETED.code);
+        oldSysConfig.setXtZxyy(deleteVO.getZxyy());
+
+        sysConfigService.getBaseMapper().updateById(oldSysConfig);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询系统配置信息", httpMethod = "GET", response = SysConfig.class)
+    public ResponseResult<IPage<SysConfig>> selectPage(ConfigPage configPage) {
+        IPage<SysConfig> userIPage = sysConfigService.selectByPage(configPage);
+        return ResponseResult.success(userIPage);
+    }
+
+}
+
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictController.java b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictController.java
new file mode 100644
index 0000000..3411b87
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictController.java
@@ -0,0 +1,323 @@
+package com.mosty.common.config.controller;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.db.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.constant.enums.DictTypeEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.Excel.DictUtils;
+import com.mosty.common.config.config.DictElementConfig;
+import com.mosty.common.config.constant.enums.DictElementEnum;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.entity.vo.*;
+import com.mosty.common.config.service.SysDictItemService;
+import com.mosty.common.config.service.SysDictService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.mosty.common.config.config.DictElementConfig.getDictCode;
+
+/**
+ * <p>
+ * 字典类别配置表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysDict")
+@Api(tags = "字典接口")
+@Slf4j
+public class SysDictController {
+
+    private final SysDictService sysDictService;
+    private final SysDictItemService sysDictItemService;
+    private final DictElementConfig dictElementConfig;
+
+    /**
+     * 添加字典信息
+     *
+     * @param addSysDictVO 字典对象
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addSysDict")
+    @Log(title = "字典功能", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加字典信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysDict(@RequestBody @Valid AddSysDictVO addSysDictVO) {
+
+        SysDict sysDict = new SysDict();
+
+        sysDict.setZdmc(addSysDictVO.getZdmc());
+        sysDict.setZdywlb(addSysDictVO.getZdywlb());
+        sysDict.setZdbh(addSysDictVO.getZdbh());
+        sysDict.setYybz(addSysDictVO.getYybz());
+        sysDict.setBz(addSysDictVO.getBz());
+        sysDict.setZdlx(addSysDictVO.getZdlx());
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息不存在");
+        Asserts.checkAuth(userInfo.getDeptId() == null, "用户部门信息不存在");
+        Asserts.checkAuth(userInfo.getUserId() == null, "用户id信息不存在");
+        sysDict.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysDict.setXtZhxgsj(new Date());
+        sysDict.setXtZhxgrid(userInfo.getUserId().toString());
+        sysDict.setXtZhxgrxm(userInfo.getUserName());
+        sysDict.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysDict.setXtZhxgrbm(userInfo.getDeptName());
+        sysDict.setXtCjsj(new Date());
+
+        sysDict.setXtLrsj(new Date());
+        sysDict.setXtLrrid(userInfo.getUserId().toString());
+        sysDict.setXtLrrxm(userInfo.getUserName());
+        sysDict.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysDict.setXtLrrbm(userInfo.getDeptName());
+        SysDict one = sysDictService.getOne(new LambdaQueryWrapper<SysDict>()
+                .eq(SysDict::getZdbh, sysDict.getZdbh()));
+        Asserts.check(Objects.nonNull(one), "当前字典编码已经存在！");
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysDict.setXtLrip(ipAddress);
+        sysDict.setXtZhxgip(ipAddress);
+
+        int insert = sysDictService.getBaseMapper().insert(sysDict);
+        if (insert > 0) {
+            DictUtils.setDictCache(sysDict.getZdbh(), null);
+        }
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改字典信息
+     *
+     * @param editSysDictVo 字典对象
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("updateSysDict")
+    @Log(title = "字典功能", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改字典信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysDict(@RequestBody @Valid EditSysDictVO editSysDictVo,
+                                                 HttpServletRequest servletRequest) {
+        Asserts.check(editSysDictVo.getId() == null, "主键id不能为空！");
+        SysDict oldSysDict = sysDictService.getBaseMapper().selectById(editSysDictVo.getId());
+        Asserts.check(oldSysDict == null, "主键为 %s 的字典信息不存在", editSysDictVo.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        oldSysDict.setXtZhxgip(ipAddress);
+
+        oldSysDict.setZdmc(editSysDictVo.getZdmc());
+        oldSysDict.setZdywlb(editSysDictVo.getZdywlb());
+        oldSysDict.setZdbh(editSysDictVo.getZdbh());
+        oldSysDict.setYybz(editSysDictVo.getYybz());
+        oldSysDict.setBz(editSysDictVo.getBz());
+        oldSysDict.setZdlx(editSysDictVo.getZdlx());
+        oldSysDict.setXtZxbz(editSysDictVo.getXtZxbz());
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息不存在");
+        Asserts.checkAuth(userInfo.getDeptId() == null, "用户部门信息不存在");
+        Asserts.checkAuth(userInfo.getUserId() == null, "用户id信息不存在");
+
+        oldSysDict.setXtZhxgsj(new Date());
+        oldSysDict.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysDict.setXtZhxgrxm(userInfo.getUserName());
+        oldSysDict.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysDict.setXtZhxgrbm(userInfo.getDeptName());
+
+        int i = sysDictService.getBaseMapper().updateById(oldSysDict);
+        if (i > 0) {
+            List<SysDictItem> dictDatas = this.sysDictItemService.getBaseMapper().selectList(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getXtZxbz, 0)
+                    .eq(SysDictItem::getZdbh, oldSysDict.getZdbh())
+            );
+            DictUtils.setDictCache(oldSysDict.getZdbh(), dictDatas);
+        }
+
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改字典信息
+     *
+     * @param deleteVO 字典删除信息
+     * @return 删除结果
+     */
+    @JwtSysUser
+    @PostMapping("deleteSysDict")
+    @Log(title = "字典功能", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除字典信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysDict(@RequestBody DeleteVO deleteVO,
+                                                 HttpServletRequest servletRequest) {
+        SysDict oldSysDict = sysDictService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(oldSysDict == null, "主键为 %s 的字典信息不存在", deleteVO.getId());
+
+        QueryWrapper<SysDictItem> childQuery = new QueryWrapper<>();
+        childQuery.and(wrapper -> wrapper.eq("zd_id", oldSysDict.getId()));
+        childQuery.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<SysDictItem> list = sysDictItemService.list(childQuery);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "当前节点下有子节点，请先删除子节点！");
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        oldSysDict.setXtZhxgip(ipAddress);
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息不存在");
+        Asserts.checkAuth(userInfo.getDeptId() == null, "用户部门信息不存在");
+        Asserts.checkAuth(userInfo.getUserId() == null, "用户id信息不存在");
+
+        oldSysDict.setXtZhxgsj(new Date());
+        oldSysDict.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysDict.setXtZhxgrxm(userInfo.getUserName());
+        oldSysDict.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysDict.setXtZhxgrbm(userInfo.getDeptName());
+
+        oldSysDict.setXtZxbz(DeletedEnum.DELETED.code);
+        oldSysDict.setXtZxyy(deleteVO.getZxyy());
+
+        sysDictService.getBaseMapper().updateById(oldSysDict);
+
+        //删除缓存
+        DictUtils.removeDictCache(oldSysDict.getZdbh());
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 根据字典编号查询字典信息
+     *
+     * @return 字典信息
+     */
+    @GetMapping("getSysDictByCode")
+    @ApiOperation(value = "根据字典编号查询字典信息", httpMethod = "GET", response = SysDictVO.class)
+    public ResponseResult<SysDictVO> getSysDictByCode(SysDictQueryVo vo) {
+        Asserts.check(StringUtils.isBlank(vo.getDictCode()), "查询的字典编号不能为空！");
+        return getSysDictVOResponseResult(vo);
+    }
+
+
+
+    /**
+     * 根据字典组件枚举，查询字典信息
+     *
+     * @param dictElementEnum 字典组件枚举
+     * @return 字典信息
+     */
+    @GetMapping("getElementSysDict")
+    @ApiOperation(value = "根据字典组件枚举，查询字典信息", httpMethod = "GET", response = SysDictVO.class)
+    public ResponseResult<SysDictVO> getElementSysDict(DictElementEnum dictElementEnum) {
+        // 获取组件编码，可以中配置中修改
+        String dictCode = getDictCode(dictElementEnum);
+        SysDictQueryVo vo = new SysDictQueryVo();
+        vo.setDictCode(dictCode);
+        return getSysDictVOResponseResult(vo);
+    }
+
+    /**
+     * 根据字典编码获取字典信息
+     *
+     * @return 字典信息
+     */
+    private ResponseResult<SysDictVO> getSysDictVOResponseResult(SysDictQueryVo vo) {
+
+        QueryWrapper<SysDict> dictWrapper = new QueryWrapper<>();
+        dictWrapper.and(wrapper -> wrapper.eq("zdbh", vo.getDictCode()));
+        SysDict sysDict = sysDictService.getOne(dictWrapper);
+        Asserts.check(sysDict == null, "字典编号 %s 对应的字典不存在", vo.getDictCode());
+        SysDictVO sysDictVO = new SysDictVO();
+        BeanUtil.copyProperties(sysDict, sysDictVO, true);
+
+        //先查redis
+        List<SysDictItem> list = DictUtils.getDictCache(vo.getDictCode());
+        if (!CollectionUtils.isEmpty(list)) {
+            if (StringUtils.isNotBlank(vo.getZdmc())) {
+                list = list.stream().filter(v -> v.getZdmc().contains(vo.getZdmc())).collect(Collectors.toList());
+            }
+        } else {
+            QueryWrapper<SysDictItem> dictItemWrapper = new QueryWrapper<>();
+            dictItemWrapper.and(wrapper -> wrapper.eq("zdbh", vo.getDictCode()));
+            dictItemWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code)
+                    .like(StringUtils.isNotBlank(vo.getZdmc()), "zdmc", vo.getZdmc()))
+                    .orderByAsc("dm");
+            list = sysDictItemService.list(dictItemWrapper);
+        }
+
+        if (DictTypeEnum.NATURE.code.equals(sysDict.getZdlx())) {
+            int expectedSize = CollectionUtils.isEmpty(list) ? 2 : list.size();
+            List<SysDictItemVO> itemList = Lists.newArrayListWithExpectedSize(expectedSize);
+            if (CollectionUtils.isNotEmpty(list)) {
+                itemList = BeanUtil.copyToList(list, SysDictItemVO.class);
+            }
+            sysDictVO.setItemList(itemList);
+        } else {
+            if (CollectionUtils.isNotEmpty(list)) {
+                List<SysDictItemVO> natureList = list.stream().filter(dept -> DeletedEnum.NATURE.code.equals(dept.getXtZxbz()))
+                        .map(dept -> BeanUtil.copyProperties(dept, SysDictItemVO.class)).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(natureList)) {
+                    // 递归树
+                    wrapChildList(sysDictVO, null, natureList);
+                }
+            }
+        }
+        return ResponseResult.success(sysDictVO);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询字典信息", httpMethod = "GET", response = SysDict.class)
+    public ResponseResult<IPage<SysDict>> selectPage(DictPage dictPage) {
+        IPage<SysDict> userIPage = sysDictService.selectByPage(dictPage);
+        return ResponseResult.success(userIPage);
+    }
+
+    /**
+     * 递归组装字典信息
+     *
+     * @param sysDictVO     字典信息
+     * @param sysDictItemVO 字典明细信息
+     * @param natureList    所有字典信息
+     */
+    public void wrapChildList(SysDictVO sysDictVO, SysDictItemVO sysDictItemVO, List<SysDictItemVO> natureList) {
+        Long rootId = sysDictVO != null ? sysDictVO.getId() : sysDictItemVO.getId();
+        List<SysDictItemVO> collect = natureList.stream().filter(dept -> rootId.equals(dept.getZdId()))
+                .sorted(Comparator.comparing(SysDictItemVO::getPx).reversed()).collect(Collectors.toList());
+        if (sysDictVO != null) {
+            sysDictVO.setItemList(collect);
+        } else {
+            sysDictItemVO.setItemList(collect);
+        }
+        if (CollectionUtils.isNotEmpty(collect)) {
+            collect.forEach(dictItem -> wrapChildList(null, dictItem, natureList));
+        }
+    }
+
+}
+
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictItemController.java b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictItemController.java
new file mode 100644
index 0000000..073762c
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysDictItemController.java
@@ -0,0 +1,321 @@
+package com.mosty.common.config.controller;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.ChineseCharacterUtil;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.Excel.DictUtils;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.entity.vo.*;
+import com.mosty.common.config.service.SysDictItemService;
+import com.mosty.common.config.service.SysDictService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 字典代码值表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sys-dict-item")
+@Api(tags = "字典明细接口")
+public class SysDictItemController {
+
+    private final SysDictService sysDictService;
+    private final SysDictItemService sysDictItemService;
+
+    /**
+     * 根据字典明细编号查询子字典明细信息
+     *
+     * @param dictItemCode 字典明细编码
+     * @return 字典信息
+     */
+    @GetMapping("getChildItemByCode")
+    @ApiOperation(value = "根据字典明细编号查询子字典明细信息", httpMethod = "GET", response = SysDictItemVO.class)
+    public ResponseResult<List<SysDictItemVO>> getChildItemByCode(String dictItemCode) {
+        SysDictItem sysDictItem = checkAndGetItem(dictItemCode);
+
+        QueryWrapper<SysDictItem> queryChildWrapper = new QueryWrapper<>();
+        queryChildWrapper.eq("zd_id", sysDictItem.getId());
+        List<SysDictItem> list = sysDictItemService.list(queryChildWrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return ResponseResult.success(Lists.newArrayList());
+        }
+        List<SysDictItemVO> sysDictItemVOS = BeanUtil.copyToList(list, SysDictItemVO.class);
+        List<SysDictItemVO> collect = sysDictItemVOS.stream().sorted(Comparator.comparing(SysDictItemVO::getPx).reversed()).collect(Collectors.toList());
+        return ResponseResult.success(collect);
+    }
+
+    /**
+     * 根据字典明细编号，查询所有子字典明细信息
+     *
+     * @param dictItemCode 字典明细编码
+     * @return 字典信息
+     */
+    @GetMapping("getAllChildItemByCode")
+    @ApiOperation(value = "根据字典明细编号，查询所有子字典明细信息", httpMethod = "GET", response = SysDictItemVO.class)
+    public ResponseResult<List<SysDictItemVO>> getAllChildItemByCode(String dictItemCode) {
+        SysDictItem sysDictItem = checkAndGetItem(dictItemCode);
+        SysDictItemVO sysDictItemVO = BeanUtil.copyProperties(sysDictItem, SysDictItemVO.class);
+
+        QueryWrapper<SysDictItem> queryChildWrapper = new QueryWrapper<>();
+        queryChildWrapper.eq("root_path", sysDictItem.getRootPath());
+        List<SysDictItem> allDict = sysDictItemService.list(queryChildWrapper);
+        List<SysDictItemVO> resultList = Lists.newArrayList();
+
+        if (CollectionUtils.isEmpty(allDict)) {
+            return ResponseResult.success(resultList);
+        }
+        List<SysDictItemVO> natureList = allDict.stream().filter(dept -> DeletedEnum.NATURE.code.equals(dept.getXtZxbz()))
+                .map(dept -> BeanUtil.copyProperties(dept, SysDictItemVO.class)).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(natureList)) {
+            // 递归组织组织机构树
+            wrapChildList(sysDictItemVO, natureList);
+        }
+        return ResponseResult.success(sysDictItemVO.getItemList());
+    }
+
+    /**
+     * 递归组装字典信息
+     *
+     * @param sysDictItemVO 字典明细信息
+     * @param natureList    所有字典信息
+     */
+    public void wrapChildList(SysDictItemVO sysDictItemVO, List<SysDictItemVO> natureList) {
+        Long rootId = sysDictItemVO.getId();
+        List<SysDictItemVO> collect = natureList.stream().filter(dept -> rootId.equals(dept.getZdId()))
+                .sorted(Comparator.comparing(SysDictItemVO::getPx).reversed()).collect(Collectors.toList());
+        sysDictItemVO.setItemList(collect);
+        if (CollectionUtils.isNotEmpty(collect)) {
+            collect.forEach(dictItem -> wrapChildList(dictItem, natureList));
+        }
+    }
+
+    /**
+     * 检查并获取字典明细信息
+     *
+     * @param dictItemCode 字典明细编码
+     */
+    private SysDictItem checkAndGetItem(String dictItemCode) {
+        Asserts.check(StringUtils.isBlank(dictItemCode), "查询的字典明细编码不能为空！");
+        QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("zdbh", dictItemCode);
+        SysDictItem sysDictItem = sysDictItemService.getOne(queryWrapper);
+        Asserts.check(sysDictItem == null || DeletedEnum.DELETED.code.equals(sysDictItem.getXtZxbz()),
+                "字典编码对应的字典不存在或已删除");
+        return sysDictItem;
+    }
+
+    /**
+     * 添加字典明细信息
+     *
+     * @param addDictItemVo 字典明细信息对象
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addSysDictItem")
+    @Log(title = "字典明细功能", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加字典明细信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysDictItem(@RequestBody @Valid AddDictItemVO addDictItemVo,
+                                                  HttpServletRequest servletRequest) {
+        Long parentId = addDictItemVo.getParentId();
+        SysDict sysDict = sysDictService.getById(parentId);
+        String rootPath = null;
+        if (sysDict == null) {
+            SysDictItem sysDictItem = sysDictItemService.getById(parentId);
+            Asserts.check(sysDictItem == null, "传入的父id对应的字典信息不存在");
+            rootPath = sysDictItem.getRootPath() + "_";
+            addDictItemVo.setZdbh(sysDictItem.getZdbh());
+        } else {
+            rootPath = sysDict.getId() + "_";
+            addDictItemVo.setZdbh(sysDict.getZdbh());
+        }
+
+        //拼音
+        addDictItemVo.setPy(ChineseCharacterUtil.getUpperCase(addDictItemVo.getZdmc(), false));
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysDictItemService.addSysDictItem(addDictItemVo, rootPath, ipAddress);
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "", httpMethod = "GET", response = SysDictVO.class)
+    public ResponseResult<IPage<SysDictItem>> selectPageDict(SysDictQueryPage vo) {
+        Asserts.check(StringUtils.isBlank(vo.getDictCode()), "查询的字典编号不能为空！");
+        LambdaQueryWrapper<SysDictItem> wrapper = new LambdaQueryWrapper<SysDictItem>()
+                .like(StringUtils.isNotBlank(vo.getZdmc()), SysDictItem::getZdmc, vo.getZdmc())
+                .eq(StringUtils.isNotBlank(vo.getDictCode()), SysDictItem::getZdbh, vo.getDictCode())
+                .eq(SysDictItem::getXtZxbz, "0");
+        return ResponseResult.success(this.sysDictItemService.page(vo, wrapper));
+    }
+
+    /**
+     * 修改字典明细信息
+     *
+     * @param editDictItemVO 字典对象
+     * @return 修改结果
+     */
+    @JwtSysUser
+    @PostMapping("updateSysDictItem")
+    @Log(title = "字典明细功能", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改字典明细信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysDictItem(@RequestBody @Valid EditDictItemVO editDictItemVO,
+                                                     HttpServletRequest servletRequest) {
+        Asserts.check(editDictItemVO.getId() == null, "主键id不能为空！");
+        SysDictItem oldSysDictItem = sysDictItemService.getBaseMapper().selectById(editDictItemVO.getId());
+        Asserts.check(oldSysDictItem == null, "主键为 %s 的字典明细信息不存在", editDictItemVO.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+        oldSysDictItem.setXtZhxgsj(new Date());
+        oldSysDictItem.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysDictItem.setXtZhxgrxm(userInfo.getUserName());
+        oldSysDictItem.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysDictItem.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysDictItem.setXtZhxgip(ipAddress);
+
+        oldSysDictItem.setBz(editDictItemVO.getBz());
+        oldSysDictItem.setDm(editDictItemVO.getDm());
+        oldSysDictItem.setPy(editDictItemVO.getPy());
+        oldSysDictItem.setPx(editDictItemVO.getPx());
+        oldSysDictItem.setZdbh(editDictItemVO.getZdbh());
+        oldSysDictItem.setZdmc(editDictItemVO.getZdmc());
+        oldSysDictItem.setPy(ChineseCharacterUtil.getUpperCase(oldSysDictItem.getZdmc(), false));
+        int i = sysDictItemService.getBaseMapper().updateById(oldSysDictItem);
+        if (i > 0) {
+            List<SysDictItem> dictDatas = this.sysDictItemService.getBaseMapper().selectList(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getXtZxbz, 0)
+                    .eq(SysDictItem::getZdbh, oldSysDictItem.getZdbh())
+            );
+            DictUtils.setDictCache(oldSysDictItem.getZdbh(), dictDatas);
+        }
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改字典明细信息
+     *
+     * @param deleteVO 字典主键
+     * @return 删除结果
+     */
+    @JwtSysUser
+    @PostMapping("deleteSysDictItem")
+    @Log(title = "字典明细功能", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除字典明细信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysDictItem(@RequestBody DeleteVO deleteVO, HttpServletRequest servletRequest) {
+        SysDictItem sysDictItem = sysDictItemService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(sysDictItem == null, "主键为 %s 的字典明细信息不存在", deleteVO.getId());
+
+        QueryWrapper<SysDictItem> childQuery = new QueryWrapper<>();
+        childQuery.and(wrapper -> wrapper.eq("zd_id", sysDictItem.getId()));
+        childQuery.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<SysDictItem> list = sysDictItemService.list(childQuery);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "当前节点下有子节点，请先删除子节点！");
+
+        sysDictItem.setXtZxbz(DeletedEnum.DELETED.code);
+        sysDictItem.setXtZxyy(deleteVO.getZxyy());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+        sysDictItem.setXtZhxgsj(new Date());
+        sysDictItem.setXtZhxgrid(userInfo.getUserId().toString());
+        sysDictItem.setXtZhxgrxm(userInfo.getUserName());
+        sysDictItem.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysDictItem.setXtZhxgrbm(userInfo.getDeptName());
+        sysDictItem.setXtZhxgip(ipAddress);
+        int i = sysDictItemService.getBaseMapper().updateById(sysDictItem);
+        if (i > 0) {
+            List<SysDictItem> dictDatas = this.sysDictItemService.getBaseMapper().selectList(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getXtZxbz, 0)
+                    .eq(SysDictItem::getZdbh, sysDictItem.getZdbh())
+            );
+            DictUtils.setDictCache(sysDictItem.getZdbh(), dictDatas);
+        }
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+
+    @JwtSysUser
+    @PostMapping("deleteSysDictItemBatch")
+    @Log(title = "字典明细功能", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除字典明细信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysDictItemBatch(@RequestBody List<Long> ids, HttpServletRequest servletRequest) {
+
+        if (!CollectionUtils.isEmpty(ids)) {
+            for (Long id : ids) {
+                SysDictItem sysDictItem = sysDictItemService.getBaseMapper().selectById(id);
+                Asserts.check(sysDictItem == null, "主键为 %s 的字典明细信息不存在", id);
+
+                QueryWrapper<SysDictItem> childQuery = new QueryWrapper<>();
+                childQuery.and(wrapper -> wrapper.eq("zd_id", sysDictItem.getId()));
+                childQuery.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+                List<SysDictItem> list = sysDictItemService.list(childQuery);
+                Asserts.check(CollectionUtils.isNotEmpty(list), "当前节点下有子节点，请先删除子节点！");
+
+                sysDictItem.setXtZxbz(DeletedEnum.DELETED.code);
+                sysDictItem.setXtZxyy(null);
+                // 获取ip地址
+                String ipAddress = IpUtil.getIpAddress(servletRequest);
+                UserInfo userInfo = UserInfoManager.get();
+                Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+                sysDictItem.setXtZhxgsj(new Date());
+                sysDictItem.setXtZhxgrid(userInfo.getUserId().toString());
+                sysDictItem.setXtZhxgrxm(userInfo.getUserName());
+                sysDictItem.setXtZhxgrbmid(userInfo.getDeptId().toString());
+                sysDictItem.setXtZhxgrbm(userInfo.getDeptName());
+                sysDictItem.setXtZhxgip(ipAddress);
+                int i = sysDictItemService.getBaseMapper().updateById(sysDictItem);
+                if (i > 0) {
+                    List<SysDictItem> dictDatas = this.sysDictItemService.getBaseMapper().selectList(new LambdaQueryWrapper<SysDictItem>()
+                            .eq(SysDictItem::getXtZxbz, 0)
+                            .eq(SysDictItem::getZdbh, sysDictItem.getZdbh())
+                    );
+                    DictUtils.setDictCache(sysDictItem.getZdbh(), dictDatas);
+                }
+            }
+        }
+        return ResponseResult.success(Boolean.TRUE);
+    }
+}
+
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/controller/SysVersionManageController.java b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysVersionManageController.java
new file mode 100644
index 0000000..f74a92e
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/controller/SysVersionManageController.java
@@ -0,0 +1,168 @@
+package com.mosty.common.config.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.SysVersionManage;
+import com.mosty.common.config.entity.vo.AddVersionManageVO;
+import com.mosty.common.config.entity.vo.EditVersionManageVO;
+import com.mosty.common.config.entity.vo.VersionManagePage;
+import com.mosty.common.config.service.SysVersionManageService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 版本管理表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-21
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@SuppressWarnings("unused")
+@RequestMapping("/sys-version-manage")
+@Api(tags = "系统版本管理接口")
+public class SysVersionManageController {
+
+    private final SysVersionManageService sysVersionManageService;
+
+    /**
+     * 添加系统版本管理
+     * @param addVersionManageVo 添加系统版本管理请求
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addVersionManage")
+    @Log(title = "系统版本管理功能", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加系统版本管理", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addVersionManage(@RequestBody @Valid AddVersionManageVO addVersionManageVo) {
+
+        SysVersionManage sysVersionManage = new SysVersionManage();
+
+        sysVersionManage.setSysVersion(addVersionManageVo.getSysVersion());
+        sysVersionManage.setPublishTime(addVersionManageVo.getPublishTime());
+        sysVersionManage.setAddFunction(addVersionManageVo.getAddFunction());
+        sysVersionManage.setFixBug(addVersionManageVo.getFixBug());
+        sysVersionManage.setBz(addVersionManageVo.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+        sysVersionManage.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysVersionManage.setXtCjsj(LocalDateTime.now());
+        sysVersionManage.setXtZhxgsj(LocalDateTime.now());
+        sysVersionManage.setXtZhxgrid(userInfo.getUserId().toString());
+        sysVersionManage.setXtZhxgrxm(userInfo.getUserName());
+        sysVersionManage.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysVersionManage.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysVersionManage.setXtLrsj(LocalDateTime.now());
+        sysVersionManage.setXtLrrid(userInfo.getUserId().toString());
+        sysVersionManage.setXtLrrxm(userInfo.getUserName());
+        sysVersionManage.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysVersionManage.setXtLrrbm(userInfo.getDeptName());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysVersionManage.setXtLrip(ipAddress);
+        sysVersionManage.setXtZhxgip(ipAddress);
+
+        sysVersionManageService.getBaseMapper().insert(sysVersionManage);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改系统版本管理
+     * @param editVersionManageVo 修改系统版本管理请求
+     * @return 修改结果
+     */
+    @JwtSysUser
+    @PostMapping("updateVersionManage")
+    @Log(title = "系统版本管理功能", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改系统版本管理", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateVersionManage(@RequestBody @Valid EditVersionManageVO editVersionManageVo) {
+        Asserts.check(editVersionManageVo.getId() == null, "主键id不能为空！");
+        SysVersionManage sysVersionManage = sysVersionManageService.getBaseMapper().selectById(editVersionManageVo.getId());
+        Asserts.check(sysVersionManage == null, "主键为 %s 的系统版本管理信息不存在", editVersionManageVo.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysVersionManage.setXtZhxgip(ipAddress);
+
+        sysVersionManage.setSysVersion(editVersionManageVo.getSysVersion());
+        sysVersionManage.setPublishTime(editVersionManageVo.getPublishTime());
+        sysVersionManage.setAddFunction(editVersionManageVo.getAddFunction());
+        sysVersionManage.setFixBug(editVersionManageVo.getFixBug());
+        sysVersionManage.setBz(editVersionManageVo.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        sysVersionManage.setXtZhxgsj(LocalDateTime.now());
+        sysVersionManage.setXtZhxgrid(userInfo.getUserId().toString());
+        sysVersionManage.setXtZhxgrxm(userInfo.getUserName());
+        sysVersionManage.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysVersionManage.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysVersionManageService.getBaseMapper().updateById(sysVersionManage);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除系统版本管理信息
+     * @param id 系统版本管理信息id
+     * @return 删除结果
+     */
+    @JwtSysUser
+    @GetMapping("deleteVersionManage")
+    @Log(title = "系统版本管理功能", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除系统版本管理信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteVersionManage(@RequestParam("id") Long id) {
+        SysVersionManage sysVersionManage = sysVersionManageService.getBaseMapper().selectById(id);
+        Asserts.check(sysVersionManage == null, "主键为 %s 的系统版本管理信息不存在", id);
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysVersionManage.setXtZhxgip(ipAddress);
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        sysVersionManage.setXtZhxgsj(LocalDateTime.now());
+        sysVersionManage.setXtZhxgrid(userInfo.getUserId().toString());
+        sysVersionManage.setXtZhxgrxm(userInfo.getUserName());
+        sysVersionManage.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysVersionManage.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysVersionManage.setXtZxbz(DeletedEnum.DELETED.code);
+        sysVersionManage.setXtZxyy("");
+
+        sysVersionManageService.getBaseMapper().updateById(sysVersionManage);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询字典信息", httpMethod = "GET", response = SysVersionManage.class)
+    public ResponseResult<IPage<SysVersionManage>> selectPage(VersionManagePage versionManagePage) {
+        IPage<SysVersionManage> versionManageIPage = sysVersionManageService.selectByPage(versionManagePage);
+        return ResponseResult.success(versionManageIPage);
+    }
+
+}
+
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/SysConfig.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysConfig.java
new file mode 100644
index 0000000..5e3971a
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysConfig.java
@@ -0,0 +1,93 @@
+package com.mosty.common.config.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 参数配置表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_config")
+@ApiModel(value="SysConfig对象", description="参数配置表")
+public class SysConfig implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "配置名称")
+    private String pzmc;
+
+    @ApiModelProperty(value = "配置键")
+    private String pzj;
+
+    @ApiModelProperty(value = "配置值")
+    private String pzz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDict.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDict.java
new file mode 100644
index 0000000..ccf4890
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDict.java
@@ -0,0 +1,109 @@
+package com.mosty.common.config.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.base.constant.enums.DictTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 字典类别配置表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_dict")
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value="SysDict对象", description="字典类别配置表")
+public class SysDict implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    /**
+     * 字典类型
+     *@see DictTypeEnum
+     */
+    @ApiModelProperty(value = "是否树形字典：1、不是（列表） 2、树形")
+    private Integer zdlx;
+
+    @ApiModelProperty(value = "字典业务类别")
+    private String zdywlb;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "引用标准")
+    private String yybz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDictItem.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDictItem.java
new file mode 100644
index 0000000..b41c048
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysDictItem.java
@@ -0,0 +1,114 @@
+package com.mosty.common.config.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 字典代码值表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_dict_item")
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value="SysDictItem对象", description="字典代码值表")
+public class SysDictItem implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "字典上级编号")
+    private Long zdId;
+
+    /**
+     * 根节点开始的id路径
+     */
+    @TableField(value = "root_path")
+    private String rootPath;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    @ApiModelProperty(value = "字典代码")
+    private String dm;
+
+    @ApiModelProperty(value = "字典拼音")
+    private String py;
+
+    @ApiModelProperty(value = "排序字典：100在1前面，倒序")
+    private Integer px;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/SysVersionManage.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysVersionManage.java
new file mode 100644
index 0000000..f6c867d
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/SysVersionManage.java
@@ -0,0 +1,100 @@
+package com.mosty.common.config.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 版本管理表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_version_manage")
+@ApiModel(value="SysVersionManage对象", description="版本管理表")
+public class SysVersionManage implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "版本")
+    private String sysVersion;
+
+    @ApiModelProperty(value = "发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty(value = "新增功能")
+    private String addFunction;
+
+    @ApiModelProperty(value = "修复bug")
+    private String fixBug;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private LocalDateTime xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private LocalDateTime xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private LocalDateTime xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddDictItemVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddDictItemVO.java
new file mode 100644
index 0000000..9ddd846
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddDictItemVO.java
@@ -0,0 +1,45 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ *  添加字典信息请求
+ * @author kevin
+ * @date 2022/2/20 9:24 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddDictItemVO {
+
+    @NotNull(message = "父节点id不能为空")
+    @ApiModelProperty(value = "父id： 可能是字典表id，可能是字典明细表id")
+    private Long parentId;
+
+    @ApiModelProperty(value = "字典编号", hidden = true)
+    @Size(max =  50,message = "字典编码长度不能超过50")
+    private String zdbh;
+
+    @ApiModelProperty(value = "字典名称")
+    @Size(max =  100,message = "字典名称长度不能超过50")
+    private String zdmc;
+
+    @ApiModelProperty(value = "字典代码")
+    @Size(max =  50,message = "字典代码长度不能超过50")
+    private String dm;
+
+    @ApiModelProperty(value = "字典拼音")
+    private String py;
+
+    @ApiModelProperty(value = "排序字典：100在1前面，倒序")
+    private Integer px;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddPositionVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddPositionVO.java
new file mode 100644
index 0000000..aefbb06
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddPositionVO.java
@@ -0,0 +1,38 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ *  添加岗位信息对象
+ * @author kevin
+ * @date 2022/2/21 12:47 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddPositionVO {
+
+    @NotEmpty(message = "岗位编码不能为空")
+    @ApiModelProperty(value = "岗位编码")
+    @Size(max =  30,message = "岗位编码长度不能超过50")
+    private String postCode;
+
+    @NotEmpty(message = "岗位名称不能为空")
+    @ApiModelProperty(value = "岗位名称")
+    @Size(max =  30,message = "岗位名称长度不能超过50")
+    private String postName;
+
+    @ApiModelProperty(value = "岗位描述")
+    @Size(max =  200,message = "岗位描述长度不能超过50")
+    private String postDesc;
+
+    @ApiModelProperty(value = "备注")
+    @Size(max =  200,message = "备注长度不能超过50")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysConfigVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysConfigVO.java
new file mode 100644
index 0000000..35097a2
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysConfigVO.java
@@ -0,0 +1,49 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  添加系统配置对象
+ * @author kevin
+ * @date 2022/2/21 8:13 PM
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "添加系统配置对象")
+public class AddSysConfigVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotEmpty(message = "配置名称不能为空")
+    @ApiModelProperty(value = "配置名称")
+    @Size(max =  50,message = "配置名称不能超过50")
+    private String pzmc;
+
+    @NotEmpty(message = "配置键不能为空")
+    @ApiModelProperty(value = "配置键")
+    @Size(max =  500,message = "配置键长度不能超过500")
+    private String pzj;
+
+    @NotEmpty(message = "配置值不能为空")
+    @ApiModelProperty(value = "配置值")
+    @Size(max =  1000,message = "配置键长度不能超过1000")
+    private String pzz;
+
+    @ApiModelProperty(value = "备注")
+    @Size(max =  200,message = "备注长度不能超过200")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysDictVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysDictVO.java
new file mode 100644
index 0000000..6b89f9a
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddSysDictVO.java
@@ -0,0 +1,49 @@
+package com.mosty.common.config.entity.vo;
+
+import com.mosty.common.base.constant.enums.DictTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ *  添加字典信息VO
+ * @author kevin
+ * @date 2022/2/9 8:20 PM
+ * @since 1.0.0
+ */
+@Data
+public class AddSysDictVO {
+
+    @ApiModelProperty(value = "字典名称")
+    @NotEmpty(message = "字典名称不能为空")
+    @Size(max =  50,message = "字典名称长度不能超过50")
+    private String zdmc;
+
+    /**
+     * 字典类型
+     *@see DictTypeEnum
+     */
+    @NotNull(message = "字典类型不能为空")
+    @ApiModelProperty(value = "是否树形字典：1、不是（列表） 2、树形")
+    private Integer zdlx;
+
+    @ApiModelProperty(value = "字典业务类别")
+    @Size(max =  2,message = "字典业务类别长度不能超过50")
+    private String zdywlb;
+
+    @NotEmpty(message = "字典编号不能为空")
+    @ApiModelProperty(value = "字典编号")
+    @Size(max =  50,message = "字典编号长度不能超过50")
+    private String zdbh;
+
+    @ApiModelProperty(value = "引用标准")
+    private String yybz;
+
+    @ApiModelProperty(value = "备注")
+    @Size(max =  200,message = "备注长度不能超过200")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddVersionManageVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddVersionManageVO.java
new file mode 100644
index 0000000..be038ac
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/AddVersionManageVO.java
@@ -0,0 +1,50 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ *  添加系统版本管理请求
+ * @author kevin
+ * @date 2022/2/21 9:06 PM
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "添加系统版本管理对象")
+public class AddVersionManageVO implements Serializable {
+
+    /** 序列化标识 */
+    private static final long serialVersionUID = 8136954123595145099L;
+
+    @ApiModelProperty(value = "系统版本管理id")
+    private Long id;
+
+    @ApiModelProperty(value = "版本")
+    private String sysVersion;
+
+    @ApiModelProperty(value = "发布时间")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty(value = "新增功能")
+    private String addFunction;
+
+    @ApiModelProperty(value = "修复bug")
+    private String fixBug;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/ConfigPage.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/ConfigPage.java
new file mode 100644
index 0000000..3342020
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/ConfigPage.java
@@ -0,0 +1,29 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询系统配置信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ConfigPage extends Page {
+
+    /**
+     * 配置名称
+     */
+    private String configName;
+
+    /**
+     * 配置键
+     */
+    private String configKey;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DeleteVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DeleteVO.java
new file mode 100644
index 0000000..082660c
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DeleteVO.java
@@ -0,0 +1,24 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "删除VO")
+public class DeleteVO implements Serializable {
+    @ApiModelProperty(value = "主键id")
+    @NotNull(message = "主键id不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "注销原因")
+    @NotEmpty(message = "注销原因不能为空")
+    private String zxyy;
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DictPage.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DictPage.java
new file mode 100644
index 0000000..1d13779
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/DictPage.java
@@ -0,0 +1,34 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询字典信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DictPage extends Page {
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典编码
+     */
+    private String dictCode;
+
+    /**
+     * 删除标志
+     */
+    private Integer xtZxbz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditDictItemVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditDictItemVO.java
new file mode 100644
index 0000000..272751e
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditDictItemVO.java
@@ -0,0 +1,42 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ *  修改字典信息请求
+ * @author kevin
+ * @date 2022/2/20 9:24 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class EditDictItemVO {
+
+    @NotNull(message = "主键id不能为空")
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    @ApiModelProperty(value = "字典代码")
+    private String dm;
+
+    @ApiModelProperty(value = "字典拼音")
+    private String py;
+
+    @ApiModelProperty(value = "排序字典：100在1前面，倒序")
+    private Integer px;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditPositionVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditPositionVO.java
new file mode 100644
index 0000000..a383342
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditPositionVO.java
@@ -0,0 +1,38 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  修改岗位信息对象
+ * @author kevin
+ * @date 2022/2/21 12:47 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class EditPositionVO {
+
+    @NotNull(message = "岗位id不能为空")
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @NotEmpty(message = "岗位编码不能为空")
+    @ApiModelProperty(value = "岗位编码")
+    private String postCode;
+
+    @NotEmpty(message = "岗位名称不能为空")
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "岗位描述")
+    private String postDesc;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysConfigVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysConfigVO.java
new file mode 100644
index 0000000..d4a4e93
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysConfigVO.java
@@ -0,0 +1,47 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ *  修改系统配置对象
+ * @author kevin
+ * @date 2022/2/21 8:13 PM
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "添加系统配置对象")
+public class EditSysConfigVO implements Serializable {
+
+    /** 序列化标识 */
+    private static final long serialVersionUID = -3185962159720155709L;
+
+    @NotNull(message = "系统配置id不能为空")
+    @ApiModelProperty("id")
+    private Long id;
+
+    @NotEmpty(message = "配置名称不能为空")
+    @ApiModelProperty(value = "配置名称")
+    private String pzmc;
+
+    @NotEmpty(message = "配置键不能为空")
+    @ApiModelProperty(value = "配置键")
+    private String pzj;
+
+    @NotEmpty(message = "配置值不能为空")
+    @ApiModelProperty(value = "配置值")
+    private String pzz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictItemVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictItemVO.java
new file mode 100644
index 0000000..1dc3053
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictItemVO.java
@@ -0,0 +1,48 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ *  修改字典明细信息
+ * @author kevin
+ * @date 2022/2/20 5:24 PM
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "字典明细信息")
+public class EditSysDictItemVO implements Serializable {
+
+    /**
+     * 序列化标识
+     */
+    private static final long serialVersionUID = -3202056339726922311L;
+
+    @NotNull(message = "主键id不能为空")
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    @ApiModelProperty(value = "字典代码")
+    private String dm;
+
+    @ApiModelProperty(value = "字典拼音")
+    private String py;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictVO.java
new file mode 100644
index 0000000..2ba77aa
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditSysDictVO.java
@@ -0,0 +1,51 @@
+package com.mosty.common.config.entity.vo;
+
+import com.mosty.common.base.constant.enums.DictTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  修改字典信息VO
+ * @author kevin
+ * @date 2022/2/9 8:20 PM
+ * @since 1.0.0
+ */
+@Data
+public class EditSysDictVO {
+
+    @NotNull(message = "字典id不能为空")
+    @ApiModelProperty("字典id")
+    private Long id;
+
+    @ApiModelProperty(value = "字典名称")
+    @NotEmpty(message = "字典名称不能为空")
+    private String zdmc;
+
+    /**
+     * 字典类型
+     *@see DictTypeEnum
+     */
+    @NotNull(message = "字典类型不能为空")
+    @ApiModelProperty(value = "是否树形字典：1、不是（列表） 2、树形")
+    private Integer zdlx;
+
+    @ApiModelProperty(value = "字典业务类别")
+    private String zdywlb;
+
+    @NotEmpty(message = "字典编号不能为空")
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "引用标准")
+    private String yybz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditVersionManageVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditVersionManageVO.java
new file mode 100644
index 0000000..615afe5
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/EditVersionManageVO.java
@@ -0,0 +1,47 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ *  修改系统版本管理请求
+ * @author kevin
+ * @date 2022/2/21 9:06 PM
+ * @since 1.0.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "修改系统版本管理对象")
+public class EditVersionManageVO implements Serializable {
+
+    /** 序列化标识 */
+    private static final long serialVersionUID = 4182901351269001103L;
+
+    @ApiModelProperty(value = "系统版本管理id")
+    private Long id;
+
+
+    @ApiModelProperty(value = "版本")
+    private String sysVersion;
+
+    @ApiModelProperty(value = "发布时间")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty(value = "新增功能")
+    private String addFunction;
+
+    @ApiModelProperty(value = "修复bug")
+    private String fixBug;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictItemVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictItemVO.java
new file mode 100644
index 0000000..77199e7
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictItemVO.java
@@ -0,0 +1,58 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 字典明细
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="字典信息", description="字典代码值表")
+public class SysDictItemVO implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 字典明细信息
+     */
+    @ApiModelProperty(value = "字典明细信息")
+    private List<SysDictItemVO> itemList;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "字典上级编号")
+    private Long zdId;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    @ApiModelProperty(value = "字典代码")
+    private String dm;
+
+    @ApiModelProperty(value = "字典拼音")
+    private String py;
+
+    @ApiModelProperty(value = "排序字典：100在1前面，倒序")
+    private Integer px;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryPage.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryPage.java
new file mode 100644
index 0000000..e6f316d
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryPage.java
@@ -0,0 +1,26 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *  根据字典编号查询字典信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode
+public class SysDictQueryPage extends Page implements Serializable {
+
+    // 字典编码
+    private String dictCode;
+
+    // 字典名称
+    private String zdmc;
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryVo.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryVo.java
new file mode 100644
index 0000000..4ecf238
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictQueryVo.java
@@ -0,0 +1,26 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *  根据字典编号查询字典信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode
+public class SysDictQueryVo implements Serializable {
+
+    // 字典编码
+    private String dictCode;
+
+    // 字典名称
+    private String zdmc;
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictVO.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictVO.java
new file mode 100644
index 0000000..da8b85b
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/SysDictVO.java
@@ -0,0 +1,43 @@
+package com.mosty.common.config.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *  字典信息VO
+ * @author kevin
+ * @date 2022/2/9 8:20 PM
+ * @since 1.0.0
+ */
+@Data
+public class SysDictVO {
+
+    /**
+     * 字典明细信息
+     */
+    private List<SysDictItemVO> itemList;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "字典名称")
+    private String zdmc;
+
+    @ApiModelProperty(value = "是否树形字典：1、不是（列表） 2、树形")
+    private Integer zdlx;
+
+    @ApiModelProperty(value = "字典业务类别")
+    private String zdywlb;
+
+    @ApiModelProperty(value = "字典编号")
+    private String zdbh;
+
+    @ApiModelProperty(value = "引用标准")
+    private String yybz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/VersionManagePage.java b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/VersionManagePage.java
new file mode 100644
index 0000000..e285a9e
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/entity/vo/VersionManagePage.java
@@ -0,0 +1,34 @@
+package com.mosty.common.config.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  版本管理分页请求
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class VersionManagePage extends Page {
+
+    /**
+     * 版本
+     */
+    private String sysVersion;
+
+    /**
+     * 发布开始时间
+     */
+    private String startPublishTime;
+
+    /**
+     * 发布结束时间
+     */
+    private String endPublishTime;
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysConfigMapper.java b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysConfigMapper.java
new file mode 100644
index 0000000..ebb36ef
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysConfigMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.config.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.config.entity.SysConfig;
+
+/**
+ * <p>
+ * 参数配置表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-10
+ */
+public interface SysConfigMapper extends BaseMapper<SysConfig> {
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictItemMapper.java b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictItemMapper.java
new file mode 100644
index 0000000..6c46c2c
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictItemMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.config.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.config.entity.SysDictItem;
+
+/**
+ * <p>
+ * 字典代码值表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictMapper.java b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictMapper.java
new file mode 100644
index 0000000..cd9e6ca
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysDictMapper.java
@@ -0,0 +1,21 @@
+package com.mosty.common.config.mapper;
+
+//import cn.hutool.db.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.config.entity.SysDict;
+
+/**
+ * <p>
+ * 字典类别配置表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+public interface SysDictMapper extends BaseMapper<SysDict> {
+
+//    IPage<SysDict> selectByPage(Page page);
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysVersionManageMapper.java b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysVersionManageMapper.java
new file mode 100644
index 0000000..30bb9f8
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/mapper/SysVersionManageMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.config.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.config.entity.SysVersionManage;
+
+/**
+ * <p>
+ * 版本管理表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-21
+ */
+public interface SysVersionManageMapper extends BaseMapper<SysVersionManage> {
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/SysConfigService.java b/common-config-starter/src/main/java/com/mosty/common/config/service/SysConfigService.java
new file mode 100644
index 0000000..5288b34
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/SysConfigService.java
@@ -0,0 +1,29 @@
+package com.mosty.common.config.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.base.constant.enums.ConfigKeyEnum;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.vo.ConfigPage;
+import com.mosty.common.config.entity.vo.DictPage;
+
+/**
+ * <p>
+ * 参数配置表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-10
+ */
+public interface SysConfigService extends IService<SysConfig> {
+
+    IPage<SysConfig> selectByPage(ConfigPage page);
+
+    /**
+     * 根据配制键获取值
+     * @param passwordLevel
+     * @return
+     */
+    SysConfig getOneByKey(ConfigKeyEnum passwordLevel);
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictItemService.java b/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictItemService.java
new file mode 100644
index 0000000..50602c6
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictItemService.java
@@ -0,0 +1,26 @@
+package com.mosty.common.config.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.entity.vo.AddDictItemVO;
+import lombok.Data;
+
+/**
+ * <p>
+ * 字典代码值表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+public interface SysDictItemService extends IService<SysDictItem> {
+
+    /**
+     * 添加字典明细信息
+     * @param addDictItemVo 待添加的信息
+     * @param rootPath 父根节点开始的路口，当前还不包含自己的id
+     * @param ipAddress ip地址
+     */
+    void addSysDictItem(AddDictItemVO addDictItemVo, String rootPath, String ipAddress);
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictService.java b/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictService.java
new file mode 100644
index 0000000..8b96128
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/SysDictService.java
@@ -0,0 +1,21 @@
+package com.mosty.common.config.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.vo.DictPage;
+
+/**
+ * <p>
+ * 字典类别配置表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+public interface SysDictService extends IService<SysDict> {
+
+    IPage<SysDict> selectByPage(DictPage page);
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/SysVersionManageService.java b/common-config-starter/src/main/java/com/mosty/common/config/service/SysVersionManageService.java
new file mode 100644
index 0000000..4ba57cd
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/SysVersionManageService.java
@@ -0,0 +1,25 @@
+package com.mosty.common.config.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.config.entity.SysVersionManage;
+import com.mosty.common.config.entity.vo.VersionManagePage;
+
+/**
+ * <p>
+ * 版本管理表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-21
+ */
+public interface SysVersionManageService extends IService<SysVersionManage> {
+
+    /**
+     * 版本管理功能分页
+     * @param versionManagePage 分页请求
+     * @return 分页数据
+     */
+    IPage<SysVersionManage> selectByPage(VersionManagePage versionManagePage);
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysConfigServiceImpl.java b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysConfigServiceImpl.java
new file mode 100644
index 0000000..b7c0fc8
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysConfigServiceImpl.java
@@ -0,0 +1,56 @@
+package com.mosty.common.config.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.enums.ConfigKeyEnum;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.vo.ConfigPage;
+import com.mosty.common.config.entity.vo.DictPage;
+import com.mosty.common.config.mapper.SysConfigMapper;
+import com.mosty.common.config.mapper.SysDictMapper;
+import com.mosty.common.config.service.SysConfigService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 参数配置表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-10
+ */
+@Service
+@AllArgsConstructor
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements SysConfigService {
+
+    private final SysConfigMapper sysConfigMapper;
+
+    @Override
+    public IPage<SysConfig> selectByPage(ConfigPage page) {
+        QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(page.getConfigName())) {
+            queryWrapper.and(wrapper -> wrapper.like("pzmc", page.getConfigName()));
+        }
+        if (StringUtils.isNotBlank(page.getConfigKey())) {
+            queryWrapper.and(wrapper -> wrapper.eq("pzj", page.getConfigKey()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+//        LambdaQueryWrapper<SysConfig> eq = new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getPzmc, page.getConfigName());
+        return getBaseMapper().selectPage(page, queryWrapper);
+    }
+
+    @Override
+    public SysConfig getOneByKey(ConfigKeyEnum passwordLevel) {
+        SysConfig one = this.getOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getPzj, passwordLevel.code)
+                .eq(SysConfig::getXtZxbz, DeletedEnum.NATURE.code));
+        return one;
+    }
+
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictItemServiceImpl.java b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictItemServiceImpl.java
new file mode 100644
index 0000000..c7d0090
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictItemServiceImpl.java
@@ -0,0 +1,101 @@
+package com.mosty.common.config.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.config.Excel.DictUtils;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.entity.vo.AddDictItemVO;
+import com.mosty.common.config.mapper.SysDictItemMapper;
+import com.mosty.common.config.service.SysDictItemService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 字典代码值表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements SysDictItemService {
+
+    private final SysDictItemMapper sysDictItemMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addSysDictItem(AddDictItemVO addDictItemVo, String rootPath, String ipAddress) {
+        SysDictItem one = sysDictItemMapper.selectOne(new LambdaQueryWrapper<SysDictItem>()
+                .eq(SysDictItem::getZdbh, addDictItemVo.getZdbh())
+                .eq(SysDictItem::getDm, addDictItemVo.getDm())
+                .eq(SysDictItem::getXtZxbz, "0")
+        );
+        Asserts.check(one != null, "当前字典编码 %s 下的字典代码 %s 已经存在！",
+                addDictItemVo.getZdbh(), addDictItemVo.getDm());
+        SysDictItem sysDictItem = new SysDictItem();
+        sysDictItem.setRootPath(rootPath);
+        sysDictItem.setZdId(addDictItemVo.getParentId());
+
+        sysDictItem.setZdmc(addDictItemVo.getZdmc());
+        sysDictItem.setPy(addDictItemVo.getPy());
+        sysDictItem.setPx(addDictItemVo.getPx());
+        sysDictItem.setBz(addDictItemVo.getBz());
+        sysDictItem.setDm(addDictItemVo.getDm());
+        sysDictItem.setZdbh(addDictItemVo.getZdbh());
+
+        UserInfo userInfo = UserInfoManager.get();
+        sysDictItem.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysDictItem.setXtCjsj(new Date());
+        sysDictItem.setXtZhxgsj(new Date());
+        sysDictItem.setXtZhxgrid(userInfo.getUserId().toString());
+        sysDictItem.setXtZhxgrxm(userInfo.getUserName());
+        sysDictItem.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysDictItem.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysDictItem.setXtLrsj(new Date());
+        sysDictItem.setXtLrrid(userInfo.getUserId().toString());
+        sysDictItem.setXtLrrxm(userInfo.getUserName());
+        sysDictItem.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysDictItem.setXtLrrbm(userInfo.getDeptName());
+
+        sysDictItem.setXtLrip(ipAddress);
+        sysDictItem.setXtZhxgip(ipAddress);
+        // 先保存信息，返回当前的主键id
+        sysDictItemMapper.insert(sysDictItem);
+
+        // 根据主键id，修改rootPath
+        SysDictItem updateEntity = new SysDictItem();
+        updateEntity.setRootPath(sysDictItem.getRootPath() + sysDictItem.getId());
+        updateEntity.setId(sysDictItem.getId());
+        int row = sysDictItemMapper.updateById(updateEntity);
+        if (row > 0) {
+            List<SysDictItem> dictDatas = sysDictItemMapper.selectList(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getXtZxbz, 0)
+                    .eq(SysDictItem::getZdbh, sysDictItem.getZdbh())
+            );
+            DictUtils.setDictCache(sysDictItem.getZdbh(), dictDatas);
+        }
+
+
+    }
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictServiceImpl.java b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictServiceImpl.java
new file mode 100644
index 0000000..0a00c25
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysDictServiceImpl.java
@@ -0,0 +1,43 @@
+package com.mosty.common.config.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.vo.DictPage;
+import com.mosty.common.config.mapper.SysDictMapper;
+import com.mosty.common.config.service.SysDictService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字典类别配置表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-09
+ */
+@Service
+@AllArgsConstructor
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
+
+    private final SysDictMapper sysDictMapper;
+
+    @Override
+    public IPage<SysDict> selectByPage(DictPage page) {
+        QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(page.getDictName())) {
+            queryWrapper.and(wrapper -> wrapper.like("zdmc", page.getDictName()));
+        }
+        if (StringUtils.isNotBlank(page.getDictCode())) {
+            queryWrapper.and(wrapper -> wrapper.like("zdbh", page.getDictCode()));
+        }
+        if (page.getXtZxbz() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", page.getXtZxbz()));
+        }
+        return getBaseMapper().selectPage(page, queryWrapper);
+    }
+
+}
diff --git a/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.java b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.java
new file mode 100644
index 0000000..2d67dec
--- /dev/null
+++ b/common-config-starter/src/main/java/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.java
@@ -0,0 +1,46 @@
+package com.mosty.common.config.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.SysVersionManage;
+import com.mosty.common.config.entity.vo.VersionManagePage;
+import com.mosty.common.config.mapper.SysVersionManageMapper;
+import com.mosty.common.config.service.SysVersionManageService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 版本管理表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-21
+ */
+@Service
+@AllArgsConstructor
+public class SysVersionManageServiceImpl extends ServiceImpl<SysVersionManageMapper, SysVersionManage> implements SysVersionManageService {
+
+    private final SysVersionManageMapper sysVersionManageMapper;
+
+    @Override
+    public IPage<SysVersionManage> selectByPage(VersionManagePage versionManagePage) {
+        QueryWrapper<SysVersionManage> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(versionManagePage.getSysVersion())) {
+            queryWrapper.and(wrapper -> wrapper.like("sys_version", versionManagePage.getSysVersion()));
+        }
+        if (StringUtils.isNotBlank(versionManagePage.getStartPublishTime())) {
+            queryWrapper.and(wrapper -> wrapper.gt("publish_time", versionManagePage.getStartPublishTime()));
+        }
+        if (StringUtils.isNotBlank(versionManagePage.getEndPublishTime())) {
+            queryWrapper.and(wrapper -> wrapper.le("publish_time", versionManagePage.getEndPublishTime()));
+        }
+        queryWrapper.and(wrapper -> wrapper.le("xt_zxbz", DeletedEnum.NATURE.code));
+        queryWrapper.orderByDesc("publish_time");
+        return getBaseMapper().selectPage(versionManagePage, queryWrapper);
+    }
+}
diff --git a/common-config-starter/src/main/resources/META-INF/spring.factories b/common-config-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..86b5520
--- /dev/null
+++ b/common-config-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.config.CommonConfigAutoConfiguration,\
+com.mosty.common.config.ConfigServiceFactory,\
+com.mosty.common.config.config.DictElementConfig,\
+com.mosty.common.config.config.SystemConfig
\ No newline at end of file
diff --git a/common-config-starter/src/main/resources/mapper/SysConfigMapper.xml b/common-config-starter/src/main/resources/mapper/SysConfigMapper.xml
new file mode 100644
index 0000000..2da6eea
--- /dev/null
+++ b/common-config-starter/src/main/resources/mapper/SysConfigMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysConfigMapper">
+
+</mapper>
diff --git a/common-config-starter/src/main/resources/mapper/SysDictItemMapper.xml b/common-config-starter/src/main/resources/mapper/SysDictItemMapper.xml
new file mode 100644
index 0000000..df53459
--- /dev/null
+++ b/common-config-starter/src/main/resources/mapper/SysDictItemMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysDictItemMapper">
+
+</mapper>
diff --git a/common-config-starter/src/main/resources/mapper/SysDictMapper.xml b/common-config-starter/src/main/resources/mapper/SysDictMapper.xml
new file mode 100644
index 0000000..6d34a17
--- /dev/null
+++ b/common-config-starter/src/main/resources/mapper/SysDictMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysDictMapper">
+
+    <select id="selectByPage" resultType="com.mosty.common.config.entity.SysDict" parameterType="com.mosty.common.config.entity.vo.DictPage">
+        select * FROM sys_dict
+        <where>
+            <if test="dictName != null and dictName != '' ">
+                zdmc like CONCAT('%',#{dictName,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="dictCode != null and dictCode != '' ">
+                zdmc = #{dictCode}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/common-config-starter/src/main/resources/mapper/SysVersionManageMapper.xml b/common-config-starter/src/main/resources/mapper/SysVersionManageMapper.xml
new file mode 100644
index 0000000..07a3ad7
--- /dev/null
+++ b/common-config-starter/src/main/resources/mapper/SysVersionManageMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysVersionManageMapper">
+
+</mapper>
diff --git a/common-config-starter/target/classes/META-INF/spring.factories b/common-config-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..86b5520
--- /dev/null
+++ b/common-config-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.config.CommonConfigAutoConfiguration,\
+com.mosty.common.config.ConfigServiceFactory,\
+com.mosty.common.config.config.DictElementConfig,\
+com.mosty.common.config.config.SystemConfig
\ No newline at end of file
diff --git a/common-config-starter/target/classes/com/mosty/common/config/CommonConfigAutoConfiguration.class b/common-config-starter/target/classes/com/mosty/common/config/CommonConfigAutoConfiguration.class
new file mode 100644
index 0000000..c75df2a
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/CommonConfigAutoConfiguration.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/ConfigServiceFactory.class b/common-config-starter/target/classes/com/mosty/common/config/ConfigServiceFactory.class
new file mode 100644
index 0000000..e3994e2
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/ConfigServiceFactory.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/Excel/DictUtils.class b/common-config-starter/target/classes/com/mosty/common/config/Excel/DictUtils.class
new file mode 100644
index 0000000..0ce1728
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/Excel/DictUtils.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelExp.class b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelExp.class
new file mode 100644
index 0000000..c55bdd8
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelExp.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtil.class b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtil.class
new file mode 100644
index 0000000..38fc6b4
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtil.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtilManySheet.class b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtilManySheet.class
new file mode 100644
index 0000000..619d165
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/Excel/ExcelUtilManySheet.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/config/DictElementConfig.class b/common-config-starter/target/classes/com/mosty/common/config/config/DictElementConfig.class
new file mode 100644
index 0000000..d3d3329
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/config/DictElementConfig.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/config/SystemConfig.class b/common-config-starter/target/classes/com/mosty/common/config/config/SystemConfig.class
new file mode 100644
index 0000000..92a1cc2
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/config/SystemConfig.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/constant/enums/DictElementEnum.class b/common-config-starter/target/classes/com/mosty/common/config/constant/enums/DictElementEnum.class
new file mode 100644
index 0000000..5b67c6d
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/constant/enums/DictElementEnum.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/controller/SysConfigController.class b/common-config-starter/target/classes/com/mosty/common/config/controller/SysConfigController.class
new file mode 100644
index 0000000..482ae60
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/controller/SysConfigController.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictController.class b/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictController.class
new file mode 100644
index 0000000..22d02fc
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictController.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictItemController.class b/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictItemController.class
new file mode 100644
index 0000000..91ba56f
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/controller/SysDictItemController.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/controller/SysVersionManageController.class b/common-config-starter/target/classes/com/mosty/common/config/controller/SysVersionManageController.class
new file mode 100644
index 0000000..1e67af6
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/controller/SysVersionManageController.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/SysConfig.class b/common-config-starter/target/classes/com/mosty/common/config/entity/SysConfig.class
new file mode 100644
index 0000000..100352e
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/SysConfig.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/SysDict.class b/common-config-starter/target/classes/com/mosty/common/config/entity/SysDict.class
new file mode 100644
index 0000000..c78b292
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/SysDict.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/SysDictItem.class b/common-config-starter/target/classes/com/mosty/common/config/entity/SysDictItem.class
new file mode 100644
index 0000000..cb227d9
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/SysDictItem.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/SysVersionManage.class b/common-config-starter/target/classes/com/mosty/common/config/entity/SysVersionManage.class
new file mode 100644
index 0000000..88a670a
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/SysVersionManage.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddDictItemVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddDictItemVO.class
new file mode 100644
index 0000000..c52aacb
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddDictItemVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddPositionVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddPositionVO.class
new file mode 100644
index 0000000..2a97d26
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddPositionVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysConfigVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysConfigVO.class
new file mode 100644
index 0000000..70ac32e
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysConfigVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysDictVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysDictVO.class
new file mode 100644
index 0000000..af6fae8
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddSysDictVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddVersionManageVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddVersionManageVO.class
new file mode 100644
index 0000000..f8d291b
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/AddVersionManageVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/ConfigPage.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/ConfigPage.class
new file mode 100644
index 0000000..d75302d
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/ConfigPage.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DeleteVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DeleteVO.class
new file mode 100644
index 0000000..18590c3
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DeleteVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DictPage.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DictPage.class
new file mode 100644
index 0000000..fca2c5d
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/DictPage.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditDictItemVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditDictItemVO.class
new file mode 100644
index 0000000..354ea1c
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditDictItemVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditPositionVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditPositionVO.class
new file mode 100644
index 0000000..657265b
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditPositionVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysConfigVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysConfigVO.class
new file mode 100644
index 0000000..e21e1e0
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysConfigVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictItemVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictItemVO.class
new file mode 100644
index 0000000..869c266
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictItemVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictVO.class
new file mode 100644
index 0000000..e8ca663
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditSysDictVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditVersionManageVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditVersionManageVO.class
new file mode 100644
index 0000000..5c9164c
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/EditVersionManageVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictItemVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictItemVO.class
new file mode 100644
index 0000000..3265475
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictItemVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryPage.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryPage.class
new file mode 100644
index 0000000..2a59ed2
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryPage.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryVo.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryVo.class
new file mode 100644
index 0000000..7dfd9ea
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictQueryVo.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictVO.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictVO.class
new file mode 100644
index 0000000..0d0a811
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/SysDictVO.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/entity/vo/VersionManagePage.class b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/VersionManagePage.class
new file mode 100644
index 0000000..2d12d67
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/entity/vo/VersionManagePage.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/mapper/SysConfigMapper.class b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysConfigMapper.class
new file mode 100644
index 0000000..846cc06
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysConfigMapper.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictItemMapper.class b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictItemMapper.class
new file mode 100644
index 0000000..4b64870
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictItemMapper.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictMapper.class b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictMapper.class
new file mode 100644
index 0000000..376d455
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysDictMapper.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/mapper/SysVersionManageMapper.class b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysVersionManageMapper.class
new file mode 100644
index 0000000..4e17431
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/mapper/SysVersionManageMapper.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/SysConfigService.class b/common-config-starter/target/classes/com/mosty/common/config/service/SysConfigService.class
new file mode 100644
index 0000000..8aaab36
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/SysConfigService.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/SysDictItemService.class b/common-config-starter/target/classes/com/mosty/common/config/service/SysDictItemService.class
new file mode 100644
index 0000000..175fc50
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/SysDictItemService.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/SysDictService.class b/common-config-starter/target/classes/com/mosty/common/config/service/SysDictService.class
new file mode 100644
index 0000000..8607685
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/SysDictService.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/SysVersionManageService.class b/common-config-starter/target/classes/com/mosty/common/config/service/SysVersionManageService.class
new file mode 100644
index 0000000..cbf9c5c
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/SysVersionManageService.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysConfigServiceImpl.class b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysConfigServiceImpl.class
new file mode 100644
index 0000000..dde35e7
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysConfigServiceImpl.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictItemServiceImpl.class b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictItemServiceImpl.class
new file mode 100644
index 0000000..4283cfc
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictItemServiceImpl.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictServiceImpl.class b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictServiceImpl.class
new file mode 100644
index 0000000..7687e44
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysDictServiceImpl.class differ
diff --git a/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.class b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.class
new file mode 100644
index 0000000..412242a
Binary files /dev/null and b/common-config-starter/target/classes/com/mosty/common/config/service/impl/SysVersionManageServiceImpl.class differ
diff --git a/common-config-starter/target/classes/mapper/SysConfigMapper.xml b/common-config-starter/target/classes/mapper/SysConfigMapper.xml
new file mode 100644
index 0000000..2da6eea
--- /dev/null
+++ b/common-config-starter/target/classes/mapper/SysConfigMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysConfigMapper">
+
+</mapper>
diff --git a/common-config-starter/target/classes/mapper/SysDictItemMapper.xml b/common-config-starter/target/classes/mapper/SysDictItemMapper.xml
new file mode 100644
index 0000000..df53459
--- /dev/null
+++ b/common-config-starter/target/classes/mapper/SysDictItemMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysDictItemMapper">
+
+</mapper>
diff --git a/common-config-starter/target/classes/mapper/SysDictMapper.xml b/common-config-starter/target/classes/mapper/SysDictMapper.xml
new file mode 100644
index 0000000..6d34a17
--- /dev/null
+++ b/common-config-starter/target/classes/mapper/SysDictMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysDictMapper">
+
+    <select id="selectByPage" resultType="com.mosty.common.config.entity.SysDict" parameterType="com.mosty.common.config.entity.vo.DictPage">
+        select * FROM sys_dict
+        <where>
+            <if test="dictName != null and dictName != '' ">
+                zdmc like CONCAT('%',#{dictName,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="dictCode != null and dictCode != '' ">
+                zdmc = #{dictCode}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/common-config-starter/target/classes/mapper/SysVersionManageMapper.xml b/common-config-starter/target/classes/mapper/SysVersionManageMapper.xml
new file mode 100644
index 0000000..07a3ad7
--- /dev/null
+++ b/common-config-starter/target/classes/mapper/SysVersionManageMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.config.mapper.SysVersionManageMapper">
+
+</mapper>
diff --git a/common-config-starter/target/common-config-starter-1.0.0-SNAPSHOT.jar b/common-config-starter/target/common-config-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..ae3f404
Binary files /dev/null and b/common-config-starter/target/common-config-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-config-starter/target/maven-archiver/pom.properties b/common-config-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..32f2ba7
--- /dev/null
+++ b/common-config-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:15 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-config-starter
diff --git a/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..fef343b
--- /dev/null
+++ b/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,48 @@
+com\mosty\common\config\CommonConfigAutoConfiguration.class
+com\mosty\common\config\entity\vo\EditSysDictVO.class
+com\mosty\common\config\controller\SysConfigController.class
+com\mosty\common\config\config\DictElementConfig.class
+com\mosty\common\config\service\impl\SysVersionManageServiceImpl.class
+com\mosty\common\config\entity\vo\AddVersionManageVO.class
+com\mosty\common\config\mapper\SysVersionManageMapper.class
+com\mosty\common\config\entity\SysConfig.class
+com\mosty\common\config\ConfigServiceFactory.class
+com\mosty\common\config\controller\SysDictController.class
+com\mosty\common\config\service\impl\SysDictItemServiceImpl.class
+com\mosty\common\config\mapper\SysDictItemMapper.class
+com\mosty\common\config\service\impl\SysDictServiceImpl.class
+com\mosty\common\config\Excel\ExcelUtilManySheet.class
+com\mosty\common\config\entity\vo\EditSysDictItemVO.class
+com\mosty\common\config\entity\vo\AddSysConfigVO.class
+com\mosty\common\config\Excel\ExcelExp.class
+com\mosty\common\config\entity\SysDict.class
+com\mosty\common\config\entity\vo\SysDictQueryPage.class
+com\mosty\common\config\entity\vo\VersionManagePage.class
+com\mosty\common\config\controller\SysVersionManageController.class
+com\mosty\common\config\entity\vo\SysDictQueryVo.class
+com\mosty\common\config\mapper\SysConfigMapper.class
+com\mosty\common\config\service\SysDictService.class
+com\mosty\common\config\service\SysVersionManageService.class
+com\mosty\common\config\controller\SysDictItemController.class
+com\mosty\common\config\entity\vo\AddDictItemVO.class
+com\mosty\common\config\Excel\ExcelUtil.class
+com\mosty\common\config\service\SysConfigService.class
+com\mosty\common\config\entity\vo\EditDictItemVO.class
+com\mosty\common\config\entity\vo\SysDictItemVO.class
+com\mosty\common\config\entity\SysVersionManage.class
+com\mosty\common\config\constant\enums\DictElementEnum.class
+com\mosty\common\config\config\SystemConfig.class
+com\mosty\common\config\entity\vo\EditPositionVO.class
+com\mosty\common\config\entity\vo\AddPositionVO.class
+com\mosty\common\config\entity\vo\EditVersionManageVO.class
+com\mosty\common\config\entity\vo\AddSysDictVO.class
+com\mosty\common\config\entity\SysDictItem.class
+com\mosty\common\config\mapper\SysDictMapper.class
+com\mosty\common\config\entity\vo\EditSysConfigVO.class
+com\mosty\common\config\service\impl\SysConfigServiceImpl.class
+com\mosty\common\config\entity\vo\SysDictVO.class
+com\mosty\common\config\entity\vo\ConfigPage.class
+com\mosty\common\config\Excel\DictUtils.class
+com\mosty\common\config\entity\vo\DeleteVO.class
+com\mosty\common\config\entity\vo\DictPage.class
+com\mosty\common\config\service\SysDictItemService.class
diff --git a/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..cf731cb
--- /dev/null
+++ b/common-config-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,48 @@
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\controller\SysConfigController.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditPositionVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\SysDictVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditVersionManageVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\CommonConfigAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\SysDict.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\mapper\SysConfigMapper.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\ConfigServiceFactory.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditSysDictVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\mapper\SysVersionManageMapper.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\SysVersionManage.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\config\DictElementConfig.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\ConfigPage.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\AddVersionManageVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\impl\SysVersionManageServiceImpl.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\SysDictItem.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\controller\SysDictItemController.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\AddSysDictVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\SysDictQueryPage.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\SysDictItemService.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\SysDictService.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\AddDictItemVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditSysConfigVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\config\SystemConfig.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\Excel\ExcelUtil.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\impl\SysDictServiceImpl.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\Excel\ExcelUtilManySheet.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\DeleteVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditDictItemVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\SysDictItemVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\EditSysDictItemVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\Excel\ExcelExp.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\AddSysConfigVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\AddPositionVO.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\SysConfigService.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\SysVersionManageService.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\constant\enums\DictElementEnum.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\SysDictQueryVo.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\Excel\DictUtils.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\mapper\SysDictMapper.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\impl\SysConfigServiceImpl.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\SysConfig.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\VersionManagePage.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\service\impl\SysDictItemServiceImpl.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\controller\SysDictController.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\mapper\SysDictItemMapper.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\controller\SysVersionManageController.java
+C:\tools\dy外网\mosty-common\common-config-starter\src\main\java\com\mosty\common\config\entity\vo\DictPage.java
diff --git a/common-core-starter/common-core-starter.iml b/common-core-starter/common-core-starter.iml
new file mode 100644
index 0000000..c70e5ea
--- /dev/null
+++ b/common-core-starter/common-core-starter.iml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-config-starter" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.12" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-core-starter/pom.xml b/common-core-starter/pom.xml
new file mode 100644
index 0000000..cad3794
--- /dev/null
+++ b/common-core-starter/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-core-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <shiro.version>1.8.0</shiro.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-config-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--Shiro核心框架 -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+        </dependency>
+
+        <!-- Shiro使用EhCache缓存框架 -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-ehcache</artifactId>
+        </dependency>
+
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+
+        <!--验证码 -->
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <version>${kaptcha.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <!-- minio文件服务 -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.12</version>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/CoreAutoConfiguration.java b/common-core-starter/src/main/java/com/mosty/common/core/CoreAutoConfiguration.java
new file mode 100644
index 0000000..7a2e9c0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/CoreAutoConfiguration.java
@@ -0,0 +1,16 @@
+package com.mosty.common.core;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *
+ * @author kevin
+ * @date 2022/2/3 7:28 PM
+ * @since 1.0.0
+ */
+@Configuration
+@MapperScan("com.mosty.common.core.business.mapper")
+public class CoreAutoConfiguration {
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigController.java
new file mode 100644
index 0000000..7654249
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigController.java
@@ -0,0 +1,107 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysAppHomeconfig;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.service.SysAppHomeconfigService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app首页接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysAppHomeconfig")
+public class SysAppHomeconfigController {
+
+    private SysAppHomeconfigService sysAppHomeconfigService;
+
+    /**
+     * 添加首页应用
+     * @param configVO 部门
+     * @return 添加结果
+     */
+    @PostMapping("addAppHome")
+    @JwtSysUser
+    @ApiOperation(value = "添加首页应用", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addApp(@RequestBody @Valid SysAppHomeconfigVO configVO,
+                                              HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigService.saveInfo(configVO, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改首页
+     * @param configVO 首页信息
+     * @return 修改结果
+     */
+    @PostMapping("updateAppHome")
+    @JwtSysUser
+    @Log(title = "首页应用",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改首页", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateAppHome(@RequestBody @Valid SysAppHomeconfigVO configVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigService.updateInfo(configVO, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除应用信息
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "应用功能",businessType = BusinessType.DELETE)
+    @PostMapping("deleteApp")
+    @JwtSysUser
+    @ApiOperation(value = "删除应用信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteApp(@RequestBody List<Long> list,
+                                                 HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysAppHomeconfigService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysAppHomeconfig>> selectPage(SysAppHomeconfigPage deptPage) {
+        IPage<SysAppHomeconfig> deptIPage = sysAppHomeconfigService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @GetMapping("queryConfig")
+    @ApiOperation(value = "查询应用配置", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<SysAppHomeconfigRsVO> queryConfig(SysAppHomeconfigQuery configQuery) {
+        SysAppHomeconfigRsVO vo = sysAppHomeconfigService.queryConfig(configQuery);
+        return ResponseResult.success(vo);
+    }
+
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.java
new file mode 100644
index 0000000..8ec4c1c
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.java
@@ -0,0 +1,127 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlatePage;
+import com.mosty.common.core.business.service.SysAppHomeconfigPlateService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页-板块表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app首页板块接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysAppHomeconfigPlate")
+public class SysAppHomeconfigPlateController {
+
+    private SysAppHomeconfigPlateService sysAppHomeconfigPlateService;
+
+    /**
+     * 添加首页应用
+     * @param plate 部门
+     * @return 添加结果
+     */
+    @PostMapping("addPlate")
+    @JwtSysUser
+    @ApiOperation(value = "添加首页应用板块", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addPlate(@RequestBody @Valid SysAppHomeconfigPlate plate,
+                                          HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateService.saveInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 添加首页应用
+     * @param plates 部门
+     * @return 添加结果
+     */
+    @PostMapping("addBatch")
+    @JwtSysUser
+    @ApiOperation(value = "批量添加首页应用板块", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "批量添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addPlateBatch(@RequestBody List<SysAppHomeconfigPlate> plates,
+                                            HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateService.saveInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改首页板块
+     * @param plate 首页板块信息
+     * @return 修改结果
+     */
+    @PostMapping("updatePlate")
+    @JwtSysUser
+    @Log(title = "首页应用板块",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改首页应用板块", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updatePlate(@RequestBody @Valid SysAppHomeconfigPlate plate,
+                                             HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateService.updateInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 批量修改首页应用板块
+     * @param plates 首页板块信息
+     * @return 修改结果
+     */
+    @PostMapping("updateBatch")
+    @JwtSysUser
+    @Log(title = "批量修改首页应用板块",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "批量修改首页应用板块", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateBatch(@RequestBody List<SysAppHomeconfigPlate> plates, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateService.updateInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除应用板块信息
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "删除应用板块功能",businessType = BusinessType.DELETE)
+    @PostMapping("deletePlate")
+    @JwtSysUser
+    @ApiOperation(value = "删除应用信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deletePlate(@RequestBody List<Long> list,
+                                                 HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysAppHomeconfigPlateService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysAppHomeconfigPlate>> selectPage(SysAppHomeconfigPlatePage deptPage) {
+        IPage<SysAppHomeconfigPlate> deptIPage = sysAppHomeconfigPlateService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.java
new file mode 100644
index 0000000..78d36b7
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.java
@@ -0,0 +1,127 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.service.SysAppHomeconfigPlateListService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页配置-板块内容表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app板块内容接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysAppHomeconfigPlatelList")
+public class SysAppHomeconfigPlateListController {
+
+    private SysAppHomeconfigPlateListService sysAppHomeconfigPlateListService;
+
+    /**
+     * 添加首页应用板块内容
+     * @param plate 部门
+     * @return 添加结果
+     */
+    @PostMapping("addPlate")
+    @JwtSysUser
+    @ApiOperation(value = "添加首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addPlate(@RequestBody SysAppHomeconfigPlateList plate,
+                                            HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateListService.saveInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 添加首页应用板块内容
+     * @param plates 部门
+     * @return 添加结果
+     */
+    @PostMapping("addBatch")
+    @JwtSysUser
+    @ApiOperation(value = "批量添加首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "批量添加首页应用板块内容",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addPlateBatch(@RequestBody List<SysAppHomeconfigPlateList> plates,
+                                                 HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateListService.saveInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改首页板块
+     * @param plate 首页板块内容信息
+     * @return 修改结果
+     */
+    @PostMapping("updatePlate")
+    @JwtSysUser
+    @Log(title = "首页应用板块内容",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updatePlate(@RequestBody @Valid SysAppHomeconfigPlateList plate,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateListService.updateInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 批量修改首页应用板块内容
+     * @param plates 首页板块信息内容
+     * @return 修改结果
+     */
+    @PostMapping("updateBatch")
+    @JwtSysUser
+    @Log(title = "批量修改首页应用板块内容",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "批量修改首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateBatch(@RequestBody List<SysAppHomeconfigPlateList> plates, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysAppHomeconfigPlateListService.updateInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除应用板块信息内容
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "删除应用板块内容功能",businessType = BusinessType.DELETE)
+    @PostMapping("deletePlate")
+    @JwtSysUser
+    @ApiOperation(value = "删除应用板块内容功能", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deletePlate(@RequestBody List<Long> list,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysAppHomeconfigPlateListService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysAppHomeconfigPlateList>> selectPage(SysAppHomeconfigPlateListPage deptPage) {
+        IPage<SysAppHomeconfigPlateList> deptIPage = sysAppHomeconfigPlateListService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysDeptController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysDeptController.java
new file mode 100644
index 0000000..299b2e4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysDeptController.java
@@ -0,0 +1,227 @@
+package com.mosty.common.core.business.controller;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.service.SysDeptService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Slf4j
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysDept")
+@Api(tags = "部门信息接口")
+public class SysDeptController {
+
+    private final SysDeptService sysDeptService;
+
+    @PostMapping("addSysDept")
+    @JwtSysUser
+    @ApiOperation(value = "添加部门", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "部门功能-添加部门", businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addSysDept(@RequestBody @Valid AddDeptVO addDeptVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysDeptService.saveInfo(addDeptVO, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @PostMapping("updateSysDept")
+    @JwtSysUser
+    @Log(title = "部门功能-修改部门", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改部门", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysDept(@RequestBody @Valid SysDeptVO sysDept, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysDeptService.updateInfo(sysDept, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @Log(title = "部门功能-删除部门信息", businessType = BusinessType.DELETE)
+    @PostMapping("deleteSysDept")
+    @JwtSysUser
+    @ApiOperation(value = "删除部门信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysDept(@RequestBody DeleteDeptVO deleteDeptVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        UserInfo userInfo = UserInfoManager.get();
+        sysDeptService.delete(deleteDeptVO, ipAddress, userInfo);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询部门信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysDept>> selectPage(DeptPage deptPage) {
+
+        IPage<SysDept> deptIPage = sysDeptService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @PostMapping("getChildDeptList")
+    @ApiOperation(value = "查询子部门集合", httpMethod = "POST", response = SysDeptVO.class)
+    public ResponseResult<List<SysDeptVO>> getChildDeptList(Long deptId) {
+        List<SysDept> list = sysDeptService.getChildDeptList(deptId);
+
+        List<SysDeptVO> resultList = Lists.newArrayList();
+        if (CollectionUtils.isNotEmpty(list)) {
+            resultList = BeanUtil.copyToList(resultList, SysDeptVO.class);
+        }
+        return ResponseResult.success(resultList);
+    }
+
+    @GetMapping("getChildDeptList")
+    @ApiOperation(value = "查询子部门集合", httpMethod = "POST", response = SysDeptVO.class)
+    public ResponseResult<SysDeptVO> getDeptByOrgCode(@RequestParam("orgCode") String orgCode) {
+        Asserts.check(StringUtils.isBlank(orgCode), "查询的组织机构编码不能为空！");
+        SysDept sysDept = sysDeptService.getDeptByOrgCode(orgCode);
+        Asserts.check(sysDept == null, "组织机构编码对应的部门不存在！");
+        SysDeptVO sysDeptVO = BeanUtil.copyProperties(sysDept, SysDeptVO.class);
+        return ResponseResult.success(sysDeptVO);
+    }
+
+    @JwtSysUser
+    @PostMapping("getRootDept")
+    @ApiOperation(value = "获取当前token对应的部门信息", httpMethod = "POST", response = SysDeptVO.class)
+    public ResponseResult<SysDeptVO> getRootDept(/*Long deptId*/) {
+        UserInfo userInfo = UserInfoManager.get();
+        SysDept sysDept = sysDeptService.getById(userInfo.getDeptId());
+        Asserts.check(sysDept == null || DeletedEnum.DELETED.code.equals(sysDept.getXtZxbz()),
+                "部门不存在，请重新登陆");
+        SysDeptVO sysDeptVO = BeanUtil.copyProperties(sysDept, SysDeptVO.class);
+        return ResponseResult.success(sysDeptVO);
+    }
+
+    @JwtSysUser
+    // @PostMapping("getAllChildDeptList")
+    @ApiOperation(value = "查询所有子部门树", httpMethod = "POST", response = SysDeptVO.class)
+    public ResponseResult<SysDeptVO> getAllChildDeptList(@RequestBody DeptTreeVO deptTreeVO) {
+        UserInfo userInfo = UserInfoManager.get();
+        SysDept sysDept = sysDeptService.getById(userInfo.getDeptId());
+        Asserts.check(sysDept == null || DeletedEnum.DELETED.code.equals(sysDept.getXtZxbz()),
+                "部门不存在，请求重新登陆");
+        SysDeptVO rootSysDeptVo = sysDeptService.getAllChildDeptList(sysDept, deptTreeVO);
+        return ResponseResult.success(rootSysDeptVo);
+    }
+
+    @GetMapping("selectUserPageByDept")
+    @ApiOperation(value = "分页查询部门下用户信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<UserDeptVO>> selectUserPageByDept(UserByDeptPage userByDeptPage) {
+        IPage<UserDeptVO> deptIPage = sysDeptService.selectUserPageByDept(userByDeptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @GetMapping("selectRolePageByDept")
+    @ApiOperation(value = "分页查询部门下角色信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<RoleDeptVO>> selectRolePageByDept(RoleByDeptPage roleByDeptPage) {
+        IPage<RoleDeptVO> deptIPage = sysDeptService.selectRolePageByDept(roleByDeptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @PostMapping("saveUserDeptInfo")
+    @JwtSysUser
+    @Log(title = "部门功能", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "添加用户部门关联关系", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> saveUserDeptInfo(@RequestBody AddUserDeptVO addUserDeptVO) {
+        sysDeptService.saveUserDeptInfo(addUserDeptVO);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @PostMapping("saveRoleDeptInfo")
+    @JwtSysUser
+    @Log(title = "部门功能", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "添加角色部门关联关系", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> saveRoleDeptInfo(@RequestBody AddRoleDeptVO roleDeptVO) {
+        sysDeptService.saveRoleDeptInfo(roleDeptVO);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @PostMapping("deleteUserDeptInfo")
+    @JwtSysUser
+    @Log(title = "部门功能", businessType = BusinessType.OTHER)
+    @ApiOperation(value = "删除用户部门关联关系", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteUserDeptInfo(@RequestBody DeleteUserDeptVO deleteUserDeptVO) {
+        sysDeptService.deleteUserDeptInfo(deleteUserDeptVO);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @JwtSysUser
+    @GetMapping("selectDept")
+    @ApiOperation(value = "查询部门列表信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<List<SysDept>> selectDept(DeptQuery dto) {
+        return ResponseResult.success(sysDeptService.selectDept(dto));
+    }
+
+
+//    @PostMapping("deleteRoleDeptInfo")
+//    @JwtSysUser
+//    @Log(title = "部门功能", businessType = BusinessType.OTHER)
+//    @ApiOperation(value = "删除角色部门关联关系", httpMethod = "POST", response = Boolean.class)
+//    public ResponseResult<Boolean> deleteRoleDeptInfo(@RequestBody DeleteRoleDeptVO deleteRoleDeptVO) {
+//        sysDeptService.deleteRoleDeptInfo(deleteRoleDeptVO);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    @JwtSysUser
+//    @GetMapping("selectNextPage")
+//    @ApiOperation(value = "根据部门编码分页查询当前及下级部门信息", httpMethod = "GET", response = SysDept.class)
+//    public ResponseResult<IPage<SysDept>> selectNextPage(DeptPage deptPage) {
+//        IPage<SysDept> deptIPage = sysDeptService.selectNextPage(deptPage);
+//        return ResponseResult.success(deptIPage);
+//    }
+
+    @GetMapping("getDeptList")
+    @ApiOperation(value = "根据部门编码分页查询当前及下级部门信息--第三方接口", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysDept>> getDeptList(DeptPage deptPage) {
+        IPage<SysDept> deptIPage = sysDeptService.getDeptList(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @GetMapping("deptSys")
+    @ApiOperation(value = "部门信息同步", httpMethod = "GET", response = Boolean.class)
+    public ResponseResult<Boolean> deptSys() {
+        Boolean bool = sysDeptService.deptSys();
+        return ResponseResult.success(bool);
+    }
+
+    @ApiOperation("查询部门下的所有子部门信息")
+    @GetMapping("getChildDept/{deptid}")
+    public ResponseResult<List<String>> getChildDept(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(this.sysDeptService.getChildDept(deptid));
+    }
+
+    @ApiOperation("查询部门下的所有子部门信息")
+    @GetMapping("getChildDeptByOrgCode/{orgcode}")
+    public ResponseResult<List<String>> getChildDeptByOrgCode(@PathVariable("orgcode") String orgcode) {
+        return ResponseResult.success(this.sysDeptService.getChildDeptByOrgCode(orgcode));
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysLogininforController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysLogininforController.java
new file mode 100644
index 0000000..d005362
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysLogininforController.java
@@ -0,0 +1,75 @@
+package com.mosty.common.core.business.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.core.business.entity.SysLogininfor;
+import com.mosty.common.core.business.entity.request.LoginLogPage;
+import com.mosty.common.core.business.entity.vo.DeleteListVO;
+import com.mosty.common.core.business.service.SysLogininforService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Slf4j
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysLoginLog")
+@Api(tags = "登录日志")
+public class SysLogininforController {
+
+    private final SysLogininforService sysLogininforService;
+
+    @PostMapping("/list")
+    @JwtSysUser
+    @Log(title = "查询登录日志列表", businessType = BusinessType.DELETE)
+    public ResponseResult<IPage<SysLogininfor>> list(@RequestBody LoginLogPage loginLogPage) {
+        IPage<SysLogininfor> sysOperLogPage = sysLogininforService.selectByPage(loginLogPage);
+        return ResponseResult.success(sysOperLogPage);
+    }
+
+    @Log(title = "登录日志删除", businessType = BusinessType.OTHER)
+    @PostMapping("/remove")
+    public ResponseResult<Boolean> remove(@RequestBody  DeleteListVO vo) {
+        sysLogininforService.deleteOperLogByIds(vo.getIds());
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("/detail/{id}")
+    public ResponseResult<SysLogininfor> detail(@PathVariable("id") Long id) {
+        SysLogininfor log = sysLogininforService.getOne(new LambdaQueryWrapper<SysLogininfor>()
+                .eq(SysLogininfor::getInfoId,id));
+        return ResponseResult.success(log);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @PostMapping("/clean")
+    @ResponseBody
+    public ResponseResult<Boolean> clean() {
+        sysLogininforService.cleanOperLog();
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+
+//    @Log(title = "导出巡防力量", businessType = BusinessType.EXPORT)
+//    @PostMapping("/exportZY")
+//    @JwtSysUser
+//    public void export(HttpServletResponse response) {
+//        List<SysLogininfor> list = sysLogininforService.export();
+//        ExcelUtil<SysLogininfor> util = new ExcelUtil<
+//                >(SysLogininfor.class);
+//        util.exportExcel(response, list, "登录日志");
+//    }
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysMenuController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysMenuController.java
new file mode 100644
index 0000000..b45644d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysMenuController.java
@@ -0,0 +1,186 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.constant.enums.MenuTypeEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.vo.DeleteVO;
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.business.entity.vo.AddSysMenuVO;
+import com.mosty.common.core.business.entity.vo.EditSysMenuVO;
+import com.mosty.common.core.business.entity.vo.MenuPage;
+import com.mosty.common.core.business.entity.vo.MenuQuery;
+import com.mosty.common.core.business.service.SysMenuService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 菜单表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@SuppressWarnings("unused")
+@RequestMapping("/sysMenu")
+@Api(tags = "菜单信息接口")
+public class SysMenuController {
+
+    private final SysMenuService sysMenuService;
+
+    /**
+     * 添加菜单
+     * @param addSysMenuVo 添加菜单请求
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addSysMenu")
+    @Log(title = "菜单功能",businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加菜单", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysMenu(@RequestBody @Valid AddSysMenuVO addSysMenuVo) {
+
+        MenuTypeEnum menuTypeEnum = MenuTypeEnum.valueOf(addSysMenuVo.getMenuType());
+        Asserts.check(menuTypeEnum == null, "菜单类型有误，请检查");
+      /*  Asserts.check(menuTypeEnum == MenuTypeEnum.RESOURCE && StringUtils.isNotBlank(addSysMenuVo.getMenuUrl()),
+                "资源类型菜单不能配置url地址");*/
+
+        String menuCode = addSysMenuVo.getMenuCode();
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("menu_code", menuCode);
+        queryWrapper.eq("xt_zxbz", DeletedEnum.NATURE.code);
+        List<SysMenu> list = sysMenuService.list(queryWrapper);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "菜单编码%s已存在，请修改", menuCode);
+
+        SysMenu parentMenu = null;
+        if (addSysMenuVo.getParentId() != null) {
+            parentMenu = sysMenuService.getById(addSysMenuVo.getParentId());
+            Asserts.check(parentMenu == null || DeletedEnum.DELETED.code.equals(parentMenu.getXtZxbz()),
+                    "父菜单不存在或已删除");
+        }
+        // 添加菜单信息
+        sysMenuService.addSysMenuInfo(addSysMenuVo, parentMenu);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改菜单
+     * @param editSysMenuVo 修改菜单请求
+     * @return 修改结果
+     */
+    @JwtSysUser
+    @Log(title = "菜单功能",businessType = BusinessType.UPDATE)
+    @PostMapping("updateSysMenu")
+    @ApiOperation(value = "修改菜单", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysMenu(@RequestBody @Valid EditSysMenuVO editSysMenuVo) {
+        Asserts.check(editSysMenuVo.getId() == null, "主键id不能为空！");
+        SysMenu oldSysMenu = sysMenuService.getBaseMapper().selectById(editSysMenuVo.getId());
+        Asserts.check(oldSysMenu == null, "主键为 %s 的菜单信息不存在", editSysMenuVo.getId());
+
+        String menuCode = editSysMenuVo.getMenuCode();
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("id", editSysMenuVo.getId());
+        queryWrapper.eq("menu_code", menuCode);
+        queryWrapper.eq("xt_zxbz", DeletedEnum.NATURE.code);
+        List<SysMenu> list = sysMenuService.list(queryWrapper);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "菜单编码%s已存在，请修改", menuCode);
+
+        oldSysMenu.setMenuName(editSysMenuVo.getMenuName());
+        oldSysMenu.setMenuCode(editSysMenuVo.getMenuCode());
+        oldSysMenu.setMenuUrl(editSysMenuVo.getMenuUrl());
+
+        oldSysMenu.setOrderNo(editSysMenuVo.getOrderNo());
+        oldSysMenu.setShowMode(editSysMenuVo.getShowMode());
+        oldSysMenu.setBz(editSysMenuVo.getBz());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+        oldSysMenu.setXtZhxgsj(new Date());
+        oldSysMenu.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysMenu.setXtZhxgrxm(userInfo.getUserName());
+        oldSysMenu.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysMenu.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysMenu.setXtZhxgip(ipAddress);
+
+        sysMenuService.getBaseMapper().updateById(oldSysMenu);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除菜单信息
+     * @param deleteVO 菜单id
+     * @return 删除结果
+     */
+    @PostMapping("deleteSysMenu")
+    @JwtSysUser
+    @Log(title = "菜单功能",businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除菜单信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysMenu(@RequestBody DeleteVO deleteVO) {
+        SysMenu oldSysMenu = sysMenuService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(oldSysMenu == null, "主键为 %s 的岗位信息不存在", deleteVO.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+        oldSysMenu.setXtZhxgsj(new Date());
+        oldSysMenu.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysMenu.setXtZhxgrxm(userInfo.getUserName());
+        oldSysMenu.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysMenu.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysMenu.setXtZhxgip(ipAddress);
+
+        oldSysMenu.setXtZxbz(DeletedEnum.DELETED.code);
+        oldSysMenu.setXtZxyy(deleteVO.getZxyy());
+
+        sysMenuService.getBaseMapper().updateById(oldSysMenu);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询菜单信息", httpMethod = "GET", response = SysMenu.class)
+    public ResponseResult<IPage<SysMenu>> selectPage(MenuPage positionPage) {
+        IPage<SysMenu> positionIPage = sysMenuService.selectByPage(positionPage);
+        return ResponseResult.success(positionIPage);
+    }
+
+    @GetMapping("getMenuChild/{menuId}")
+    @ApiOperation(value = "根据菜单id查询菜单和子页面信息", httpMethod = "GET", response = SysMenu.class)
+    public ResponseResult<SysMenu> getMenuChild(@PathVariable("menuId") Long menuId) {
+       SysMenu menus= sysMenuService.getMenuChild(menuId);
+        return ResponseResult.success(menus);
+    }
+
+    @GetMapping("selectList")
+    @ApiOperation(value = "查询菜单信息树形", httpMethod = "GET", response = SysMenu.class)
+    public ResponseResult<List<SysMenu>> selectList(MenuQuery menuQuery) {
+        List<SysMenu> menus = sysMenuService.selectList(menuQuery);
+        return ResponseResult.success(menus);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysPositionController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysPositionController.java
new file mode 100644
index 0000000..057831d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysPositionController.java
@@ -0,0 +1,153 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.vo.AddPositionVO;
+import com.mosty.common.config.entity.vo.DeleteVO;
+import com.mosty.common.config.entity.vo.EditPositionVO;
+import com.mosty.common.core.business.entity.SysPosition;
+import com.mosty.common.core.business.entity.vo.PositionPage;
+import com.mosty.common.core.business.service.SysPositionService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * <p>
+ * 岗位表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@SuppressWarnings("unused")
+@RequestMapping("/sysPosition")
+@Api(tags = "岗位信息接口")
+public class SysPositionController {
+
+    private final SysPositionService sysPositionService;
+
+    /**
+     * 添加岗位
+     * @param addPositionVO 添加岗位请求
+     * @return 添加结果
+     */
+    @JwtSysUser
+    @PostMapping("addSysPosition")
+    @Log(title = "岗位功能",businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加岗位", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysPosition(@RequestBody @Valid AddPositionVO addPositionVO) {
+
+        SysPosition position = new SysPosition();
+
+        position.setPostDesc(addPositionVO.getPostDesc());
+        position.setPostCode(addPositionVO.getPostCode());
+        position.setPostName(addPositionVO.getPostName());
+        position.setBz(addPositionVO.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+        position.setXtZxbz(DeletedEnum.NATURE.code);
+
+        position.setXtCjsj(new Date());
+        position.setXtZhxgsj(new Date());
+        position.setXtZhxgrid(userInfo.getUserId().toString());
+        position.setXtZhxgrxm(userInfo.getUserName());
+        position.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        position.setXtZhxgrbm(userInfo.getDeptName());
+
+        position.setXtLrsj(new Date());
+        position.setXtLrrid(userInfo.getUserId().toString());
+        position.setXtLrrxm(userInfo.getUserName());
+        position.setXtLrrbmid(userInfo.getDeptId().toString());
+        position.setXtLrrbm(userInfo.getDeptName());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        position.setXtLrip(ipAddress);
+        position.setXtZhxgip(ipAddress);
+
+        sysPositionService.getBaseMapper().insert(position);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改岗位
+     * @param editPositionVO 修改岗位请求
+     * @return 修改结果
+     */
+    @JwtSysUser
+    @PostMapping("updateSysPosition")
+    @Log(title = "岗位功能",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改岗位", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysPosition(@RequestBody @Valid EditPositionVO editPositionVO) {
+        Asserts.check(editPositionVO.getId() == null, "主键id不能为空！");
+        SysPosition oldSysPosition = sysPositionService.getBaseMapper().selectById(editPositionVO.getId());
+        Asserts.check(oldSysPosition == null, "主键为 %s 的岗位信息不存在", editPositionVO.getId());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        oldSysPosition.setXtZhxgip(ipAddress);
+
+        sysPositionService.updateSysPost(oldSysPosition, editPositionVO);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除岗位信息
+     * @param deleteVO 岗位id
+     * @return 删除结果
+     */
+    @PostMapping("deleteSysPosition")
+    @JwtSysUser
+    @Log(title = "岗位功能",businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除岗位信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysPosition(@RequestBody DeleteVO deleteVO) {
+        SysPosition oldSysPosition = sysPositionService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(oldSysPosition == null, "主键为 %s 的岗位信息不存在", deleteVO.getId());
+
+        oldSysPosition.setXtZxbz(DeletedEnum.DELETED.code);
+        oldSysPosition.setXtZxyy(deleteVO.getZxyy());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+
+        UserInfo userInfo = UserInfoManager.get();
+        Asserts.checkAuth(userInfo == null, "用户信息为空，请登陆");
+        oldSysPosition.setXtZhxgsj(new Date());
+        oldSysPosition.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysPosition.setXtZhxgrxm(userInfo.getUserName());
+        oldSysPosition.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysPosition.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysPosition.setXtZhxgip(ipAddress);
+
+        sysPositionService.getBaseMapper().updateById(oldSysPosition);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询岗位信息", httpMethod = "GET", response = SysPosition.class)
+    public ResponseResult<IPage<SysPosition>> selectPage(PositionPage positionPage) {
+        IPage<SysPosition> positionIPage = sysPositionService.selectByPage(positionPage);
+        return ResponseResult.success(positionIPage);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysRoleController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysRoleController.java
new file mode 100644
index 0000000..cebb826
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysRoleController.java
@@ -0,0 +1,281 @@
+package com.mosty.common.core.business.controller;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.OperatorType;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.vo.DeleteVO;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.core.config.DefaultRoleConfig;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 角色表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@SuppressWarnings("unused")
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysRole")
+@Api(tags = "角色信息接口")
+public class SysRoleController {
+
+    private final SysUserService sysUserService;
+    private final SysRoleService sysRoleService;
+    private final SysDeptService sysDeptService;
+    private final SysUserRoleService sysUserRoleService;
+    private final SysRoleDeptService sysRoleDeptService;
+    private final DefaultRoleConfig defaultRoleConfig;
+    private final LoginService loginService;
+
+    @JwtSysUser
+    @PostMapping("addSysRole")
+    @Log(title = "角色功能--添加角色", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加角色", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysRole(@RequestBody @Valid AddRoleVO addRoleVo,
+                                              HttpServletRequest servletRequest) {
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+
+        String roleCode = addRoleVo.getRoleCode();
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_code", roleCode);
+        queryWrapper.eq("xt_zxbz", DeletedEnum.NATURE.code);
+        List<SysRole> list = sysRoleService.list(queryWrapper);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "角色编码%s已存在，请修改", roleCode);
+
+        sysRoleService.insertRole(addRoleVo, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @JwtSysUser
+    @PostMapping("updateSysRole")
+    @Log(title = "角色功能--修改角色信息", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改角色信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateSysRole(@RequestBody @Valid SysRoleVO sysRoleVO,
+                                                 HttpServletRequest servletRequest) {
+
+        Asserts.check(sysRoleVO.getId() == null, "主键id不能为空！");
+        SysRole oldSysRole = sysRoleService.getBaseMapper().selectById(sysRoleVO.getId());
+        Asserts.check(oldSysRole == null, "主键为 %s 的角色信息不存在", sysRoleVO.getId());
+
+        String roleCode = sysRoleVO.getRoleCode();
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("id", sysRoleVO.getId());
+        queryWrapper.eq("role_code", roleCode);
+        queryWrapper.eq("xt_zxbz", DeletedEnum.NATURE.code);
+        List<SysRole> list = sysRoleService.list(queryWrapper);
+        Asserts.check(CollectionUtils.isNotEmpty(list), "角色编码%s已存在，请修改", roleCode);
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+
+        UserInfo userInfo = UserInfoManager.get();
+        oldSysRole.setXtZhxgsj(new Date());
+        oldSysRole.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysRole.setXtZhxgrxm(userInfo.getUserName());
+        oldSysRole.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysRole.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysRole.setXtZhxgip(ipAddress);
+
+        oldSysRole.setRoleName(sysRoleVO.getRoleName());
+        oldSysRole.setRoleCode(sysRoleVO.getRoleCode());
+        oldSysRole.setRoleDesc(sysRoleVO.getRoleDesc());
+        oldSysRole.setBz(sysRoleVO.getBz());
+        oldSysRole.setOrderNo(sysRoleVO.getOrderNo());
+        oldSysRole.setDataPermissionLevel(sysRoleVO.getDataPermissionLevel());
+
+        sysRoleService.getBaseMapper().updateById(oldSysRole);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @JwtSysUser
+    @PostMapping("deleteSysRole")
+    @Log(title = "角色功能--删除角色信息", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除角色信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysRole(@RequestBody DeleteVO deleteVO, HttpServletRequest servletRequest) {
+        SysRole oldSysRole = sysRoleService.getBaseMapper().selectById(deleteVO.getId());
+        Asserts.check(oldSysRole == null, "主键为 %s 的角色信息不存在", deleteVO.getId());
+
+        QueryWrapper<SysUserRole> countUserWrapper = new QueryWrapper<>();
+        countUserWrapper.eq("role_id", oldSysRole.getId());
+        Integer countUser = sysUserRoleService.getBaseMapper().selectCount(countUserWrapper);
+        Asserts.check(countUser > 0, "存在用户角色，请先删除！");
+
+        QueryWrapper<SysRoleDept> countDeptWrapper = new QueryWrapper<>();
+        countDeptWrapper.eq("role_id", oldSysRole.getId());
+        Integer countDept = sysRoleDeptService.getBaseMapper().selectCount(countDeptWrapper);
+        Asserts.check(countDept > 0, "存在部门角色，请先删除！");
+
+        // 默认角色不能进行删除
+        defaultRoleConfig.getDefaultRoleList().forEach(roleId ->
+                Asserts.check(oldSysRole.getId().equals(roleId), "默认角色不能进行删除！"));
+
+        oldSysRole.setXtZxbz(DeletedEnum.DELETED.code);
+        oldSysRole.setXtZxyy(deleteVO.getZxyy());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+
+        UserInfo userInfo = UserInfoManager.get();
+        oldSysRole.setXtZhxgsj(new Date());
+        oldSysRole.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysRole.setXtZhxgrxm(userInfo.getUserName());
+        oldSysRole.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysRole.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysRole.setXtZhxgip(ipAddress);
+
+        sysRoleService.getBaseMapper().updateById(oldSysRole);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectUnAccreditPage")
+    @ApiOperation(value = "分页查询未绑定当前用户的角色", httpMethod = "GET", response = SysRole.class)
+    public ResponseResult<IPage<SysRole>> selectUnAccreditPage(RolePage rolePage) {
+        IPage<SysRole> roleIPage = sysRoleService.selectUnAccreditPage(rolePage);
+        return ResponseResult.success(roleIPage);
+    }
+
+    @JwtSysUser
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询角色信息", httpMethod = "GET", response = SysRole.class)
+    public ResponseResult<IPage<SysRole>> selectPage(RolePage rolePage) {
+
+        IPage<SysRole> roleIPage = sysRoleService.selectByPage(rolePage);
+        return ResponseResult.success(roleIPage);
+    }
+
+    @JwtSysUser
+    @GetMapping("roleUserList")
+    @Log(title = "角色功能", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "查询角色管理的用户【需要控制当前人的权限】", httpMethod = "GET", response = SysUserVO.class)
+    public ResponseResult<IPage<SysUserVO>> roleUserList(RoleUserPage roleUserPage) {
+        UserInfo userInfo = UserInfoManager.get();
+        SysDept sysDept = sysDeptService.getById(userInfo.getDeptId());
+        IPage<SysUserVO> userPage = sysUserRoleService.roleUserList(sysDept.getRootPath(), roleUserPage);
+        return ResponseResult.success(userPage);
+    }
+
+    @JwtSysUser
+    @PostMapping("grantRoleToUser")
+    @Log(title = "角色功能--为用户授予角色", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "为用户授予角色", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> grantRoleToUser(@RequestBody UserRoleVO userRoleVo) {
+        UserInfo userInfo = UserInfoManager.get();
+        boolean save = sysUserRoleService.grantRoleToUser(userRoleVo);
+        return ResponseResult.success(save);
+    }
+
+    @PostMapping("grantUserToRole")
+    @Log(title = "角色功能--为角色授予用户", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "为角色授予用户", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> grantUserToRole(@RequestBody RoleUserVO roleUserVO) {
+        boolean save = sysUserRoleService.grantUserToRole(roleUserVO);
+        return ResponseResult.success(save);
+    }
+
+    @JwtSysUser
+    @PostMapping("batchUnboundUserRole")
+    @Log(title = "角色功能--批量解绑用户角色", businessType = BusinessType.OTHER)
+    @ApiOperation(value = "批量解绑用户角色", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> batchUnboundUserRole(@RequestBody UnboundUserRoleVO unboundUserRoleVo) {
+        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(wrapper -> wrapper.in("id", unboundUserRoleVo.getIds()));
+        boolean save = sysUserRoleService.remove(queryWrapper);
+        return ResponseResult.success(save);
+    }
+
+    @GetMapping("getUserRoleList/{userId}")
+    @ApiOperation(value = "查询用户角色列表", httpMethod = "GET", response = SysRoleVO.class)
+    public ResponseResult<List<SysRoleVO>> getUserRoleList(@PathVariable Long userId) {
+        List<SysRoleVO> userRoleList = sysRoleService.getUserRoleList(userId);
+        return ResponseResult.success(userRoleList);
+    }
+
+
+    @GetMapping("getRoleUserList")
+    @ApiOperation(value = "查询角色下用户列表", httpMethod = "GET", response = SysRoleVO.class)
+    public ResponseResult<IPage<SysUserVO>> getRoleUserList(GetUserRoleListVo vo) {
+        IPage<SysUserVO> deptIPage = sysRoleService.getRoleUserList(vo);
+        return ResponseResult.success(deptIPage);
+
+    }
+
+    @PostMapping("saveRoleMenuInfo")
+    @JwtSysUser
+    @Log(title = "角色功能--添加角色菜单关联关系", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "添加角色菜单关联关系", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> saveRoleMenuInfo(@RequestBody AddRoleMenuVO roleMenuVO) {
+        log.info("添加角色菜单关联关系 roleMenuVO={}", JSON.toJSONString(roleMenuVO));
+
+        SysRole sysRole = sysRoleService.getById(roleMenuVO.getRoleId());
+        Asserts.check(sysRole == null || DeletedEnum.DELETED.code.equals(sysRole.getXtZxbz()),
+                "角色id不存在或已删除");
+
+        sysRoleService.saveRoleMenuInfo(roleMenuVO);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @PostMapping("saveDataPermission")
+    @JwtSysUser
+    @Log(title = "角色功能", businessType = BusinessType.GRANT)
+    @ApiOperation(value = "添加数据权限", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> saveDataPermission(@RequestBody AddRoleDataPartitionVO addRoleDataPartitionVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysRoleService.saveDataPermission(addRoleDataPartitionVO, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 根据菜单标识查询数据权限
+     *
+     * @param menuUrl 菜单URL
+     * @return 删除结果
+     */
+    @PostMapping("getDataPermission/{menuUrl}")
+    @ApiOperation(value = "根据菜单标识查询数据权限", httpMethod = "GET", response = Boolean.class)
+    public ResponseResult<DataPermissionVO> getDataPermission(@PathVariable("menuUrl") String menuUrl) {
+        DataPermissionVO dataPermissionVO = sysRoleService.getDataPermission(menuUrl);
+        return ResponseResult.success(dataPermissionVO);
+    }
+
+    @GetMapping("getRoleMenuIds/{roleId}")
+    @ApiOperation(value = "查询用户绑定的菜单ids", httpMethod = "GET", response = SysRoleVO.class)
+    public ResponseResult<List<Long>> getRoleMenuIds(@PathVariable Long roleId) {
+        List<Long> menuIds = sysRoleService.getRoleMenuIds(roleId);
+        return ResponseResult.success(menuIds);
+
+    }
+
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.java
new file mode 100644
index 0000000..e7b3b0f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.java
@@ -0,0 +1,157 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.SysAppHomeconfigRsVO;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigVo;
+import com.mosty.common.core.business.entity.vo.SysUserHomeconfigVo;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app用户首页接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysUserAppHomeconfig")
+public class SysUserAppHomeconfigController {
+
+    private SysUserAppHomeconfigService sysUserAppHomeconfigService;
+
+    /**
+     * 添加用户首页应用
+     * @param config
+     * @return 添加结果
+     */
+    @PostMapping("add")
+    @JwtSysUser
+    @ApiOperation(value = "添加首页应用", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> add(@RequestBody @Valid SysUserAppHomeconfig config,
+                                            HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigService.saveInfo(config, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 添加用户首页应用
+     * @param plates 部门
+     * @return 添加结果
+     */
+    @PostMapping("addBatch")
+    @JwtSysUser
+    @ApiOperation(value = "批量添加首页应用板块", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "批量添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addBatch(@RequestBody List<SysUserAppHomeconfig> plates,
+                                                 HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigService.saveInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改用户首页应用
+     * @param config 修改用户首页应用信息
+     * @return 修改结果
+     */
+    @PostMapping("update")
+    @JwtSysUser
+    @Log(title = "用户首页应用",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改用户首页应用", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> update(@RequestBody @Valid SysUserAppHomeconfig config,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigService.updateInfo(config, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 批量修改用户首页应用
+     * @param plates 首页板块信息
+     * @return 修改结果
+     */
+    @PostMapping("updateBatch")
+    @JwtSysUser
+    @Log(title = "批量修改用户首页应用",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "批量修改用户首页应用", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateBatch(@RequestBody List<SysUserAppHomeconfig> plates, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigService.updateInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除用户应用信息
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "删除用户应用功能",businessType = BusinessType.DELETE)
+    @PostMapping("deletePlate")
+    @JwtSysUser
+    @ApiOperation(value = "删除用户应用信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deletePlate(@RequestBody List<Long> list,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysUserAppHomeconfigService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysUserAppHomeconfig>> selectPage(SysUserAppHomeconfigPage deptPage) {
+        IPage<SysUserAppHomeconfig> deptIPage = sysUserAppHomeconfigService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+    @GetMapping("queryUserConfig")
+    @ApiOperation(value = "查询用户配置", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<List<SysUserAppHomeconfigVo>> queryUserConfig(SysUserAppHomeconfigQuery cofigQuery) {
+        List<SysUserAppHomeconfigVo> vos = sysUserAppHomeconfigService.queryUserConfig(cofigQuery);
+        return ResponseResult.success(vos);
+    }
+
+
+    /**
+     * 添加用户默认配置
+     * @param config
+     * @return 添加结果
+     */
+    @PostMapping("addDefaultConfig")
+    @JwtSysUser
+    @ApiOperation(value = "添加用户默认配置", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加用户默认配置",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addDefaultConfig(@RequestBody @Valid SysUserHomeconfigVo config,
+                                       HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigService.saveDefaultConfig(config, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.java
new file mode 100644
index 0000000..36fd0f0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.java
@@ -0,0 +1,130 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlatePage;
+import com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateMapper;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app用户首页板块接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysuserAppHomeconfigPlate")
+public class SysUserAppHomeconfigPlateController {
+
+    private SysUserAppHomeconfigPlateService sysUserAppHomeconfigPlateService;
+
+    /**
+     * 添加用户首页应用板块
+     * @param config
+     * @return 添加结果
+     */
+    @PostMapping("add")
+    @JwtSysUser
+    @ApiOperation(value = "添加用户首页应用板块", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> add(@RequestBody @Valid SysUserAppHomeconfigPlate config,
+                                       HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateService.saveInfo(config, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 添加用户首页应用
+     * @param plates 部门
+     * @return 添加结果
+     */
+    @PostMapping("addBatch")
+    @JwtSysUser
+    @ApiOperation(value = "批量添加用户首页应用板块", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "批量添加首页应用板块",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addBatch(@RequestBody List<SysUserAppHomeconfigPlate> plates,
+                                            HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateService.saveInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改用户首页应用
+     * @param plate 修改用户首页应用信息
+     * @return 修改结果
+     */
+    @PostMapping("update")
+    @JwtSysUser
+    @Log(title = "首页应用板块",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改用户首页应用板块", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> update(@RequestBody @Valid SysUserAppHomeconfigPlate plate,
+                                          HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateService.updateInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 批量修改用户首页应用板块
+     * @param plates 首页板块信息
+     * @return 修改结果
+     */
+    @PostMapping("updateBatch")
+    @JwtSysUser
+    @Log(title = "批量修改用户首页应用板块",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "批量修改用户首页应用板块", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateBatch(@RequestBody List<SysUserAppHomeconfigPlate> plates, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateService.updateInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除应用板块信息
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "删除用户应用板块功能",businessType = BusinessType.DELETE)
+    @PostMapping("deletePlate")
+    @JwtSysUser
+    @ApiOperation(value = "删除用户应用板块信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deletePlate(@RequestBody List<Long> list,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysUserAppHomeconfigPlateService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用板块信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysUserAppHomeconfigPlate>> selectPage(SysUserAppHomeconfigPlatePage deptPage) {
+        IPage<SysUserAppHomeconfigPlate> deptIPage = sysUserAppHomeconfigPlateService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.java
new file mode 100644
index 0000000..4d59f17
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.java
@@ -0,0 +1,127 @@
+package com.mosty.common.core.business.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateListService;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块内容表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Api(tags = "app用户首页板块内容接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysUserAppHomeconfigPlateList")
+public class SysUserAppHomeconfigPlateListController {
+
+    private SysUserAppHomeconfigPlateListService sysUserAppHomeconfigPlateListService;
+
+    /**
+     * 添加用户首页应用板块内容
+     * @param config
+     * @return 添加结果
+     */
+    @PostMapping("add")
+    @JwtSysUser
+    @ApiOperation(value = "添加用户首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加首页应用板块内容",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> add(@RequestBody @Valid SysUserAppHomeconfigPlateList config,
+                                       HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateListService.saveInfo(config, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 添加用户首页应用内容
+     * @param plates
+     * @return 添加结果
+     */
+    @PostMapping("addBatch")
+    @JwtSysUser
+    @ApiOperation(value = "批量添加用户首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "批量添加首页应用板块内容",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addBatch(@RequestBody List<SysUserAppHomeconfigPlateList> plates,
+                                            HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateListService.saveInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改用户首页应用
+     * @param plate 修改用户首页应用信息
+     * @return 修改结果
+     */
+    @PostMapping("update")
+    @JwtSysUser
+    @Log(title = "首页应用板块内容",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改用户首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> update(@RequestBody @Valid SysUserAppHomeconfigPlateList plate,
+                                          HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateListService.updateInfo(plate, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 批量修改用户首页应用板块
+     * @param plates 首页板块信息
+     * @return 修改结果
+     */
+    @PostMapping("updateBatch")
+    @JwtSysUser
+    @Log(title = "批量修改用户首页应用板块内容",businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "批量修改用户首页应用板块内容", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> updateBatch(@RequestBody List<SysUserAppHomeconfigPlateList> plates, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserAppHomeconfigPlateListService.updateInfoBatch(plates, ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除应用板块信息
+     * @param list 应用id
+     * @return 删除结果
+     */
+    @Log(title = "删除用户应用板块内容功能",businessType = BusinessType.DELETE)
+    @PostMapping("deletePlate")
+    @JwtSysUser
+    @ApiOperation(value = "删除用户应用板块内容信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deletePlate(@RequestBody List<Long> list,
+                                               HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+//        UserInfo userInfo = UserInfoManager.get();
+        sysUserAppHomeconfigPlateListService.delete(list, ipAddress, null);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("selectPage")
+    @ApiOperation(value = "分页查询应用板块内容信息", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<IPage<SysUserAppHomeconfigPlateList>> selectPage(SysUserAppHomeconfigPlateListPage deptPage) {
+        IPage<SysUserAppHomeconfigPlateList> deptIPage = sysUserAppHomeconfigPlateListService.selectByPage(deptPage);
+        return ResponseResult.success(deptIPage);
+    }
+
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserController.java
new file mode 100644
index 0000000..e671078
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/SysUserController.java
@@ -0,0 +1,313 @@
+package com.mosty.common.core.business.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.constant.enums.ConfigKeyEnum;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.constant.enums.PasswordLevelEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.entity.vo.DeleteVO;
+import com.mosty.common.config.service.SysConfigService;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.request.SysUserEditPasswordRequest;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserRoleMapper;
+import com.mosty.common.core.business.mapper.YbmjMapper;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+
+/**
+ * 用户控制类
+ *
+ * @author kevin
+ * @date 2022/2/12 10:17 PM
+ * @since 1.0.0
+ */
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysUser")
+@Api(tags = "用户接口")
+public class SysUserController {
+
+    private final SysUserService sysUserService;
+    private final SysDeptService sysDeptService;
+    private final SysPositionService sysPositionService;
+    private final SysConfigService sysConfigService;
+    private final SysUserDeptService sysUserDeptService;
+    private final SysUserRoleService sysUserRoleService;
+    private final RedisService redisService;
+    private final SysUserRoleMapper sysUserRoleMapper;
+    private final SysUserDeptMapper sysUserDeptMapper;
+    private final YbmjMapper ybmjMapper;
+
+    @JwtSysUser
+    @PostMapping("addUser")
+    @Log(title = "添加用户信息", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加用户信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addSysUser(@RequestBody @Valid AddSysUserVO sysUserVo,
+                                              HttpServletRequest servletRequest) {
+
+/*        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", sysUserVo.getLoginName());
+        SysUser sysUser = sysUserService.getBaseMapper().selectOne(queryWrapper);
+        if (sysUser != null)
+            return ResponseResult.fail("登录账号重复！！");*/
+
+        if (sysUserService.getBaseMapper().selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getIdEntityCard, sysUserVo.getIdEntityCard())) > 0)
+            return ResponseResult.fail("身份证重复！！");
+
+        if (sysUserService.getBaseMapper().selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getInDustRialId, sysUserVo.getInDustRialId())) > 0)
+            return ResponseResult.fail("警号重复！！");
+
+
+        // 验证岗位信息并且设置岗位名称
+        SysPosition sysPosition = sysPositionService.getById(sysUserVo.getPositionId());
+//        if (sysPosition == null || sysPosition.getXtZxbz() != 0)
+//            return ResponseResult.fail("岗位 %s 不存在！");
+        sysUserVo.setPositionName(sysPosition != null ? sysPosition.getPostName() : "");
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserVo.setXtLrip(ipAddress);
+        sysUserVo.setXtZhxgrip(ipAddress);
+
+        // 保存用户信息
+        sysUserService.saveInfo(sysUserVo);
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+
+    @JwtSysUser
+    @PostMapping("addUserTbYb")
+    @Log(title = "同步宜宾人员", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "同步宜宾人员", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> addUserTbYb() {
+
+        List<Ybmj> ybmjs = ybmjMapper.selectList(new QueryWrapper<>());
+        if (!CollectionUtils.isEmpty(ybmjs)) {
+            for (Ybmj ybmj : ybmjs) {
+                SysUser sysUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().eq("id_entity_card", ybmj.getSfzh()));
+                if (sysUser == null) {
+                    AddSysUserVO sysUserVo = new AddSysUserVO();
+                    sysUserVo.setSsbmdm(ybmj.getSsbmdm());
+                    sysUserVo.setLoginName(ybmj.getXm());
+                    sysUserVo.setPassword("E10ADC3949BA59ABBEcm9OiHRC56E057F20F883E");
+                    sysUserVo.setUserName(ybmj.getXm());
+                    sysUserVo.setUserType("00");
+                    sysUserVo.setMobile(ybmj.getDh());
+                    sysUserVo.setTelePhone(ybmj.getDh());
+                    sysUserVo.setIdEntityCard(ybmj.getSfzh());
+                    sysUserVo.setInDustRialId(ybmj.getJh());
+                    //计算男女
+                    int gender = Integer.parseInt(ybmj.getSfzh().substring(16, 17));
+                    if (gender % 2 == 1) {
+                        sysUserVo.setSex("0");
+                    } else {
+                        sysUserVo.setSex("1");
+                    }
+                    sysUserVo.setNation("01");
+                    sysUserVo.setType("01");
+                    sysUserVo.setIsVirtualUser("2");
+                    sysUserVo.setSfrh("0");
+                    UserInfo userInfo = UserInfoManager.get();
+                    // 获取ip地址
+//                    String ipAddress = IpUtil.getIpAddress(servletRequest);
+//                    sysUserVo.setXtLrip(ipAddress);
+//                    sysUserVo.setXtZhxgrip(ipAddress);
+                    // 保存用户信息
+                    sysUserService.saveInfo(sysUserVo);
+                    ybmjMapper.deleteById(ybmj);
+                } else {
+                    if (DeletedEnum.DELETED.code.equals(sysUser.getXtZxbz()))
+                        return ResponseResult.fail("用户不存在！");
+                    SysUserEditVO sysUserEditVo = new SysUserEditVO();
+                    sysUserEditVo.setSsbmdm(ybmj.getSsbmdm());
+                    sysUserEditVo.setLoginName(ybmj.getXm());
+//                    sysUserEditVo.setPassword("E10ADC3949BA59ABBEcm9OiHRC56E057F20F883E");
+                    sysUserEditVo.setUserName(ybmj.getXm());
+                    sysUserEditVo.setUserType("01");
+                    sysUserEditVo.setMobile(ybmj.getDh());
+                    sysUserEditVo.setTelePhone(ybmj.getDh());
+                    sysUserEditVo.setIdEntityCard(ybmj.getSfzh());
+                    sysUserEditVo.setInDustRialId(ybmj.getJh());
+                    //计算男女
+                    int gender = Integer.parseInt(ybmj.getSfzh().substring(16, 17));
+                    if (gender % 2 == 1) {
+                        sysUserEditVo.setSex("1");
+                    } else {
+                        sysUserEditVo.setSex("2");
+                    }
+                    sysUserEditVo.setNation("01");
+                    sysUserEditVo.setType("01");
+                    sysUserEditVo.setIsVirtualUser("2");
+                    sysUserEditVo.setSfrh("0");
+                    sysUserEditVo.setId(sysUser.getId());
+                    UserInfo userInfo = UserInfoManager.get();
+                    sysUserService.editInfo(sysUserEditVo, sysUser);
+                    ybmjMapper.deleteById(ybmj);
+                }
+            }
+            return ResponseResult.success(Boolean.TRUE);
+        }
+        return null;
+    }
+
+
+    @JwtSysUser
+    @PostMapping("editSysUser")
+    @Log(title = "用户功能--编辑用户信息", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "编辑用户信息", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> editSysUser(@RequestBody @Valid SysUserEditVO sysUserEditVo) {
+
+        Long id = sysUserEditVo.getId();
+        SysUser sysUser = sysUserService.getUserInfo(id);
+        if (sysUser == null || DeletedEnum.DELETED.code.equals(sysUser.getXtZxbz()))
+            return ResponseResult.fail("用户不存在！");
+        sysUserService.editInfo(sysUserEditVo, sysUser);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @JwtSysUser
+    @PostMapping("editPassword")
+    @Log(title = "用户功能--编辑密码", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "编辑密码", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> editPassword(@RequestBody @Valid SysUserEditPasswordRequest sysUserEditPasswordRequest) {
+        sysUserService.editPassword(sysUserEditPasswordRequest);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("resetPassword")
+    @Log(title = "用户功能--重置密码", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "重置密码", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> resetPassword(@RequestParam("userId") Long userId) {
+        SysUser user = sysUserService.getUserInfo(userId);
+
+        Asserts.check(user == null || DeletedEnum.DELETED.code.equals(user.getXtZxbz()),
+                "用户不存在或已删除");
+
+        sysUserService.resetPassword(user);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("getUserInfo/{id}")
+    @JwtSysUser
+    @ApiOperation(value = "查询用户信息", httpMethod = "GET", response = SysUserInfoVO.class)
+    public ResponseResult<SysUserInfoVO> getUserInfo(@PathVariable("id") Long id) {
+        UserInfo user1 = UserInfoManager.get();
+        SysUser user = sysUserService.getUserInfo(id);
+        Asserts.check(user == null || DeletedEnum.DELETED.code.equals(user.getXtZxbz()),
+                "用户不存在或已删除");
+        List<Long> deptIds = sysUserDeptService.listByUserId(user.getId());
+        SysUserInfoVO sysUserInfoVO = BeanUtil.copyProperties(user, SysUserInfoVO.class);
+        if (!CollectionUtils.isEmpty(deptIds)) {
+            sysUserInfoVO.setDeptIds(deptIds);
+            SysDept dept = sysDeptService.getById(deptIds.get(0));
+            if (dept != null) {
+                sysUserInfoVO.setSsbm(dept.getOrgName());
+                sysUserInfoVO.setSsbmdm(dept.getOrgCode());
+            }
+        }
+        return ResponseResult.success(sysUserInfoVO);
+    }
+
+    @GetMapping("selectUnAccreditPage")
+    @ApiOperation(value = "分页查询未绑定当前角色的用户", httpMethod = "GET", response = SysRole.class)
+    public ResponseResult<IPage<SysUserVO>> selectUnAccreditPage(UserPage userPage) {
+        IPage<SysUserVO> roleIPage = sysUserService.selectUnAccreditPage(userPage);
+        return ResponseResult.success(roleIPage);
+    }
+
+    @GetMapping("selectPage")
+    @JwtSysUser
+    @ApiOperation(value = "分页查询用户信息", httpMethod = "GET", response = SysUserVO.class)
+    public ResponseResult<IPage<SysUserVO>> selectPage(UserPage userPage) {
+        IPage<SysUserVO> userVoPage = sysUserService.selectByPage(userPage);
+        return ResponseResult.success(userVoPage);
+    }
+
+    @GetMapping("getUserList")
+    @JwtSysUser
+    @ApiOperation(value = "根据条件查询用户信息", httpMethod = "GET", response = SysUserVO.class)
+    public ResponseResult<List<SysUserVO>> getUserList(GetUserPage dto) {
+        return ResponseResult.success(sysUserService.getUserList(dto));
+    }
+
+
+    @PostMapping("selectUserDeptPage")
+    @JwtSysUser
+    @ApiOperation(value = "查询用户和部门分页", httpMethod = "POST", response = SysRole.class)
+    public ResponseResult<IPage<SysUserDeptVO>> selectUserDeptPage(@RequestBody UserDeptPage userDeptPage) {
+        IPage<SysUserDeptVO> sysUserDeptVOIPage = sysUserService.selectUserDeptPage(userDeptPage);
+        return ResponseResult.success(sysUserDeptVOIPage);
+    }
+
+    @JwtSysUser
+    @GetMapping("getPasswordLevel")
+    @ApiOperation(value = "当前系统的密码等级", httpMethod = "GET", response = Integer.class)
+    public ResponseResult<Integer> getPasswordLevel() {
+        UserInfo userInfo = UserInfoManager.get();
+        SysConfig config = sysConfigService.getOneByKey(ConfigKeyEnum.PASSWORD_LEVEL);
+        if (Objects.isNull(config)) {
+            return ResponseResult.success(PasswordLevelEnum.PASSWORD_LEVEL_ONE.code);
+        }
+        return ResponseResult.success(Integer.valueOf(config.getPzz()));
+    }
+
+    @JwtSysUser
+    @PostMapping("deleteSysUser")
+    @Log(title = "删除用户", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除用户", httpMethod = "POST", response = Boolean.class)
+    public ResponseResult<Boolean> deleteSysRole(@RequestBody DeleteVO deleteVO, HttpServletRequest servletRequest) {
+        SysUser oldSysUser = sysUserService.getBaseMapper().selectById(deleteVO.getId());
+        if (oldSysUser == null)
+            return ResponseResult.fail("用户不存在或已删除");
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysUserService.delById(oldSysUser.getId());
+        //  删除关联角色
+        this.sysUserRoleMapper.delete(
+                new LambdaQueryWrapper<SysUserRole>()
+                        .eq(SysUserRole::getUserId, oldSysUser.getId())
+        );
+        // 删除关联部门
+        this.sysUserDeptMapper.delete(
+                new LambdaQueryWrapper<SysUserDept>()
+                        .eq(SysUserDept::getUserId, oldSysUser.getId())
+        );
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("userSys")
+    @ApiOperation(value = "用户信息同步", httpMethod = "GET", response = Boolean.class)
+    public ResponseResult<Boolean> userSys() {
+        Boolean bool = sysUserService.userSys();
+        return ResponseResult.success(bool);
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/controller/TokenController.java b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/TokenController.java
new file mode 100644
index 0000000..e2b8169
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/controller/TokenController.java
@@ -0,0 +1,106 @@
+package com.mosty.common.core.business.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.vo.LoginResponseVO;
+import com.mosty.common.core.util.HttpClientUtil;
+import com.mosty.common.core.util.RSAUtil;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Objects;
+
+import static com.google.common.base.Charsets.UTF_8;
+
+/**
+ * <p>
+ * 应用信息表 前端控制器
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-04-21
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("yjxx/token")
+@Api(tags = "获取托尔思预警token")
+@Slf4j
+public class TokenController {
+
+    /**
+     * 获取预警token
+     *
+     * @param idCard 添加应用信息请求
+     * @return 添加结果
+     */
+    @GetMapping("getToken")
+    public ResponseResult<LoginResponseVO> getToken(@RequestParam("idCard") String idCard) throws Exception {
+        String rsa = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKtrYCRHk/++b/yZteGW5pSfKynGjfNZ9TkC/+v8SrAZ8Gb24lEbB0zUp/rXabNHfSY6X3z6tCCA7pCig0TQIQT5iIz1eBuMPWcY61U1sySqVANu4IxchLzaPmKamttz2GXKby94rVa71eTVZ2kC0Vi424PjfL7C/iBQsgvoPV8wIDAQAB";
+        String url = "https://80.35.1.27:7001/login/app?key=";
+        log.info("公钥：{}", rsa);
+        log.info("身份证号：{}", idCard);
+        String rsaStr = RSAUtil.encryptByPubKey(idCard, rsa);
+        String idCardRas = URLEncoder.encode(rsaStr, "UTF-8");
+        String urls = url + idCardRas;
+
+        HashMap<String, String> loginMap = Maps.newHashMap();
+        loginMap.put("Content-Type", "multipart/form-data");
+        loginMap.put("Authorization", "Basic eXE6YWRtaW4=");
+        loginMap.put("User-Agent", "trs");
+
+        HttpResponse response = HttpClientUtil.postRequest(urls, loginMap);
+        String body = EntityUtils.toString(response.getEntity(), UTF_8);
+
+        JSONObject jsonObject = JSONObject.parseObject(body);
+        String accessToken = jsonObject.getString("access_token");
+        log.info("获取到的access_token={}", accessToken);
+
+        if (response.getStatusLine().getStatusCode() != 200) {
+            log.warn("调用登陆服务异常{}", JSON.toJSONString(response));
+            throw new RuntimeException("POST调用异常 : " + response.getStatusLine().getStatusCode());
+        }
+
+
+        HashMap<String, String> cookieMap = Maps.newHashMap();
+        cookieMap.put("Authorization", "Bearer " + accessToken);
+
+        String getCookieUrl = "http://80.35.1.27:7000/dispatchWarning/yjxx/getYjxxList?page=2&pageSize=10&type=9&lev=0&datasource=&datetype=nolimit&startdate=&enddate=&bklx=0&emphasiscode=&searchType=1&otherinfo=&yjlx=0";
+        HttpResponse cookieResponse = HttpClientUtil.postRequest(getCookieUrl, cookieMap);
+        Header firstHeader = cookieResponse.getFirstHeader("Set-Cookie");
+
+        log.warn("调用cookie接口的 Http status = {}", response.getStatusLine().getStatusCode());
+
+        if (Objects.isNull(firstHeader)) {
+            log.warn("响应体cookie为空 ------{}", JSON.toJSONString(response.getAllHeaders()));
+            throw new RuntimeException("POST调用异常 : " + response.getStatusLine().getStatusCode());
+        }
+        log.info("获取到的cookie={}", firstHeader.getValue());
+
+        LoginResponseVO loginResponseVO = new LoginResponseVO();
+        loginResponseVO.setLoginResponseBody(body);
+        loginResponseVO.setLoginResponseCookie(firstHeader.getValue());
+
+        log.info("响应体 ------{}", JSON.toJSONString(loginResponseVO));
+        return ResponseResult.success(loginResponseVO);
+
+    }
+
+    public static void main(String[] args) {
+        try {
+            LoginResponseVO vo = new TokenController().getToken("510603198807207837").getData();
+            System.err.println(vo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfig.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfig.java
new file mode 100644
index 0000000..1af074a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfig.java
@@ -0,0 +1,88 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_app_homeconfig")
+@ApiModel(value="SysAppHomeconfig对象", description="app首页表")
+public class SysAppHomeconfig implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页名称，如：领导端")
+    private String homename;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.java
new file mode 100644
index 0000000..1b4c93f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.java
@@ -0,0 +1,103 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_app_homeconfig_plate")
+@ApiModel(value="SysAppHomeconfigPlate对象", description="app首页-板块表")
+public class SysAppHomeconfigPlate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页ID")
+    private Long homeid;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+    @ApiModelProperty(value = "板块样式")
+    private String dyys;
+
+    @ApiModelProperty(value = "板块顺序")
+    private Integer bksx;
+
+    @ApiModelProperty(value = "跳转地址")
+    private String tzdz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.java
new file mode 100644
index 0000000..2046df4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.java
@@ -0,0 +1,100 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页配置-板块内容表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_app_homeconfig_plate_list")
+@ApiModel(value="SysAppHomeconfigPlateList对象", description="app首页配置-板块内容表")
+public class SysAppHomeconfigPlateList implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "板块ID")
+    private Long plateId;
+
+    @ApiModelProperty(value = "内容名称")
+    private String nrmc;
+
+    @ApiModelProperty(value = "内容样式")
+    private String nrys;
+
+    @ApiModelProperty(value = "路由跳转地址")
+    private String tzdz;
+
+    @ApiModelProperty(value = "内容顺序")
+    private Integer nrsx;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysDept.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysDept.java
new file mode 100644
index 0000000..029427e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysDept.java
@@ -0,0 +1,382 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.core.business.entity.vo.SysDeptVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部门表
+ * @TableName sys_dept
+ */
+@TableName(value ="sys_dept")
+@Data
+public class SysDept implements Serializable {
+    /**
+     * 部门id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 部门代码
+     */
+    @TableField(value = "org_code")
+    private String orgCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "org_name")
+    private String orgName;
+
+    /**
+     * 根节点开始的id路径
+     */
+    @TableField(value = "root_path")
+    private String rootPath;
+
+    /**
+     * 部门类型
+     */
+    @TableField(value = "org_type")
+    private String orgType;
+
+    /**
+     * 部门等级
+     */
+    @TableField(value = "org_level")
+    private String orgLevel;
+
+    /**
+     * 部门业务类型
+     */
+    @TableField(value = "org_biz_type")
+    private String orgBizType;
+
+    /**
+     * 部门顺序号
+     */
+    @TableField(value = "org_no")
+    private String orgNo;
+
+    /**
+     * 上级部门主键
+     */
+    @TableField(value = "parent_id")
+    private Long parentId;
+
+    /**
+     * 部门名称拼音首字母
+     */
+    @TableField(value = "bmpyszm")
+    private String bmpyszm;
+
+    /**
+     * 部门简称
+     */
+    @TableField(value = "org_jc")
+    private String orgJc;
+
+    /**
+     * 部门全称
+     */
+    @TableField(value = "org_qc")
+    private String orgQc;
+
+    /**
+     * 部门地址
+     */
+    @TableField(value = "address")
+    private String address;
+
+    /**
+     * 部门电话
+     */
+    @TableField(value = "link_tel")
+    private String linkTel;
+
+    /**
+     * 部门联系人
+     */
+    @TableField(value = "link_man")
+    private String linkMan;
+
+    /**
+     * 部门联系人电话
+     */
+    @TableField(value = "link_man_tel")
+    private String linkManTel;
+
+    /**
+     * 部门主页
+     */
+    @TableField(value = "web_url")
+    private String webUrl;
+
+    /**
+     * 部门邮箱
+     */
+    @TableField(value = "email")
+    private String email;
+
+    /**
+     * 部门所属行政区划
+     */
+    @TableField(value = "xzqh")
+    private String xzqh;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "bz")
+    private String bz;
+
+    /**
+     * 注销标志0正常 1.注销
+     */
+    @TableField(value = "xt_zxbz")
+    private Integer xtZxbz;
+
+    /**
+     * 注销原因
+     */
+    @TableField(value = "xt_zxyy")
+    private String xtZxyy;
+
+    /**
+     * 采集时间
+     */
+    @TableField(value = "xt_cjsj")
+    private Date xtCjsj;
+
+    /**
+     * 录入时间
+     */
+    @TableField(value = "xt_lrsj")
+    private Date xtLrsj;
+
+    /**
+     * 录入人姓名
+     */
+    @TableField(value = "xt_lrrxm")
+    private String xtLrrxm;
+
+    /**
+     * 录入人id
+     */
+    @TableField(value = "xt_lrrid")
+    private Long xtLrrid;
+
+    /**
+     * 录入人部门
+     */
+    @TableField(value = "xt_lrrbm")
+    private String xtLrrbm;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrrbmid")
+    private String xtLrrbmid;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrip")
+    private String xtLrip;
+
+    /**
+     * 最后修改时间
+     */
+    @TableField(value = "xt_zhxgsj")
+    private Date xtZhxgsj;
+
+    /**
+     * 最后修改人姓名
+     */
+    @TableField(value = "xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    /**
+     * 最后修改人id
+     */
+    @TableField(value = "xt_zhxgid")
+    private Long xtZhxgid;
+
+    /**
+     * 最后修改人部门
+     */
+    @TableField(value = "xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    /**
+     * 最后修改人部门id
+     */
+    @TableField(value = "xt_zhxgrbmid")
+    private Long xtZhxgrbmid;
+
+    /**
+     * 最后修改人ip
+     */
+    @TableField(value = "xt_zhxgrip")
+    private String xtZhxgrip;
+
+    /**
+     * 子部门集合
+     */
+    @ApiModelProperty(value = "子部门集合")
+    @TableField(exist = false)
+    private List<SysDept> childDeptList;
+
+    /**
+     * 是否包含下级
+     */
+    @ApiModelProperty(value = "是否包含下级")
+    @TableField(exist = false)
+    private boolean hasChildren;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysDept other = (SysDept) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+                && (this.getOrgCode() == null ? other.getOrgCode() == null : this.getOrgCode().equals(other.getOrgCode()))
+                && (this.getOrgName() == null ? other.getOrgName() == null : this.getOrgName().equals(other.getOrgName()))
+                && (this.getOrgType() == null ? other.getOrgType() == null : this.getOrgType().equals(other.getOrgType()))
+                && (this.getOrgLevel() == null ? other.getOrgLevel() == null : this.getOrgLevel().equals(other.getOrgLevel()))
+                && (this.getOrgBizType() == null ? other.getOrgBizType() == null : this.getOrgBizType().equals(other.getOrgBizType()))
+                && (this.getOrgNo() == null ? other.getOrgNo() == null : this.getOrgNo().equals(other.getOrgNo()))
+                && (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId()))
+                && (this.getBmpyszm() == null ? other.getBmpyszm() == null : this.getBmpyszm().equals(other.getBmpyszm()))
+                && (this.getOrgJc() == null ? other.getOrgJc() == null : this.getOrgJc().equals(other.getOrgJc()))
+                && (this.getOrgQc() == null ? other.getOrgQc() == null : this.getOrgQc().equals(other.getOrgQc()))
+                && (this.getAddress() == null ? other.getAddress() == null : this.getAddress().equals(other.getAddress()))
+                && (this.getLinkTel() == null ? other.getLinkTel() == null : this.getLinkTel().equals(other.getLinkTel()))
+                && (this.getLinkMan() == null ? other.getLinkMan() == null : this.getLinkMan().equals(other.getLinkMan()))
+                && (this.getLinkManTel() == null ? other.getLinkManTel() == null : this.getLinkManTel().equals(other.getLinkManTel()))
+                && (this.getWebUrl() == null ? other.getWebUrl() == null : this.getWebUrl().equals(other.getWebUrl()))
+                && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
+                && (this.getXzqh() == null ? other.getXzqh() == null : this.getXzqh().equals(other.getXzqh()))
+                && (this.getBz() == null ? other.getBz() == null : this.getBz().equals(other.getBz()))
+                && (this.getXtZxbz() == null ? other.getXtZxbz() == null : this.getXtZxbz().equals(other.getXtZxbz()))
+                && (this.getXtZxyy() == null ? other.getXtZxyy() == null : this.getXtZxyy().equals(other.getXtZxyy()))
+                && (this.getXtCjsj() == null ? other.getXtCjsj() == null : this.getXtCjsj().equals(other.getXtCjsj()))
+                && (this.getXtLrsj() == null ? other.getXtLrsj() == null : this.getXtLrsj().equals(other.getXtLrsj()))
+                && (this.getXtLrrxm() == null ? other.getXtLrrxm() == null : this.getXtLrrxm().equals(other.getXtLrrxm()))
+                && (this.getXtLrrid() == null ? other.getXtLrrid() == null : this.getXtLrrid().equals(other.getXtLrrid()))
+                && (this.getXtLrrbm() == null ? other.getXtLrrbm() == null : this.getXtLrrbm().equals(other.getXtLrrbm()))
+                && (this.getXtLrrbmid() == null ? other.getXtLrrbmid() == null : this.getXtLrrbmid().equals(other.getXtLrrbmid()))
+                && (this.getXtLrip() == null ? other.getXtLrip() == null : this.getXtLrip().equals(other.getXtLrip()))
+                && (this.getXtZhxgsj() == null ? other.getXtZhxgsj() == null : this.getXtZhxgsj().equals(other.getXtZhxgsj()))
+                && (this.getXtZhxgrxm() == null ? other.getXtZhxgrxm() == null : this.getXtZhxgrxm().equals(other.getXtZhxgrxm()))
+                && (this.getXtZhxgid() == null ? other.getXtZhxgid() == null : this.getXtZhxgid().equals(other.getXtZhxgid()))
+                && (this.getXtZhxgrbm() == null ? other.getXtZhxgrbm() == null : this.getXtZhxgrbm().equals(other.getXtZhxgrbm()))
+                && (this.getXtZhxgrbmid() == null ? other.getXtZhxgrbmid() == null : this.getXtZhxgrbmid().equals(other.getXtZhxgrbmid()))
+                && (this.getXtZhxgrip() == null ? other.getXtZhxgrip() == null : this.getXtZhxgrip().equals(other.getXtZhxgrip()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getOrgCode() == null) ? 0 : getOrgCode().hashCode());
+        result = prime * result + ((getOrgName() == null) ? 0 : getOrgName().hashCode());
+        result = prime * result + ((getOrgType() == null) ? 0 : getOrgType().hashCode());
+        result = prime * result + ((getOrgLevel() == null) ? 0 : getOrgLevel().hashCode());
+        result = prime * result + ((getOrgBizType() == null) ? 0 : getOrgBizType().hashCode());
+        result = prime * result + ((getOrgNo() == null) ? 0 : getOrgNo().hashCode());
+        result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode());
+        result = prime * result + ((getBmpyszm() == null) ? 0 : getBmpyszm().hashCode());
+        result = prime * result + ((getOrgJc() == null) ? 0 : getOrgJc().hashCode());
+        result = prime * result + ((getOrgQc() == null) ? 0 : getOrgQc().hashCode());
+        result = prime * result + ((getAddress() == null) ? 0 : getAddress().hashCode());
+        result = prime * result + ((getLinkTel() == null) ? 0 : getLinkTel().hashCode());
+        result = prime * result + ((getLinkMan() == null) ? 0 : getLinkMan().hashCode());
+        result = prime * result + ((getLinkManTel() == null) ? 0 : getLinkManTel().hashCode());
+        result = prime * result + ((getWebUrl() == null) ? 0 : getWebUrl().hashCode());
+        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
+        result = prime * result + ((getXzqh() == null) ? 0 : getXzqh().hashCode());
+        result = prime * result + ((getBz() == null) ? 0 : getBz().hashCode());
+        result = prime * result + ((getXtZxbz() == null) ? 0 : getXtZxbz().hashCode());
+        result = prime * result + ((getXtZxyy() == null) ? 0 : getXtZxyy().hashCode());
+        result = prime * result + ((getXtCjsj() == null) ? 0 : getXtCjsj().hashCode());
+        result = prime * result + ((getXtLrsj() == null) ? 0 : getXtLrsj().hashCode());
+        result = prime * result + ((getXtLrrxm() == null) ? 0 : getXtLrrxm().hashCode());
+        result = prime * result + ((getXtLrrid() == null) ? 0 : getXtLrrid().hashCode());
+        result = prime * result + ((getXtLrrbm() == null) ? 0 : getXtLrrbm().hashCode());
+        result = prime * result + ((getXtLrrbmid() == null) ? 0 : getXtLrrbmid().hashCode());
+        result = prime * result + ((getXtLrip() == null) ? 0 : getXtLrip().hashCode());
+        result = prime * result + ((getXtZhxgsj() == null) ? 0 : getXtZhxgsj().hashCode());
+        result = prime * result + ((getXtZhxgrxm() == null) ? 0 : getXtZhxgrxm().hashCode());
+        result = prime * result + ((getXtZhxgid() == null) ? 0 : getXtZhxgid().hashCode());
+        result = prime * result + ((getXtZhxgrbm() == null) ? 0 : getXtZhxgrbm().hashCode());
+        result = prime * result + ((getXtZhxgrbmid() == null) ? 0 : getXtZhxgrbmid().hashCode());
+        result = prime * result + ((getXtZhxgrip() == null) ? 0 : getXtZhxgrip().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", orgName=").append(orgName);
+        sb.append(", orgType=").append(orgType);
+        sb.append(", orgLevel=").append(orgLevel);
+        sb.append(", orgBizType=").append(orgBizType);
+        sb.append(", orgNo=").append(orgNo);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", bmpyszm=").append(bmpyszm);
+        sb.append(", orgJc=").append(orgJc);
+        sb.append(", orgQc=").append(orgQc);
+        sb.append(", address=").append(address);
+        sb.append(", linkTel=").append(linkTel);
+        sb.append(", linkMan=").append(linkMan);
+        sb.append(", linkManTel=").append(linkManTel);
+        sb.append(", webUrl=").append(webUrl);
+        sb.append(", email=").append(email);
+        sb.append(", xzqh=").append(xzqh);
+        sb.append(", bz=").append(bz);
+        sb.append(", xtZxbz=").append(xtZxbz);
+        sb.append(", xtZxyy=").append(xtZxyy);
+        sb.append(", xtCjsj=").append(xtCjsj);
+        sb.append(", xtLrsj=").append(xtLrsj);
+        sb.append(", xtLrrxm=").append(xtLrrxm);
+        sb.append(", xtLrrid=").append(xtLrrid);
+        sb.append(", xtLrrbm=").append(xtLrrbm);
+        sb.append(", xtLrrbmid=").append(xtLrrbmid);
+        sb.append(", xtLrip=").append(xtLrip);
+        sb.append(", xtZhxgsj=").append(xtZhxgsj);
+        sb.append(", xtZhxgrxm=").append(xtZhxgrxm);
+        sb.append(", xtZhxgid=").append(xtZhxgid);
+        sb.append(", xtZhxgrbm=").append(xtZhxgrbm);
+        sb.append(", xtZhxgrbmid=").append(xtZhxgrbmid);
+        sb.append(", xtZhxgrip=").append(xtZhxgrip);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysLogininfor.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysLogininfor.java
new file mode 100644
index 0000000..ac421d3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysLogininfor.java
@@ -0,0 +1,110 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@TableName(value = "mosty_base.sys_logininfor")
+@Data
+public class SysLogininfor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "info_id", type = IdType.AUTO)
+    @ApiModelProperty("访问ID")
+    private Long infoId;
+
+    @TableField(value = "user_id")
+    @ApiModelProperty("人员ID")
+    private String userId;
+
+    @TableField(value = "sfzh")
+    @ApiModelProperty("身份证号")
+    @Excel(name = "身份证号")
+    private String sfzh;
+
+    @TableField(value = "user_name")
+    @ApiModelProperty("用户账号")
+    @Excel(name = "用户账号")
+    private String userName;
+
+    @TableField(value = "ipaddr")
+    @ApiModelProperty("登录IP地址")
+    @Excel(name = "用户账号")
+    private String ipaddr;
+
+    @TableField(value = "type")
+    @ApiModelProperty("登录方式 01.app登录  02.pc端登录")
+    private String type;
+
+    @TableField(value = "status")
+    @ApiModelProperty("登录状态（0成功 1失败）")
+    private String status;
+
+    @TableField(value = "msg")
+    @ApiModelProperty("提示信息")
+    @Excel(name = "登录状态")
+    private String msg;
+
+    @TableField(value = "browser")
+    @ApiModelProperty("浏览器类型")
+    @Excel(name = "浏览器类型")
+    private String browser;
+
+    @TableField(value = "os")
+    @ApiModelProperty("操作系统")
+    @Excel(name = "操作系统")
+    private String os;
+
+    @TableField(value = "access_time")
+    @ApiModelProperty("访问时间")
+    @Excel(name = "访问时间")
+    private LocalDateTime accessTime;
+
+    @ApiModelProperty(value = "所属部门id")
+    @TableField(value = "ssbmid")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    @TableField(value = "ssbm")
+    @Excel(name = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @TableField(value = "ssbmdm")
+    @Excel(name = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    @TableField(value = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    @TableField(value = "ssxgajid")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    @TableField(value = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    @TableField(value = "sssgajid")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    @TableField(value = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    @TableField(value = "sssgajdm")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysMenu.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysMenu.java
new file mode 100644
index 0000000..1c53296
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysMenu.java
@@ -0,0 +1,114 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 菜单表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_menu")
+@ApiModel(value="SysMenu对象", description="菜单表")
+public class SysMenu implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "父菜单id")
+    private Long parentId;
+
+    @ApiModelProperty(value = "父菜单路径，使用逗号间隔")
+    private String parentPath;
+
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    @ApiModelProperty(value = "菜单编码")
+    private String menuCode;
+
+    @ApiModelProperty(value = "菜单地址")
+    private String menuUrl;
+
+    @ApiModelProperty(value = "菜单类型：1、菜单 2、资源")
+    private Integer menuType;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer orderNo;
+
+    @ApiModelProperty(value = "是否展示：1、展示 2、不展示")
+    private Integer showMode;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "子菜单集合")
+    @TableField(exist = false)
+    private List<SysMenu> sysMenuList;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysOss.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysOss.java
new file mode 100644
index 0000000..04edc01
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysOss.java
@@ -0,0 +1,114 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * OSS云存储表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_oss")
+@ApiModel(value="SysOss对象", description="OSS云存储表")
+public class SysOss implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "云存储主键")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    private String md5;
+
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    @ApiModelProperty(value = "原名")
+    private String originalName;
+
+    @ApiModelProperty(value = "文件后缀名")
+    private String fileSuffix;
+
+    @ApiModelProperty(value = "URL地址")
+    private String url;
+
+    @ApiModelProperty(value = "数据来源(业务表名)")
+    private String sjlybm;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "添加顺序")
+    private Integer tjsx;
+
+    @ApiModelProperty(value = "图片类型：0-缩略图，1-大图")
+    private String tplx;
+
+    @ApiModelProperty(value = "服务商")
+    private String service;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private String xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysPosition.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysPosition.java
new file mode 100644
index 0000000..c9c9ffa
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysPosition.java
@@ -0,0 +1,94 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 岗位表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_position")
+@ApiModel(value="SysPosition对象", description="岗位表")
+public class SysPosition implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "岗位编码")
+    private String postCode;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "岗位描述")
+    private String postDesc;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRole.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRole.java
new file mode 100644
index 0000000..1a70106
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRole.java
@@ -0,0 +1,269 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 角色表
+ * @TableName sys_role
+ */
+@TableName(value ="mosty_base.sys_role")
+@Data
+public class SysRole implements Serializable {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "角色ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    @ApiModelProperty(value = "角色名称")
+    @TableField(value = "role_name")
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    @ApiModelProperty(value = "角色编码")
+    @TableField(value = "role_code")
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    @ApiModelProperty(value = "角色描述")
+    @TableField(value = "role_desc")
+    private String roleDesc;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty(value = "排序号")
+    @TableField(value = "order_no")
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    @TableField(value = "bz")
+    private String bz;
+
+    /**
+     * 采集时间
+     */
+    @ApiModelProperty(value = "采集时间")
+    @TableField(value = "xt_cjsj")
+    private Date xtCjsj;
+
+    /**
+     * 录入时间
+     */
+    @ApiModelProperty(value = "录入时间")
+    @TableField(value = "xt_lrsj")
+    private Date xtLrsj;
+
+    /**
+     * 录入人姓名
+     */
+    @ApiModelProperty(value = "录入人姓名")
+    @TableField(value = "xt_lrrxm")
+    private String xtLrrxm;
+
+    /**
+     * 录入人ID
+     */
+    @ApiModelProperty(value = "录入人ID")
+    @TableField(value = "xt_lrrid")
+    private String xtLrrid;
+
+    /**
+     * 录入人部门
+     */
+    @ApiModelProperty(value = "录入人部门")
+    @TableField(value = "xt_lrrbm")
+    private String xtLrrbm;
+
+    /**
+     * 录入人部门ID
+     */
+    @ApiModelProperty(value = "录入人部门ID")
+    @TableField(value = "xt_lrrbmid")
+    private String xtLrrbmid;
+
+    /**
+     * 录入IP
+     */
+    @ApiModelProperty(value = "录入IP")
+    @TableField(value = "xt_lrip")
+    private String xtLrip;
+
+    /**
+     * 最后修改时间
+     */
+    @ApiModelProperty(value = "最后修改时间")
+    @TableField(value = "xt_zhxgsj")
+    private Date xtZhxgsj;
+
+    /**
+     * 最后修改人姓名
+     */
+    @ApiModelProperty(value = "最后修改人姓名")
+    @TableField(value = "xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    /**
+     * 最后修改人ID
+     */
+    @ApiModelProperty(value = "最后修改人ID")
+    @TableField(value = "xt_zhxgrid")
+    private String xtZhxgrid;
+
+    /**
+     * 最后修改人部门
+     */
+    @ApiModelProperty(value = "最后修改人部门")
+    @TableField(value = "xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    /**
+     * 最后修改人部门ID
+     */
+    @ApiModelProperty(value = "最后修改人部门ID")
+    @TableField(value = "xt_zhxgrbmid")
+    private String xtZhxgrbmid;
+
+    /**
+     * 最后修改IP
+     */
+    @ApiModelProperty(value = "最后修改IP")
+    @TableField(value = "xt_zhxgip")
+    private String xtZhxgip;
+
+    /**
+     * 注销标志0正常 1.注销
+     */
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    @TableField(value = "xt_zxbz")
+    private Integer xtZxbz;
+
+    /**
+     * 注销原因
+     */
+    @ApiModelProperty(value = "注销原因")
+    @TableField(value = "xt_zxyy")
+    private String xtZxyy;
+
+
+    /**
+     * 数据权限等级
+     */
+    @ApiModelProperty(value = "数据权限等级")
+    @TableField(value = "data_permission_level")
+    private String dataPermissionLevel;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysRole other = (SysRole) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getRoleName() == null ? other.getRoleName() == null : this.getRoleName().equals(other.getRoleName()))
+            && (this.getRoleDesc() == null ? other.getRoleDesc() == null : this.getRoleDesc().equals(other.getRoleDesc()))
+            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+            && (this.getBz() == null ? other.getBz() == null : this.getBz().equals(other.getBz()))
+            && (this.getXtCjsj() == null ? other.getXtCjsj() == null : this.getXtCjsj().equals(other.getXtCjsj()))
+            && (this.getXtLrsj() == null ? other.getXtLrsj() == null : this.getXtLrsj().equals(other.getXtLrsj()))
+            && (this.getXtLrrxm() == null ? other.getXtLrrxm() == null : this.getXtLrrxm().equals(other.getXtLrrxm()))
+            && (this.getXtLrrid() == null ? other.getXtLrrid() == null : this.getXtLrrid().equals(other.getXtLrrid()))
+            && (this.getXtLrrbm() == null ? other.getXtLrrbm() == null : this.getXtLrrbm().equals(other.getXtLrrbm()))
+            && (this.getXtLrrbmid() == null ? other.getXtLrrbmid() == null : this.getXtLrrbmid().equals(other.getXtLrrbmid()))
+            && (this.getXtLrip() == null ? other.getXtLrip() == null : this.getXtLrip().equals(other.getXtLrip()))
+            && (this.getXtZhxgsj() == null ? other.getXtZhxgsj() == null : this.getXtZhxgsj().equals(other.getXtZhxgsj()))
+            && (this.getXtZhxgrxm() == null ? other.getXtZhxgrxm() == null : this.getXtZhxgrxm().equals(other.getXtZhxgrxm()))
+            && (this.getXtZhxgrid() == null ? other.getXtZhxgrid() == null : this.getXtZhxgrid().equals(other.getXtZhxgrid()))
+            && (this.getXtZhxgrbm() == null ? other.getXtZhxgrbm() == null : this.getXtZhxgrbm().equals(other.getXtZhxgrbm()))
+            && (this.getXtZhxgrbmid() == null ? other.getXtZhxgrbmid() == null : this.getXtZhxgrbmid().equals(other.getXtZhxgrbmid()))
+            && (this.getXtZhxgip() == null ? other.getXtZhxgip() == null : this.getXtZhxgip().equals(other.getXtZhxgip()))
+            && (this.getXtZxbz() == null ? other.getXtZxbz() == null : this.getXtZxbz().equals(other.getXtZxbz()))
+            && (this.getXtZxyy() == null ? other.getXtZxyy() == null : this.getXtZxyy().equals(other.getXtZxyy()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getRoleName() == null) ? 0 : getRoleName().hashCode());
+        result = prime * result + ((getRoleDesc() == null) ? 0 : getRoleDesc().hashCode());
+        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+        result = prime * result + ((getBz() == null) ? 0 : getBz().hashCode());
+        result = prime * result + ((getXtCjsj() == null) ? 0 : getXtCjsj().hashCode());
+        result = prime * result + ((getXtLrsj() == null) ? 0 : getXtLrsj().hashCode());
+        result = prime * result + ((getXtLrrxm() == null) ? 0 : getXtLrrxm().hashCode());
+        result = prime * result + ((getXtLrrid() == null) ? 0 : getXtLrrid().hashCode());
+        result = prime * result + ((getXtLrrbm() == null) ? 0 : getXtLrrbm().hashCode());
+        result = prime * result + ((getXtLrrbmid() == null) ? 0 : getXtLrrbmid().hashCode());
+        result = prime * result + ((getXtLrip() == null) ? 0 : getXtLrip().hashCode());
+        result = prime * result + ((getXtZhxgsj() == null) ? 0 : getXtZhxgsj().hashCode());
+        result = prime * result + ((getXtZhxgrxm() == null) ? 0 : getXtZhxgrxm().hashCode());
+        result = prime * result + ((getXtZhxgrid() == null) ? 0 : getXtZhxgrid().hashCode());
+        result = prime * result + ((getXtZhxgrbm() == null) ? 0 : getXtZhxgrbm().hashCode());
+        result = prime * result + ((getXtZhxgrbmid() == null) ? 0 : getXtZhxgrbmid().hashCode());
+        result = prime * result + ((getXtZhxgip() == null) ? 0 : getXtZhxgip().hashCode());
+        result = prime * result + ((getXtZxbz() == null) ? 0 : getXtZxbz().hashCode());
+        result = prime * result + ((getXtZxyy() == null) ? 0 : getXtZxyy().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", roleName=").append(roleName);
+        sb.append(", roleDesc=").append(roleDesc);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", bz=").append(bz);
+        sb.append(", xtCjsj=").append(xtCjsj);
+        sb.append(", xtLrsj=").append(xtLrsj);
+        sb.append(", xtLrrxm=").append(xtLrrxm);
+        sb.append(", xtLrrid=").append(xtLrrid);
+        sb.append(", xtLrrbm=").append(xtLrrbm);
+        sb.append(", xtLrrbmid=").append(xtLrrbmid);
+        sb.append(", xtLrip=").append(xtLrip);
+        sb.append(", xtZhxgsj=").append(xtZhxgsj);
+        sb.append(", xtZhxgrxm=").append(xtZhxgrxm);
+        sb.append(", xtZhxgrid=").append(xtZhxgrid);
+        sb.append(", xtZhxgrbm=").append(xtZhxgrbm);
+        sb.append(", xtZhxgrbmid=").append(xtZhxgrbmid);
+        sb.append(", xtZhxgip=").append(xtZhxgip);
+        sb.append(", xtZxbz=").append(xtZxbz);
+        sb.append(", xtZxyy=").append(xtZxyy);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleDept.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleDept.java
new file mode 100644
index 0000000..1f683a3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleDept.java
@@ -0,0 +1,79 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 角色和部门关联表
+ * @TableName sys_role_dept
+ */
+@TableName(value ="mosty_base.sys_role_dept")
+@Data
+public class SysRoleDept implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色ID
+     */
+    @TableField(value = "role_id")
+    private Long roleId;
+
+    /**
+     * 部门ID
+     */
+    @TableField(value = "dept_id")
+    private Long deptId;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysRoleDept other = (SysRoleDept) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()))
+            && (this.getDeptId() == null ? other.getDeptId() == null : this.getDeptId().equals(other.getDeptId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
+        result = prime * result + ((getDeptId() == null) ? 0 : getDeptId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", roleId=").append(roleId);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleMenu.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleMenu.java
new file mode 100644
index 0000000..97fc74c
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysRoleMenu.java
@@ -0,0 +1,79 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 角色和菜单关联表
+ * @TableName sys_role_menu
+ */
+@TableName(value ="mosty_base.sys_role_menu")
+@Data
+public class SysRoleMenu implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色ID
+     */
+    @TableField(value = "role_id")
+    private Long roleId;
+
+    /**
+     * 菜单ID
+     */
+    @TableField(value = "menu_id")
+    private Long menuId;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysRoleMenu other = (SysRoleMenu) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()))
+            && (this.getMenuId() == null ? other.getMenuId() == null : this.getMenuId().equals(other.getMenuId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
+        result = prime * result + ((getMenuId() == null) ? 0 : getMenuId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", roleId=").append(roleId);
+        sb.append(", menuId=").append(menuId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java
new file mode 100644
index 0000000..b67268f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java
@@ -0,0 +1,332 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户信息表
+ * @TableName sys_user
+ */
+@Data
+@TableName(value ="mosty_base.sys_user")
+public class SysUser implements Serializable {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+    @TableField(value = "manager_org_id")
+    @ApiModelProperty(value = "管理部门ID")
+    private Long managerOrgId;
+
+    @TableField(value = "manager_org_name")
+    @ApiModelProperty(value = "管理部门名称")
+    private String managerOrgName;
+
+    @TableField(value = "position_id")
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    @TableField(value = "position_name")
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    @TableField(value = "is_virtual_user")
+    @ApiModelProperty(value = "是否虚拟用户：1、是 2、不是")
+    private String isVirtualUser;
+
+    @TableField(value = "login_name")
+    @ApiModelProperty(value = "登录账号")
+    private String loginName;
+
+    @TableField(value = "password")
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @TableField(value = "user_name")
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    @TableField(value = "user_type")
+    @ApiModelProperty(value = "用户类型（00系统用户 01注册用户）")
+    private String userType;
+
+    @TableField(value = "email")
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    @TableField(value = "mobile")
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @TableField(value = "tele_phone")
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    @TableField(value = "id_entity_card")
+    @ApiModelProperty(value = "身份证号")
+    private String idEntityCard;
+
+    @TableField(value = "in_dust_rial_id")
+    @ApiModelProperty(value = "行业号码（如：警号）")
+    private String inDustRialId;
+
+    @TableField(value = "sex")
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    @TableField(value = "nation")
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @TableField(value = "politic")
+    @ApiModelProperty(value = "政治面貌")
+    private String politic;
+
+    @TableField(value = "marital")
+    @ApiModelProperty(value = "婚姻状态")
+    private String marital;
+
+    @TableField(value = "type")
+    @ApiModelProperty(value = "人员类别")
+    private String type;
+
+    @TableField(value = "type_name")
+    @ApiModelProperty(value = "人员类别中文")
+    private String typeName;
+
+    @TableField(value = "whcd")
+    @ApiModelProperty(value = "文化程度")
+    private String whcd;
+
+    @TableField(value = "bz")
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @TableField(value = "birthday")
+    @ApiModelProperty(value = "出生日期")
+    private String birthday;
+
+    @TableField(value = "begin_time")
+    @ApiModelProperty(value = " 用户有效开始时间，默认为当前日期（用户可改）")
+    private Date beginTime;
+
+    @TableField(value = "end_time")
+    @ApiModelProperty(value = " 用户有效结束时间，默认空")
+    private Date endTime;
+
+    @TableField(value = "salt")
+    @ApiModelProperty(value = "盐加密")
+    private String salt;
+
+    @TableField(value = "xzcs")
+    @ApiModelProperty(value = "选择次数")
+    private Integer xzcs;
+
+    @TableField(value = "xt_zxbz")
+    private Integer xtZxbz;
+
+    @TableField(value = "xt_zxyz")
+    private String xtZxyz;
+
+    @TableField(value = "xt_cjsj")
+    private Date xtCjsj;
+
+    @TableField(value = "xt_lrsj")
+    private Date xtLrsj;
+
+    @TableField(value = "xt_lrrxm")
+    private String xtLrrxm;
+
+    @TableField(value = "xt_lrrid")
+    private Long xtLrrid;
+
+    @TableField(value = "xt_lrrbm")
+    private String xtLrrbm;
+
+    @TableField(value = "xt_lrrbmid")
+    private String xtLrrbmid;
+
+    @TableField(value = "xt_lrip")
+    private String xtLrip;
+
+    @TableField(value = "xt_zhxgsj")
+    private Date xtZhxgsj;
+
+    @TableField(value = "xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    @TableField(value = "xt_zhxgid")
+    private Long xtZhxgid;
+
+    @TableField(value = "xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    @TableField(value = "xt_zhxgrbmid")
+    private Long xtZhxgrbmid;
+
+    @TableField(value = "xt_zhxgrip")
+    private String xtZhxgrip;
+
+    @TableField(value = "sfrh")
+    private String sfrh;
+
+    @TableField(value = "mk")
+    private String mk;
+
+    /** 用户头像 */
+    @TableField(value = "avatar")
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysUser other = (SysUser) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getManagerOrgId() == null ? other.getManagerOrgId() == null : this.getManagerOrgId().equals(other.getManagerOrgId()))
+            && (this.getManagerOrgName() == null ? other.getManagerOrgName() == null : this.getManagerOrgName().equals(other.getManagerOrgName()))
+            && (this.getPositionId() == null ? other.getPositionId() == null : this.getPositionId().equals(other.getPositionId()))
+            && (this.getPositionName() == null ? other.getPositionName() == null : this.getPositionName().equals(other.getPositionName()))
+            && (this.getLoginName() == null ? other.getLoginName() == null : this.getLoginName().equals(other.getLoginName()))
+            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
+            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
+            && (this.getUserType() == null ? other.getUserType() == null : this.getUserType().equals(other.getUserType()))
+            && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
+            && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile()))
+            && (this.getTelePhone() == null ? other.getTelePhone() == null : this.getTelePhone().equals(other.getTelePhone()))
+            && (this.getIdEntityCard() == null ? other.getIdEntityCard() == null : this.getIdEntityCard().equals(other.getIdEntityCard()))
+            && (this.getInDustRialId() == null ? other.getInDustRialId() == null : this.getInDustRialId().equals(other.getInDustRialId()))
+            && (this.getSex() == null ? other.getSex() == null : this.getSex().equals(other.getSex()))
+            && (this.getNation() == null ? other.getNation() == null : this.getNation().equals(other.getNation()))
+            && (this.getWhcd() == null ? other.getWhcd() == null : this.getWhcd().equals(other.getWhcd()))
+            && (this.getBz() == null ? other.getBz() == null : this.getBz().equals(other.getBz()))
+            && (this.getBirthday() == null ? other.getBirthday() == null : this.getBirthday().equals(other.getBirthday()))
+            && (this.getBeginTime() == null ? other.getBeginTime() == null : this.getBeginTime().equals(other.getBeginTime()))
+            && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
+            && (this.getSalt() == null ? other.getSalt() == null : this.getSalt().equals(other.getSalt()))
+            && (this.getXtZxbz() == null ? other.getXtZxbz() == null : this.getXtZxbz().equals(other.getXtZxbz()))
+            && (this.getXtZxyz() == null ? other.getXtZxyz() == null : this.getXtZxyz().equals(other.getXtZxyz()))
+            && (this.getXtCjsj() == null ? other.getXtCjsj() == null : this.getXtCjsj().equals(other.getXtCjsj()))
+            && (this.getXtLrsj() == null ? other.getXtLrsj() == null : this.getXtLrsj().equals(other.getXtLrsj()))
+            && (this.getXtLrrxm() == null ? other.getXtLrrxm() == null : this.getXtLrrxm().equals(other.getXtLrrxm()))
+            && (this.getXtLrrid() == null ? other.getXtLrrid() == null : this.getXtLrrid().equals(other.getXtLrrid()))
+            && (this.getXtLrrbm() == null ? other.getXtLrrbm() == null : this.getXtLrrbm().equals(other.getXtLrrbm()))
+            && (this.getXtLrrbmid() == null ? other.getXtLrrbmid() == null : this.getXtLrrbmid().equals(other.getXtLrrbmid()))
+            && (this.getXtLrip() == null ? other.getXtLrip() == null : this.getXtLrip().equals(other.getXtLrip()))
+            && (this.getXtZhxgsj() == null ? other.getXtZhxgsj() == null : this.getXtZhxgsj().equals(other.getXtZhxgsj()))
+            && (this.getXtZhxgrxm() == null ? other.getXtZhxgrxm() == null : this.getXtZhxgrxm().equals(other.getXtZhxgrxm()))
+            && (this.getXtZhxgid() == null ? other.getXtZhxgid() == null : this.getXtZhxgid().equals(other.getXtZhxgid()))
+            && (this.getXtZhxgrbm() == null ? other.getXtZhxgrbm() == null : this.getXtZhxgrbm().equals(other.getXtZhxgrbm()))
+            && (this.getXtZhxgrbmid() == null ? other.getXtZhxgrbmid() == null : this.getXtZhxgrbmid().equals(other.getXtZhxgrbmid()))
+            && (this.getXtZhxgrip() == null ? other.getXtZhxgrip() == null : this.getXtZhxgrip().equals(other.getXtZhxgrip()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getManagerOrgId() == null) ? 0 : getManagerOrgId().hashCode());
+        result = prime * result + ((getManagerOrgName() == null) ? 0 : getManagerOrgName().hashCode());
+        result = prime * result + ((getPositionId() == null) ? 0 : getPositionId().hashCode());
+        result = prime * result + ((getPositionName() == null) ? 0 : getPositionName().hashCode());
+        result = prime * result + ((getLoginName() == null) ? 0 : getLoginName().hashCode());
+        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
+        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
+        result = prime * result + ((getUserType() == null) ? 0 : getUserType().hashCode());
+        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
+        result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode());
+        result = prime * result + ((getTelePhone() == null) ? 0 : getTelePhone().hashCode());
+        result = prime * result + ((getIdEntityCard() == null) ? 0 : getIdEntityCard().hashCode());
+        result = prime * result + ((getInDustRialId() == null) ? 0 : getInDustRialId().hashCode());
+        result = prime * result + ((getSex() == null) ? 0 : getSex().hashCode());
+        result = prime * result + ((getNation() == null) ? 0 : getNation().hashCode());
+        result = prime * result + ((getWhcd() == null) ? 0 : getWhcd().hashCode());
+        result = prime * result + ((getBz() == null) ? 0 : getBz().hashCode());
+        result = prime * result + ((getBirthday() == null) ? 0 : getBirthday().hashCode());
+        result = prime * result + ((getBeginTime() == null) ? 0 : getBeginTime().hashCode());
+        result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
+        result = prime * result + ((getSalt() == null) ? 0 : getSalt().hashCode());
+        result = prime * result + ((getXtZxbz() == null) ? 0 : getXtZxbz().hashCode());
+        result = prime * result + ((getXtZxyz() == null) ? 0 : getXtZxyz().hashCode());
+        result = prime * result + ((getXtCjsj() == null) ? 0 : getXtCjsj().hashCode());
+        result = prime * result + ((getXtLrsj() == null) ? 0 : getXtLrsj().hashCode());
+        result = prime * result + ((getXtLrrxm() == null) ? 0 : getXtLrrxm().hashCode());
+        result = prime * result + ((getXtLrrid() == null) ? 0 : getXtLrrid().hashCode());
+        result = prime * result + ((getXtLrrbm() == null) ? 0 : getXtLrrbm().hashCode());
+        result = prime * result + ((getXtLrrbmid() == null) ? 0 : getXtLrrbmid().hashCode());
+        result = prime * result + ((getXtLrip() == null) ? 0 : getXtLrip().hashCode());
+        result = prime * result + ((getXtZhxgsj() == null) ? 0 : getXtZhxgsj().hashCode());
+        result = prime * result + ((getXtZhxgrxm() == null) ? 0 : getXtZhxgrxm().hashCode());
+        result = prime * result + ((getXtZhxgid() == null) ? 0 : getXtZhxgid().hashCode());
+        result = prime * result + ((getXtZhxgrbm() == null) ? 0 : getXtZhxgrbm().hashCode());
+        result = prime * result + ((getXtZhxgrbmid() == null) ? 0 : getXtZhxgrbmid().hashCode());
+        result = prime * result + ((getXtZhxgrip() == null) ? 0 : getXtZhxgrip().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() +
+                " [" +
+                "Hash = " + hashCode() +
+                ", id=" + id +
+                ", managerOrgId=" + managerOrgId +
+                ", managerOrgName=" + managerOrgName +
+                ", positionId=" + positionId +
+                ", positionName=" + positionName +
+                ", loginName=" + loginName +
+                ", password=" + password +
+                ", userName=" + userName +
+                ", userType=" + userType +
+                ", email=" + email +
+                ", mobile=" + mobile +
+                ", telePhone=" + telePhone +
+                ", idEntityCard=" + idEntityCard +
+                ", inDustRialId=" + inDustRialId +
+                ", sex=" + sex +
+                ", nation=" + nation +
+                ", whcd=" + whcd +
+                ", bz=" + bz +
+                ", birthday=" + birthday +
+                ", beginTime=" + beginTime +
+                ", endTime=" + endTime +
+                ", salt=" + salt +
+                ", xtZxbz=" + xtZxbz +
+                ", xtZxyz=" + xtZxyz +
+                ", xtCjsj=" + xtCjsj +
+                ", xtLrsj=" + xtLrsj +
+                ", xtLrrxm=" + xtLrrxm +
+                ", xtLrrid=" + xtLrrid +
+                ", xtLrrbm=" + xtLrrbm +
+                ", xtLrrbmid=" + xtLrrbmid +
+                ", xtLrip=" + xtLrip +
+                ", xtZhxgsj=" + xtZhxgsj +
+                ", xtZhxgrxm=" + xtZhxgrxm +
+                ", xtZhxgid=" + xtZhxgid +
+                ", xtZhxgrbm=" + xtZhxgrbm +
+                ", xtZhxgrbmid=" + xtZhxgrbmid +
+                ", xtZhxgrip=" + xtZhxgrip +
+                ", serialVersionUID=" + serialVersionUID +
+                "]";
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfig.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfig.java
new file mode 100644
index 0000000..2823a06
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfig.java
@@ -0,0 +1,109 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户app首页配置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_user_app_homeconfig")
+@ApiModel(value="SysUserAppHomeconfig对象", description="用户app首页配置表")
+public class SysUserAppHomeconfig implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeid;
+
+    @ApiModelProperty(value = "首页名称")
+    private String homename;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String userSfzh;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userXm;
+
+    @ApiModelProperty(value = "配置时间")
+    private Date pzsj;
+
+    @ApiModelProperty(value = "配置板块数")
+    private Integer pzbks;
+
+    @ApiModelProperty(value = "色调01-蓝色，02-白色")
+    private String sd;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.java
new file mode 100644
index 0000000..ac82d06
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.java
@@ -0,0 +1,103 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_user_app_homeconfig_plate")
+@ApiModel(value="SysUserAppHomeconfigPlate对象", description="用户app首页配置-板块表")
+public class SysUserAppHomeconfigPlate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "配置id")
+    private Long pzId;
+
+    @ApiModelProperty(value = "板块id")
+    private Long plateId;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+    @ApiModelProperty(value = "板块内容数")
+    private Integer bknrs;
+
+    @ApiModelProperty(value = "板块顺序")
+    private Integer bksx;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.java
new file mode 100644
index 0000000..5c4ca1b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.java
@@ -0,0 +1,103 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户app首页配置-板块内容表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("mosty_base.sys_user_app_homeconfig_plate_list")
+@ApiModel(value="SysUserAppHomeconfigPlateList对象", description="用户app首页配置-板块内容表")
+public class SysUserAppHomeconfigPlateList implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "配置id")
+    private Long pzId;
+
+    @ApiModelProperty(value = "配置板块ID")
+    private Long pzPlateId;
+
+    @ApiModelProperty(value = "内容ID")
+    private Long plateListId;
+
+    @ApiModelProperty(value = "内容名称")
+    private String nrmc;
+
+    @ApiModelProperty(value = "板块顺序")
+    private Integer bksx;
+
+    @ApiModelProperty(value = "路由跳转地址")
+    private String tzdz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserDept.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserDept.java
new file mode 100644
index 0000000..5cddf9f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserDept.java
@@ -0,0 +1,90 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 用户和部门关联表
+ * @TableName sys_user_dept
+ */
+@Data
+@TableName(value ="mosty_base.sys_user_dept")
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserDept implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "user_id")
+    private Long userId;
+
+    /**
+     * 部门id
+     */
+    @TableField(value = "dept_id")
+    private Long deptId;
+
+    public SysUserDept(Long userId, Long deptId) {
+        this.userId = userId;
+        this.deptId = deptId;
+    }
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysUserDept other = (SysUserDept) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getDeptId() == null ? other.getDeptId() == null : this.getDeptId().equals(other.getDeptId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getDeptId() == null) ? 0 : getDeptId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserRole.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserRole.java
new file mode 100644
index 0000000..ae6d20a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUserRole.java
@@ -0,0 +1,88 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 用户和角色关联表
+ * @TableName sys_user_role
+ */
+@TableName(value ="mosty_base.sys_user_role")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserRole implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "user_id")
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    @TableField(value = "role_id")
+    private Long roleId;
+
+    public SysUserRole(Long userId, Long roleId) {
+        this.userId = userId;
+        this.roleId = roleId;
+    }
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysUserRole other = (SysUserRole) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", roleId=").append(roleId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/TbJcglXfll.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/TbJcglXfll.java
new file mode 100644
index 0000000..132a49d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/TbJcglXfll.java
@@ -0,0 +1,183 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表", description = "")
+@TableName("mosty_base.tb_jcgl_xfll")
+public class TbJcglXfll implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty(name = "警员管理表标识ID", notes = "", hidden = true)
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）", notes = "")
+    private String ryid;
+
+    @ApiModelProperty(name = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(name = "警员类型", notes = "01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警")
+    private String lx;
+
+    @ApiModelProperty(name = "姓名", notes = "")
+    private String xm;
+
+    @ApiModelProperty(name = "性别代码", notes = "")
+    private String xbdm;
+
+    @ApiModelProperty(name = "身份证号", notes = "")
+    private String sfzh;
+
+    @ApiModelProperty(name = "警号", notes = "")
+    private String jh;
+
+    @ApiModelProperty(name = "警衔", notes = "")
+    private String jx;
+
+    @ApiModelProperty(name = "政治面貌", notes = "")
+    private String zzmm;
+
+    @ApiModelProperty(name = "婚姻状况", notes = "0、未婚，1、已婚，2、离异")
+    private String hyzk;
+
+    @ApiModelProperty(name = "入职时间", notes = "")
+    private Date rzsj;
+
+    @ApiModelProperty(name = "出生日期", notes = "")
+    private Date csrq;
+
+    @ApiModelProperty(name = "民族编码", notes = "")
+    private String mzdm;
+
+    @ApiModelProperty(name = "文化程度", notes = "")
+    private String whcddm;
+
+    @ApiModelProperty(name = "籍贯", notes = "")
+    private String jgdm;
+
+    @ApiModelProperty(name = "家庭住址", notes = "")
+    private String jtzz;
+
+    @ApiModelProperty(name = "联系电话", notes = "")
+    private String lxdh;
+
+    @ApiModelProperty(name = "电子邮箱", notes = "")
+    private String dzyx;
+
+    @ApiModelProperty(name = "巡防力量图片")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+    @ApiModelProperty(value = "数据来源：1、PC，2、手机端",name = "xtSjly")
+    private String xtSjly;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "数据状态：0、注销，1、正常，-1、封存",name = "xtSjzt")
+    private String xtSjzt;
+
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "删除标识：0、未删除，1、已删除",name = "xtScbz")
+    private String xtScbz;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建IP",name = "xtCjip")
+    private String xtCjip;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间",name = "xtCjsj")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",  timezone="GMT+8")
+    private Timestamp xtCjsj;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人ID",name = "xtCjrId")
+    private String xtCjrId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人名称",name = "xtCjr")
+    private String xtCjr;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门代码",name = "xtCjbmdm")
+    private String xtCjbmdm;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门名称",name = "xtCjbmmc")
+    private String xtCjbmmc;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新IP",name = "xtZhgxip")
+    private String xtZhgxip;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新时间",name = "xtZhgxsj")
+    private Timestamp xtZhgxsj;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人ID",name = "xtZhgxrid")
+    private String xtZhgxrid;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人名称",name = "xtZhgxr")
+    private String xtZhgxr;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门代码",name = "xtZhgxbmdm")
+    private String xtZhgxbmdm;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门名称",name = "xtZhgxbm")
+    private String xtZhgxbm;
+
+    @ApiModelProperty(value = "备注",name = "bz")
+    private String bz;
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/Ybmj.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/Ybmj.java
new file mode 100644
index 0000000..b006af6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/Ybmj.java
@@ -0,0 +1,51 @@
+package com.mosty.common.core.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户信息表
+ *
+ * @TableName sys_user
+ */
+@Data
+@TableName(value = "mosty_base.ybmj")
+public class Ybmj implements Serializable {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "用户ID")
+    private String id;
+
+    @TableField(value = "xm")
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @TableField(value = "jh")
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @TableField(value = "dh")
+    @ApiModelProperty(value = "电话")
+    private String dh;
+
+    @TableField(value = "ssbmdm")
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @TableField(value = "ssbm")
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @TableField(value = "sfzh")
+    @ApiModelProperty(value = "身份证")
+    private String sfzh;
+
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/LoginLogPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/LoginLogPage.java
new file mode 100644
index 0000000..89769a9
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/LoginLogPage.java
@@ -0,0 +1,20 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class LoginLogPage extends Page {
+
+    @ApiModelProperty(value = "登录账号")
+    private String userName;
+
+    @ApiModelProperty(value = "登录状态")
+    private Integer status;
+}
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.java
new file mode 100644
index 0000000..bf280bd
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.java
@@ -0,0 +1,34 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SysAppHomeconfig对象", description="app首页表")
+public class SysAppHomeconfigPage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页ID")
+    private Long id;
+
+    @ApiModelProperty(value = "首页名称，如：领导端")
+    private String homename;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.java
new file mode 100644
index 0000000..e370d82
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.java
@@ -0,0 +1,37 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页配置-板块内容表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="app首页配置-板块内容", description="app首页配置-板块内容")
+public class SysAppHomeconfigPlateListPage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "板块ID")
+    private Long plateId;
+
+    @ApiModelProperty(value = "内容名称")
+    private String nrmc;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.java
new file mode 100644
index 0000000..b9cf64e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.java
@@ -0,0 +1,42 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_app_homeconfig_plate")
+@ApiModel(value="SysAppHomeconfigPlate对象", description="app首页-板块表")
+public class SysAppHomeconfigPlatePage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页ID")
+    private Long homeid;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.java
new file mode 100644
index 0000000..00d0cae
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SysAppHomeconfigQuery对象", description="app首页表")
+public class SysAppHomeconfigQuery {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页ID")
+    private Long id;
+
+    @ApiModelProperty(value = "首页名称，如：领导端")
+    private String homename;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.java
new file mode 100644
index 0000000..dffbd1b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SysUserAppHomeconfig对象", description="用户app首页配置表")
+public class SysUserAppHomeconfigPage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeid;
+
+    @ApiModelProperty(value = "首页名称")
+    private String homename;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String userSfzh;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.java
new file mode 100644
index 0000000..4c5396a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * app首页配置-板块内容表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="app首页配置-板块内容", description="app首页配置-板块内容")
+public class SysUserAppHomeconfigPlateListPage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "配置id")
+    private Long pzId;
+
+    @ApiModelProperty(value = "配置板块ID")
+    private Long pzPlateId;
+
+    @ApiModelProperty(value = "内容ID")
+    private Long plateListId;
+
+    @ApiModelProperty(value = "内容名称")
+    private String nrmc;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.java
new file mode 100644
index 0000000..29930f5
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.java
@@ -0,0 +1,39 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * app首页-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysAppHomeconfigPlate对象", description="app首页-板块表")
+public class SysUserAppHomeconfigPlatePage extends Page {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "配置id")
+    private Long pzId;
+
+    @ApiModelProperty(value = "板块id")
+    private Long plateId;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.java
new file mode 100644
index 0000000..f39e140
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.business.entity.request;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SysUserAppHomeconfig对象", description="用户app首页配置表")
+public class SysUserAppHomeconfigQuery {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeid;
+
+    @ApiModelProperty(value = "首页名称")
+    private String homename;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String userSfzh;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.java
new file mode 100644
index 0000000..b5cb20f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.java
@@ -0,0 +1,20 @@
+package com.mosty.common.core.business.entity.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liyan
+ */
+@Data
+public class SysUserEditPasswordRequest {
+
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+    @ApiModelProperty(value = "旧密码")
+    private String oldPassword;
+
+    @ApiModelProperty(value = "新密码")
+    private String password;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddDeptVO.java
new file mode 100644
index 0000000..7c23be0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddDeptVO.java
@@ -0,0 +1,81 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@Accessors(chain = true)
+public class AddDeptVO {
+
+    @ApiModelProperty("部门id")
+    private Long id;
+
+    @ApiModelProperty("部门代码")
+    @NotBlank(message = "部门代码不能为空！")
+    private String orgCode;
+
+    @ApiModelProperty("部门名称")
+    @NotBlank(message = "部门名称不能为空！")
+    private String orgName;
+
+    @ApiModelProperty("部门类型")
+    @NotNull(message = "部门类型不能为空！")
+    private String orgType;
+
+    @ApiModelProperty("部门等级")
+    @NotNull(message = "部门等级不能为空！")
+    private String orgLevel;
+
+    @ApiModelProperty("部门业务类型")
+    @NotNull(message = "部门业务类型不能为空！")
+    private String orgBizType;
+
+    @ApiModelProperty("部门顺序号")
+    private String orgNo;
+
+    @ApiModelProperty("上级部门主键")
+    private Long parentId;
+
+    @ApiModelProperty("部门名称拼音首字母")
+    private String bmpyszm;
+
+    @ApiModelProperty("部门简称")
+    private String orgJc;
+
+    @ApiModelProperty("部门全称")
+    @NotBlank(message = "部门全称不能为空！")
+    private String orgQc;
+
+    @ApiModelProperty("部门地址")
+    @NotBlank(message = "部门地址不能为空！")
+    private String address;
+
+    @ApiModelProperty("部门电话")
+    @NotBlank(message = "部门电话不能为空！")
+    private String linkTel;
+
+    @ApiModelProperty("部门联系人")
+    private String linkMan;
+
+    @ApiModelProperty("部门联系人电话")
+    private String linkManTel;
+
+    @ApiModelProperty("部门主页")
+    private String webUrl;
+
+    @ApiModelProperty("部门邮箱")
+    private String email;
+
+    @ApiModelProperty("部门所属行政区划")
+    private String xzqh;
+
+    @ApiModelProperty("备注")
+    private String bz;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.java
new file mode 100644
index 0000000..ab62ac8
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class AddRoleDataPartitionVO extends Page {
+
+    /**
+     * 角色id
+     */
+    @ApiModelProperty("角色id")
+    private Long id;
+    /**
+     * 数据权限等级
+     */
+    @ApiModelProperty("数据权限等级")
+    private String dataPermissionLevel;
+
+
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.java
new file mode 100644
index 0000000..974d9c1
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.java
@@ -0,0 +1,37 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddRoleDeptVO  {
+
+    /**
+     * 部门id
+     */
+    @NotNull(message = "部门id不能为空")
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 角色ids
+     */
+    @NotEmpty(message = "角色集合不能为空")
+    @ApiModelProperty("角色ids")
+    private List<Long> roleIds;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.java
new file mode 100644
index 0000000..54f8fe0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.java
@@ -0,0 +1,29 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddRoleMenuVO  {
+
+    @ApiModelProperty("角色id")
+    @NotNull(message = "角色id不能为空")
+    private Long roleId;
+
+    @ApiModelProperty("菜单ids, 菜单可以为空表示解绑，才能删除角色")
+    private List<Long> menuIds;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleVO.java
new file mode 100644
index 0000000..6a86727
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddRoleVO.java
@@ -0,0 +1,60 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  新增角色对象
+ * @author kevin
+ * @date 2022/2/18 10:40 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddRoleVO {
+
+
+    /**
+     * 角色名称
+     */
+    @NotEmpty(message = "角色名称不能为空")
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    @NotEmpty(message = "角色编码不能为空")
+    @ApiModelProperty("角色编码")
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    @ApiModelProperty("角色描述")
+    private String roleDesc;
+
+    /**
+     * 排序号
+     */
+    @NotNull(message = "排序号不能为空")
+    @ApiModelProperty("排序号")
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 数据权限等级
+     */
+    @ApiModelProperty("数据权限等级")
+    private String dataPermissionLevel;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysMenuVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysMenuVO.java
new file mode 100644
index 0000000..d628887
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysMenuVO.java
@@ -0,0 +1,55 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  添加系统菜单
+ * @author kevin
+ * @date 2022/2/22 12:51 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddSysMenuVO {
+
+    @ApiModelProperty(value = "父菜单id")
+    private Long parentId;
+
+    @NotEmpty(message = "菜单名称不能为空")
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    @NotEmpty(message = "菜单编码不能为空")
+    @ApiModelProperty(value = "菜单编码")
+    private String menuCode;
+
+    @ApiModelProperty(value = "菜单地址")
+    private String menuUrl;
+
+    /**
+     * 菜单类型
+     * @see com.mosty.common.base.constant.enums.MenuTypeEnum
+     */
+    @NotNull(message = "菜单类型不能为空")
+    @ApiModelProperty(value = "菜单类型：1、菜单组 2、菜单 3、页面 4、资源")
+    private Integer menuType;
+
+    @NotNull(message = "排序号不能为空")
+    @ApiModelProperty(value = "排序号")
+    private Integer orderNo;
+
+    @ApiModelProperty(value = "是否展示：1、展示 2、不展示")
+    private Integer showMode;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "按钮标识")
+    private String buttonResource;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysUserVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysUserVO.java
new file mode 100644
index 0000000..c194090
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddSysUserVO.java
@@ -0,0 +1,278 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  添加用户信息请求对象
+ * @author kevin
+ * @date 2022/2/16 10:11 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class AddSysUserVO implements Serializable {
+
+    /**
+     * 序列化标识
+     */
+    private static final long serialVersionUID = 5407773316739763410L;
+
+    /**
+     * 部门ids
+     */
+//    @NotEmpty(message = "部门ids不能为空！")
+//    @ApiModelProperty(value = "部门ids")
+//    private List<Long> deptIds;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    /**
+     * 管理部门ID
+     */
+    @ApiModelProperty(value = "管理部门ID")
+    private Long managerOrgId;
+
+    /**
+     * 管理部门名称
+     */
+    @ApiModelProperty(value = "管理部门名称")
+    private String managerOrgName;
+
+    /**
+     * 岗位ID
+     */
+//    @NotNull(message = "岗位id不能为空！")
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    /**
+     * 岗位名称
+     */
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    /**
+     * 登录账号
+     */
+    @ApiModelProperty(value = "登录账号")
+//    @NotEmpty(message ="登录账号不能为空")
+    private String loginName;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+//    @NotEmpty(message = "密码不能为空")
+    private String password;
+
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    /**
+     * 用户类型（00系统用户 01注册用户）
+     */
+    @ApiModelProperty(value = "用户类型（00系统用户默认  01注册用户）")
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 移动电话
+     */
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    /**
+     * 电话号码
+     */
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "id_entity_card")
+    private String idEntityCard;
+
+    /**
+     * 行业号码（如：警号）
+     */
+    @ApiModelProperty(value = "行业号码（如：警号）")
+    private String inDustRialId;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    /**
+     * 政治面貌
+     */
+    @ApiModelProperty(value = "政治面貌")
+    private String politic;
+
+    /**
+     * 婚姻状态
+     */
+    @ApiModelProperty(value = "婚姻状态")
+    private String marital;
+
+    /**
+     * 人员类别
+     */
+    @ApiModelProperty(value = "人员类别")
+    private String type;
+
+    /**
+     * 文化程度
+     */
+    @ApiModelProperty(value = "文化程度")
+    private String whcd;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    /**
+     * 出生日期
+     */
+    @ApiModelProperty(value = "出生日期")
+    private String birthday;
+
+    /**
+     * 用户有效开始时间，默认为当前日期（用户可改）
+     */
+    @ApiModelProperty(value = " 用户有效开始时间，默认为当前日期（用户可改）")
+    private Date beginTime;
+
+    /**
+     * 用户有效结束时间，默认空
+     */
+    @ApiModelProperty(value = " 用户有效结束时间，默认空")
+    private Date endTime;
+
+    /**
+     * 是否虚拟用户：1、是 2、不是
+     */
+    @ApiModelProperty(value = "是否虚拟用户：1、是 2、不是")
+    private String isVirtualUser;
+
+
+    /**
+     * 采集时间
+     */
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    /**
+     * 录入时间
+     */
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    /**
+     * 录入人姓名
+     */
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    /**
+     * 录入人id
+     */
+    @ApiModelProperty(value = "录入人id")
+    private Long xtLrrid;
+
+    /**
+     * 录入人部门
+     */
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    /**
+     * 录入人部门id
+     */
+    @ApiModelProperty(value = "录入人部门id")
+    private String xtLrrbmid;
+
+    /**
+     * 录入人部门id
+     */
+    @ApiModelProperty(value = "录入人部门id")
+    private String xtLrip;
+
+    /**
+     * 最后修改时间
+     */
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    /**
+     * 最后修改人姓名
+     */
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    /**
+     * 最后修改人id
+     */
+    @ApiModelProperty(value = "最后修改人id")
+    private Long xtZhxgid;
+
+    /**
+     * 最后修改人部门
+     */
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    /**
+     * 最后修改人部门id
+     */
+    @ApiModelProperty(value = "最后修改人部门id")
+    private Long xtZhxgrbmid;
+
+    /**
+     * 最后修改人ip
+     */
+    @ApiModelProperty(value = "最后修改人ip")
+    private String xtZhxgrip;
+
+    /**
+     * token登陆
+     */
+    @ApiModelProperty(value = "token登陆")
+    private String token;
+
+
+    @ApiModelProperty(value = "是否融合 0否 1是")
+    private String sfrh;
+
+    @ApiModelProperty(value = "模块")
+    private String mk;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddUserDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddUserDeptVO.java
new file mode 100644
index 0000000..8732262
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/AddUserDeptVO.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class AddUserDeptVO extends Page {
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/Base64Str.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/Base64Str.java
new file mode 100644
index 0000000..ccfc100
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/Base64Str.java
@@ -0,0 +1,18 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class Base64Str {
+
+    @ApiModelProperty(value = "base64字符串")
+    private String base64;
+
+    @ApiModelProperty(value = "文件后缀 png mp4")
+    private String suffix;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DataPermissionVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DataPermissionVO.java
new file mode 100644
index 0000000..b8d14db
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DataPermissionVO.java
@@ -0,0 +1,18 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DataPermissionVO {
+    @ApiModelProperty(value = "数据权限等级")
+    private String permissionLevel;
+
+    @ApiModelProperty(value = "数据权限对应得部门ids")
+    private List<Long> deptIds;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteDeptVO.java
new file mode 100644
index 0000000..67406e8
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteDeptVO.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@Accessors(chain = true)
+public class DeleteDeptVO {
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    @NotNull(message = "部门id不能为空")
+    private Long id;
+
+    @ApiModelProperty("注销原因")
+    @NotBlank(message = "注销原因不能为空")
+    private String xtZxyy;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteListVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteListVO.java
new file mode 100644
index 0000000..bf18915
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteListVO.java
@@ -0,0 +1,19 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DeleteListVO", description="DeleteList批量")
+public class DeleteListVO {
+    /**
+     * ID集合
+     */
+   private List<Long> ids;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.java
new file mode 100644
index 0000000..31c31ba
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DeleteRoleDeptVO extends Page {
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 角色ids
+     */
+    @ApiModelProperty("角色ids")
+    private String roleIds;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.java
new file mode 100644
index 0000000..52ba553
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DeleteUserDeptVO extends Page {
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private String userIds;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptPage.java
new file mode 100644
index 0000000..2aae970
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptPage.java
@@ -0,0 +1,32 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.core.business.entity.SysDept;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 分页查询部门信息
+ *
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DeptPage extends Page<SysDept> {
+
+    // 部门名称
+    private String deptName;
+
+    // 部门编码
+    private String orgCode;
+
+    // 部门编码ids
+    private String ids;
+
+    // 是否需要权限 1.不需要权限
+    private String isAll;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptQuery.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptQuery.java
new file mode 100644
index 0000000..2b632e3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.common.core.business.entity.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 分页查询部门信息
+ *
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class DeptQuery {
+
+    // 部门名称
+    private String deptname;
+
+    // 部门编码
+    private String deptcode;
+
+    // 部门父级编码
+    private Integer parentid;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptTreeVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptTreeVO.java
new file mode 100644
index 0000000..112bdf4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptTreeVO.java
@@ -0,0 +1,20 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ *  组织结构树搜索请求
+ * @author kevin
+ * @date 2022/3/27 11:44 AM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class DeptTreeVO {
+
+    @ApiModelProperty("搜索关键词")
+    private String keyword;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptVo.java
new file mode 100644
index 0000000..a027702
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/DeptVo.java
@@ -0,0 +1,56 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 返回的组织机构对象，包含所属部门 所属分县局 所属地市州
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "DeptVo 对象", description = "返回的组织机构对象，包含所属部门 所属分县局 所属地市州")
+public class DeptVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("所属部门ID")
+    private String deptid;
+
+    @ApiModelProperty("所属部门代码")
+    private String deptcode;
+
+    @ApiModelProperty("所属部门名称")
+    private String deptname;
+
+    @ApiModelProperty("部门类型")
+    private String orgType;
+
+    @ApiModelProperty("部门等级")
+    private String orgLevel;
+
+    @ApiModelProperty("所属分县局id")
+    private String fxjid;
+
+    @ApiModelProperty("所属分县局代码")
+    private String fxjcode;
+
+    @ApiModelProperty("所属分现局名称")
+    private String fxjname;
+
+    @ApiModelProperty("所属地市州id")
+    private String dszid;
+
+    @ApiModelProperty("所属地市州代码")
+    private String dszcode;
+
+    @ApiModelProperty("所属地市州名称")
+    private String dszname;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/EditSysMenuVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/EditSysMenuVO.java
new file mode 100644
index 0000000..a09f9b7
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/EditSysMenuVO.java
@@ -0,0 +1,48 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  修改系统菜单
+ * @author kevin
+ * @date 2022/2/22 12:51 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class EditSysMenuVO {
+
+    @NotNull(message = "菜单id不能为空")
+    @ApiModelProperty(value = "菜单id")
+    private Long id;
+
+    @NotEmpty(message = "菜单名称不能为空")
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    @NotEmpty(message = "菜单编码不能为空")
+    @ApiModelProperty(value = "菜单编码")
+    private String menuCode;
+
+    @ApiModelProperty(value = "菜单地址")
+    private String menuUrl;
+
+    @NotNull(message = "排序号不能为空")
+    @ApiModelProperty(value = "排序号")
+    private Integer orderNo;
+
+    @ApiModelProperty(value = "是否展示：1、展示 2、不展示")
+    private Integer showMode;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "按钮标识")
+    private String buttonResource;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserPage.java
new file mode 100644
index 0000000..84a5984
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserPage.java
@@ -0,0 +1,24 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  用户分页展示
+ * @author dw
+ * @date 2022/2/17 10:04 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class GetUserPage {
+
+    @ApiModelProperty("查询方式 1.本部门 2.所有部门")
+    private String type;
+
+    @ApiModelProperty("搜索关键字")
+    private String keyword;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.java
new file mode 100644
index 0000000..4028ec2
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.java
@@ -0,0 +1,24 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class GetUserRoleListVo implements Serializable {
+
+    @ApiModelProperty("角色id")
+    @NotNull(message = "角色id不能为空")
+    private Long roleId;
+
+    @ApiModelProperty("菜单ids")
+    private String userName;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/LoginResponseVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/LoginResponseVO.java
new file mode 100644
index 0000000..5c76d7d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/LoginResponseVO.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  登陆返回信息
+ * @author kevin
+ * @date 2022/5/25 4:19 下午
+ * @since 1.0.0
+ */
+@Data
+@Api(tags = "登陆返回body和cookie")
+public class LoginResponseVO {
+
+    @ApiModelProperty("登陆返回的body")
+    private String loginResponseBody;
+
+    @ApiModelProperty("登陆返回的Set-Cookie键值对")
+    private String loginResponseCookie;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuPage.java
new file mode 100644
index 0000000..d5d1fce
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuPage.java
@@ -0,0 +1,29 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询菜单信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class MenuPage extends Page {
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+//    /**
+//     * 岗位状态 ：-1：全部、0：正常 2、删除（弃用）
+//     */
+//    private Integer positionStatus;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuQuery.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuQuery.java
new file mode 100644
index 0000000..6bfd8f8
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/MenuQuery.java
@@ -0,0 +1,28 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询菜单信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class MenuQuery {
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+//    /**
+//     * 岗位状态 ：-1：全部、0：正常 2、删除（弃用）
+//     */
+//    private Integer positionStatus;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/PositionPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/PositionPage.java
new file mode 100644
index 0000000..4d8128e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/PositionPage.java
@@ -0,0 +1,34 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询岗位信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class PositionPage extends Page {
+
+    /**
+     * 岗位编码
+     */
+    private String positionCode;
+
+    /**
+     * 岗位名称
+     */
+    private String positionName;
+
+//    /**
+//     * 岗位状态 ：-1：全部、0：正常 2、删除（弃用）
+//     */
+//    private Integer positionStatus;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleByDeptPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleByDeptPage.java
new file mode 100644
index 0000000..0fc8707
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleByDeptPage.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询部门信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class RoleByDeptPage extends Page {
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+
+    /**
+     * 角色id
+     */
+    @ApiModelProperty(value = "角色id")
+    private Long roleId;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleDeptVO.java
new file mode 100644
index 0000000..aa79d0a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleDeptVO.java
@@ -0,0 +1,64 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class RoleDeptVO  implements Serializable {
+
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("关联关系id")
+    private Long id;
+
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    /**
+     * 角色描述
+     */
+    @ApiModelProperty("角色描述")
+    private String roleDesc;
+
+    @ApiModelProperty("注销标志")
+    private Integer  xtZxbz;
+
+    /**
+     * 录入时间
+     */
+    @ApiModelProperty("录入时间")
+    private Date xtLrsj;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RolePage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RolePage.java
new file mode 100644
index 0000000..27c94a4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RolePage.java
@@ -0,0 +1,29 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询角色信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class RolePage extends Page {
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserPage.java
new file mode 100644
index 0000000..ef27296
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserPage.java
@@ -0,0 +1,38 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  角色关联的用户信息分页查询请求
+ * @author kevin
+ * @date 2022/2/20 11:24 AM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class RoleUserPage extends Page {
+
+    /**
+     * 登陆名称
+     */
+    @ApiModelProperty("登陆名称")
+    private String loginName;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty("手机号码")
+    private String phone;
+
+    /**
+     * 角色id
+     */
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserVO.java
new file mode 100644
index 0000000..6f7be59
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/RoleUserVO.java
@@ -0,0 +1,31 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户和角色关联关系
+ */
+@Data
+@Accessors(chain = true)
+public class RoleUserVO implements Serializable {
+
+
+    private static final long serialVersionUID = 3289683012945300862L;
+
+    @NotEmpty(message = "角色id不能为空")
+    @NotNull(message = "用户id不能为空")
+    @ApiModelProperty(value = "用户ID")
+    private List<Long> userIds;
+
+    @NotEmpty(message = "角色id不能为空")
+    @ApiModelProperty(value = "用户IDS")
+    private Long roleId;
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.java
new file mode 100644
index 0000000..a219dcb
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.java
@@ -0,0 +1,108 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_app_homeconfig_plate")
+@ApiModel(value="SysAppHomeconfigPlate对象", description="app首页-板块表")
+public class SysAppHomeconfigPlateVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页ID")
+    private Long homeid;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+    @ApiModelProperty(value = "板块样式")
+    private String dyys;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "板块顺序")
+    private Integer bksx;
+
+    @ApiModelProperty(value = "跳转地址")
+    private String tzdz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "板块内容集合")
+    List<SysAppHomeconfigPlateList> plateList;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.java
new file mode 100644
index 0000000..6c04e72
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.java
@@ -0,0 +1,92 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_app_homeconfig")
+@ApiModel(value="SysAppHomeconfig对象", description="app首页表")
+public class SysAppHomeconfigRsVO implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页名称，如：领导端")
+    private String homename;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "板块集合")
+    List<SysAppHomeconfigPlateVo> plateList;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.java
new file mode 100644
index 0000000..cb90f1b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.java
@@ -0,0 +1,88 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app首页表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_app_homeconfig")
+@ApiModel(value="SysAppHomeconfig对象", description="app首页表")
+public class SysAppHomeconfigVO implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页名称，如：领导端")
+    private String homename;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysDeptVO.java
new file mode 100644
index 0000000..917434e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysDeptVO.java
@@ -0,0 +1,176 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *  部门信息
+ * @author kevin
+ * @date 2022/2/17 8:48 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class SysDeptVO {
+
+    /**
+     * 子部门集合
+     */
+    @ApiModelProperty(value = "子部门集合")
+    private List<SysDeptVO> childDeptList;
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long id;
+
+    /**
+     * 部门代码
+     */
+    @ApiModelProperty("部门代码")
+    @NotBlank(message = "部门代码不能为空！")
+    private String orgCode;
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty("部门名称")
+    @NotBlank(message = "部门名称不能为空！")
+    private String orgName;
+
+
+    /**
+     * 部门类型
+     */
+    @ApiModelProperty("部门类型")
+    @NotNull(message = "部门类型不能为空！")
+    private String orgType;
+
+    /**
+     * 部门等级
+     */
+    @ApiModelProperty("部门等级")
+    @NotNull(message = "部门等级不能为空！")
+    private String orgLevel;
+
+    /**
+     * 部门业务类型
+     */
+    @ApiModelProperty("部门业务类型")
+    @NotNull(message = "部门业务类型不能为空！")
+    private String orgBizType;
+
+    /**
+     * 部门顺序号
+     */
+    @ApiModelProperty("部门顺序号")
+    @NotNull(message = "部门顺序号不能为空！")
+    private String orgNo;
+
+    /**
+     * 上级部门主键
+     */
+    @ApiModelProperty("上级部门主键")
+//    @NotNull(message = "上级部门主键不能为空！")
+    private Long parentId;
+
+    /**
+     * 部门名称拼音首字母
+     */
+    @ApiModelProperty("部门名称拼音首字母")
+    private String bmpyszm;
+
+    /**
+     * 部门简称
+     */
+    @ApiModelProperty("部门简称")
+    @NotBlank(message = "部门简称不能为空！")
+    private String orgJc;
+
+    /**
+     * 部门全称
+     */
+    @ApiModelProperty("部门全称")
+    @NotBlank(message = "部门全称不能为空！")
+    private String orgQc;
+
+    /**
+     * 部门地址
+     */
+    @ApiModelProperty("部门地址")
+    @NotBlank(message = "部门地址不能为空！")
+    private String address;
+
+    /**
+     * 部门电话
+     */
+    @ApiModelProperty("部门电话")
+    @NotBlank(message = "部门电话不能为空！")
+    private String linkTel;
+
+    /**
+     * 部门联系人
+     */
+    @ApiModelProperty("部门联系人")
+    @NotBlank(message = "部门联系人不能为空！")
+    private String linkMan;
+
+    /**
+     * 部门联系人电话
+     */
+    @ApiModelProperty("部门联系人电话")
+    @NotBlank(message = "部门联系人电话不能为空！")
+    private String linkManTel;
+
+    /**
+     * 部门主页
+     */
+    @ApiModelProperty("部门主页")
+    private String webUrl;
+
+    /**
+     * 部门邮箱
+     */
+    @ApiModelProperty("部门邮箱")
+    private String email;
+
+    /**
+     * 部门所属行政区划
+     */
+    @ApiModelProperty("部门所属行政区划")
+    @NotBlank(message = "部门所属行政区划电话不能为空！")
+    private String xzqh;
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 根目录地址
+     */
+    @JsonInclude
+    private String rootPath;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SysDeptVO sysDeptVO = (SysDeptVO) o;
+        return Objects.equals(childDeptList, sysDeptVO.childDeptList) && Objects.equals(id, sysDeptVO.id) && Objects.equals(orgCode, sysDeptVO.orgCode) && Objects.equals(orgName, sysDeptVO.orgName) && Objects.equals(orgLevel, sysDeptVO.orgLevel) && Objects.equals(parentId, sysDeptVO.parentId) && Objects.equals(bmpyszm, sysDeptVO.bmpyszm) && Objects.equals(rootPath, sysDeptVO.rootPath);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(childDeptList, id, orgCode, orgName, orgLevel, parentId, bmpyszm, rootPath);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysRoleVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysRoleVO.java
new file mode 100644
index 0000000..b44b16a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysRoleVO.java
@@ -0,0 +1,62 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ *  角色列表
+ * @author kevin
+ * @date 2022/2/18 9:41 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class SysRoleVO implements Serializable {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("角色id")
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    @NotEmpty(message = "角色编码不能为空")
+    @ApiModelProperty("角色编码")
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    @ApiModelProperty("角色描述")
+    private String roleDesc;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty("排序号")
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 数据权限等级
+     */
+    @ApiModelProperty("数据权限等级")
+    private String dataPermissionLevel;
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.java
new file mode 100644
index 0000000..12c504e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.java
@@ -0,0 +1,107 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlateList;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user_app_homeconfig_plate")
+@ApiModel(value="SysUserAppHomeconfigPlate对象", description="用户app首页配置-板块表")
+public class SysUserAppHomeconfigPlateVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "配置id")
+    private Long pzId;
+
+    @ApiModelProperty(value = "板块id")
+    private Long plateId;
+
+    @ApiModelProperty(value = "板块类型（00-置顶按钮，01-五情板块，02-工作任务板块，03-概况板块，04-风险板块）")
+    private String bklx;
+
+    @ApiModelProperty(value = "板块名称")
+    private String bkmc;
+
+    @ApiModelProperty(value = "板块内容数")
+    private Integer bknrs;
+
+    @ApiModelProperty(value = "板块顺序")
+    private Integer bksx;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "用户板块内容集合")
+    List<SysUserAppHomeconfigPlateList> plateList;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.java
new file mode 100644
index 0000000..5d64054
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.java
@@ -0,0 +1,112 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user_app_homeconfig")
+@ApiModel(value="SysUserAppHomeconfig对象", description="用户app首页配置表")
+public class SysUserAppHomeconfigVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeid;
+
+    @ApiModelProperty(value = "首页名称")
+    private String homename;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String userSfzh;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userXm;
+
+    @ApiModelProperty(value = "配置时间")
+    private Date pzsj;
+
+    @ApiModelProperty(value = "配置板块数")
+    private Integer pzbks;
+
+    @ApiModelProperty(value = "色调01-蓝色，02-白色")
+    private String sd;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "用户板块集合")
+    List<SysUserAppHomeconfigPlateVo> plates;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserDeptVO.java
new file mode 100644
index 0000000..cfb7e91
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserDeptVO.java
@@ -0,0 +1,90 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 用户信息视图
+ *
+ * @author kevin
+ * @date 2022/2/17 10:08 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class SysUserDeptVO {
+
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    @ApiModelProperty(value = "登录账号")
+    private String loginName;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politic;
+
+    @ApiModelProperty(value = "婚姻状态")
+    private String marital;
+
+    @ApiModelProperty(value = "人员类别")
+    private String type;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "证件号码")
+    private String idEntityCard;
+
+    @ApiModelProperty(value = "文化程度")
+    private String whcd;
+
+    @ApiModelProperty(value = "文化程度")
+    private String hylb;
+
+    @ApiModelProperty(value = "行业号")
+    private String inDustRialId;
+
+    @ApiModelProperty(value = "是否虚拟用户")
+    private String isVirtualUser;
+
+    @ApiModelProperty(value = "是否在线 SYS_SF 0.否 1.是")
+    private boolean sfzx;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "是否融合")
+    private String mk;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserEditVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserEditVO.java
new file mode 100644
index 0000000..7c42565
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserEditVO.java
@@ -0,0 +1,97 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class SysUserEditVO {
+
+    @NotEmpty(message = "用户绑定的部门不能为空")
+    @ApiModelProperty(value = "用户绑定的部门id集合")
+    private List<Long> deptIds;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @NotNull(message = "用户id不能为空")
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+//    @NotNull(message = "岗位id不能为空")
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    @ApiModelProperty(value = "登录账号")
+    private String loginName;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "行业号码（如：警号）")
+    private String inDustRialId;
+
+    @ApiModelProperty(value = "用户类型（00系统用户 01注册用户）")
+    private String userType;
+
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    @ApiModelProperty(value = "是否虚拟用户：1、是 2、不是")
+    private String isVirtualUser;
+
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politic;
+
+    @ApiModelProperty(value = "婚姻状态")
+    private String marital;
+
+    @ApiModelProperty(value = "人员类别")
+    private String type;
+
+    @ApiModelProperty(value = "文化程度")
+    private String whcd;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idEntityCard;
+
+    @ApiModelProperty(value = "出生日期")
+    private String birthday;
+
+    @ApiModelProperty(value = "用户有效开始时间，默认为当前日期（用户可改）")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "用户有效结束时间，默认空")
+    private Date endTime;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "是否融合 0否 1是")
+    private String sfrh;
+
+    @ApiModelProperty(value = "模块")
+    private String mk;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.java
new file mode 100644
index 0000000..46ca383
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.java
@@ -0,0 +1,50 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户app首页配置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user_app_homeconfig")
+@ApiModel(value="SysUserAppHomeconfig对象", description="用户app首页配置表")
+public class SysUserHomeconfigVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeid;
+
+    @ApiModelProperty(value = "首页名称")
+    private String homename;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String userSfzh;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userXm;
+
+    @ApiModelProperty(value = "色调01-蓝色，02-白色")
+    private String sd;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserInfoVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserInfoVO.java
new file mode 100644
index 0000000..15c12d9
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserInfoVO.java
@@ -0,0 +1,158 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.mosty.common.base.autoconfig.Desensitization;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  用户信息视图
+ * @author kevin
+ * @date 2022/2/17 10:08 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class SysUserInfoVO {
+
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+    @ApiModelProperty(value = "部门Ids")
+    private List<Long> deptIds;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "管理部门ID")
+    private Long managerOrgId;
+
+    @ApiModelProperty(value = "管理部门名称")
+    private String managerOrgName;
+
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    @ApiModelProperty(value = "是否虚拟用户：1、是 2、不是")
+    private String isVirtualUser;
+
+    @ApiModelProperty(value = "登录账号")
+    private String loginName;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    @ApiModelProperty(value = "用户类型（00系统用户 01注册用户）")
+    private String userType;
+
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idEntityCard;
+
+    @ApiModelProperty(value = "行业号码（如：警号）")
+    private String inDustRialId;
+
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politic;
+
+    @ApiModelProperty(value = "婚姻状态")
+    private String marital;
+
+    @ApiModelProperty(value = "人员类别")
+    private String type;
+
+    @ApiModelProperty(value = "文化程度")
+    private String whcd;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "出生日期")
+    private String birthday;
+
+    @ApiModelProperty(value = "用户有效开始时间，默认为当前日期（用户可改）")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "用户有效结束时间，默认空")
+    private Date endTime;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyz;
+
+    @ApiModelProperty(value = "采集时间")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人id")
+    private Long xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门id")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入人部门id")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人id")
+    private Long xtZhxgid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门id")
+    private Long xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改人ip")
+    private String xtZhxgrip;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "模块")
+    private String mk;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserVO.java
new file mode 100644
index 0000000..608a30a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/SysUserVO.java
@@ -0,0 +1,74 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.mosty.common.base.autoconfig.Desensitization;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ *  用户信息视图
+ * @author kevin
+ * @date 2022/2/17 10:08 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class SysUserVO {
+
+
+    @ApiModelProperty(value = "用户ID")
+    private Long id;
+
+    @ApiModelProperty(value = "岗位ID")
+    private Long positionId;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String positionName;
+
+    @ApiModelProperty(value = "登录账号")
+    private String loginName;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String userName;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "电话号码")
+    private String telePhone;
+
+    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
+    private String sex;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "行业类别")
+    private String inDustRialId;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idEntityCard;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "部门编码")
+    private String deptCode;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "部门简称称")
+    private String deptJc;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "是否融合")
+    private String mk;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.java
new file mode 100644
index 0000000..882b994
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.java
@@ -0,0 +1,26 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户和角色关联关系
+ */
+@Data
+@Accessors(chain = true)
+public class UnboundUserRoleVO implements Serializable {
+
+    private static final long serialVersionUID = 3289683012945300862L;
+
+    @NotEmpty(message = "关联关系ids")
+    @ApiModelProperty(value = "关联关系ids")
+    private List<Long> ids;
+
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserByDeptPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserByDeptPage.java
new file mode 100644
index 0000000..28ac756
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserByDeptPage.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  分页查询部门信息
+ * @author kevin
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class UserByDeptPage extends Page {
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptPage.java
new file mode 100644
index 0000000..bc48d4e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptPage.java
@@ -0,0 +1,43 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *  用户部门分页展示
+ * @author kevin
+ * @date 2022/6/5 2:36 下午
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class UserDeptPage extends Page {
+
+    @ApiModelProperty("登陆名称")
+    private String loginName;
+
+    @ApiModelProperty("电话号码")
+    private String phone;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("部门Id")
+    private String deptId;
+
+    @ApiModelProperty("orgcode")
+    private String orgcode;
+
+    @ApiModelProperty("ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty("部门id集合")
+    private List<String> deptList;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptVO.java
new file mode 100644
index 0000000..33e6d66
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserDeptVO.java
@@ -0,0 +1,61 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 添加 部门 用户关联关系
+ * @author liyan
+ * @date 2022/2/9 8:53 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class UserDeptVO implements Serializable {
+
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("关联关系id")
+    private Long id;
+
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty("用户昵称")
+    private String userName;
+
+    /**
+     * 登录账号
+     */
+    @ApiModelProperty("登录账号")
+    private String loginName;
+
+    @ApiModelProperty("注销标志")
+    private Integer  xtZxbz;
+
+    /**
+     * 录入时间
+     */
+    @ApiModelProperty("录入时间")
+    private Date xtLrsj;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserPage.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserPage.java
new file mode 100644
index 0000000..b86ab4e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserPage.java
@@ -0,0 +1,44 @@
+package com.mosty.common.core.business.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.core.business.entity.SysUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *  用户分页展示
+ * @author kevin
+ * @date 2022/2/17 10:04 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class UserPage extends Page<SysUser> {
+
+    @ApiModelProperty("部门id：左边组织机构树选中的部门id")
+    private String deptId;
+
+    @ApiModelProperty("登陆名称")
+    private String loginName;
+
+    @ApiModelProperty("电话号码")
+    private String phone;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
+    @ApiModelProperty("orgcode")
+    private String orgcode;
+
+    @ApiModelProperty("是否包含下级")
+    private String isChild;
+
+    @ApiModelProperty("身份证")
+    private String idEntityCard;
+
+    @ApiModelProperty("行业号码（如：警号）")
+    private String inDustRialId;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserRoleVO.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserRoleVO.java
new file mode 100644
index 0000000..d8958a0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/vo/UserRoleVO.java
@@ -0,0 +1,31 @@
+package com.mosty.common.core.business.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户和角色关联关系
+ */
+@Data
+@Accessors(chain = true)
+public class UserRoleVO implements Serializable {
+
+
+    private static final long serialVersionUID = 3289683012945300862L;
+
+
+    @NotNull(message = "用户id不能为空")
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @NotEmpty(message = "角色id不能为空")
+    @ApiModelProperty(value = "用户IDS")
+    private List<Long> roleIds;
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.java
new file mode 100644
index 0000000..a483609
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.java
@@ -0,0 +1,19 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysAppHomeconfig;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app首页表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigMapper extends BaseMapper<SysAppHomeconfig> {
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.java
new file mode 100644
index 0000000..37b996a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * app首页配置-板块内容表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigPlateListMapper extends BaseMapper<SysAppHomeconfigPlateList> {
+
+    /**
+     * 根据首页ID删除
+     * @param plateId
+     */
+    void deleteByPlateId(@Param("plateId") Long plateId);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.java
new file mode 100644
index 0000000..125a3f6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * app首页-板块表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigPlateMapper extends BaseMapper<SysAppHomeconfigPlate> {
+
+    /**
+     * 根据首页ID删除
+     * @param homeid
+     */
+    void deleteByHomeid(@Param("homeid") Long homeid);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysDeptMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysDeptMapper.java
new file mode 100644
index 0000000..aa32201
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysDeptMapper.java
@@ -0,0 +1,47 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysRole;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.RoleByDeptPage;
+import com.mosty.common.core.business.entity.vo.RoleDeptVO;
+import com.mosty.common.core.business.entity.vo.UserByDeptPage;
+import com.mosty.common.core.business.entity.vo.UserDeptVO;
+import com.mosty.common.core.login.dto.DeptDTO;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_dept(部门表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:52:58
+* @Entity generator.domain.SysDept
+*/
+public interface SysDeptMapper extends BaseMapper<SysDept> {
+
+    @ApiOperation("查询用户关联的部门id集合")
+    List<DeptDTO> selectUserDeptList(@Param("userId") Long userId);
+
+    @ApiOperation("分页查询部门下用户信息")
+    IPage<UserDeptVO> selectUserPageByDept(@Param("param") UserByDeptPage userByDeptPage);
+
+    @ApiOperation("分页查询部门下角色信息")
+    IPage<RoleDeptVO> selectRolePageByDept(@Param("param")  RoleByDeptPage roleByDeptPage);
+
+    @ApiOperation("查询用户的所属部门")
+    SysDept getDeptByUserId(Long id);
+
+    @ApiOperation("查询下级部门")
+    List<SysDept> getDeptListByParentId(@Param("parentid") Integer parentid, @Param("deptname") String deptname);
+
+    @ApiOperation("查询下级部门")
+    List<SysDept> getDeptListByOrgcode(@Param("deptCode") String deptCode, @Param("deptname") String deptname);
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysLogininforMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysLogininforMapper.java
new file mode 100644
index 0000000..ad1953b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysLogininforMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysLogininfor;
+
+/**
+* @author li
+* @description 针对表【sys_logininfor(系统访问记录)】的数据库操作Mapper
+* @createDate 2022-03-20 15:01:16
+*/
+public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
+    /**
+     * 删除日志
+     * @param toStrArray
+     */
+    void deleteOperLogByIds(String[] toStrArray);
+
+    /**
+     * 清空日志
+     */
+    void cleanOperLog();
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysMenuMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysMenuMapper.java
new file mode 100644
index 0000000..94673b6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysMenuMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysMenu;
+
+/**
+ * <p>
+ * 菜单表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysOssMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysOssMapper.java
new file mode 100644
index 0000000..6daed58
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysOssMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysOss;
+
+/**
+ * <p>
+ * OSS云存储表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-31
+ */
+public interface SysOssMapper extends BaseMapper<SysOss> {
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysPositionMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysPositionMapper.java
new file mode 100644
index 0000000..c348474
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysPositionMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysPosition;
+
+/**
+ * <p>
+ * 岗位表 Mapper 接口
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+public interface SysPositionMapper extends BaseMapper<SysPosition> {
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleDeptMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleDeptMapper.java
new file mode 100644
index 0000000..8f3e7a6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleDeptMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.common.core.business.mapper;
+
+import com.mosty.common.core.business.entity.SysRoleDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author li
+* @description 针对表【sys_role_dept(角色和部门关联表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:53:15
+* @Entity generator.domain.SysRoleDept
+*/
+public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMapper.java
new file mode 100644
index 0000000..434033d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.common.core.business.mapper;
+
+import com.mosty.common.core.business.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author li
+* @description 针对表【sys_role(角色表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:53:11
+* @Entity generator.domain.SysRole
+*/
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMenuMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMenuMapper.java
new file mode 100644
index 0000000..0929216
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysRoleMenuMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.common.core.business.mapper;
+
+import com.mosty.common.core.business.entity.SysRoleMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author li
+* @description 针对表【sys_role_menu(角色和菜单关联表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:53:18
+* @Entity generator.domain.SysRoleMenu
+*/
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.java
new file mode 100644
index 0000000..859f777
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 用户app首页配置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigMapper extends BaseMapper<SysUserAppHomeconfig> {
+
+    /**
+     * 根据身份证号删除
+     * @param sfzh
+     */
+    void deleteBySfzh(@Param("sfzh") String sfzh);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.java
new file mode 100644
index 0000000..ce0d377
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlateList;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 用户app首页配置-板块内容表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigPlateListMapper extends BaseMapper<SysUserAppHomeconfigPlateList> {
+
+    /**
+     * 根据配置ID删除
+     * @param pzId
+     */
+    void deleteByPzId(@Param("pzId") Long pzId, @Param("pzPlateId") Long pzPlateId);
+
+    /**
+     * 根据配置ID删除
+     * @param pzId
+     */
+    void delByPzId(@Param("pzId") Long pzId);
+
+    /**
+     * 修改配置内容
+     * @param pzId
+     */
+    void updateById(@Param("pzId") Long pzId, @Param("pzPlateId") Long pzPlateId, @Param("plateListId") Long plateListId, @Param(
+            "zxbz") Integer zxbz);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.java
new file mode 100644
index 0000000..729f63b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.java
@@ -0,0 +1,30 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlate;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigPlateMapper extends BaseMapper<SysUserAppHomeconfigPlate> {
+
+    /**
+     * 根据首页ID删除
+     * @param pzId
+     */
+    void deleteByPzid(@Param("pzId") Long pzId);
+
+    /**
+     * 根据首页ID删除
+     * @param id
+     */
+    void updateById(@Param("id") Long id, @Param("zxbz") Integer zxbz);
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserDeptMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserDeptMapper.java
new file mode 100644
index 0000000..9334b78
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserDeptMapper.java
@@ -0,0 +1,19 @@
+package com.mosty.common.core.business.mapper;
+
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+
+/**
+* @author li
+* @description 针对表【sys_user_dept(用户和部门关联表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:53:21
+* @Entity generator.domain.SysUserDept
+*/
+public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserMapper.java
new file mode 100644
index 0000000..4f72c7b
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserMapper.java
@@ -0,0 +1,46 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.core.business.entity.vo.UserDeptPage;
+import com.mosty.common.core.business.entity.vo.UserPage;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *  用户服务dao层
+ * @author kevin
+ * @date 2022/2/12 10:10 PM
+ * @since 1.0.0
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+    @ApiOperation("分页查询用户信息")
+    List<SysUserVO> selectByPage(@Param("userPage") UserPage userPage);
+
+    @ApiOperation("查询用户部门分页")
+    IPage<SysUserDeptVO> selectUserDeptPage(@Param("userDeptPage") UserDeptPage userDeptPage);
+
+    @ApiOperation("获取部门下的所有的人员数据（包含子部门）")
+    List<SysUser> getUserListByDeptId(@Param("deptIds") List<String> deptIds,
+                                      @Param("keyword") String keyword);
+
+    @ApiOperation("获取部门下的所有人员")
+    List<SysUser> getUserListByDeptIdOne(Long id);
+
+    @ApiOperation("查询用户数量")
+    int selectByCount(@Param("userPage") UserPage userPage);
+
+
+    @ApiOperation("删除用户信息")
+    void delById(Long id);
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserRoleMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserRoleMapper.java
new file mode 100644
index 0000000..ce61b75
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/SysUserRoleMapper.java
@@ -0,0 +1,38 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysUserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.vo.GetUserRoleListVo;
+import com.mosty.common.core.business.entity.vo.RoleUserPage;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_user_role(用户和角色关联表)】的数据库操作Mapper
+* @createDate 2022-02-12 16:53:24
+* @Entity generator.domain.SysUserRole
+*/
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    /**
+     * 查询用户可以查看的，当前角色绑定的用户列表
+     * @param rootPath 当前用户的组织机构前缀
+     * @param roleUserPage 查询请求
+     * @return 绑定的用户信息
+     */
+    List<SysUserVO> roleUserList(@Param("rootPath") String rootPath, @Param("roleUserPage") RoleUserPage roleUserPage);
+
+    /**
+     * 分页查询角色下用户
+     * @return
+     */
+    List<SysUserVO> getRoleUserList(GetUserRoleListVo vo);
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/YbmjMapper.java b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/YbmjMapper.java
new file mode 100644
index 0000000..9dcbf99
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/mapper/YbmjMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.common.core.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.Ybmj;
+
+
+public interface YbmjMapper extends BaseMapper<Ybmj> {
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/LoginService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/LoginService.java
new file mode 100644
index 0000000..4f3a6ca
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/LoginService.java
@@ -0,0 +1,15 @@
+package com.mosty.common.core.business.service;
+
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.login.LoginResponseVO;
+import com.mosty.common.core.login.dto.DeptDTO;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface LoginService {
+
+    @ApiOperation("获取用户菜单信息")
+    List<SysMenu> getMenus(DeptDTO currentLoginDept, SysUser sysUser, LoginResponseVO loginResponseVO);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.java
new file mode 100644
index 0000000..6f5a3a5
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.java
@@ -0,0 +1,60 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlateListPage;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app首页配置-板块内容表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigPlateListService extends IService<SysAppHomeconfigPlateList> {
+
+    /**
+     * 新增板块内容
+     * @param plate
+     */
+    Long saveInfo(SysAppHomeconfigPlateList plate, String ipAddress);
+
+    /**
+     * 新增板块内容
+     * @param plates
+     */
+    boolean saveInfoBatch(List<SysAppHomeconfigPlateList> plates, String ipAddress);
+
+    /**
+     * 修改首板块内容
+     * @param plate
+     * @param ipAddress
+     */
+    void updateInfo(SysAppHomeconfigPlateList plate, String ipAddress);
+
+    /**
+     * 修改板块内容
+     * @param plates
+     * @param ipAddress
+     */
+    void updateInfoBatch(List<SysAppHomeconfigPlateList> plates, String ipAddress);
+
+    /**
+     * 删除板块内容
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询应用
+     * @param cofigPage
+     * @return
+     */
+    IPage<SysAppHomeconfigPlateList> selectByPage(SysAppHomeconfigPlateListPage cofigPage);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.java
new file mode 100644
index 0000000..553e0c0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.java
@@ -0,0 +1,60 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlatePage;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app首页-板块表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigPlateService extends IService<SysAppHomeconfigPlate> {
+
+    /**
+     * 新增板块
+     * @param plate
+     */
+    Long saveInfo(SysAppHomeconfigPlate plate, String ipAddress);
+
+    /**
+     * 新增板块
+     * @param plates
+     */
+    boolean saveInfoBatch(List<SysAppHomeconfigPlate> plates, String ipAddress);
+
+    /**
+     * 修改板块
+     * @param plate
+     * @param ipAddress
+     */
+    void updateInfo(SysAppHomeconfigPlate plate, String ipAddress);
+
+    /**
+     * 修改板块
+     * @param plates
+     * @param ipAddress
+     */
+    void updateInfoBatch(List<SysAppHomeconfigPlate> plates, String ipAddress);
+
+    /**
+     * 删除板块
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询板块
+     * @param platePage
+     * @return
+     */
+    IPage<SysAppHomeconfigPlate> selectByPage(SysAppHomeconfigPlatePage platePage);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigService.java
new file mode 100644
index 0000000..23499f2
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysAppHomeconfigService.java
@@ -0,0 +1,56 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysAppHomeconfig;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app首页表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysAppHomeconfigService extends IService<SysAppHomeconfig> {
+
+    /**
+     * 新增首页应用
+     * @param configVO
+     */
+    Long saveInfo(SysAppHomeconfigVO configVO, String ipAddress);
+
+    /**
+     * 修改首页应用
+     * @param configVO
+     * @param ipAddress
+     */
+    void updateInfo(SysAppHomeconfigVO configVO, String ipAddress);
+
+    /**
+     * 删除首页应用
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询应用
+     * @param cofigPage
+     * @return
+     */
+    IPage<SysAppHomeconfig> selectByPage(SysAppHomeconfigPage cofigPage);
+
+    /**
+     * 根据首页id查询模块及内容数据
+     * @param configQuery
+     * @return
+     */
+    SysAppHomeconfigRsVO queryConfig(SysAppHomeconfigQuery configQuery);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysDeptService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysDeptService.java
new file mode 100644
index 0000000..9a43416
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysDeptService.java
@@ -0,0 +1,84 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysRole;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.login.dto.DeptAllVo;
+import com.mosty.common.core.login.dto.DeptDTO;
+import com.mosty.common.token.UserInfo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author li
+ * @description 针对表【sys_dept(部门表)】的数据库操作Service
+ * @createDate 2022-02-12 16:52:58
+ */
+public interface SysDeptService extends IService<SysDept> {
+
+    // 分页查询部门信息
+    IPage<SysDept> selectByPage(DeptPage deptPage);
+
+
+    // 分页查询下级部门信息
+    List<SysDept> selectDept(DeptQuery dto);
+
+
+    // 查询用户关联的部门
+    List<DeptDTO> selectUserDeptList(Long id);
+
+    // 查询子部门集合
+    List<SysDept> getChildDeptList(Long deptId);
+
+    // 查询该部门下的所有部门结合
+    SysDeptVO getAllChildDeptList(SysDept sysDept, DeptTreeVO deptTreeVO);
+
+    // 新增部门
+    Long saveInfo(AddDeptVO addDeptVO, String ipAddress);
+
+    // 修改部门
+    void updateInfo(SysDeptVO sysDept, String ipAddress);
+
+    // 删除部门
+    void delete(DeleteDeptVO deleteDeptV, String ipAddress, UserInfo userInfo);
+
+    // 根据部门查询部门下用户
+    IPage<UserDeptVO> selectUserPageByDept(UserByDeptPage userByDeptPage);
+
+    // 根据部门查询部门下角色
+    IPage<RoleDeptVO> selectRolePageByDept(RoleByDeptPage roleByDeptPage);
+
+    // 保存部门角色关联关系
+    void saveRoleDeptInfo(AddRoleDeptVO roleDeptVO);
+
+    // 添加用户部门关联关系
+    void saveUserDeptInfo(AddUserDeptVO addUserDeptVO);
+
+    // 删除用户部门关联关系
+    void deleteUserDeptInfo(DeleteUserDeptVO deleteUserDeptVO);
+
+    // 根据部门id 获取部门及以下部门id
+    List<Long> getAllChildDeptIds(Long deptId);
+
+    // 根据组织机构编码查询部门信息
+    SysDept getDeptByOrgCode(String orgCode);
+
+    // 部门数据同步
+    Boolean deptSys();
+
+    //根据部门编码分页查询当前及下级部门信息--第三方接口
+    IPage<SysDept> getDeptList(DeptPage deptPage);
+
+    // 查询部门下的所有子部门信息
+    List<String> getChildDept(String deptid);
+
+    // 查询部门下的所有子部门信息
+    List<String> getChildDeptByOrgCode(String orgcode);
+
+    // 查询所属部门、地市州、分县局
+    DeptAllVo getOrgByDeptId(String deptId);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysLogininforService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysLogininforService.java
new file mode 100644
index 0000000..ab362a6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysLogininforService.java
@@ -0,0 +1,31 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysLogininfor;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.request.LoginLogPage;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author li
+ * @description 针对表【sys_logininfor(系统访问记录)】的数据库操作Service
+ * @createDate 2022-03-20 15:01:16
+ */
+public interface SysLogininforService extends IService<SysLogininfor> {
+
+    // 记录登录日志
+    void recordLogininfor(SysUser user, String loginFail, String message,
+                          HttpServletRequest httpServletRequest, String type);
+
+    // 删除
+    void deleteOperLogByIds(List<Long> ids);
+
+    // 清空
+    void cleanOperLog();
+
+    // 分页查询
+    IPage<SysLogininfor> selectByPage(LoginLogPage loginLogPage);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysMenuService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysMenuService.java
new file mode 100644
index 0000000..4badc61
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysMenuService.java
@@ -0,0 +1,40 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.base.constant.enums.MenuTypeEnum;
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.business.entity.vo.AddSysMenuVO;
+import com.mosty.common.core.business.entity.vo.MenuPage;
+import com.mosty.common.core.business.entity.vo.MenuQuery;
+import com.mosty.common.core.login.LoginResponseVO;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 菜单表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+public interface SysMenuService extends IService<SysMenu> {
+
+    @ApiOperation("分页查询菜单信息")
+    IPage<SysMenu> selectByPage(MenuPage menuPage);
+
+    @ApiOperation("添加菜单信息")
+    void addSysMenuInfo(AddSysMenuVO addSysMenuVo, SysMenu parentMenu);
+
+    @ApiOperation("登录返回权限")
+    List<SysMenu> listByType(Set<Long> menuIds, MenuTypeEnum menuGroup, LoginResponseVO loginResponseVO);
+
+    @ApiOperation("根据菜单id查询子集")
+    SysMenu getMenuChild(Long menuId);
+
+    @ApiOperation("查询树形结构")
+    List<SysMenu> selectList(MenuQuery menuQuery);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysOssService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysOssService.java
new file mode 100644
index 0000000..3df068d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysOssService.java
@@ -0,0 +1,23 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysOss;
+import com.mosty.common.core.business.entity.vo.AddRoleMenuVO;
+
+/**
+ * <p>
+ * OSS云存储表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-31
+ */
+public interface SysOssService extends IService<SysOss> {
+
+    /**
+     * 添加存储
+     * @param sysOss
+     */
+    void saveSysOss(SysOss sysOss);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysPositionService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysPositionService.java
new file mode 100644
index 0000000..c77ee45
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysPositionService.java
@@ -0,0 +1,32 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.config.entity.vo.EditPositionVO;
+import com.mosty.common.core.business.entity.SysPosition;
+import com.mosty.common.core.business.entity.vo.PositionPage;
+
+/**
+ * <p>
+ * 岗位表 服务类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+public interface SysPositionService extends IService<SysPosition> {
+
+    /**
+     * 分页查询岗位信息
+     * @param positionPage 分页请求
+     * @return 岗位分页
+     */
+    IPage<SysPosition> selectByPage(PositionPage positionPage);
+
+    /**
+     * 修改岗位信息
+     * @param oldSysPosition 原岗位信息
+     * @param editPositionVO 修改岗位信息请求
+     */
+    void updateSysPost(SysPosition oldSysPosition, EditPositionVO editPositionVO);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleDeptService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleDeptService.java
new file mode 100644
index 0000000..1c82737
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleDeptService.java
@@ -0,0 +1,28 @@
+package com.mosty.common.core.business.service;
+
+import com.mosty.common.core.business.entity.SysRoleDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_role_dept(角色和部门关联表)】的数据库操作Service
+* @createDate 2022-02-12 16:53:15
+*/
+public interface SysRoleDeptService extends IService<SysRoleDept> {
+    /**
+     * 部门id
+     * @param deptId
+     * @return
+     */
+    List<SysRoleDept> listByDeptId(Long deptId);
+
+    /**
+     *
+     * @param deptId
+     * @param roleId
+     * @return
+     */
+    SysRoleDept getByDeptIdAndRoleId(Long deptId, Long roleId);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleMenuService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleMenuService.java
new file mode 100644
index 0000000..3913198
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleMenuService.java
@@ -0,0 +1,28 @@
+package com.mosty.common.core.business.service;
+
+import com.mosty.common.core.business.entity.SysRoleMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+* @author li
+* @description 针对表【sys_role_menu(角色和菜单关联表)】的数据库操作Service
+* @createDate 2022-02-12 16:53:18
+*/
+public interface SysRoleMenuService extends IService<SysRoleMenu> {
+    /**
+     * 根据角色ids查询菜单
+     * @param rolesSet
+     * @return
+     */
+    List<SysRoleMenu> listByRoleIds(Set<Long> rolesSet);
+
+    /**
+     * g根据菜单id查询角色
+     * @param id
+     * @return
+     */
+    Set<Long> listByMenuId(Long id);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleService.java
new file mode 100644
index 0000000..1b2abb3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysRoleService.java
@@ -0,0 +1,49 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.token.DeptInfo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_role(角色表)】的数据库操作Service
+* @createDate 2022-02-12 16:53:11
+*/
+public interface SysRoleService extends IService<SysRole> {
+
+    @ApiOperation("查询角色分页信息")
+    IPage<SysRole> selectByPage(RolePage rolePage);
+
+    @ApiOperation("查询用户角色列表")
+    List<SysRoleVO> getUserRoleList(Long userId);
+
+    @ApiOperation("添加角色信息")
+    void insertRole(AddRoleVO addRoleVo, String ipAddress);
+
+    @ApiOperation("添加角色和菜单关联关系")
+    void saveRoleMenuInfo(AddRoleMenuVO roleMenuVO);
+
+    @ApiOperation("分配数据权限")
+    void saveDataPermission(AddRoleDataPartitionVO addRoleDataPartitionVO,String ipAddress);
+
+    @ApiOperation("根据菜单标识获取数据权限")
+    DataPermissionVO getDataPermission(String menuUrl);
+
+    @ApiOperation("分页查询未绑定当前用户的角色")
+    IPage<SysRole> selectUnAccreditPage(RolePage rolePage);
+
+    @ApiOperation("分页查询当前角色下用户")
+    IPage<SysUserVO> getRoleUserList(GetUserRoleListVo vo);
+
+    @ApiOperation("查询用户绑定的菜单ids")
+    List<Long> getRoleMenuIds(Long roleId);
+
+    @ApiOperation("获取部门最高角色等级权限")
+    DeptInfo getSysDeptLevel(String orgCode);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.java
new file mode 100644
index 0000000..fa7690a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.java
@@ -0,0 +1,63 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlateListPage;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块内容表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigPlateListService extends IService<SysUserAppHomeconfigPlateList> {
+
+    /**
+     * 新增板块内容
+     * @param plate
+     */
+    Long saveInfo(SysUserAppHomeconfigPlateList plate, String ipAddress);
+
+    /**
+     * 新增板块内容
+     * @param plates
+     */
+    boolean saveInfoBatch(List<SysUserAppHomeconfigPlateList> plates, String ipAddress);
+
+    /**
+     * 修改首板块内容
+     * @param plate
+     * @param ipAddress
+     */
+    void updateInfo(SysUserAppHomeconfigPlateList plate, String ipAddress);
+
+    /**
+     * 修改板块内容
+     * @param plates
+     * @param ipAddress
+     */
+    void updateInfoBatch(List<SysUserAppHomeconfigPlateList> plates, String ipAddress);
+
+    /**
+     * 删除板块内容
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询应用
+     * @param cofigPage
+     * @return
+     */
+    IPage<SysUserAppHomeconfigPlateList> selectByPage(SysUserAppHomeconfigPlateListPage cofigPage);
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.java
new file mode 100644
index 0000000..72d18b0
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.java
@@ -0,0 +1,62 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlatePage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlatePage;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigPlateService extends IService<SysUserAppHomeconfigPlate> {
+
+    /**
+     * 新增板块
+     * @param plate
+     */
+    Long saveInfo(SysUserAppHomeconfigPlate plate, String ipAddress);
+
+    /**
+     * 新增板块
+     * @param plates
+     */
+    boolean saveInfoBatch(List<SysUserAppHomeconfigPlate> plates, String ipAddress);
+
+    /**
+     * 修改板块
+     * @param plate
+     * @param ipAddress
+     */
+    void updateInfo(SysUserAppHomeconfigPlate plate, String ipAddress);
+
+    /**
+     * 修改板块
+     * @param plates
+     * @param ipAddress
+     */
+    void updateInfoBatch(List<SysUserAppHomeconfigPlate> plates, String ipAddress);
+
+    /**
+     * 删除板块
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询板块
+     * @param platePage
+     * @return
+     */
+    IPage<SysUserAppHomeconfigPlate> selectByPage(SysUserAppHomeconfigPlatePage platePage);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigService.java
new file mode 100644
index 0000000..052d9f4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserAppHomeconfigService.java
@@ -0,0 +1,77 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigVo;
+import com.mosty.common.core.business.entity.vo.SysUserHomeconfigVo;
+import com.mosty.common.token.UserInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+public interface SysUserAppHomeconfigService extends IService<SysUserAppHomeconfig> {
+
+    /**
+     * 新增用户首页应用
+     * @param config
+     */
+    Long saveInfo(SysUserAppHomeconfig config, String ipAddress);
+
+    /**
+     * 新增用户首页应用
+     * @param config
+     */
+    void saveInfoBatch(List<SysUserAppHomeconfig> config, String ipAddress);
+
+    /**
+     * 修改首页应用
+     * @param config
+     * @param ipAddress
+     */
+    void updateInfo(SysUserAppHomeconfig config, String ipAddress);
+
+
+    /**
+     * 修改首页应用
+     * @param config
+     * @param ipAddress
+     */
+    void updateInfoBatch(List<SysUserAppHomeconfig> config, String ipAddress);
+
+    /**
+     * 删除首页应用
+     * @param list
+     */
+    void delete(List<Long> list, String ipAddress, UserInfo userInfo);
+
+    /**
+     * 查询用户应用
+     * @param cofigPage
+     * @return
+     */
+    IPage<SysUserAppHomeconfig> selectByPage(SysUserAppHomeconfigPage cofigPage);
+
+    /**
+     * 查询用户配置
+     * @param cofigQuery
+     * @return
+     */
+    List<SysUserAppHomeconfigVo> queryUserConfig(SysUserAppHomeconfigQuery cofigQuery);
+
+    /**
+     * 新增用户首页应用
+     * @param config
+     */
+    Long saveDefaultConfig(SysUserHomeconfigVo config, String ipAddress);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserDeptService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserDeptService.java
new file mode 100644
index 0000000..ea0669c
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserDeptService.java
@@ -0,0 +1,42 @@
+package com.mosty.common.core.business.service;
+
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_user_dept(用户和部门关联表)】的数据库操作Service
+* @createDate 2022-02-12 16:53:21
+*/
+public interface SysUserDeptService extends IService<SysUserDept> {
+    /**
+     *
+     * @param id
+     * @return
+     */
+    List<SysUserDept> listByDeptId(Long id);
+
+    /**
+     * 根据部门id，用户id查询关联关系
+     * @param deptId
+     * @param userId
+     * @return
+     */
+    SysUserDept getByDeptIdAndUserId(Long deptId, Long userId);
+
+    /**
+     * 根据userId获取相关部门
+     * @param id
+     * @return
+     */
+    List<Long> listByUserId(Long id);
+
+    /**
+     * 根据部门ID集合查询用户
+     * @param ids
+     * @return
+     */
+    List<SysUserDept> listByDeptIds(List<String> ids);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserRoleService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserRoleService.java
new file mode 100644
index 0000000..5e0cb31
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserRoleService.java
@@ -0,0 +1,34 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.core.business.entity.SysUserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.vo.RoleUserPage;
+import com.mosty.common.core.business.entity.vo.RoleUserVO;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.core.business.entity.vo.UserRoleVO;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_user_role(用户和角色关联表)】的数据库操作Service
+* @createDate 2022-02-12 16:53:24
+*/
+public interface SysUserRoleService extends IService<SysUserRole> {
+
+    @ApiOperation("查询角色关联的用户信息")
+    IPage<SysUserVO> roleUserList(String rootPath, RoleUserPage roleUserPage);
+
+    @ApiOperation("跟根据用户id查询角色列表")
+    List<SysUserRole> listByUserId(Long id);
+
+    @ApiOperation("为用户授权角色")
+    boolean grantRoleToUser(UserRoleVO userRoleVo);
+
+    @ApiOperation("为角色授予用户")
+    boolean grantUserToRole(RoleUserVO roleUserVO);
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserService.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserService.java
new file mode 100644
index 0000000..74ee957
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/SysUserService.java
@@ -0,0 +1,49 @@
+package com.mosty.common.core.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.request.SysUserEditPasswordRequest;
+import com.mosty.common.core.business.entity.vo.*;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface SysUserService extends IService<SysUser> {
+
+    @ApiOperation("添加用户信息")
+    void saveInfo(AddSysUserVO sysUser);
+
+    @ApiOperation("编辑用户信息")
+    void editInfo(SysUserEditVO sysUserEditVo, SysUser sysUser);
+
+    @ApiOperation("编辑密码")
+    void editPassword(SysUserEditPasswordRequest sysUserEditPasswordRequest);
+
+    @ApiOperation("查询用户信息")
+    SysUser getUserInfo(Long id);
+
+    @ApiOperation("查询用户信息")
+    SysUser checkUserInfo(SysUser user);
+
+    @ApiOperation("分页查询用户信息")
+    IPage<SysUserVO> selectByPage(UserPage userPage);
+
+    @ApiOperation("重置密码")
+    void resetPassword(SysUser user);
+
+    @ApiOperation("查询未绑定当前角色的用户")
+    IPage<SysUserVO> selectUnAccreditPage(UserPage userPage);
+
+    @ApiOperation("查询用户部门信息")
+    IPage<SysUserDeptVO> selectUserDeptPage(UserDeptPage userDeptPage);
+
+    @ApiOperation("用户数据同步")
+    Boolean userSys();
+
+    @ApiOperation("根据条件查询用户信息")
+    List<SysUserVO> getUserList(GetUserPage dto);
+
+    @ApiOperation("删除用户信息")
+    void delById(Long id);
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/LoginServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/LoginServiceImpl.java
new file mode 100644
index 0000000..f794c5a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/LoginServiceImpl.java
@@ -0,0 +1,67 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.mosty.common.base.constant.enums.MenuTypeEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.core.login.LoginResponseVO;
+import com.mosty.common.core.login.UserPermissionsInfo;
+import com.mosty.common.core.login.dto.DeptDTO;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+@Service
+@AllArgsConstructor
+public class LoginServiceImpl implements LoginService {
+
+
+    private final SysRoleDeptService sysRoleDeptService;
+    private final SysUserRoleService sysUserRoleService;
+    private final SysRoleMenuService sysRoleMenuService;
+    private final SysMenuService sysMenuService;
+
+    @Override
+    public List<SysMenu> getMenus(DeptDTO currentLoginDept, SysUser sysUser, LoginResponseVO loginResponseVO) {
+        if (!sysUser.getLoginName().contains("admin")) {
+            List<SysRoleDept> roleDepts = sysRoleDeptService.listByDeptId(currentLoginDept.getDeptId());
+            List<SysUserRole> userRoles = sysUserRoleService.listByUserId(sysUser.getId());
+            List<Long> roleIds = new ArrayList<>();
+            if (!roleDepts.isEmpty()) {
+                List<Long> deptRoleIds = roleDepts.stream().map(SysRoleDept::getRoleId).collect(Collectors.toList());
+                roleIds.addAll(deptRoleIds);
+            }
+            if (!userRoles.isEmpty()) {
+                List<Long> userRoleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+                roleIds.addAll(userRoleIds);
+            }
+            //  如果没有权限 ，添加默认权限
+            if (CollectionUtils.isEmpty(roleIds)) {
+                SysUserRole role = new SysUserRole();
+                role.setUserId(sysUser.getId());
+                role.setRoleId(136L);
+                this.sysUserRoleService.save(role);
+                roleIds.add(136L);
+            }
+            Set<Long> rolesSet = new HashSet<>(roleIds);
+            List<SysRoleMenu> roleMenus = sysRoleMenuService.listByRoleIds(rolesSet);
+            if (roleMenus.isEmpty()) {
+                return new ArrayList<>();
+            }
+            Set<Long> menuIds = roleMenus.stream().map(SysRoleMenu::getMenuId).collect(Collectors.toSet());
+            //查询一级菜单组 递归
+            return sysMenuService.listByType(menuIds, MenuTypeEnum.MENU_GROUP, loginResponseVO);
+        } else {
+            return sysMenuService.listByType(null, MenuTypeEnum.MENU_GROUP, loginResponseVO);
+        }
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.java
new file mode 100644
index 0000000..4c1b7ed
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.java
@@ -0,0 +1,127 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.mapper.SysAppHomeconfigPlateListMapper;
+import com.mosty.common.core.business.service.SysAppHomeconfigPlateListService;
+import com.mosty.common.token.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页配置-板块内容表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+public class SysAppHomeconfigPlateListServiceImpl extends ServiceImpl<SysAppHomeconfigPlateListMapper, SysAppHomeconfigPlateList> implements SysAppHomeconfigPlateListService {
+
+    @Resource
+    private SysAppHomeconfigPlateListMapper sysAppHomeconfigPlateListMapper;
+
+    @Override
+    public Long saveInfo(SysAppHomeconfigPlateList plate, String ipAddress) {
+        plate.setXtZhxgsj(new Date());
+        plate.setXtCjsj(new Date());
+        plate.setXtLrip(ipAddress);
+        plate.setXtLrsj(new Date());
+        plate.setXtZhxgsj(new Date());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        sysAppHomeconfigPlateListMapper.insert(plate);
+        return plate.getId();
+    }
+
+    @Override
+    public boolean saveInfoBatch(List<SysAppHomeconfigPlateList> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            for(SysAppHomeconfigPlateList plate : plates) {
+                plate.setXtZhxgsj(new Date());
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysAppHomeconfigPlateListMapper.insert(plate);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void updateInfo(SysAppHomeconfigPlateList plate, String ipAddress) {
+        SysAppHomeconfigPlateList oldConfig = sysAppHomeconfigPlateListMapper.selectById(plate.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的信息不存在", plate.getId());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        plate.setXtZhxgsj(new Date());
+        plate.setXtLrip(ipAddress);
+        sysAppHomeconfigPlateListMapper.updateById(plate);
+    }
+
+    @Override
+    public void updateInfoBatch(List<SysAppHomeconfigPlateList> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            Long plateId = plates.get(0).getPlateId();
+            sysAppHomeconfigPlateListMapper.deleteByPlateId(plateId);
+            for(SysAppHomeconfigPlateList plate : plates) {
+                plate.setXtZhxgsj(new Date());
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysAppHomeconfigPlateListMapper.insert(plate);
+            }
+        }
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if(!CollectionUtils.isEmpty(list)) {
+            for(Long id : list) {
+                SysAppHomeconfigPlateList plate = sysAppHomeconfigPlateListMapper.selectById(id);
+                if(plate != null) {
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZxbz(DeletedEnum.DELETED.code);
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZhxgip(ipAddress);
+                    if(userInfo != null) {
+                        plate.setXtZhxgrxm(userInfo.getUserName());
+                        plate.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        plate.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysAppHomeconfigPlateListMapper.updateById(plate);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysAppHomeconfigPlateList> selectByPage(SysAppHomeconfigPlateListPage platePage) {
+        QueryWrapper<SysAppHomeconfigPlateList> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(platePage.getNrmc())) {
+            queryWrapper.and(wrapper -> wrapper.like("nrmc", platePage.getNrmc()));
+        }
+        if(platePage.getPlateId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("pz_id", platePage.getPlateId()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        platePage.setOrders(orderBy);
+        return sysAppHomeconfigPlateListMapper.selectPage(platePage, queryWrapper);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.java
new file mode 100644
index 0000000..5177975
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.java
@@ -0,0 +1,135 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysAppHomeconfig;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlatePage;
+import com.mosty.common.core.business.mapper.SysAppHomeconfigPlateMapper;
+import com.mosty.common.core.business.service.SysAppHomeconfigPlateService;
+import com.mosty.common.token.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * app首页-板块表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+
+
+public class SysAppHomeconfigPlateServiceImpl extends ServiceImpl<SysAppHomeconfigPlateMapper, SysAppHomeconfigPlate> implements SysAppHomeconfigPlateService {
+
+    @Resource
+    private SysAppHomeconfigPlateMapper sysAppHomeconfigPlateMapper;
+
+    @Override
+    public Long saveInfo(SysAppHomeconfigPlate plate, String ipAddress) {
+        plate.setXtZhxgsj(new Date());
+        plate.setXtCjsj(new Date());
+        plate.setXtLrip(ipAddress);
+        plate.setXtLrsj(new Date());
+        plate.setXtZhxgsj(new Date());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        sysAppHomeconfigPlateMapper.insert(plate);
+        return plate.getId();
+    }
+
+    @Override
+    public boolean saveInfoBatch(List<SysAppHomeconfigPlate> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            for(SysAppHomeconfigPlate plate : plates) {
+                plate.setXtZhxgsj(new Date());
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysAppHomeconfigPlateMapper.insert(plate);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void updateInfo(SysAppHomeconfigPlate plate, String ipAddress) {
+        SysAppHomeconfigPlate oldConfig = sysAppHomeconfigPlateMapper.selectById(plate.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的信息不存在", plate.getId());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        plate.setXtZhxgsj(new Date());
+        plate.setXtLrip(ipAddress);
+        sysAppHomeconfigPlateMapper.updateById(plate);
+    }
+
+    @Override
+    public void updateInfoBatch(List<SysAppHomeconfigPlate> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            Long homeId = plates.get(0).getHomeid();
+            sysAppHomeconfigPlateMapper.deleteByHomeid(homeId);
+            for(SysAppHomeconfigPlate plate : plates) {
+                plate.setXtZhxgsj(new Date());
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysAppHomeconfigPlateMapper.insert(plate);
+            }
+        }
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if(!CollectionUtils.isEmpty(list)) {
+            for(Long id : list) {
+                SysAppHomeconfigPlate plate = sysAppHomeconfigPlateMapper.selectById(id);
+                if(plate != null) {
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZxbz(DeletedEnum.DELETED.code);
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZhxgip(ipAddress);
+                    if(userInfo != null) {
+                        plate.setXtZhxgrxm(userInfo.getUserName());
+                        plate.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        plate.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysAppHomeconfigPlateMapper.updateById(plate);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysAppHomeconfigPlate> selectByPage(SysAppHomeconfigPlatePage platePage) {
+        QueryWrapper<SysAppHomeconfigPlate> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(platePage.getBkmc())) {
+            queryWrapper.and(wrapper -> wrapper.like("bkmc", platePage.getBkmc()));
+        }
+        if(StringUtils.isNotBlank(platePage.getBklx())) {
+            queryWrapper.and(wrapper -> wrapper.eq("bklx", platePage.getBklx()));
+        }
+        if(platePage.getHomeid() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("homeid", platePage.getHomeid()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        platePage.setOrders(orderBy);
+        return sysAppHomeconfigPlateMapper.selectPage(platePage, queryWrapper);
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.java
new file mode 100644
index 0000000..c1a955e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.java
@@ -0,0 +1,152 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysAppHomeconfig;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.SysAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.SysAppHomeconfigPlateVo;
+import com.mosty.common.core.business.entity.vo.SysAppHomeconfigRsVO;
+import com.mosty.common.core.business.entity.vo.SysAppHomeconfigVO;
+import com.mosty.common.core.business.mapper.SysAppHomeconfigMapper;
+import com.mosty.common.core.business.mapper.SysAppHomeconfigPlateListMapper;
+import com.mosty.common.core.business.mapper.SysAppHomeconfigPlateMapper;
+import com.mosty.common.core.business.service.SysAppHomeconfigService;
+import com.mosty.common.token.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * app首页表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+public class SysAppHomeconfigServiceImpl extends ServiceImpl<SysAppHomeconfigMapper, SysAppHomeconfig> implements SysAppHomeconfigService {
+
+    @Resource
+    private SysAppHomeconfigMapper sysAppHomeconfigMapper;
+
+    @Resource
+    private SysAppHomeconfigPlateMapper sysAppHomeconfigPlateMapper;
+
+    @Resource
+    private SysAppHomeconfigPlateListMapper sysAppHomeconfigPlateListMapper;
+
+    @Override
+    public Long saveInfo(SysAppHomeconfigVO configVO, String ipAddress) {
+        SysAppHomeconfig config = new SysAppHomeconfig();
+        BeanUtils.copyProperties(configVO, config);
+        config.setXtZhxgsj(new Date());
+        config.setXtCjsj(new Date());
+        config.setXtLrip(ipAddress);
+        config.setBz(configVO.getBz());
+        config.setXtLrsj(new Date());
+        config.setXtZhxgsj(new Date());
+        config.setXtZxbz(DeletedEnum.NATURE.code);
+        sysAppHomeconfigMapper.insert(config);
+        return config.getId();
+    }
+
+    @Override
+    public void updateInfo(SysAppHomeconfigVO configVO, String ipAddress) {
+        SysAppHomeconfig oldConfig = this.getBaseMapper().selectById(configVO.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的应用信息不存在", configVO.getId());
+        SysAppHomeconfig config = BeanUtil.copyProperties(configVO, SysAppHomeconfig.class);
+        config.setXtZxbz(DeletedEnum.NATURE.code);
+        config.setXtZhxgsj(new Date());
+        config.setXtLrip(ipAddress);
+        sysAppHomeconfigMapper.updateById(config);
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if(!CollectionUtils.isEmpty(list)) {
+            for(Long id : list) {
+                SysAppHomeconfig config = getBaseMapper().selectById(id);
+                if(config != null) {
+                    config.setXtZhxgsj(new Date());
+                    config.setXtZxbz(DeletedEnum.DELETED.code);
+                    config.setXtZhxgsj(new Date());
+                    config.setXtZhxgip(ipAddress);
+                    if(userInfo != null) {
+                        config.setXtZhxgrxm(userInfo.getUserName());
+                        config.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        config.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysAppHomeconfigMapper.updateById(config);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysAppHomeconfig> selectByPage(SysAppHomeconfigPage cofigPage) {
+        QueryWrapper<SysAppHomeconfig> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(cofigPage.getHomename())) {
+            queryWrapper.and(wrapper -> wrapper.like("homename", cofigPage.getHomename()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        cofigPage.setOrders(orderBy);
+        return sysAppHomeconfigMapper.selectPage(cofigPage, queryWrapper);
+    }
+
+    @Override
+    public SysAppHomeconfigRsVO queryConfig(SysAppHomeconfigQuery configQuery) {
+        List<SysAppHomeconfigPlateList> plateList = new ArrayList<>();
+        SysAppHomeconfigRsVO vo = new SysAppHomeconfigRsVO();
+        if (configQuery.getId() == null) {
+            return vo;
+        }
+        SysAppHomeconfig config = sysAppHomeconfigMapper.selectById(configQuery.getId());
+        BeanUtils.copyProperties(config, vo);
+        QueryWrapper<SysAppHomeconfigPlate> plateWrapper = new QueryWrapper<>();
+        plateWrapper.lambda().eq(SysAppHomeconfigPlate::getHomeid, config.getId());
+        plateWrapper.lambda().eq(SysAppHomeconfigPlate::getXtZxbz, DeletedEnum.NATURE.code);
+        plateWrapper.orderByAsc("bksx");
+        List<SysAppHomeconfigPlate> plates = sysAppHomeconfigPlateMapper.selectList(plateWrapper);
+        if(!CollectionUtils.isEmpty(plates)) {
+            List<Long> plateIds = plates.stream().map(item->item.getId()).collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(plateIds)) {
+                QueryWrapper<SysAppHomeconfigPlateList> plateListWrapper = new QueryWrapper<>();
+                plateListWrapper.lambda().in(SysAppHomeconfigPlateList::getPlateId, plateIds);
+                plateListWrapper.lambda().eq(SysAppHomeconfigPlateList::getXtZxbz, DeletedEnum.NATURE.code);
+                plateListWrapper.orderByAsc("nrsx");
+                plateList = sysAppHomeconfigPlateListMapper.selectList(plateListWrapper);
+            }
+            List<SysAppHomeconfigPlateVo> plateVos = new ArrayList<>();
+            for(SysAppHomeconfigPlate plate : plates) {
+                SysAppHomeconfigPlateVo plateVo = new SysAppHomeconfigPlateVo();
+                BeanUtils.copyProperties(plate, plateVo);
+                if(!CollectionUtils.isEmpty(plateList)) {
+                    List<SysAppHomeconfigPlateList> list =
+                            plateList.parallelStream().filter(item->item.getPlateId().longValue()== plate.getId().longValue()).collect(Collectors.toList());
+                    plateVo.setPlateList(list);
+                }
+                plateVos.add(plateVo);
+            }
+            vo.setPlateList(plateVos);
+        }
+        return vo;
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.java
new file mode 100644
index 0000000..0f04127
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.java
@@ -0,0 +1,592 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.ChineseCharacterUtil;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.mapper.SysDeptMapper;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.core.constant.DataPermissionConstant;
+import com.mosty.common.core.login.dto.DeptAllVo;
+import com.mosty.common.core.login.dto.DeptDTO;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
+        implements SysDeptService {
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
+    @Resource
+    private SysRoleDeptService sysRoleDeptService;
+    @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private SysUserService sysUserService;
+
+    public static String DEPT_URL = "http://80.149.27.78:8001/no-auth-api/system/jurisdictions/all";
+
+    @Value("${config.orgCode}")
+    private String orgCode;
+
+
+    @Override
+    public IPage<SysDept> selectByPage(DeptPage deptPage) {
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(deptPage.getDeptName())) {
+            queryWrapper.and(wrapper -> wrapper.like("org_name", deptPage.getDeptName()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        queryWrapper.and(wrapper -> wrapper.eq("parent_id", DeletedEnum.NATURE.code));
+//        queryWrapper.and(wrapper -> wrapper.isNull("parent_id"));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        deptPage.setOrders(orderBy);
+        IPage<SysDept> iPage = this.baseMapper.selectPage(deptPage, queryWrapper);
+        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+            List<SysDept> records = iPage.getRecords();
+            records.forEach(this::wrapChildList);
+            iPage.setRecords(records);
+        }
+        return iPage;
+    }
+
+    @Override
+    public List<SysDept> selectDept(DeptQuery dto) {
+        if (dto.getParentid() != null) {
+            return this.baseMapper.getDeptListByParentId(dto.getParentid(), dto.getDeptname());
+        }
+        UserInfo user = UserInfoManager.get();
+        String ssbm = getSsbm(user);
+        return this.baseMapper.getDeptListByOrgcode(ssbm, dto.getDeptname());
+    }
+
+    // 获取用户的查询条件
+    public String getSsbm(UserInfo user) {
+        // 查询用户权限
+        SysRoleVO role = null;
+        List<SysRoleVO> userRoles = sysRoleService.getUserRoleList(user.getUserId());
+        if (!CollectionUtils.isEmpty(userRoles)) {
+            int level = Integer.parseInt(userRoles.get(0).getDataPermissionLevel());
+            role = userRoles.get(0);
+            for (SysRoleVO item : userRoles) {
+                if (level > Integer.parseInt(item.getDataPermissionLevel())) {
+                    level = Integer.parseInt(item.getDataPermissionLevel());
+                    role = item;
+                }
+            }
+        }
+        if (role != null) {
+            String level = role.getDataPermissionLevel();
+            if ("1".equals(level) || "2".equals(level)) {
+                return orgCode;
+            } else if ("3".equals(level)) {
+                return user.getDszDeptCode();
+            } else if ("4".equals(level)) {
+                return user.getFxjDeptCode();
+            } else {
+                return user.getDeptCode();
+            }
+        }
+        return user.getDeptCode();
+    }
+
+
+    private void wrapChildList1(SysDept item, List<SysDept> allList) {
+//        List<SysDept> list = this.list(
+//                new LambdaQueryWrapper<SysDept>()
+//                        .eq(SysDept::getParentId, item.getId())
+//                        .eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code)
+//        );
+        List<SysDept> list = allList.stream().filter(it ->
+                !Objects.isNull(it.getParentId()) && it.getParentId().equals(item.getId())).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setChildDeptList(list);
+            list.forEach(it -> this.wrapChildList1(it, allList));
+        }
+    }
+
+    private void wrapChildList(SysDept item) {
+        List<SysDept> list = this.list(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, item.getId())
+                        .eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code)
+        );
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setChildDeptList(list);
+            list.forEach(this::wrapChildList);
+        }
+    }
+
+    // 获取部门
+    public IPage<SysDept> getDept(DeptPage deptPage) {
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        if (StringUtils.isBlank(deptPage.getDeptName())) {
+            if (StringUtils.isNotBlank(deptPage.getOrgCode())) {
+                queryWrapper.and(wrapper -> wrapper.eq("org_code", deptPage.getOrgCode()));
+            } else {
+                queryWrapper.and(wrapper -> wrapper.isNull("parent_id"));
+            }
+        }
+        if (StringUtils.isNotBlank(deptPage.getIds())) {
+            List<String> list = Arrays.asList(deptPage.getIds().split(","));
+            queryWrapper.in("id", list);
+        }
+        queryWrapper.like(StringUtils.isNotBlank(deptPage.getDeptName()), "org_name", deptPage.getDeptName());
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        deptPage.setOrders(orderBy);
+        return getBaseMapper().selectPage(deptPage, queryWrapper);
+    }
+
+    @Override
+    public List<DeptDTO> selectUserDeptList(Long userId) {
+        return sysDeptMapper.selectUserDeptList(userId);
+    }
+
+    @Override
+    public List<SysDept> getChildDeptList(Long deptId) {
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(wrapper -> wrapper.eq("parent_id", deptId));
+        return getBaseMapper().selectList(queryWrapper);
+    }
+
+    @Override
+    public SysDeptVO getAllChildDeptList(SysDept sysDept, DeptTreeVO deptTreeVO) {
+        SysDeptVO sysDeptVO = BeanUtil.copyProperties(sysDept, SysDeptVO.class);
+
+        String keyword = StringUtils.isEmpty(deptTreeVO.getKeyword()) ? null : deptTreeVO.getKeyword();
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+        UserInfo userInfo = UserInfoManager.get();
+        //获取最大权限角色
+        String level = userInfo.getLevel();
+        if (DataPermissionConstant.DATA_SCOPE_COUNTY.equals(level) || DataPermissionConstant.DATA_SCOPE_DEPT_AND_CHILD.equals(level) || DataPermissionConstant.DATA_SCOPE_DEPT.equals(level) || DataPermissionConstant.DATA_SCOPE_SELF.equals(level)) {
+            queryWrapper.and(wrapper -> wrapper.like("root_path", sysDept.getRootPath() + "%"));
+        }
+        //部门查询
+        List<SysDept> allDept = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(allDept)) {
+            return sysDeptVO;
+        }
+        List<SysDeptVO> natureList = allDept.stream().filter(dept -> DeletedEnum.NATURE.code.equals(dept.getXtZxbz()))
+                .map(dept -> BeanUtil.copyProperties(dept, SysDeptVO.class)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(natureList)) {
+            return sysDeptVO;
+        }
+
+        if (keyword != null) {
+            Map<Long, SysDeptVO> idMap = natureList.stream().collect(Collectors.toMap(SysDeptVO::getId, vo -> vo));
+            Set<SysDeptVO> containSet = Sets.newHashSet();
+            natureList.stream().filter(dept -> dept.getOrgName().contains(keyword) || dept.getBmpyszm().toLowerCase().contains(keyword))
+                    .forEach(dept -> {
+                        try {
+                            for (String id : dept.getRootPath().split("_")) {
+                                SysDeptVO sysDeptVO1 = idMap.get(Long.parseLong(id));
+                                if (sysDeptVO1 != null) {
+                                    containSet.add(sysDeptVO1);
+                                }
+                            }
+                        } catch (Exception e) {
+                            log.error("解析跟目录地址异常：dept={}" + JSON.toJSONString(dept));
+                        }
+                    });
+            natureList = Lists.newArrayList(containSet);
+        }
+        // 递归组织组织机构树
+        wrapChildList(sysDeptVO, natureList);
+
+        return sysDeptVO;
+    }
+
+    @Override
+    @JwtSysUser
+    public Long saveInfo(AddDeptVO addDeptVO, String ipAddress) {
+        SysDept sysDept = BeanUtil.copyProperties(addDeptVO, SysDept.class);
+        String lowerCase = ChineseCharacterUtil.getLowerCase(addDeptVO.getOrgName(), false);
+        sysDept.setBmpyszm(lowerCase);
+        UserInfo userInfo = UserInfoManager.get();
+        sysDept.setXtZxbz(DeletedEnum.NATURE.code);
+        String rootPath;
+        sysDept.setXtZhxgsj(new Date());
+        sysDept.setXtCjsj(new Date());
+        sysDept.setXtLrip(ipAddress);
+        sysDept.setXtZhxgid(userInfo.getUserId());
+        sysDept.setXtZhxgrxm(userInfo.getUserName());
+        sysDept.setXtZhxgrbmid(userInfo.getDeptId());
+        sysDept.setXtZhxgrbm(userInfo.getDeptName());
+        sysDept.setBz(addDeptVO.getBz());
+        sysDept.setXtLrsj(new Date());
+        sysDept.setXtLrrid(userInfo.getUserId());
+        sysDept.setXtLrrxm(userInfo.getUserName());
+        sysDept.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysDept.setXtLrrbm(userInfo.getDeptName());
+        this.save(sysDept);
+        if (Objects.nonNull(sysDept.getParentId())) {
+            SysDept dept = this.getById(addDeptVO.getParentId());
+            Asserts.check(dept == null, "传入的父id对应的部门信息不存在");
+            rootPath = dept.getRootPath().endsWith("_") ?
+                    (dept.getRootPath() + sysDept.getId()) : (dept.getRootPath() + "_" + sysDept.getId());
+        } else {
+            rootPath = sysDept.getId() + "_";
+        }
+        sysDept.setRootPath(rootPath);
+        sysDeptMapper.updateById(sysDept);
+        return sysDept.getId();
+
+    }
+
+    @Override
+    @JwtSysUser
+    public void updateInfo(SysDeptVO sysDept, String ipAddress) {
+        SysDept oldSysDept = this.getBaseMapper().selectById(sysDept.getId());
+        Asserts.check(oldSysDept == null, "主键为 %s 的部门信息不存在", sysDept.getId());
+        SysDept sysDeptEntity = BeanUtil.copyProperties(sysDept, SysDept.class);
+        String lowerCase = ChineseCharacterUtil.getLowerCase(sysDept.getOrgName(), false);
+        sysDeptEntity.setBmpyszm(lowerCase);
+        UserInfo userInfo = UserInfoManager.get();
+        sysDeptEntity.setXtZxbz(DeletedEnum.NATURE.code);
+        sysDeptEntity.setXtZhxgsj(new Date());
+        sysDeptEntity.setXtLrip(ipAddress);
+        sysDeptEntity.setXtZhxgid(userInfo.getUserId());
+        sysDeptEntity.setXtZhxgrxm(userInfo.getUserName());
+        sysDeptEntity.setXtZhxgrbmid(userInfo.getDeptId());
+        sysDeptEntity.setXtZhxgrbm(userInfo.getDeptName());
+        this.updateById(sysDeptEntity);
+
+    }
+
+    @Override
+    @JwtSysUser
+    public void delete(DeleteDeptVO deleteDeptVO, String ipAddress, UserInfo userInfo) {
+        SysDept oldSysDept = this.getBaseMapper().selectById(deleteDeptVO.getId());
+        Asserts.check(oldSysDept == null, "主键为 %s 的部门信息不存在", deleteDeptVO.getId());
+        //判断部门角色表
+        List<SysUserDept> userDepts = sysUserDeptService.listByDeptId(deleteDeptVO.getId());
+        Asserts.check(!CollectionUtils.isEmpty(userDepts), "主键为 %s 的部门含有关联角色，请解绑", deleteDeptVO.getId());
+        //判断部门用户表
+        List<SysRoleDept> roleDepts = sysRoleDeptService.listByDeptId(deleteDeptVO.getId());
+        Asserts.check(!CollectionUtils.isEmpty(roleDepts), "主键为 %s 的部门含有关联用户，请解绑", deleteDeptVO.getId());
+        oldSysDept.setXtZxbz(DeletedEnum.NATURE.code);
+        oldSysDept.setXtZhxgsj(new Date());
+        oldSysDept.setXtLrip(ipAddress);
+        oldSysDept.setXtZhxgid(userInfo.getUserId());
+        oldSysDept.setXtZhxgrxm(userInfo.getUserName());
+        oldSysDept.setXtZhxgrbmid(userInfo.getDeptId());
+        oldSysDept.setXtZhxgrbm(userInfo.getDeptName());
+        oldSysDept.setXtZxbz(1);
+        oldSysDept.setXtZxyy(deleteDeptVO.getXtZxyy());
+        this.updateById(oldSysDept);
+    }
+
+    @Override
+    public IPage<UserDeptVO> selectUserPageByDept(UserByDeptPage userByDeptPage) {
+        return sysDeptMapper.selectUserPageByDept(userByDeptPage);
+    }
+
+    @Override
+    public IPage<RoleDeptVO> selectRolePageByDept(RoleByDeptPage roleByDeptPage) {
+        return sysDeptMapper.selectRolePageByDept(roleByDeptPage);
+    }
+
+    @Override
+    public void saveRoleDeptInfo(AddRoleDeptVO roleDeptVO) {
+        SysDept dept = this.getById(roleDeptVO.getDeptId());
+        Asserts.check(dept == null, "主键为 %s 的部门信息不存在", roleDeptVO.getDeptId());
+        List<SysRoleDept> sysRoleDeptList = new ArrayList<>();
+        List<Long> roleIds = roleDeptVO.getRoleIds();
+        roleIds.forEach(roleId -> {
+            SysRole role = sysRoleService.getById(roleId);
+            Asserts.check(role == null, "主键为 %s 的角色信息不存在", roleDeptVO.getDeptId());
+            SysRoleDept sysRoleDept = new SysRoleDept();
+            sysRoleDept.setDeptId(roleDeptVO.getDeptId());
+            sysRoleDept.setRoleId(roleId);
+            sysRoleDeptList.add(sysRoleDept);
+        });
+        sysRoleDeptService.remove(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getDeptId, roleDeptVO.getDeptId()));
+        sysRoleDeptService.saveBatch(sysRoleDeptList);
+    }
+
+    @Override
+    public void saveUserDeptInfo(AddUserDeptVO addUserDeptVO) {
+        SysUser user = sysUserService.getById(addUserDeptVO.getUserId());
+        Asserts.check(user == null, "主键为 %s 的用户信息不存在", addUserDeptVO.getUserId());
+        SysDept dept = this.getById(addUserDeptVO.getDeptId());
+        Asserts.check(dept == null, "主键为 %s 的部门信息不存在", addUserDeptVO.getDeptId());
+        SysUserDept userDept = sysUserDeptService.getByDeptIdAndUserId(addUserDeptVO.getDeptId(), addUserDeptVO.getUserId());
+        Asserts.check(userDept != null, "该部门已经含有当前用户");
+        SysUserDept sysUserDept = BeanUtil.copyProperties(addUserDeptVO, SysUserDept.class);
+        sysUserDeptService.save(sysUserDept);
+    }
+
+    @Override
+    public void deleteUserDeptInfo(DeleteUserDeptVO deleteUserDeptVO) {
+        sysUserDeptService.remove(new LambdaQueryWrapper<SysUserDept>().eq(SysUserDept::getDeptId, deleteUserDeptVO.getDeptId())
+                .in(SysUserDept::getUserId, deleteUserDeptVO.getUserIds()));
+    }
+
+    @Override
+    public List<Long> getAllChildDeptIds(Long deptId) {
+        List<Long> ids = new ArrayList<>();
+        wrapChildIdList(deptId, ids);
+        return ids;
+    }
+
+
+    private void wrapChildIdList(Long id, List<Long> ids) {
+        List<SysDept> list = this.list(new LambdaQueryWrapper<SysDept>().eq(SysDept::getParentId, id).eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code));
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<Long> deptIds = list.stream().map(SysDept::getId).collect(Collectors.toList());
+            ids.addAll(deptIds);
+            list.forEach(dept -> wrapChildIdList(dept.getId(), ids));
+        }
+    }
+
+    /**
+     * 递归查询子部门集合
+     *
+     * @param sysDeptVO  当前部门信息
+     * @param natureList 所有部门信息
+     */
+    private void wrapChildList(SysDeptVO sysDeptVO, List<SysDeptVO> natureList) {
+        Long rootId = sysDeptVO.getId();
+        List<SysDeptVO> collect = natureList.stream().filter(dept -> rootId.equals(dept.getParentId())).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(collect)) {
+            sysDeptVO.setChildDeptList(collect);
+        }
+        if (CollectionUtils.isNotEmpty(collect)) {
+            collect.forEach(dept -> wrapChildList(dept, natureList));
+        }
+    }
+
+    @Override
+    public SysDept getDeptByOrgCode(String orgCode) {
+        LambdaQueryWrapper<SysDept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysDept::getOrgCode, orgCode).eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code);
+        return sysDeptMapper.selectOne(lambdaQueryWrapper);
+    }
+
+    @Override
+    public Boolean deptSys() {
+        Map<String, Object> params = new HashMap<>();
+        String rs = HttpUtils.executeGet(DEPT_URL, params);
+        JSONObject json = JSONObject.parseObject(rs);
+        if (json.getBoolean("success")) {
+            JSONArray array = json.getJSONArray("data");
+            if (CollectionUtils.isNotEmpty(array)) {
+                for (int i = 0; i < array.size(); i++) {
+                    JSONObject deptJson = array.getJSONObject(i);
+                    String orgCode = deptJson.getString("jurisdictionCode");
+                    if (orgCode.startsWith("511421")) {
+                        String xtLrsj = deptJson.getString("createTime");
+                        xtLrsj = xtLrsj.replace("T", " ");
+                        String xtZhxgsj = deptJson.getString("lastModifiedTime");
+                        xtZhxgsj = xtZhxgsj.replace("T", " ");
+                        Integer xtZxbz = DeletedEnum.NATURE.code;
+                        if (!"1".equals(deptJson.getString("zt"))) {
+                            xtZxbz = DeletedEnum.DELETED.code;
+                        }
+                        SysDept sysDept = getDeptByOrgCode(orgCode);
+                        if (sysDept == null) {
+                            sysDept = new SysDept();
+                        }
+                        sysDept.setOrgCode(deptJson.getString("jurisdictionCode"));
+                        sysDept.setOrgName(deptJson.getString("jurisdictionName"));
+//                        String orgJc = deptJson.getString("jurisdictionName").replace("四川省眉山市", "");
+//                        sysDept.setOrgJc(orgJc);
+                        sysDept.setXtCjsj(new Date());
+                        sysDept.setXtLrsj(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, xtLrsj));
+                        sysDept.setXtZhxgsj(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, xtZhxgsj));
+                        sysDept.setXzqh("511421");
+                        sysDept.setXtZxbz(xtZxbz);
+                        if (sysDept.getId() == null) {
+                            String rootPath = "";
+                            String lowerCase = ChineseCharacterUtil.getLowerCase(sysDept.getOrgName(), false);
+                            sysDept.setBmpyszm(lowerCase);
+                            this.save(sysDept);
+                            JSONObject parent = deptJson.getJSONObject("parent");
+                            if (Objects.nonNull(parent)) {
+                                String parentOrgCode = parent.getString("jurisdictionCode");
+                                if (parentOrgCode.startsWith("511421")) {
+                                    SysDept dept = getDeptByOrgCode(parentOrgCode);
+                                    Asserts.check(dept == null, "传入的父CODE对应的部门信息不存在");
+                                    rootPath = dept.getRootPath().endsWith("_") ?
+                                            (dept.getRootPath() + sysDept.getId()) : (dept.getRootPath() + "_" + sysDept.getId());
+                                }
+                            } else {
+                                rootPath = sysDept.getId() + "_";
+                            }
+                            sysDept.setRootPath(rootPath);
+                            sysDeptMapper.updateById(sysDept);
+                        } else {
+                            sysDept.setXtZxbz(DeletedEnum.NATURE.code);
+                            sysDeptMapper.updateById(sysDept);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public IPage<SysDept> getDeptList(DeptPage deptPage) {
+        if (StringUtils.isBlank(deptPage.getOrgCode())) {
+            throw new BusinessException("orgCode不能为null");
+        }
+        deptPage.setOrgCode(deptPage.getOrgCode());
+        IPage<SysDept> iPage = getDept(deptPage);
+        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+            List<SysDept> records = iPage.getRecords();
+            records.forEach(this::wrapChildList);
+            iPage.setRecords(records);
+        }
+        return iPage;
+    }
+
+    @Override
+    public List<String> getChildDept(String deptid) {
+        SysDept dept = this.baseMapper.selectById(deptid);
+        List<String> deptIds = new ArrayList<>();
+        this.getChildList(dept, deptIds);
+        return deptIds;
+    }
+
+    @Override
+    public List<String> getChildDeptByOrgCode(String orgcode) {
+        SysDept dept = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getXtZxbz, "0")
+                        .eq(SysDept::getOrgCode, orgcode)
+        );
+        List<String> orgcodes = new ArrayList<>();
+        this.getChildListByOrgcode(dept, orgcodes);
+        return orgcodes;
+    }
+
+    @Override
+    public DeptAllVo getOrgByDeptId(String deptid) {
+        DeptAllVo vo = new DeptAllVo();
+        SysDept dept = this.baseMapper.selectById(deptid);
+        if (dept != null) {
+            vo.setOrgType(dept.getOrgType());
+            vo.setOrgLevel(dept.getOrgLevel());
+            vo.setOrgBizType(dept.getOrgBizType());
+            String rootPath = dept.getRootPath();
+            // 省厅
+            if (dept.getParentId() == 0) {
+                this.setDept(vo, dept);
+                return vo;
+            }
+            if (rootPath != null) {
+                String[] paths = rootPath.split("_");
+                this.setDept(vo, dept);
+                SysDept dept1 = this.baseMapper.selectById(paths[1]);
+                this.setDsz(vo, dept1);
+                if (paths.length == 2 || paths.length == 3) {
+                    this.setFxj(vo, dept);
+                } else if (paths.length >= 4) {
+                    SysDept dept2 = this.baseMapper.selectById(paths[2]);
+                    this.setFxj(vo, dept2);
+                }
+            }
+        }
+        return vo;
+    }
+
+
+    // 设置分县局
+    private void setFxj(DeptAllVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setFxjid(dept.getId());
+            vo.setFxjcode(dept.getOrgCode());
+            vo.setFxjname(dept.getOrgName());
+        }
+    }
+
+    // 设置地市州
+    private void setDsz(DeptAllVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDszid(dept.getId());
+            vo.setDszcode(dept.getOrgCode());
+            vo.setDszname(dept.getOrgName());
+        }
+    }
+
+    // 设置所属单位
+    private void setDept(DeptAllVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDeptid(dept.getId());
+            vo.setDeptcode(dept.getOrgCode());
+            vo.setDeptname(dept.getOrgName());
+        }
+    }
+
+    private void getChildListByOrgcode(SysDept dept, List<String> orgcodes) {
+        orgcodes.add(String.valueOf(dept.getOrgCode()));
+        List<SysDept> tempList1 = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, dept.getId())
+        );
+        if (tempList1.size() > 0) {
+            orgcodes.addAll(tempList1.stream().map(SysDept::getOrgCode).collect(Collectors.toList()));
+            tempList1.forEach(item -> this.getChildListByOrgcode(item, orgcodes));
+        }
+    }
+
+    private void getChildList(SysDept dept, List<String> deptIds) {
+        deptIds.add(String.valueOf(dept.getId()));
+        List<SysDept> tempList1 = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, dept.getId())
+        );
+        if (tempList1.size() > 0) {
+            deptIds.addAll(tempList1.stream().map(item -> String.valueOf(item.getId())).collect(Collectors.toList()));
+            tempList1.forEach(item -> this.getChildList(item, deptIds));
+        }
+    }
+
+    public List<Long> getDeptUser(Long deptId) {
+        List<Long> userIds = new ArrayList<>();
+        List<String> childDepts = getChildDept(String.valueOf(deptId));
+        System.out.println("childDepts--->" + JSONArray.toJSONString(childDepts));
+        List<SysUserDept> deptUsers = sysUserDeptService.listByDeptIds(childDepts);
+        System.out.println("deptUsers---->" + JSONArray.toJSONString(deptUsers));
+        if (CollectionUtils.isNotEmpty(deptUsers)) {
+            deptUsers.forEach(item -> {
+                userIds.add(item.getUserId());
+            });
+        }
+        return userIds;
+    }
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.java
new file mode 100644
index 0000000..60e30f3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.java
@@ -0,0 +1,191 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.Constants;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysLogininfor;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.mosty.common.core.business.entity.request.LoginLogPage;
+import com.mosty.common.core.business.entity.vo.DeptVo;
+import com.mosty.common.core.business.mapper.SysDeptMapper;
+import com.mosty.common.core.business.mapper.SysLogininforMapper;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import com.mosty.common.core.business.service.SysLogininforService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author li
+ * @description 针对表【sys_logininfor(系统访问记录)】的数据库操作Service实现
+ * @createDate 2022-03-20 15:01:16
+ */
+@Service
+public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor>
+        implements SysLogininforService {
+    @Resource
+    private SysLogininforMapper sysLogininforMapper;
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+    @Resource
+    private SysUserDeptMapper sysUserDeptMapper;
+
+    @Override
+    public void recordLogininfor(SysUser user, String status, String message, HttpServletRequest request, String type) {
+        UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
+
+        // 获取客户端操作系统
+        String os = userAgent.getOs().getName() == null ? "未知" : userAgent.getOs().getName();
+        // 获取客户端浏览器
+        String browser = userAgent.getBrowser().getName() == null ? "未知" : userAgent.getBrowser().getName();
+        // 封装对象
+        SysLogininfor logininfor = new SysLogininfor();
+        try {
+            String ipAddress = IpUtil.getIpAddress(request);
+            logininfor.setIpaddr(ipAddress);
+        }catch (Exception e){
+            log.error("IP获取异常"+e.getMessage());
+        }
+        logininfor.setUserName(user.getUserName());
+        logininfor.setBrowser(browser);
+        logininfor.setOs(os);
+        logininfor.setMsg(message);
+        logininfor.setType(type);
+        logininfor.setAccessTime(LocalDateTime.now());
+        logininfor.setUserId(String.valueOf(user.getId()));
+        logininfor.setSfzh(user.getIdEntityCard());
+        // 日志状态
+        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
+            logininfor.setStatus(Constants.SUCCESS);
+        } else if (Constants.LOGIN_FAIL.equals(status)) {
+            logininfor.setStatus(Constants.FAIL);
+        }
+        DeptVo dept = this.getDeptInfoByUserId(String.valueOf(user.getId()));
+        logininfor.setSsbm(dept.getDeptname());
+        logininfor.setSsbmid(dept.getDeptid());
+        logininfor.setSsbmdm(dept.getDeptcode());
+        logininfor.setSsxgajdm(dept.getFxjcode());
+        logininfor.setSsxgajid(dept.getFxjid());
+        logininfor.setSsxgaj(dept.getFxjname());
+        logininfor.setSssgaj(dept.getDszname());
+        logininfor.setSssgajdm(dept.getDszcode());
+        logininfor.setSssgajid(dept.getDszid());
+
+        // 插入数据
+        this.save(logininfor);
+    }
+
+    public DeptVo getDeptInfoByUserId(String userId) {
+        SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                new QueryWrapper<SysUserDept>()
+                        .eq("user_id", String.valueOf(userId))
+                        .last(" limit 1")
+        );
+        if (sysUserDept != null) {
+            SysDept sysDept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+            if (sysDept != null) {
+                return this.getOrgByDeptId(String.valueOf(sysDept.getId()));
+            }
+        }
+        return null;
+    }
+
+    public DeptVo getOrgByDeptId(String deptid) {
+        DeptVo vo = new DeptVo();
+        SysDept dept = this.sysDeptMapper.selectById(deptid);
+        if (dept != null) {
+            vo.setOrgType(dept.getOrgType());
+            vo.setOrgLevel(dept.getOrgLevel());
+            String rootPath = dept.getRootPath();
+            if (rootPath != null) {
+                String[] paths = rootPath.split("_");
+                if (paths.length == 2) {
+                    this.setDept(vo, dept);
+                    this.setDsz(vo, dept);
+                } else if (paths.length == 3) {
+                    this.setDept(vo, dept);
+                    this.setFxj(vo, dept);
+                    SysDept dsz = this.sysDeptMapper.selectById(paths[1]);
+                    this.setDsz(vo, dsz);
+                } else if (paths.length >= 4) {
+                    this.setDept(vo, dept);
+                    SysDept fxj = this.sysDeptMapper.selectById(paths[2]);
+                    this.setFxj(vo, fxj);
+                    SysDept dsz = this.sysDeptMapper.selectById(paths[1]);
+                    this.setDsz(vo, dsz);
+                }
+            }
+        }
+        return vo;
+    }
+
+    // 设置所属单位
+    private void setDept(DeptVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDeptid(String.valueOf(dept.getId()));
+            vo.setDeptcode(dept.getOrgCode());
+            vo.setDeptname(dept.getOrgName());
+        }
+    }
+
+    // 设置分县局
+    private void setFxj(DeptVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setFxjid(String.valueOf(dept.getId()));
+            vo.setFxjcode(dept.getOrgCode());
+            vo.setFxjname(dept.getOrgName());
+        }
+    }
+
+    // 设置地市州
+    private void setDsz(DeptVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDszid(String.valueOf(dept.getId()));
+            vo.setDszcode(dept.getOrgCode());
+            vo.setDszname(dept.getOrgName());
+        }
+    }
+
+    @Override
+    public void deleteOperLogByIds(List<Long> ids) {
+        sysLogininforMapper.delete(new LambdaQueryWrapper<SysLogininfor>().in(SysLogininfor::getInfoId, ids));
+    }
+
+    @Override
+    public void cleanOperLog() {
+        sysLogininforMapper.cleanOperLog();
+    }
+
+    @Override
+    public IPage<SysLogininfor> selectByPage(LoginLogPage dto) {
+        QueryWrapper<SysLogininfor> qw = new QueryWrapper<>();
+        UserInfo user = UserInfoManager.get();
+        PermissionsUtil.queryWrapperUtil(qw, user);
+        qw.lambda().like(StringUtils.isNotBlank(dto.getUserName()), SysLogininfor::getUserName, dto.getUserName())
+                .eq(Objects.nonNull(dto.getStatus()), SysLogininfor::getStatus, dto.getStatus());
+        qw.lambda().orderByDesc(SysLogininfor::getInfoId);
+        return this.page(dto, qw);
+    }
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.java
new file mode 100644
index 0000000..bf34adb
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.java
@@ -0,0 +1,208 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Sets;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.constant.enums.MenuTypeEnum;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.business.entity.vo.AddSysMenuVO;
+import com.mosty.common.core.business.entity.vo.MenuPage;
+import com.mosty.common.core.business.entity.vo.MenuQuery;
+import com.mosty.common.core.business.mapper.SysMenuMapper;
+import com.mosty.common.core.business.service.SysMenuService;
+import com.mosty.common.core.login.LoginResponseVO;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 菜单表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Service
+@AllArgsConstructor
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
+
+    private final SysMenuMapper sysMenuMapper;
+
+    @Override
+    public IPage<SysMenu> selectByPage(MenuPage menuPage) {
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(menuPage.getMenuName())) {
+            queryWrapper.and(wrapper -> wrapper.like("menu_name", menuPage.getMenuName()));
+        } else {
+            queryWrapper.and(wrapper -> wrapper.eq("menu_type", MenuTypeEnum.MENU_GROUP.code));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        IPage iPage = getBaseMapper().selectPage(menuPage, queryWrapper);
+        List<SysMenu> records = iPage.getRecords();
+        if (StringUtils.isBlank(menuPage.getMenuName())) {
+            records.forEach(item -> {
+                wrapChildList(null, item, null);
+            });
+        }
+        iPage.setRecords(records);
+        return iPage;
+    }
+
+    @Override
+    public List<SysMenu> selectList(MenuQuery menuQuery) {
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        queryWrapper.and(wrapper -> wrapper.eq("menu_type", MenuTypeEnum.MENU_GROUP.code));
+        List<SysMenu> list = getBaseMapper().selectList(queryWrapper);
+        list.forEach(item -> {
+            wrapChildList(null, item, null);
+        });
+        return list;
+    }
+
+    private void wrapChildList(Set<Long> menuIds, SysMenu item, Set<String> menuCodeSet) {
+        LambdaQueryWrapper<SysMenu> lambdaQueryWrapper = new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getParentId, item.getId()).eq(SysMenu::getXtZxbz, DeletedEnum.NATURE.code);
+        if (CollectionUtils.isNotEmpty(menuIds)) {
+            lambdaQueryWrapper.in(SysMenu::getId, menuIds);
+        }
+        List<SysMenu> list = this.list(lambdaQueryWrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setSysMenuList(list);
+            list.forEach(menu -> {
+                if (menuCodeSet != null) {
+                    menuCodeSet.add(menu.getMenuCode());
+                }
+                wrapChildList(menuIds, menu, menuCodeSet);
+            });
+        }
+    }
+
+    private void wrapChildListByType(Set<Long> menuIds, SysMenu item, MenuTypeEnum menuTypeEnum) {
+        wrapChildListByType(menuIds, item, menuTypeEnum, null);
+    }
+
+    private void wrapChildListByType(Set<Long> menuIds, SysMenu item, MenuTypeEnum menuTypeEnum, Set<String> menuCodeSet) {
+        LambdaQueryWrapper<SysMenu> lambdaQueryWrapper = new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getParentId, item.getId())
+                .eq(SysMenu::getXtZxbz, DeletedEnum.NATURE.code)
+                .eq(SysMenu::getMenuType, menuTypeEnum.code);
+        if (CollectionUtils.isNotEmpty(menuIds)) {
+            lambdaQueryWrapper.in(SysMenu::getId, menuIds);
+        }
+        List<SysMenu> list = this.list(lambdaQueryWrapper);
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            item.setSysMenuList(list);
+            list.forEach(menu -> {
+                if (menuCodeSet != null) {
+                    menuCodeSet.add(menu.getMenuCode());
+                }
+                wrapChildList(menuIds, menu, menuCodeSet);
+            });
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addSysMenuInfo(AddSysMenuVO addSysMenuVo, SysMenu parentMenu) {
+        // 初始化菜单信息
+        SysMenu sysMenu = initMenuInfo(addSysMenuVo);
+
+        // 添加菜单信息
+        sysMenuMapper.insert(sysMenu);
+
+        SysMenu sysMenuForUpdate = new SysMenu();
+        Long id = sysMenu.getId();
+        if (parentMenu == null) {
+            sysMenuForUpdate.setParentPath(id.toString());
+        } else {
+            sysMenuForUpdate.setParentPath(parentMenu.getParentPath() + "_" + id);
+        }
+        sysMenuMapper.updateById(sysMenuForUpdate);
+    }
+
+    @Override
+    public List<SysMenu> listByType(Set<Long> menuIds, MenuTypeEnum menuGroup, LoginResponseVO loginResponseVO) {
+        Set<String> menuCodeSet = Sets.newHashSet();
+        LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getMenuType, menuGroup.code)
+                .eq(SysMenu::getXtZxbz, DeletedEnum.NATURE.code);
+        if (CollectionUtils.isNotEmpty(menuIds)) {
+            queryWrapper.in(SysMenu::getId, menuIds);
+        }
+        List<SysMenu> list = this.list(queryWrapper);
+        list.forEach(item -> {
+            menuCodeSet.add(item.getMenuCode());
+            wrapChildListByType(menuIds, item, MenuTypeEnum.MENU, menuCodeSet);
+        });
+        loginResponseVO.setMenuCodeSet(menuCodeSet);
+        return list;
+    }
+
+    @Override
+    public SysMenu getMenuChild(Long menuId) {
+        SysMenu sysMenu = this.getOne(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getId, menuId)
+                .eq(SysMenu::getXtZxbz, DeletedEnum.NATURE.code));
+        wrapChildListByType(null, sysMenu, MenuTypeEnum.MENU);
+        return sysMenu;
+    }
+
+
+    /**
+     * 初始化菜单信息
+     *
+     * @param addSysMenuVo 添加菜单请求
+     * @return 菜单信息
+     */
+    private SysMenu initMenuInfo(AddSysMenuVO addSysMenuVo) {
+        SysMenu sysMenu = new SysMenu();
+        sysMenu.setParentId(addSysMenuVo.getParentId());
+        sysMenu.setMenuName(addSysMenuVo.getMenuName());
+        sysMenu.setMenuCode(addSysMenuVo.getMenuCode());
+        sysMenu.setMenuUrl(addSysMenuVo.getMenuUrl());
+        sysMenu.setMenuType(addSysMenuVo.getMenuType());
+
+        sysMenu.setOrderNo(addSysMenuVo.getOrderNo());
+        sysMenu.setShowMode(addSysMenuVo.getShowMode());
+        sysMenu.setBz(addSysMenuVo.getBz());
+
+        UserInfo userInfo = UserInfoManager.get();
+        sysMenu.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysMenu.setXtCjsj(new Date());
+        sysMenu.setXtZhxgsj(new Date());
+        sysMenu.setXtZhxgrid(userInfo.getUserId().toString());
+        sysMenu.setXtZhxgrxm(userInfo.getUserName());
+        sysMenu.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysMenu.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysMenu.setXtLrsj(new Date());
+        sysMenu.setXtLrrid(userInfo.getUserId().toString());
+        sysMenu.setXtLrrxm(userInfo.getUserName());
+        sysMenu.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysMenu.setXtLrrbm(userInfo.getDeptName());
+
+        // 获取ip地址
+        String ipAddress = IpUtil.getIpAddress();
+        sysMenu.setXtLrip(ipAddress);
+        sysMenu.setXtZhxgip(ipAddress);
+        return sysMenu;
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysOssServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysOssServiceImpl.java
new file mode 100644
index 0000000..b70bf25
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysOssServiceImpl.java
@@ -0,0 +1,29 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.core.business.entity.SysOss;
+import com.mosty.common.core.business.mapper.SysOssMapper;
+import com.mosty.common.core.business.mapper.SysPositionMapper;
+import com.mosty.common.core.business.service.SysOssService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * OSS云存储表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-31
+ */
+@Service
+@AllArgsConstructor
+public class SysOssServiceImpl extends ServiceImpl<SysOssMapper, SysOss> implements SysOssService {
+
+    private final SysOssMapper sysOssMapper;
+
+    @Override
+    public void saveSysOss(SysOss sysOss) {
+        sysOssMapper.insert(sysOss);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.java
new file mode 100644
index 0000000..a853b0a
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.java
@@ -0,0 +1,83 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.config.entity.vo.EditPositionVO;
+import com.mosty.common.core.business.entity.SysPosition;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.PositionPage;
+import com.mosty.common.core.business.mapper.SysPositionMapper;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import com.mosty.common.core.business.service.SysPositionService;
+import com.mosty.common.core.business.service.SysUserService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 岗位表 服务实现类
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-02-12
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPosition> implements SysPositionService {
+
+    private final SysUserService sysUserService;
+    private final SysPositionMapper sysPositionMapper;
+
+    @Override
+    public IPage<SysPosition> selectByPage(PositionPage page) {
+        QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(page.getPositionName())) {
+            queryWrapper.and(wrapper -> wrapper.like("post_name", page.getPositionName()));
+        }
+        if (StringUtils.isNotBlank(page.getPositionCode())) {
+            queryWrapper.and(wrapper -> wrapper.eq("post_code", page.getPositionCode()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        queryWrapper.orderByDesc("xt_zhxgsj");
+        return getBaseMapper().selectPage(page, queryWrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysPost(SysPosition oldSysPosition, EditPositionVO editPositionVO) {
+        // 当岗位名称变更，去修改用户表中的岗位名称
+        if (!oldSysPosition.getPostName().equals(editPositionVO.getPostName())) {
+            UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("position_id", oldSysPosition.getId())
+                    .set("position_name", editPositionVO.getPostName());
+            boolean update = sysUserService.update(updateWrapper);
+            log.info("岗位名称发送变更后，修改了用户表的{}条岗位名称数据", update);
+        }
+        oldSysPosition.setBz(editPositionVO.getBz());
+        oldSysPosition.setPostCode(editPositionVO.getPostCode());
+        oldSysPosition.setPostName(editPositionVO.getPostName());
+        oldSysPosition.setPostDesc(editPositionVO.getPostDesc());
+
+        UserInfo userInfo = UserInfoManager.get();
+
+        oldSysPosition.setXtZhxgsj(new Date());
+        oldSysPosition.setXtZhxgrid(userInfo.getUserId().toString());
+        oldSysPosition.setXtZhxgrxm(userInfo.getUserName());
+        oldSysPosition.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        oldSysPosition.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysPositionMapper.updateById(oldSysPosition);
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.java
new file mode 100644
index 0000000..434d374
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.java
@@ -0,0 +1,38 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.core.business.entity.SysRoleDept;
+import com.mosty.common.core.business.service.SysRoleDeptService;
+import com.mosty.common.core.business.mapper.SysRoleDeptMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author li
+* @description 针对表【sys_role_dept(角色和部门关联表)】的数据库操作Service实现
+* @createDate 2022-02-12 16:53:15
+*/
+@Service
+public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptMapper, SysRoleDept>
+    implements SysRoleDeptService {
+
+    @Override
+    public List<SysRoleDept> listByDeptId(Long deptId) {
+        List<SysRoleDept> list = this.list(new LambdaQueryWrapper<SysRoleDept>()
+                .eq(SysRoleDept::getDeptId, deptId));
+        return list;
+    }
+
+    @Override
+    public SysRoleDept getByDeptIdAndRoleId(Long deptId, Long roleId) {
+        SysRoleDept one = this.getOne(new LambdaQueryWrapper<SysRoleDept>()
+                .eq(SysRoleDept::getDeptId, deptId).eq(SysRoleDept::getRoleId, roleId));
+        return one;
+    }
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.java
new file mode 100644
index 0000000..502e8ca
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.java
@@ -0,0 +1,42 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.core.business.entity.SysRoleMenu;
+import com.mosty.common.core.business.service.SysRoleMenuService;
+import com.mosty.common.core.business.mapper.SysRoleMenuMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+* @author li
+* @description 针对表【sys_role_menu(角色和菜单关联表)】的数据库操作Service实现
+* @createDate 2022-02-12 16:53:18
+*/
+@Service
+@AllArgsConstructor
+public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements SysRoleMenuService {
+
+    @Override
+    public List<SysRoleMenu> listByRoleIds(Set<Long> rolesSet) {
+        List<SysRoleMenu> list = this.list(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, rolesSet));
+        return list;
+    }
+
+    @Override
+    public Set<Long> listByMenuId(Long menuId) {
+        List<SysRoleMenu> list = this.list(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getMenuId, menuId));
+        if (!list.isEmpty()){
+            return list.stream().map(SysRoleMenu::getRoleId).collect(Collectors.toSet());
+        }
+        return null;
+    }
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.java
new file mode 100644
index 0000000..f0a655c
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.java
@@ -0,0 +1,292 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.constant.enums.PermissionLevelEnum;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.mapper.SysDeptMapper;
+import com.mosty.common.core.business.mapper.SysRoleDeptMapper;
+import com.mosty.common.core.business.mapper.SysRoleMapper;
+import com.mosty.common.core.business.mapper.SysUserRoleMapper;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author li
+ * @description 针对表【sys_role(角色表)】的数据库操作Service实现
+ * @createDate 2022-02-12 16:53:11
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private SysRoleMenuService sysRoleMenuService;
+    @Resource
+    private SysMenuService sysMenuService;
+    @Resource
+    private SysUserRoleMapper sysUserRoleMapper;
+    @Resource
+    private SysRoleDeptMapper sysRoleDeptMapper;
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+    @Resource
+    private SysDeptService sysDeptService;
+
+
+    @Override
+    public DeptInfo getSysDeptLevel(String orgCode) {
+        DeptInfo deptInfo = new DeptInfo();
+        SysDept sysDept = sysDeptMapper.selectOne(new QueryWrapper<SysDept>().eq("org_code", orgCode).eq("xt_zxbz", 0));
+        if (sysDept != null) {
+            deptInfo.setSsbmid(sysDept.getId());
+            deptInfo.setSsbmdm(sysDept.getOrgCode());
+            deptInfo.setSsbm(sysDept.getOrgName());
+            //获取地市州
+            SysDept dszDept = getDszDept(sysDept);
+            if (dszDept != null) {
+                deptInfo.setSssgajid(dszDept.getId());
+                deptInfo.setSssgajdm(dszDept.getOrgCode());
+                deptInfo.setSssgaj(dszDept.getOrgName());
+            }
+            //获取分县局
+            SysDept fxjDept = getFxjDept(sysDept);
+            if (fxjDept != null) {
+                deptInfo.setSsxgajid(fxjDept.getId());
+                deptInfo.setSsxgajdm(fxjDept.getOrgCode());
+                deptInfo.setSsxgaj(fxjDept.getOrgName());
+            }
+
+            QueryWrapper<SysRoleDept> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("dept_id", sysDept.getId());
+            List<SysRoleDept> list = sysRoleDeptMapper.selectList(queryWrapper);
+            if (CollectionUtil.isEmpty(list)) {
+                return deptInfo;
+            }
+            List<Long> roleList = list.stream().map(SysRoleDept::getRoleId).collect(Collectors.toList());
+            Collection<SysRole> sysRoles = super.listByIds(roleList);
+            List<SysRoleVO> collect = sysRoles.stream().filter(role -> DeletedEnum.NATURE.code.equals(role.getXtZxbz()))
+                    .map(role -> BeanUtil.copyProperties(role, SysRoleVO.class))
+                    .sorted(Comparator.comparing(SysRoleVO::getDataPermissionLevel))
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                deptInfo.setPermissionsLevel(collect.get(0).getDataPermissionLevel());
+                if (deptInfo.getPermissionsLevel().equals("5")) {
+                    // 本部门以及下级部门权限
+                    // 查询下级部门
+                    List<Long> childDeptIds = sysDeptService.getAllChildDeptIds(sysDept.getId());
+                    List<String> collect1 = childDeptIds.stream().map(String::valueOf).collect(Collectors.toList());
+                    collect1.add(String.valueOf(sysDept.getId()));
+                    deptInfo.setIds(String.join(",", collect1));
+                }
+            }
+        }
+        return deptInfo;
+    }
+
+
+    // 根据当前地市州
+    public SysDept getDszDept(SysDept sysDept) {
+        if (sysDept == null) {
+            return null;
+        }
+        long id;
+        String path = sysDept.getRootPath();
+        if (path.contains("_")) {
+            String[] paths = path.split("_");
+            id = Long.parseLong(paths[1]);
+        } else {
+            id = Long.parseLong(path);
+        }
+        return sysDeptService.getById(id);
+    }
+
+    // 根据当前部门获取分县局部门
+    public SysDept getFxjDept(SysDept sysDept) {
+        if (sysDept == null) {
+            return null;
+        }
+        Long id = null;
+        String path = sysDept.getRootPath();
+        if (path.contains("_")) {
+            String[] paths = path.split("_");
+            if (paths.length == 2) {
+                id = Long.valueOf(paths[1]);
+            } else if (paths.length == 3) {
+                id = Long.valueOf(paths[2]);
+            } else if (paths.length >= 4) {
+                id = Long.valueOf(paths[2]);
+            }
+        } else {
+            id = Long.valueOf(path);
+        }
+        return sysDeptService.getById(id);
+    }
+
+    @Override
+    public IPage<SysRole> selectByPage(RolePage rolePage) {
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(rolePage.getRoleName())) {
+            queryWrapper.and(wrapper -> wrapper.like("role_name", rolePage.getRoleName()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        return getBaseMapper().selectPage(rolePage, queryWrapper);
+    }
+
+    @Override
+    public List<SysRoleVO> getUserRoleList(Long userId) {
+        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", String.valueOf(userId));
+        List<SysUserRole> list = sysUserRoleService.list(queryWrapper);
+        if (CollectionUtil.isEmpty(list)) {
+            return Lists.newArrayList();
+        }
+
+        List<Long> roleList = list.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+        Collection<SysRole> sysRoles = super.listByIds(roleList);
+
+        return sysRoles.stream().filter(role -> DeletedEnum.NATURE.code.equals(role.getXtZxbz()))
+                .map(role -> BeanUtil.copyProperties(role, SysRoleVO.class))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public void insertRole(AddRoleVO addRoleVo, String ipAddress) {
+        SysRole sysRole = BeanUtil.copyProperties(addRoleVo, SysRole.class);
+
+        UserInfo userInfo = UserInfoManager.get();
+        sysRole.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysRole.setXtCjsj(new Date());
+        sysRole.setXtZhxgsj(new Date());
+        sysRole.setXtZhxgrid(userInfo.getUserId().toString());
+        sysRole.setXtZhxgrxm(userInfo.getUserName());
+        sysRole.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysRole.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysRole.setXtLrsj(new Date());
+        sysRole.setXtLrrid(userInfo.getUserId().toString());
+        sysRole.setXtLrrxm(userInfo.getUserName());
+        sysRole.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysRole.setXtLrrbm(userInfo.getDeptName());
+
+        sysRole.setXtZhxgip(ipAddress);
+        sysRole.setXtLrip(ipAddress);
+
+        this.save(sysRole);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRoleMenuInfo(AddRoleMenuVO roleMenuVO) {
+        // 先删除已绑定的菜单
+        QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_id", roleMenuVO.getRoleId());
+        sysRoleMenuService.remove(queryWrapper);
+
+        List<SysRoleMenu> list = new ArrayList<>();
+        List<Long> menuIds = roleMenuVO.getMenuIds();
+        menuIds.forEach(item -> {
+            SysRoleMenu sysRoleMenu = new SysRoleMenu();
+            sysRoleMenu.setRoleId(roleMenuVO.getRoleId());
+            sysRoleMenu.setMenuId(item);
+            list.add(sysRoleMenu);
+        });
+        sysRoleMenuService.saveBatch(list);
+    }
+
+    @Override
+    public void saveDataPermission(AddRoleDataPartitionVO addRoleDataPartitionVO, String ipAddress) {
+        UserInfo userInfo = UserInfoManager.get();
+        SysRole sysRole = new SysRole();
+        sysRole.setId(addRoleDataPartitionVO.getId());
+        sysRole.setDataPermissionLevel(addRoleDataPartitionVO.getDataPermissionLevel());
+        sysRole.setXtZhxgsj(new Date());
+        sysRole.setXtZhxgrid(userInfo.getUserId().toString());
+        sysRole.setXtZhxgrxm(userInfo.getUserName());
+        sysRole.setXtZhxgrbmid(userInfo.getDeptId().toString());
+        sysRole.setXtZhxgrbm(userInfo.getDeptName());
+        sysRole.setXtZhxgip(ipAddress);
+        sysRole.setXtLrip(ipAddress);
+
+        this.updateById(sysRole);
+    }
+
+    @Override
+    public DataPermissionVO getDataPermission(String menuUrl) {
+        UserInfo userInfo = UserInfoManager.get();
+        DataPermissionVO vo = new DataPermissionVO();
+        SysMenu menu = sysMenuService.getOne(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getMenuUrl, menuUrl).eq(SysMenu::getXtZxbz, DeletedEnum.NATURE.code));
+        Set<Long> roleIds = sysRoleMenuService.listByMenuId(menu.getId());
+        if (CollectionUtils.isNotEmpty(roleIds)) {
+            SysRole sysRole = this.list(new LambdaQueryWrapper<SysRole>()
+                    .in(SysRole::getId, roleIds).orderByAsc(SysRole::getDataPermissionLevel)).get(0);
+            vo.setPermissionLevel(sysRole.getDataPermissionLevel());
+            if (PermissionLevelEnum.DEPT_AND_CHILD.level.equals(sysRole.getDataPermissionLevel())) {
+                List<Long> deptIds = sysDeptService.getAllChildDeptIds(userInfo.getDeptId());
+                vo.setDeptIds(deptIds);
+            }
+        } else {
+            vo.setPermissionLevel(PermissionLevelEnum.ALL.level.toString());
+        }
+
+        return vo;
+    }
+
+    @Override
+    public IPage<SysRole> selectUnAccreditPage(RolePage rolePage) {
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(rolePage.getRoleName())) {
+            queryWrapper.and(wrapper -> wrapper.like("role_name", rolePage.getRoleName()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
+        sysUserRoleQueryWrapper.and(wrapper -> wrapper.eq("user_id", rolePage.getUserId()));
+        List<SysUserRole> list = sysUserRoleService.list(sysUserRoleQueryWrapper);
+        if (CollectionUtil.isNotEmpty(list)) {
+            List<Long> roleList = list.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+            queryWrapper.and(wrapper -> wrapper.notIn("id", roleList));
+        }
+        return getBaseMapper().selectPage(rolePage, queryWrapper);
+    }
+
+    @Override
+    public IPage<SysUserVO> getRoleUserList(GetUserRoleListVo vo) {
+        List<SysUserVO> roleUserList = sysUserRoleMapper.getRoleUserList(vo);
+        Page<SysUserVO> page = BeanUtil.copyProperties(roleUserList, Page.class);
+        page.setRecords(roleUserList);
+        page.setTotal(roleUserList.size());
+        return page;
+    }
+
+    @Override
+    public List<Long> getRoleMenuIds(Long roleId) {
+        List<SysRoleMenu> list = sysRoleMenuService.list(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
+        return list.stream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
+    }
+
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.java
new file mode 100644
index 0000000..8971b24
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.java
@@ -0,0 +1,175 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlateList;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlateListPage;
+import com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateListMapper;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateListService;
+import com.mosty.common.token.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块内容表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+public class SysUserAppHomeconfigPlateListServiceImpl extends ServiceImpl<SysUserAppHomeconfigPlateListMapper, SysUserAppHomeconfigPlateList> implements SysUserAppHomeconfigPlateListService {
+
+    @Resource
+    private SysUserAppHomeconfigPlateListMapper sysUserAppHomeconfigPlateListMapper;
+
+    @Override
+    public Long saveInfo(SysUserAppHomeconfigPlateList plate, String ipAddress) {
+        plate.setXtCjsj(new Date());
+        plate.setXtLrip(ipAddress);
+        plate.setXtLrsj(new Date());
+        plate.setXtZhxgsj(new Date());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        sysUserAppHomeconfigPlateListMapper.insert(plate);
+        return plate.getId();
+    }
+
+    @Override
+    public boolean saveInfoBatch(List<SysUserAppHomeconfigPlateList> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            Long pzId = plates.get(0).getPzId();
+            Long pzPlateId = plates.get(0).getPzPlateId();
+            QueryWrapper<SysUserAppHomeconfigPlateList> queryWrapper = new QueryWrapper<>();
+            queryWrapper.and(wrapper -> wrapper.eq("pz_id", pzId));
+            queryWrapper.and(wrapper -> wrapper.eq("pz_plate_id", pzPlateId));
+            queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+            List<SysUserAppHomeconfigPlateList> list = sysUserAppHomeconfigPlateListMapper.selectList(queryWrapper);
+            for(SysUserAppHomeconfigPlateList plate : plates) {
+                boolean bool = isExist(list, plate.getPzId(), plate.getPzPlateId(), plate.getPlateListId());
+                if(!bool) {
+                    QueryWrapper<SysUserAppHomeconfigPlateList> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.and(wrapper -> wrapper.eq("pz_id", plate.getPzId()));
+                    queryWrapper1.and(wrapper -> wrapper.eq("pz_plate_id", plate.getPzPlateId()));
+                    queryWrapper1.and(wrapper -> wrapper.eq("plate_list_id", plate.getPlateListId()));
+                    SysUserAppHomeconfigPlateList plateList =
+                            sysUserAppHomeconfigPlateListMapper.selectOne(queryWrapper1);
+                    if(plateList != null) {
+                        sysUserAppHomeconfigPlateListMapper.updateById(plateList.getPzId(), plateList.getPzPlateId(),
+                                plateList.getPlateListId(), DeletedEnum.NATURE.code);
+                    }
+                }
+                if(!CollectionUtils.isEmpty(list)) {
+                    // list 库中   plateList 参数,
+                    for(SysUserAppHomeconfigPlateList plateList : list) {
+                        boolean bools = isExist(plates, plateList.getPzId(), plateList.getPzPlateId(),
+                                plateList.getPlateListId());
+                        if(!bools) {
+                            sysUserAppHomeconfigPlateListMapper.updateById(plate.getPzId(), plate.getPzPlateId(),
+                                    plate.getPlateListId(), DeletedEnum.DELETED.code);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 判断用户配置板块是否存在
+     * @param list
+     * @param pzid
+     * @param pzPlateId
+     * @return
+     */
+    public boolean isExist(List<SysUserAppHomeconfigPlateList> list, Long pzid, Long pzPlateId, Long plateListId) {
+        if(CollectionUtils.isEmpty(list)) {
+            return false;
+        }
+        for(SysUserAppHomeconfigPlateList plate : list) {
+            if(plate.getPzId().longValue() == pzid.longValue() && plate.getPzPlateId().longValue() == pzPlateId.longValue() && plate.getPlateListId().longValue() == plateListId.longValue()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void updateInfo(SysUserAppHomeconfigPlateList plate, String ipAddress) {
+        SysUserAppHomeconfigPlateList oldConfig = sysUserAppHomeconfigPlateListMapper.selectById(plate.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的信息不存在", oldConfig.getId());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        plate.setXtZhxgsj(new Date());
+        plate.setXtLrip(ipAddress);
+        sysUserAppHomeconfigPlateListMapper.updateById(plate);
+    }
+
+    @Override
+    public void updateInfoBatch(List<SysUserAppHomeconfigPlateList> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            sysUserAppHomeconfigPlateListMapper.deleteByPzId(plates.get(0).getPzId(), plates.get(0).getPzPlateId());
+            for(SysUserAppHomeconfigPlateList plate : plates) {
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysUserAppHomeconfigPlateListMapper.insert(plate);
+            }
+        }
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if(!CollectionUtils.isEmpty(list)) {
+            for(Long id : list) {
+                SysUserAppHomeconfigPlateList plate = sysUserAppHomeconfigPlateListMapper.selectById(id);
+                if(plate != null) {
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZxbz(DeletedEnum.DELETED.code);
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZhxgip(ipAddress);
+                    if(userInfo != null) {
+                        plate.setXtZhxgrxm(userInfo.getUserName());
+                        plate.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        plate.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysUserAppHomeconfigPlateListMapper.updateById(plate);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysUserAppHomeconfigPlateList> selectByPage(SysUserAppHomeconfigPlateListPage cofigPage) {
+        QueryWrapper<SysUserAppHomeconfigPlateList> queryWrapper = new QueryWrapper<>();
+        if (cofigPage.getPzId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("pz_id", cofigPage.getPzId()));
+        }
+        if (cofigPage.getPzPlateId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("pz_plate_id", cofigPage.getPzPlateId()));
+        }
+        if (cofigPage.getPlateListId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("plate_list_id", cofigPage.getPlateListId()));
+        }
+        if (StringUtils.isNotBlank(cofigPage.getNrmc())) {
+            queryWrapper.and(wrapper -> wrapper.like("nrmc", cofigPage.getNrmc()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        cofigPage.setOrders(orderBy);
+        return sysUserAppHomeconfigPlateListMapper.selectPage(cofigPage, queryWrapper);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.java
new file mode 100644
index 0000000..469fde1
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.java
@@ -0,0 +1,176 @@
+package com.mosty.common.core.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfigPlate;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPlatePage;
+import com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateMapper;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateService;
+import com.mosty.common.token.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户app首页配置-板块表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+public class SysUserAppHomeconfigPlateServiceImpl extends ServiceImpl<SysUserAppHomeconfigPlateMapper, SysUserAppHomeconfigPlate> implements SysUserAppHomeconfigPlateService {
+
+    @Resource
+    private SysUserAppHomeconfigPlateMapper sysUserAppHomeconfigPlateMapper;
+
+    @Override
+    public Long saveInfo(SysUserAppHomeconfigPlate plate, String ipAddress) {
+        plate.setXtCjsj(new Date());
+        plate.setXtLrip(ipAddress);
+        plate.setXtLrsj(new Date());
+        plate.setXtZhxgsj(new Date());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        sysUserAppHomeconfigPlateMapper.insert(plate);
+        return plate.getId();
+    }
+
+    @Override
+    public boolean saveInfoBatch(List<SysUserAppHomeconfigPlate> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            Long pzId = plates.get(0).getPzId();
+//            sysUserAppHomeconfigPlateMapper.deleteByPzid(pzId);
+            QueryWrapper<SysUserAppHomeconfigPlate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.and(wrapper -> wrapper.eq("pz_id", pzId));
+            queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+            List<SysUserAppHomeconfigPlate> list = sysUserAppHomeconfigPlateMapper.selectList(queryWrapper);
+            for(SysUserAppHomeconfigPlate plate : plates) {
+                boolean bool = isExist(list, plate.getPzId(), plate.getPlateId());
+
+                if(!bool) {
+                    QueryWrapper<SysUserAppHomeconfigPlate> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.and(wrapper -> wrapper.eq("pz_id", plate.getPzId()));
+                    queryWrapper1.and(wrapper -> wrapper.eq("plate_id", plate.getPlateId()));
+                    SysUserAppHomeconfigPlate userPlate =
+                            sysUserAppHomeconfigPlateMapper.selectOne(queryWrapper1);
+//                    plate.setXtCjsj(new Date());
+//                    plate.setXtLrip(ipAddress);
+//                    plate.setXtLrsj(new Date());
+//                    plate.setXtZhxgsj(new Date());
+//                    plate.setXtZxbz(DeletedEnum.NATURE.code);
+//                    sysUserAppHomeconfigPlateMapper.insert(plate);
+                    sysUserAppHomeconfigPlateMapper.updateById(userPlate.getId(), 0);
+                }
+            }
+            if(!CollectionUtils.isEmpty(list)) {
+                for(SysUserAppHomeconfigPlate plate : list) {
+                    boolean bool = isExist(plates, plate.getPzId(), plate.getPlateId());
+                    if(!bool) {
+                        sysUserAppHomeconfigPlateMapper.updateById(plate.getId(), 1);
+                    }
+                }
+            }
+
+        }
+        return true;
+    }
+
+    @Override
+    public void updateInfo(SysUserAppHomeconfigPlate plate, String ipAddress) {
+        SysUserAppHomeconfigPlate oldConfig = sysUserAppHomeconfigPlateMapper.selectById(plate.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的信息不存在", oldConfig.getId());
+        plate.setXtZxbz(DeletedEnum.NATURE.code);
+        plate.setXtZhxgsj(new Date());
+        plate.setXtLrip(ipAddress);
+        sysUserAppHomeconfigPlateMapper.updateById(plate);
+    }
+
+    @Override
+    public void updateInfoBatch(List<SysUserAppHomeconfigPlate> plates, String ipAddress) {
+        if(!CollectionUtils.isEmpty(plates)) {
+            Long pzid = plates.get(0).getPzId();
+            sysUserAppHomeconfigPlateMapper.deleteByPzid(pzid);
+            for(SysUserAppHomeconfigPlate plate : plates) {
+                plate.setXtCjsj(new Date());
+                plate.setXtLrip(ipAddress);
+                plate.setXtLrsj(new Date());
+                plate.setXtZhxgsj(new Date());
+                plate.setXtZxbz(DeletedEnum.NATURE.code);
+                sysUserAppHomeconfigPlateMapper.insert(plate);
+            }
+        }
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if(!CollectionUtils.isEmpty(list)) {
+            for(Long id : list) {
+                SysUserAppHomeconfigPlate plate = sysUserAppHomeconfigPlateMapper.selectById(id);
+                if(plate != null) {
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZxbz(DeletedEnum.DELETED.code);
+                    plate.setXtZhxgsj(new Date());
+                    plate.setXtZhxgip(ipAddress);
+                    if(userInfo != null) {
+                        plate.setXtZhxgrxm(userInfo.getUserName());
+                        plate.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        plate.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysUserAppHomeconfigPlateMapper.updateById(plate);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysUserAppHomeconfigPlate> selectByPage(SysUserAppHomeconfigPlatePage platePage) {
+        QueryWrapper<SysUserAppHomeconfigPlate> queryWrapper = new QueryWrapper<>();
+        if (platePage.getPzId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("pz_id", platePage.getPzId()));
+        }
+        if (platePage.getPlateId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("plate_id", platePage.getPlateId()));
+        }
+        if (StringUtils.isNotBlank(platePage.getBklx())) {
+            queryWrapper.and(wrapper -> wrapper.eq("bklx", platePage.getBklx()));
+        }
+        if (StringUtils.isNotBlank(platePage.getBkmc())) {
+            queryWrapper.and(wrapper -> wrapper.like("bkmc", platePage.getBkmc()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        platePage.setOrders(orderBy);
+        return sysUserAppHomeconfigPlateMapper.selectPage(platePage, queryWrapper);
+    }
+
+    /**
+     * 判断用户配置板块是否存在
+     * @param list
+     * @param pzid
+     * @param plateId
+     * @return
+     */
+    public boolean isExist(List<SysUserAppHomeconfigPlate> list, Long pzid, Long plateId) {
+        if(CollectionUtils.isEmpty(list)) {
+            return false;
+        }
+        for(SysUserAppHomeconfigPlate plate : list) {
+            if(plate.getPzId().longValue() == pzid.longValue() && plate.getPlateId().longValue() == plateId.longValue()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.java
new file mode 100644
index 0000000..dac460e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.java
@@ -0,0 +1,343 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.request.SysAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigPage;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.mapper.*;
+import com.mosty.common.core.business.service.SysAppHomeconfigService;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateListService;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigPlateService;
+import com.mosty.common.core.business.service.SysUserAppHomeconfigService;
+import com.mosty.common.token.UserInfo;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 用户app首页配置表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-18
+ */
+@Service
+public class SysUserAppHomeconfigServiceImpl extends ServiceImpl<SysUserAppHomeconfigMapper, SysUserAppHomeconfig> implements SysUserAppHomeconfigService {
+
+    private static final Logger log = LoggerFactory.getLogger(SysUserAppHomeconfigServiceImpl.class);
+
+    @Resource
+    private SysUserAppHomeconfigMapper sysUserAppHomeconfigMapper;
+
+    @Resource
+    private SysUserAppHomeconfigPlateMapper sysUserAppHomeconfigPlateMapper;
+
+    @Resource
+    private SysUserAppHomeconfigPlateListMapper sysUserAppHomeconfigPlateListMapper;
+
+    @Resource
+    private SysAppHomeconfigService sysAppHomeconfigService;
+
+    @Resource
+    private SysUserAppHomeconfigPlateService sysUserAppHomeconfigPlateService;
+
+    @Resource
+    private SysUserAppHomeconfigPlateListService sysUserAppHomeconfigPlateListService;
+
+
+    @Override
+    public Long saveInfo(SysUserAppHomeconfig config, String ipAddress) {
+        config.setXtCjsj(new Date());
+        config.setXtLrip(ipAddress);
+        config.setXtLrsj(new Date());
+        config.setXtZhxgsj(new Date());
+        config.setXtZxbz(DeletedEnum.NATURE.code);
+        sysUserAppHomeconfigMapper.insert(config);
+        return config.getId();
+    }
+
+    @Override
+    public void saveInfoBatch(List<SysUserAppHomeconfig> configs, String ipAddress) {
+        if (!CollectionUtils.isEmpty(configs)) {
+            for (SysUserAppHomeconfig config : configs) {
+                config.setXtCjsj(new Date());
+                config.setXtLrip(ipAddress);
+                config.setXtLrsj(new Date());
+                config.setXtZhxgsj(new Date());
+                config.setXtZxbz(DeletedEnum.NATURE.code);
+                sysUserAppHomeconfigMapper.insert(config);
+            }
+        }
+    }
+
+    @Override
+    public void updateInfo(SysUserAppHomeconfig config, String ipAddress) {
+        SysUserAppHomeconfig oldConfig = sysUserAppHomeconfigMapper.selectById(config.getId());
+        Asserts.check(oldConfig == null, "主键为 %s 的信息不存在", config.getId());
+        config.setXtZxbz(DeletedEnum.NATURE.code);
+        config.setXtZhxgsj(new Date());
+        config.setXtLrip(ipAddress);
+        sysUserAppHomeconfigMapper.updateById(config);
+    }
+
+    @Override
+    public void updateInfoBatch(List<SysUserAppHomeconfig> configs, String ipAddress) {
+        if (!CollectionUtils.isEmpty(configs)) {
+            String sfzh = configs.get(0).getUserSfzh();
+            sysUserAppHomeconfigMapper.deleteBySfzh(sfzh);
+            for (SysUserAppHomeconfig config : configs) {
+                config.setXtZhxgsj(new Date());
+                config.setXtCjsj(new Date());
+                config.setXtLrip(ipAddress);
+                config.setXtLrsj(new Date());
+                config.setXtZhxgsj(new Date());
+                config.setXtZxbz(DeletedEnum.NATURE.code);
+                sysUserAppHomeconfigMapper.insert(config);
+            }
+        }
+    }
+
+    @Override
+    public void delete(List<Long> list, String ipAddress, UserInfo userInfo) {
+        if (!CollectionUtils.isEmpty(list)) {
+            for (Long id : list) {
+                SysUserAppHomeconfig config = sysUserAppHomeconfigMapper.selectById(id);
+                if (config != null) {
+                    config.setXtZhxgsj(new Date());
+                    config.setXtZxbz(DeletedEnum.DELETED.code);
+                    config.setXtZhxgsj(new Date());
+                    config.setXtZhxgip(ipAddress);
+                    if (userInfo != null) {
+                        config.setXtZhxgrxm(userInfo.getUserName());
+                        config.setXtZhxgrbmid(userInfo.getDeptId() + "");
+                        config.setXtZhxgrbm(userInfo.getDeptName());
+                    }
+                    sysUserAppHomeconfigMapper.updateById(config);
+                }
+            }
+        }
+    }
+
+    @Override
+    public IPage<SysUserAppHomeconfig> selectByPage(SysUserAppHomeconfigPage cofigPage) {
+        QueryWrapper<SysUserAppHomeconfig> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(cofigPage.getHomename())) {
+            queryWrapper.and(wrapper -> wrapper.like("homename", cofigPage.getHomename()));
+        }
+        if (cofigPage.getHomeid() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("homeid", cofigPage.getHomeid()));
+        }
+        if (cofigPage.getUserId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("user_id", cofigPage.getUserId()));
+        }
+        if (StringUtils.isNotBlank(cofigPage.getUserSfzh())) {
+            queryWrapper.and(wrapper -> wrapper.eq("user_sfzh", cofigPage.getUserSfzh()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<OrderItem> orderBy = Lists.newArrayList(OrderItem.asc("id"));
+        cofigPage.setOrders(orderBy);
+        return sysUserAppHomeconfigMapper.selectPage(cofigPage, queryWrapper);
+    }
+
+    @Override
+    public List<SysUserAppHomeconfigVo> queryUserConfig(SysUserAppHomeconfigQuery cofigQuery) {
+        List<SysUserAppHomeconfigVo> homeconfigVos = new ArrayList<>();
+        List<SysUserAppHomeconfig> configs = getConfigs(cofigQuery);
+        List<SysUserAppHomeconfigPlate> plates = getPlates(configs);
+        List<SysUserAppHomeconfigPlateList> plateList = getPlateList(plates);
+        if (!CollectionUtils.isEmpty(configs)) {
+            for (SysUserAppHomeconfig config : configs) {
+                SysUserAppHomeconfigVo vo = new SysUserAppHomeconfigVo();
+                BeanUtils.copyProperties(config, vo);
+                if (!CollectionUtils.isEmpty(plates)) {
+                    List<SysUserAppHomeconfigPlate> list =
+                            plates.parallelStream().filter(item -> item.getPzId().longValue() == config.getId().longValue()).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(list)) {
+                        List<SysUserAppHomeconfigPlateVo> voList = new ArrayList<>();
+                        for (SysUserAppHomeconfigPlate plate : list) {
+                            SysUserAppHomeconfigPlateVo plateVo = new SysUserAppHomeconfigPlateVo();
+                            BeanUtils.copyProperties(plate, plateVo);
+                            if (!CollectionUtils.isEmpty(plateList)) {
+                                List<SysUserAppHomeconfigPlateList> platesArray = getList(plateList, plate.getId());
+                                plateVo.setPlateList(platesArray);
+                            }
+                            voList.add(plateVo);
+                        }
+                        vo.setPlates(voList);
+                    }
+                }
+                homeconfigVos.add(vo);
+            }
+        }
+        return homeconfigVos;
+    }
+
+    @Override
+    public Long saveDefaultConfig(SysUserHomeconfigVo configVo, String ipAddress) {
+        QueryWrapper<SysUserAppHomeconfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(wrapper -> wrapper.eq("user_id", configVo.getUserId()));
+        queryWrapper.and(wrapper -> wrapper.eq("homeid", configVo.getHomeid()));
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        List<SysUserAppHomeconfig> configs = sysUserAppHomeconfigMapper.selectList(queryWrapper);
+        System.out.println(configs);
+        if (configs != null && configs.size() > 0 &&
+                configs.get(0).getPzbks() != null && configs.get(0).getPzbks() != 0) {
+            System.out.println("configs------->" + configs.size());
+            log.info(JSONObject.toJSONString(configs));
+            return configs.get(0).getId();
+        }
+        SysAppHomeconfigQuery query = new SysAppHomeconfigQuery();
+        query.setId(configVo.getHomeid());
+        SysAppHomeconfigRsVO vo = sysAppHomeconfigService.queryConfig(query);
+        //用户首页配置ID
+        SysUserAppHomeconfig config = new SysUserAppHomeconfig();
+        config.setHomeid(configVo.getHomeid());
+        config.setHomename(vo.getHomename());
+        config.setUserId(configVo.getUserId());
+        config.setUserXm(configVo.getUserXm());
+        config.setUserSfzh(configVo.getUserSfzh());
+        if (!CollectionUtils.isEmpty(vo.getPlateList())) {
+            config.setPzbks(vo.getPlateList().size());
+        }
+        config.setPzsj(new Date());
+        config.setSd(configVo.getSd());
+        Long homeConfigId = saveInfo(config, ipAddress);
+        if (!CollectionUtils.isEmpty(vo.getPlateList())) {
+            //用户默认板块内容
+            int i = 0;
+            for (SysAppHomeconfigPlateVo plate : vo.getPlateList()) {
+                i++;
+                SysUserAppHomeconfigPlate userPlate = new SysUserAppHomeconfigPlate();
+                userPlate.setPzId(homeConfigId);
+                userPlate.setPlateId(plate.getId());
+                userPlate.setBklx(plate.getBklx());
+                userPlate.setBkmc(plate.getBkmc());
+                userPlate.setBksx(i);
+                Long userPlateId = sysUserAppHomeconfigPlateService.saveInfo(userPlate, ipAddress);
+                if (!CollectionUtils.isEmpty(vo.getPlateList())) {
+                    userPlate.setBknrs(vo.getPlateList().size());
+                    int j = 0;
+                    for (SysAppHomeconfigPlateList plateVo : plate.getPlateList()) {
+                        j++;
+                        SysUserAppHomeconfigPlateList userList = new SysUserAppHomeconfigPlateList();
+                        userList.setPzId(homeConfigId);
+                        userList.setPzPlateId(userPlateId);
+                        userList.setPlateListId(plateVo.getId());
+                        userList.setNrmc(plateVo.getNrmc());
+                        userList.setBksx(j);
+                        userList.setTzdz(plateVo.getTzdz());
+                        userList.setBz(plateVo.getBz());
+                        sysUserAppHomeconfigPlateListService.saveInfo(userList, ipAddress);
+                    }
+                }
+            }
+        }
+        return homeConfigId;
+    }
+
+    public List<SysUserAppHomeconfigPlateList> getList(List<SysUserAppHomeconfigPlateList> platesArray, Long id) {
+        List<SysUserAppHomeconfigPlateList> array = new ArrayList<>();
+        if (CollectionUtils.isEmpty(platesArray)) {
+            return array;
+        }
+        log.info("platesArray:" + platesArray.size() + ",id:" + id);
+        for (SysUserAppHomeconfigPlateList plate : platesArray) {
+            if (plate.getPzPlateId().longValue() == id.longValue()) {
+                array.add(plate);
+            }
+        }
+        return array;
+    }
+
+    /**
+     * 获取用户配置首页
+     *
+     * @param cofigQuery
+     * @return
+     */
+    public List<SysUserAppHomeconfig> getConfigs(SysUserAppHomeconfigQuery cofigQuery) {
+        QueryWrapper<SysUserAppHomeconfig> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(cofigQuery.getHomename())) {
+            queryWrapper.and(wrapper -> wrapper.like("homename", cofigQuery.getHomename()));
+        }
+        if (cofigQuery.getHomeid() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("homeid", cofigQuery.getHomeid()));
+        }
+        if (cofigQuery.getUserId() != null) {
+            queryWrapper.and(wrapper -> wrapper.eq("user_id", cofigQuery.getUserId()));
+        }
+        if (StringUtils.isNotBlank(cofigQuery.getUserSfzh())) {
+            queryWrapper.and(wrapper -> wrapper.eq("user_sfzh", cofigQuery.getUserSfzh()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        queryWrapper.orderByAsc("ID");
+        return sysUserAppHomeconfigMapper.selectList(queryWrapper);
+    }
+
+
+    /**
+     * 获取用户配置板块
+     *
+     * @param configs
+     * @return
+     */
+    public List<SysUserAppHomeconfigPlate> getPlates(List<SysUserAppHomeconfig> configs) {
+        List<SysUserAppHomeconfigPlate> plates = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(configs)) {
+            List<Long> configIds = configs.stream().map(item -> item.getId()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(configIds)) {
+                QueryWrapper<SysUserAppHomeconfigPlate> plateListWrapper = new QueryWrapper<>();
+                plateListWrapper.lambda().in(SysUserAppHomeconfigPlate::getPzId, configIds);
+                plateListWrapper.lambda().eq(SysUserAppHomeconfigPlate::getXtZxbz, DeletedEnum.NATURE.code);
+                plateListWrapper.orderByAsc("bksx");
+                plates = sysUserAppHomeconfigPlateMapper.selectList(plateListWrapper);
+            }
+        }
+        return plates;
+    }
+
+
+    /**
+     * 获取用户配置板块内容
+     *
+     * @param plates
+     * @return
+     */
+    public List<SysUserAppHomeconfigPlateList> getPlateList(List<SysUserAppHomeconfigPlate> plates) {
+        List<SysUserAppHomeconfigPlateList> plateList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(plates)) {
+            List<Long> configIds = plates.stream().map(item -> item.getId()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(configIds)) {
+                QueryWrapper<SysUserAppHomeconfigPlateList> plateListWrapper = new QueryWrapper<>();
+                plateListWrapper.lambda().in(SysUserAppHomeconfigPlateList::getPzPlateId, configIds);
+                plateListWrapper.lambda().eq(SysUserAppHomeconfigPlateList::getXtZxbz, DeletedEnum.NATURE.code);
+                plateListWrapper.orderByAsc("bksx");
+                plateList = sysUserAppHomeconfigPlateListMapper.selectList(plateListWrapper);
+            }
+        }
+        return plateList;
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.java
new file mode 100644
index 0000000..30f3c71
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.java
@@ -0,0 +1,64 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.stream.CollectorUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.mosty.common.core.business.service.SysUserDeptService;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import org.apache.shiro.util.CollectionUtils;
+import org.springframework.data.redis.connection.ConnectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author li
+ * @description 针对表【sys_user_dept(用户和部门关联表)】的数据库操作Service实现
+ * @createDate 2022-02-12 16:53:21
+ */
+@Service
+public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptMapper, SysUserDept>
+        implements SysUserDeptService {
+
+    @Override
+    public List<SysUserDept> listByDeptId(Long deptId) {
+        List<SysUserDept> list = this.list(new LambdaQueryWrapper<SysUserDept>()
+                .eq(SysUserDept::getDeptId, deptId));
+        return list;
+    }
+
+    @Override
+    public SysUserDept getByDeptIdAndUserId(Long deptId, Long userId) {
+        SysUserDept one = this.getOne(new LambdaQueryWrapper<SysUserDept>()
+                .eq(SysUserDept::getDeptId, deptId).eq(SysUserDept::getUserId, userId));
+        return one;
+    }
+
+    @Override
+    public List<Long> listByUserId(Long userId) {
+        List<SysUserDept> list = this.list(new LambdaQueryWrapper<SysUserDept>()
+                .eq(SysUserDept::getUserId, userId));
+        if (!CollectionUtils.isEmpty(list)) {
+            return list.stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+        } else {
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<SysUserDept> listByDeptIds(List<String> ids) {
+        if (!CollectionUtils.isEmpty(ids)) {
+            List<SysUserDept> list = this.list(new LambdaQueryWrapper<SysUserDept>()
+                    .in(SysUserDept::getDeptId, ids));
+            return list;
+        }
+        return new ArrayList<>();
+    }
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.java
new file mode 100644
index 0000000..98dfca5
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.java
@@ -0,0 +1,112 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.core.business.entity.SysRole;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.SysUserRole;
+import com.mosty.common.core.business.entity.vo.RoleUserPage;
+import com.mosty.common.core.business.entity.vo.RoleUserVO;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.core.business.entity.vo.UserRoleVO;
+import com.mosty.common.core.business.mapper.SysUserRoleMapper;
+import com.mosty.common.core.business.service.LoginService;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.core.business.service.SysUserRoleService;
+import com.mosty.common.core.business.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author li
+ * @description 针对表【sys_user_role(用户和角色关联表)】的数据库操作Service实现
+ * @createDate 2022-02-12 16:53:24
+ */
+@Slf4j
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements SysUserRoleService {
+
+    @Resource
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Resource
+    private SysUserService sysUserService;
+
+    @Resource
+    private SysRoleService sysRoleService;
+
+    @Resource
+    private LoginService loginService;
+
+    @Override
+    public IPage<SysUserVO> roleUserList(String rootPath, RoleUserPage roleUserPage) {
+
+        List<SysUserVO> dataList = sysUserRoleMapper.roleUserList(rootPath, roleUserPage);
+        Page<SysUserVO> page = BeanUtil.copyProperties(dataList, Page.class);
+        page.setRecords(dataList);
+        return page;
+    }
+
+    @Override
+    public List<SysUserRole> listByUserId(Long id) {
+        return this.list(new LambdaQueryWrapper<SysUserRole>()
+                .eq(SysUserRole::getUserId, id));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean grantRoleToUser(UserRoleVO userRoleVo) {
+        // 先删除所有的权限信息
+        this.sysUserRoleMapper.delete(
+                new LambdaQueryWrapper<SysUserRole>()
+                        .eq(SysUserRole::getUserId, userRoleVo.getUserId())
+        );
+        SysUser sysUser = sysUserService.getById(userRoleVo.getUserId());
+        Asserts.check(sysUser == null || DeletedEnum.DELETED.code.equals(sysUser.getXtZxbz()), "用户不存在或已删除");
+        List<SysUserRole> sysUserRoles = new ArrayList<>();
+        List<Long> roleIds = userRoleVo.getRoleIds();
+        roleIds.forEach(roleId -> {
+            SysRole sysRole = sysRoleService.getById(roleId);
+            Asserts.check(sysRole == null || DeletedEnum.DELETED.code.equals(sysRole.getXtZxbz()), "角色不存在或已删除");
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(roleId);
+            sysUserRole.setUserId(userRoleVo.getUserId());
+            sysUserRoles.add(sysUserRole);
+        });
+        // 修改redis中用户缓存的信息
+        return this.saveBatch(sysUserRoles);
+    }
+
+    @Override
+    public boolean grantUserToRole(RoleUserVO roleUserVO) {
+        SysRole role = sysRoleService.getById(roleUserVO.getRoleId());
+        Asserts.check(role == null || DeletedEnum.DELETED.code.equals(role.getXtZxbz()), "角色不存在或已删除");
+        List<SysUserRole> sysUserRoles = new ArrayList<>();
+        List<Long> userIds = roleUserVO.getUserIds();
+        userIds.forEach(userId -> {
+            SysUser user = sysUserService.getById(userId);
+            Asserts.check(user == null || DeletedEnum.DELETED.code.equals(user.getXtZxbz()), "用户不存在或已删除");
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(role.getId());
+            sysUserRole.setUserId(userId);
+            sysUserRoles.add(sysUserRole);
+        });
+        return this.saveBatch(sysUserRoles);
+    }
+
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserServiceImpl.java
new file mode 100644
index 0000000..0b9f0f6
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,551 @@
+package com.mosty.common.core.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.constant.UserConstants;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.PasswordUtil;
+import com.mosty.common.base.util.RandomUtil;
+import com.mosty.common.config.config.SystemConfig;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.request.SysUserEditPasswordRequest;
+import com.mosty.common.core.business.entity.vo.*;
+import com.mosty.common.core.business.mapper.SysDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.core.config.DefaultRoleConfig;
+import com.mosty.common.core.util.BeanUtils;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+
+    @Resource
+    private SysUserMapper sysUserMapper;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
+    @Resource
+    private DefaultRoleConfig defaultRoleConfig;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private SystemConfig systemConfig;
+    @Resource
+    private SysDeptService sysDeptService;
+    @Resource
+    private SysPositionService sysPositionService;
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+    @Resource
+    private SysUserDeptMapper sysUserDeptMapper;
+    @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private LoginService loginService;
+    public static String USER_URL = "http://80.149.27.78:8001/no-auth-api/coreUsersList";
+
+    @Override
+    public void saveInfo(AddSysUserVO sysUserVo) {
+        if (StringUtils.isBlank(sysUserVo.getSsbmdm())) return;
+        // 保存用户信息
+        Long userId = saveUserInfo(sysUserVo);
+        // 保存用户部门关联关系
+        // 验证部门并设置部门名称
+//        List<Long> deptIds = sysUserVo.getDeptIds();
+        List<SysUserDept> sysUserDeptList = new ArrayList<>();
+//        deptIds.forEach(deptId -> {
+//            SysDept sysDept = sysDeptService.getById(deptId);
+//            Asserts.check(sysDept == null || sysDept.getXtZxbz() != 0, "部门 %s 不存在！", deptId);
+//            SysUserDept sysUserDept = new SysUserDept().setUserId(userId).setDeptId(deptId);
+//            sysUserDeptList.add(sysUserDept);
+//        });
+        SysDept sysDept = sysDeptService.getDeptByOrgCode(sysUserVo.getSsbmdm());
+        Asserts.check(sysDept == null || sysDept.getXtZxbz() != 0, "部门 %s 不存在！", sysUserVo.getSsbmdm());
+        SysUserDept sysUserDept = new SysUserDept().setUserId(userId).setDeptId(sysDept.getId());
+        sysUserDeptList.add(sysUserDept);
+
+        sysUserDeptService.saveBatch(sysUserDeptList);
+        // 保存默认用户角色
+        List<Long> defaultRoleList = defaultRoleConfig.getDefaultRoleList();
+        if (CollectionUtils.isNotEmpty(defaultRoleList)) {
+            List<SysUserRole> collect = defaultRoleList.stream()
+                    .map(roleId -> new SysUserRole(userId, roleId)).collect(Collectors.toList());
+            sysUserRoleService.saveBatch(collect);
+        }
+    }
+
+    // 保存用户信息
+    private Long saveUserInfo(AddSysUserVO sysUserVo) {
+        SysUser sysUser = BeanUtil.copyProperties(sysUserVo, SysUser.class);
+
+        // 初始化用户密码
+        String salt = RandomUtil.generateString(8);
+        if (StringUtils.isNotBlank(sysUserVo.getPassword())) {
+            String encodePassword = PasswordUtil.encode(sysUserVo.getPassword(), salt);
+            sysUser.setPassword(encodePassword);
+        } else {
+            String passwordPzz = getDefaultPassword(salt);
+            sysUser.setPassword(passwordPzz);
+        }
+        sysUser.setSalt(salt);
+        UserInfo userInfo = UserInfoManager.get();
+        sysUser.setXtZxbz(DeletedEnum.NATURE.code);
+
+        sysUser.setXtCjsj(new Date());
+        sysUser.setXtZhxgsj(new Date());
+        sysUser.setXtZhxgid(userInfo.getUserId());
+        sysUser.setXtZhxgrxm(userInfo.getUserName());
+        sysUser.setXtZhxgrbmid(userInfo.getDeptId());
+        sysUser.setXtZhxgrbm(userInfo.getDeptName());
+
+        sysUser.setXtLrsj(new Date());
+        sysUser.setXtLrrid(userInfo.getUserId());
+        sysUser.setXtLrrxm(userInfo.getUserName());
+        sysUser.setXtLrrbmid(userInfo.getDeptId().toString());
+        sysUser.setXtLrrbm(userInfo.getDeptName());
+
+        this.save(sysUser);
+
+        return sysUser.getId();
+    }
+
+    // 获取默认的初始化密码
+    private String getDefaultPassword(String salt) {
+        String passwordPzz = systemConfig.getDefaultPassword();
+        return PasswordUtil.encode(passwordPzz, salt);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void editInfo(SysUserEditVO sysUserEditVo, SysUser userInfo) {
+
+        if (StringUtils.isBlank(sysUserEditVo.getSsbmdm())) return;
+
+        // 先删除用户id，再添加
+        QueryWrapper<SysUserDept> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userInfo.getId());
+
+        sysUserDeptService.remove(wrapper);
+
+//        List<SysUserDept> saveRelation = sysUserEditVo.getDeptIds().stream().map(deptId ->
+//                new SysUserDept(userInfo.getId(), deptId)).collect(Collectors.toList());
+        List<SysUserDept> sysUserDeptList = new ArrayList<>();
+        SysDept sysDept = sysDeptService.getDeptByOrgCode(sysUserEditVo.getSsbmdm());
+        Asserts.check(sysDept == null || sysDept.getXtZxbz() != 0, "部门 %s 不存在！", sysUserEditVo.getSsbmdm());
+        SysUserDept sysUserDept = new SysUserDept().setUserId(sysUserEditVo.getId()).setDeptId(sysDept.getId());
+        sysUserDeptList.add(sysUserDept);
+        sysUserDeptService.saveBatch(sysUserDeptList);
+
+        SysPosition position = sysPositionService.getById(sysUserEditVo.getPositionId());
+//        Asserts.check(position == null, "岗位信息不存在，请登陆");
+        // 更改需要保存的字段
+        userInfo.setPositionId(sysUserEditVo.getPositionId());
+        userInfo.setPositionName(position != null ? position.getPostName() : "");
+        userInfo.setUserName(sysUserEditVo.getUserName());
+        userInfo.setEmail(sysUserEditVo.getEmail());
+        userInfo.setMobile(sysUserEditVo.getMobile());
+        userInfo.setTelePhone(sysUserEditVo.getTelePhone());
+        userInfo.setPolitic(sysUserEditVo.getPolitic());
+        userInfo.setMarital(sysUserEditVo.getMarital());
+        userInfo.setType(sysUserEditVo.getType());
+        userInfo.setBz(sysUserEditVo.getBz());
+        userInfo.setIsVirtualUser(sysUserEditVo.getIsVirtualUser());
+        userInfo.setSex(sysUserEditVo.getSex());
+        userInfo.setUserType(sysUserEditVo.getUserType());
+        userInfo.setInDustRialId(sysUserEditVo.getInDustRialId());
+        userInfo.setBeginTime(sysUserEditVo.getBeginTime());
+        userInfo.setEndTime(sysUserEditVo.getEndTime());
+        userInfo.setBirthday(sysUserEditVo.getBirthday());
+        userInfo.setIdEntityCard(sysUserEditVo.getIdEntityCard());
+        userInfo.setWhcd(sysUserEditVo.getWhcd());
+        userInfo.setNation(sysUserEditVo.getNation());
+        userInfo.setLoginName(sysUserEditVo.getLoginName());
+        userInfo.setSfrh(sysUserEditVo.getSfrh());
+        userInfo.setMk(sysUserEditVo.getMk());
+        super.updateById(userInfo);
+    }
+
+    @Override
+    public void editPassword(SysUserEditPasswordRequest sysUserEditPasswordRequest) {
+        UserInfo userInfo = UserInfoManager.get();
+        SysUser sysUser = this.getById(userInfo.getUserId());
+        boolean match = PasswordUtil.match(sysUserEditPasswordRequest.getOldPassword(), sysUser.getPassword());
+        Asserts.check(!match, "账号 %s 的密码错误", sysUser.getLoginName());
+        String salt = RandomUtil.generateString(8);
+        String password = PasswordUtil.encode(sysUserEditPasswordRequest.getPassword(), salt);
+        sysUser.setPassword(password);
+        sysUser.setSalt(salt);
+        this.updateById(sysUser);
+    }
+
+    @Override
+    public SysUser getUserInfo(Long id) {
+        return this.getById(id);
+    }
+
+    @Override
+    public SysUser checkUserInfo(SysUser user) {
+        SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getLoginName, user.getLoginName()).eq(SysUser::getXtZxbz, UserConstants.NORMAL));
+        Asserts.check(sysUser == null, "账号 %s 的用户不存在", user.getLoginName());
+        boolean match = PasswordUtil.match(sysUser.getPassword(), sysUser.getPassword());
+        Asserts.check(match, "账号 %s 的密码错误", sysUser.getLoginName());
+        return sysUser;
+    }
+
+    @Override
+    public IPage<SysUserVO> selectByPage(UserPage userPage) {
+        if (StringUtils.isBlank(userPage.getDeptId())) {
+            userPage.setOrgcode(this.getSsbm("", userPage.getIsChild()));
+            List<SysUserVO> list = sysUserMapper.selectByPage(userPage);
+            Page<SysUserVO> page = BeanUtil.copyProperties(userPage, Page.class);
+            page.setRecords(list);
+            return page;
+        } else {
+            SysDept dept = this.sysDeptMapper.selectById(userPage.getDeptId());
+            if (dept != null) {
+                userPage.setOrgcode(this.getSsbm(dept.getOrgCode(), userPage.getIsChild()));
+                List<SysUserVO> list = sysUserMapper.selectByPage(userPage);
+                Page<SysUserVO> page = BeanUtil.copyProperties(userPage, Page.class);
+                page.setRecords(list);
+                return page;
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public void resetPassword(SysUser user) {
+        String defaultPassword = getDefaultPassword(user.getSalt());
+        user.setPassword(defaultPassword);
+        sysUserMapper.updateById(user);
+    }
+
+    @Override
+    public IPage<SysUserVO> selectUnAccreditPage(UserPage userPage) {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(userPage.getLoginName())) {
+            queryWrapper.and(wrapper -> wrapper.like("login_name", userPage.getLoginName()));
+        }
+        if (StringUtils.isNotBlank(userPage.getPhone())) {
+            queryWrapper.and(wrapper -> wrapper.like("mobile", userPage.getPhone()));
+        }
+        queryWrapper.and(wrapper -> wrapper.eq("xt_zxbz", DeletedEnum.NATURE.code));
+        QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
+        sysUserRoleQueryWrapper.and(wrapper -> wrapper.eq("role_id", userPage.getRoleId()));
+        List<SysUserRole> list = sysUserRoleService.list(sysUserRoleQueryWrapper);
+        if (CollectionUtil.isNotEmpty(list)) {
+            List<Long> userList = list.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+            queryWrapper.and(wrapper -> wrapper.notIn("id", userList));
+        }
+        UserPage page = this.baseMapper.selectPage(userPage, queryWrapper);
+        IPage<SysUserVO> resPage = new Page<>(userPage.getCurrent(), userPage.getSize());
+        List<SysUserVO> voList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                SysUserVO userVO = new SysUserVO();
+                BeanUtils.copyProperties(item, userVO);
+                voList.add(userVO);
+            });
+        }
+        resPage.setRecords(voList);
+        resPage.setTotal(page.getTotal());
+        return resPage;
+    }
+
+    @Override
+    public IPage<SysUserDeptVO> selectUserDeptPage(UserDeptPage userDeptPage) {
+        UserInfo user = UserInfoManager.get();
+        if (StringUtils.isEmpty(userDeptPage.getSsbmdm())) {
+            userDeptPage.setSsbmdm(String.valueOf(user.getDeptCode()));
+        }
+//        else {
+//            userDeptPage.setOrgcode(userDeptPage.getDeptId());
+//        }
+        userDeptPage.setOrgcode(userDeptPage.getSsbmdm().replaceAll("(00)+$", ""));
+        return sysUserMapper.selectUserDeptPage(userDeptPage);
+    }
+
+    @Override
+    public Boolean userSys() {
+        Map<String, Object> params = new HashMap<>();
+        String rs = HttpUtils.executeGet(USER_URL, params);
+        JSONObject json = JSONObject.parseObject(rs);
+        if (json.getBoolean("success")) {
+            JSONArray array = json.getJSONArray("data");
+            if (CollectionUtils.isNotEmpty(array)) {
+                for (int i = 0; i < array.size(); i++) {
+                    JSONObject userJson = array.getJSONObject(i);
+                    String orgCode = userJson.getString("jurisdictionCode");
+                    SysDept sysDept = sysDeptService.getDeptByOrgCode(orgCode);
+                    Asserts.check(sysDept == null, "用户code对应的部门信息不存在");
+                    String idNum = userJson.getString("idNum");
+                    QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("id_entity_card", idNum);
+                    SysUser sysUser = sysUserMapper.selectOne(queryWrapper);
+                    if (sysUser == null) {
+                        sysUser = new SysUser();
+                    }
+                    sysUser.setInDustRialId(userJson.getString("username"));
+                    sysUser.setLoginName(userJson.getString("nickName"));
+                    sysUser.setUserName(userJson.getString("nickName"));
+                    sysUser.setMobile(userJson.getString("mobilePhone"));
+                    sysUser.setIdEntityCard(userJson.getString("idNum"));
+                    sysUser.setManagerOrgId(sysDept.getId());
+                    sysUser.setManagerOrgName(sysDept.getOrgJc());
+                    sysUser.setXtZxbz(DeletedEnum.NATURE.code);
+                    sysUser.setXtCjsj(new Date());
+                    sysUser.setXtZhxgsj(new Date());
+                    if (sysUser.getId() == null) {
+                        sysUser.setXtLrsj(new Date());
+                        this.save(sysUser);
+                        SysUserDept userDept = new SysUserDept();
+                        userDept.setUserId(sysUser.getId());
+                        userDept.setDeptId(sysDept.getId());
+                        sysUserDeptService.save(userDept);
+                    } else {
+                        this.updateById(sysUser);
+                        SysUserDept oldUserDept = sysUserDeptService.getByDeptIdAndUserId(sysDept.getId(),
+                                sysUser.getId());
+                        if (oldUserDept == null) {
+                            sysUserDeptService.remove(new LambdaQueryWrapper<SysUserDept>().eq(SysUserDept::getUserId,
+                                    sysUser.getId()));
+                            SysUserDept userDept = new SysUserDept();
+                            userDept.setUserId(sysUser.getId());
+                            userDept.setDeptId(sysDept.getId());
+                            sysUserDeptService.save(userDept);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+
+    @Override
+    public void delById(Long id) {
+        this.baseMapper.delById(id);
+    }
+
+
+    @Override
+    public List<SysUserVO> getUserList(GetUserPage dto) {
+        UserInfo user = UserInfoManager.get();
+        if ("1".equals(dto.getType())) {
+            return this.getUserListByDept(dto.getKeyword(), String.valueOf(user.getDeptId()));
+        } else {
+            return this.getUserListByAll(dto.getKeyword());
+        }
+    }
+
+    private List<SysUserVO> getUserListByAll(String keyword) {
+        List<SysUserVO> userVOList = new ArrayList<>();
+        if (StringUtils.isNotBlank(keyword)) {
+            List<SysDept> list = this.sysDeptMapper.selectList(
+                    new LambdaQueryWrapper<SysDept>()
+                            .like(SysDept::getOrgName, keyword)
+                            .eq(SysDept::getXtZxbz, "0")
+            );
+
+            if (list != null && list.size() > 0) {
+                List<String> deptIds = list.stream().map(d -> String.valueOf(d.getId())).collect(Collectors.toList());
+                List<SysUser> userList = this.baseMapper.getUserListByDeptId(deptIds, null);
+                userList.forEach(user -> {
+                    SysUserVO userVO = new SysUserVO();
+                    BeanUtils.copyProperties(user, userVO);
+                    SysDept dept = this.sysDeptMapper.getDeptByUserId(user.getId());
+                    userVO.setDeptId(dept.getId());
+                    userVO.setDeptCode(dept.getOrgCode());
+                    userVO.setDeptJc(dept.getOrgJc());
+                    userVO.setDeptName(dept.getOrgName());
+                    userVOList.add(userVO);
+                });
+            }
+        }
+        List<SysUser> userList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getIsVirtualUser, "02")
+                        .eq(SysUser::getXtZxbz, "0")
+                        .and(StringUtils.isNotBlank(keyword), it -> it.like(SysUser::getLoginName, keyword)
+                                .or()
+                                .like(SysUser::getUserName, keyword))
+        );
+        userList.forEach(item -> {
+            SysUserVO userVO = new SysUserVO();
+            BeanUtils.copyProperties(item, userVO);
+            SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                    new QueryWrapper<SysUserDept>()
+                            .eq("user_id", String.valueOf(item.getId()))
+                            .last(" limit 1")
+            );
+            if (sysUserDept != null) {
+                SysDept sysDept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+                userVO.setDeptId(sysDept.getId());
+                userVO.setDeptCode(sysDept.getOrgCode());
+                userVO.setDeptJc(sysDept.getOrgJc());
+                userVO.setDeptName(sysDept.getOrgName());
+            }
+            userVOList.add(userVO);
+        });
+        return userVOList;
+    }
+
+    // 获取本部门下的所有的人员信息
+    private List<SysUserVO> getUserListByDept(String keyword, String deptid) {
+        SysDept dept = this.sysDeptMapper.selectById(deptid);
+        List<String> deptIds = new ArrayList<>();
+        this.getChildList(dept, deptIds);
+        List<SysUser> userList = this.baseMapper.getUserListByDeptId(deptIds, keyword);
+        List<SysUserVO> userVOList = new ArrayList<>();
+        userList.forEach(item -> {
+            SysUserVO userVO = new SysUserVO();
+            BeanUtils.copyProperties(item, userVO);
+            userVO.setDeptId(dept.getId());
+            userVO.setDeptCode(dept.getOrgCode());
+            userVO.setDeptJc(dept.getOrgJc());
+            userVO.setDeptName(dept.getOrgName());
+            userVOList.add(userVO);
+        });
+        return userVOList;
+    }
+
+    private void getChildList(SysDept dept, List<String> deptIds) {
+        deptIds.add(String.valueOf(dept.getId()));
+        List<SysDept> tempList1 = this.sysDeptMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, dept.getId())
+        );
+        if (tempList1.size() > 0) {
+            deptIds.addAll(tempList1.stream().map(item -> String.valueOf(item.getId())).collect(Collectors.toList()));
+            tempList1.forEach(item -> this.getChildList(item, deptIds));
+        }
+    }
+
+    public String getSsbm(String ssbmdm, String isChild) {
+        isChild = StringUtils.isNotBlank(isChild) ? isChild : "1";
+        UserInfo user = UserInfoManager.getUser();
+        // 如果用户信息存在，先查询用户权限
+        SysRoleVO role = null;
+        if (StringUtils.isBlank(ssbmdm)) {
+            if (user != null) {
+                ssbmdm = user.getDeptCode();
+                // 查询用户权限
+                List<SysRoleVO> userRoles = sysRoleService.getUserRoleList(user.getUserId());
+                if (!org.springframework.util.CollectionUtils.isEmpty(userRoles)) {
+                    int level = Integer.parseInt(userRoles.get(0).getDataPermissionLevel());
+                    role = userRoles.get(0);
+                    for (SysRoleVO item : userRoles) {
+                        if (level > Integer.parseInt(item.getDataPermissionLevel())) {
+                            level = Integer.parseInt(item.getDataPermissionLevel());
+                            role = item;
+                        }
+                    }
+                }
+            }
+            if (role != null && !"5".equals(role.getDataPermissionLevel())) {
+                String level = role.getDataPermissionLevel();
+                if ("1".equals(level) || "2".equals(level)) {
+                    return "1".equals(isChild) ? ssbmdm.substring(0, 2) : ssbmdm;
+                } else if ("3".equals(level)) {
+                    return "1".equals(isChild) ? ssbmdm.substring(0, 4) : ssbmdm;
+                } else if ("4".equals(level)) {
+                    return "1".equals(isChild) ? ssbmdm.substring(0, 6) : ssbmdm;
+                } else if ("6".equals(level)) {
+                    return ssbmdm;
+                }
+            } else {
+                if ("1".equals(isChild)) {
+                    SysDept dept = this.sysDeptMapper.selectOne(
+                            new LambdaQueryWrapper<SysDept>()
+                                    .eq(SysDept::getXtZxbz, "0")
+                                    .eq(SysDept::getOrgCode, ssbmdm)
+                    );
+                    if (dept == null) {
+                        throw new BusinessException("部门信息不存在！");
+                    }
+                    if (StringUtils.isBlank(dept.getOrgLevel())) {
+                        return ssbmdm;
+                    }
+                    switch (dept.getOrgLevel()) {
+                        case "10":
+                        case "11":
+                            return ssbmdm.substring(0, 2);
+                        case "21":
+                        case "31":
+                            return ssbmdm.substring(0, 8);
+                        case "12":
+                        case "32":
+                        case "22":
+                            return ssbmdm.substring(0, 10);
+                        case "20":
+                            return ssbmdm.substring(0, 4);
+                        case "30":
+                            return ssbmdm.substring(0, 6);
+                        default:
+                            return ssbmdm;
+                    }
+                }
+            }
+        } else {
+            if ("1".equals(isChild)) {
+                SysDept dept = this.sysDeptMapper.selectOne(
+                        new LambdaQueryWrapper<SysDept>()
+                                .eq(SysDept::getXtZxbz, "0")
+                                .eq(SysDept::getOrgCode, ssbmdm)
+                );
+                if (dept == null) {
+                    throw new BusinessException("部门信息不存在！");
+                }
+                if (StringUtils.isBlank(dept.getOrgLevel())) {
+                    return ssbmdm;
+                }
+                switch (dept.getOrgLevel()) {
+                    case "10":
+                    case "11":
+                        return ssbmdm.substring(0, 2);
+                    case "21":
+                    case "31":
+                        return ssbmdm.substring(0, 8);
+                    case "12":
+                    case "32":
+                    case "22":
+                        return ssbmdm.substring(0, 10);
+                    case "20":
+                        return ssbmdm.substring(0, 4);
+                    case "30":
+                        return ssbmdm.substring(0, 6);
+                    default:
+                        return ssbmdm;
+                }
+            }
+        }
+        return ssbmdm;
+    }
+
+}
+
+
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/timer/DeptUserSys.java b/common-core-starter/src/main/java/com/mosty/common/core/business/timer/DeptUserSys.java
new file mode 100644
index 0000000..79e2053
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/timer/DeptUserSys.java
@@ -0,0 +1,34 @@
+package com.mosty.common.core.business.timer;
+
+import com.mosty.common.core.business.service.SysDeptService;
+import com.mosty.common.core.business.service.SysUserService;
+import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 用户部门数据同步
+ * @title: DeptUserSys
+ * @projectName mosty-common
+ * @description: TODO
+ * @date 2022/8/27 16:52
+ */
+@Component
+@AllArgsConstructor
+public class DeptUserSys {
+
+    private SysDeptService sysDeptService;
+
+    private SysUserService sysUserService;
+
+//    @Scheduled(cron = "0 0 1 * * ?")
+    @Transactional
+    public void run() {
+        //同步部门数据
+        sysDeptService.deptSys();
+        //同步用户数据
+        sysUserService.userSys();
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/config/CaptchaConfig.java b/common-core-starter/src/main/java/com/mosty/common/core/config/CaptchaConfig.java
new file mode 100644
index 0000000..41a0bc3
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/config/CaptchaConfig.java
@@ -0,0 +1,72 @@
+package com.mosty.common.core.config;
+
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * 验证码配置
+ *
+ * @author xingsong
+ */
+@Data
+@Slf4j
+@Configuration
+public class CaptchaConfig implements InitializingBean {
+
+    /** 默认角色列表 多个使用逗号间隔 */
+    @Value("${login.check.kaptcha:false}")
+    private Boolean loginCheckKaptcha;
+
+    @Bean(name = "captchaProducerMath")
+    public DefaultKaptcha getKaptchaBeanMath() {
+
+        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+        Properties properties = new Properties();
+        // 是否有边框 默认为true 我们可以自己设置yes，no
+        properties.setProperty("kaptcha.border", "yes");
+        // 边框颜色 默认为Color.BLACK
+        properties.setProperty("kaptcha.border.color", "105,179,90");
+        // 验证码文本字符颜色 默认为Color.BLACK
+        properties.setProperty("kaptcha.textproducer.font.color", "blue");
+        // 验证码图片宽度 默认为200
+        properties.setProperty("kaptcha.image.width", "160");
+        // 验证码图片高度 默认为50
+        properties.setProperty("kaptcha.image.height", "60");
+        // 验证码文本字符大小 默认为40
+        properties.setProperty("kaptcha.textproducer.font.size", "35");
+        // KAPTCHA_SESSION_KEY
+        properties.setProperty("kaptcha.session.key", "kaptchaCodeMath");
+        // 验证码文本字符间距 默认为2
+        properties.setProperty("kaptcha.textproducer.char.space", "3");
+        // 验证码文本字符长度 默认为5
+        properties.setProperty("kaptcha.textproducer.char.length", "4");
+        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1,
+        // fontSize)
+        properties.setProperty("kaptcha.textproducer.font.names", "Arial,Courier");
+        // 验证码噪点颜色 默认为Color.BLACK
+        properties.setProperty("kaptcha.noise.color", "white");
+        // 干扰实现类
+        properties.setProperty("kaptcha.noise.impl", "com.google.code.kaptcha.impl.NoNoise");
+        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple
+        // 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy
+        // 阴影com.google.code.kaptcha.impl.ShadowGimpy
+        properties.setProperty("kaptcha.obscurificator.impl", "com.google.code.kaptcha.impl.ShadowGimpy");
+        Config config = new Config(properties);
+        defaultKaptcha.setConfig(config);
+
+        return defaultKaptcha;
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        log.info("login check captcha is {}", loginCheckKaptcha);
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/config/DefaultRoleConfig.java b/common-core-starter/src/main/java/com/mosty/common/core/config/DefaultRoleConfig.java
new file mode 100644
index 0000000..3874596
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/config/DefaultRoleConfig.java
@@ -0,0 +1,43 @@
+package com.mosty.common.core.config;
+
+import com.google.common.collect.Lists;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  默认角色配置
+ * @author kevin
+ * @date 2022/2/21 1:12 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Data
+@Slf4j
+public class DefaultRoleConfig {
+
+    /** 默认角色列表 多个使用逗号间隔 */
+    @Value("${default.role:12345}")
+    private String defaultRole;
+
+    public List<Long> getDefaultRoleList() {
+        List<Long> defaultRoleList = Lists.newArrayList();
+        if (StringUtils.isEmpty(defaultRole)) {
+            return defaultRoleList;
+        }
+        String[] split = defaultRole.split(",");
+        for (String roleId : split) {
+            try {
+                defaultRoleList.add(Long.parseLong(roleId));
+            } catch (Exception e) {
+                log.error("解析角色id异常", e);
+            }
+        }
+        return defaultRoleList;
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/config/MinIoClientConfig.java b/common-core-starter/src/main/java/com/mosty/common/core/config/MinIoClientConfig.java
new file mode 100644
index 0000000..d3d08bc
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/config/MinIoClientConfig.java
@@ -0,0 +1,46 @@
+package com.mosty.common.core.config;
+
+import io.minio.MinioClient;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  minio配置
+ * @author kevin
+ * @date 2022/3/7 10:41 AM
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+public class MinIoClientConfig {
+
+    @Value("${minio.endpoint:http://123.60.67.142:8001}")
+    private String endpoint;
+    @Value("${minio.downloadEndpoint:http://123.60.67.142:8000}")
+    private String downloadEndpoint;
+    @Value("${minio.accessKey:root}")
+    private String accessKey;
+    @Value("${minio.secretKey:sczy@2022}")
+    private String secretKey;
+    /** 图片桶名称 */
+    @Value("${minio.bucket.image:image}")
+    private String imageBucket;
+    /** 文件桶名称 */
+    @Value("${minio.bucket.file:file}")
+    private String fileBucket;
+
+
+    /**
+     * 注入minio 客户端
+     * @return
+     */
+    @Bean
+    public MinioClient minioClient() {
+        return MinioClient.builder()
+                        .endpoint(endpoint)
+                        .credentials(accessKey, secretKey)
+                        .build();
+    }
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/constant/DataPermissionConstant.java b/common-core-starter/src/main/java/com/mosty/common/core/constant/DataPermissionConstant.java
new file mode 100644
index 0000000..b70e657
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/constant/DataPermissionConstant.java
@@ -0,0 +1,44 @@
+package com.mosty.common.core.constant;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  菜单类型枚举
+ * @author kevin
+ * @date 2022/2/22 12:53 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public class DataPermissionConstant {
+
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 市级数据权限
+     */
+    public static final String DATA_SCOPE_CITY = "2";
+
+    /**
+     * 县级数据权限
+     */
+    public static final String DATA_SCOPE_COUNTY = "3";
+
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "5";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "99";
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/IdCardLoginRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/login/IdCardLoginRequest.java
new file mode 100644
index 0000000..4b3cf70
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/IdCardLoginRequest.java
@@ -0,0 +1,28 @@
+package com.mosty.common.core.login;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ *  pki登陆（身份证号登陆）
+ * @author kevin
+ * @date 2022/4/23 2:28 下午
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("身份证号登陆请求")
+public class IdCardLoginRequest {
+
+    /**
+     * 身份证号
+     */
+    @NotEmpty(message = "身份证号不能为空")
+    @ApiModelProperty("身份证号")
+    private String idCardNo;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/ImageController.java b/common-core-starter/src/main/java/com/mosty/common/core/login/ImageController.java
new file mode 100644
index 0000000..4e3eb20
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/ImageController.java
@@ -0,0 +1,74 @@
+package com.mosty.common.core.login;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.login.dto.ImageRequest;
+import com.mosty.common.core.util.Base64Util;
+import com.mosty.common.util.ImageUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/image")
+@Api(tags = "图片功能服务")
+public class ImageController {
+
+    @GetMapping("/base64")
+    @ApiOperation(value = "根据URL获取base64图片", httpMethod = "GET", response = SysDept.class)
+    public ResponseResult<String> selectPage(ImageRequest imageRequest) {
+        try {
+            String base = "";
+            if (imageRequest.getUrl().startsWith("https://")) {
+                base = ImageUtils.encodeImageToBase64Https(imageRequest.getUrl());
+            } else {
+                base = ImageUtils.encodeImageToBase64(imageRequest.getUrl());
+            }
+            return ResponseResult.success(base);
+        } catch (Exception e) {
+            return ResponseResult.fail("图片下载失败");
+        }
+    }
+
+    //　下载图片(返回二进制)
+    @RequestMapping(value = "/image", method = RequestMethod.GET)
+    public HttpEntity<byte[]> downloadFile(String url, HttpServletRequest request) throws Exception{
+        byte[] obsBytes = null;
+        if (StringUtils.isNotBlank(url)) {
+            url= URLDecoder.decode(url,"UTF-8");
+            if (url.startsWith("https://")) {
+                obsBytes = ImageUtils.encodeImageToByteHttps(url);
+            } else {
+                obsBytes = ImageUtils.encodeImageTobyte(url);
+            }
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.IMAGE_JPEG);
+        headers.setContentLength(obsBytes.length);
+        return new HttpEntity(obsBytes, headers);
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java b/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java
new file mode 100644
index 0000000..9f5f0ec
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java
@@ -0,0 +1,236 @@
+package com.mosty.common.core.login;
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.Claim;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.interfaces.JWTVerifier;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysRoleVO;
+import com.mosty.common.core.login.dto.DeptAllVo;
+import com.mosty.common.core.login.dto.DeptDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_ISSUER;
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_KEY;
+
+/**
+ * jwt token工具类
+ *
+ * @author kevin
+ * @date 2022/2/15 10:32 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@Component
+public class JwtTokenGenerator {
+
+    /**
+     * 配置文件中过期时间，单位秒
+     */
+    @Value("${jwt.expiration:864000}")
+    private Long expiration;
+
+    /**
+     * 配置文件中的jwt秘钥
+     */
+    @Value("${jwt.secret:RVvjAORWxgmDyvGP8RkD7HuaYEuekN7rXyaDaLn2jbk6OJvFupTXzicR883pFUmI}")
+    private String secret;
+
+    @Value("${jwt.issuer:mosty-admin}")
+    private String issuer;
+
+    /**
+     * 获取当前登陆的token
+     * <p>
+     * private String id;//人员主键	userId
+     * private String identitycard;//人员账号
+     * private String identitycard;//身份证号码
+     * private String identitycard;//行业号码
+     * private String username;//人员姓名
+     * private String orgname;//所在部门名称
+     * private String orgcode;//所在部门代码
+     * private String orgid;//所在部门ID
+     * private String org_level;//所在部门等级代码	[部门等级]
+     * private String orgid;//所在部门业务类型代码	org_biz_type
+     * private String position;//登陆时间
+     *
+     * @param sysUser          用户信息
+     * @param dept    当前登陆用户部门
+     * @return token信息
+     */
+    public String generateToken(SysUser sysUser, DeptAllVo dept) {
+        try {
+            long currentMills = System.currentTimeMillis();
+            Algorithm algorithm = Algorithm.HMAC256(secret);
+
+            Date expireDate = DateUtils.parseDate("2099-12-31 00:00:00");
+            return JWT.create()
+                    .withIssuer(issuer)
+                    .withIssuedAt(new Date(currentMills))
+                    .withClaim("userId", sysUser.getId())
+                    .withClaim("userName", sysUser.getUserName())
+                    .withClaim("userType", sysUser.getUserType())
+                    .withClaim("userLoginName", sysUser.getLoginName())
+                    .withClaim("inDustRialId", sysUser.getInDustRialId())
+                    .withClaim("idEntityCard", sysUser.getIdEntityCard())
+                    .withClaim("phone", sysUser.getMobile())
+                    .withClaim("isVirtualUser", sysUser.getIsVirtualUser())
+                    .withClaim("deptId", dept.getDeptid())
+                    .withClaim("deptCode", dept.getDeptcode())
+                    .withClaim("deptName", dept.getDeptname())
+                    .withClaim("deptLevel", dept.getOrgLevel())
+                    .withClaim("deptBizType", dept.getOrgType())
+                    .withClaim("fxjDeptId", dept.getFxjid())
+                    .withClaim("fxjDeptName", dept.getFxjname())
+                    .withClaim("fxjDeptCode", dept.getFxjcode())
+                    .withClaim("dszDeptId", dept.getDszid())
+                    .withClaim("dszDeptName", dept.getDszname())
+                    .withClaim("dszDeptCode", dept.getDszcode())
+                    .withIssuedAt(new Date())
+                    .withSubject("admin")
+                    //设置时间长一点，永不过期
+//                    .withExpiresAt(new Date(currentMills + expiration * 1000))
+                    .withExpiresAt(expireDate)
+                    .sign(algorithm);
+        } catch (Exception e) {
+            log.error("生产token异常", e);
+            return null;
+        }
+    }
+
+    public String generatePromotionToken(Long promotionId, String promotionMobile, Integer promotionType, String pageUrl) {
+        try {
+//            Long expiration = 7200L;
+            long currentMills = System.currentTimeMillis();
+            Algorithm algorithm = Algorithm.HMAC256(secret);
+            /*DecodedJWT verify = verify(token, secret, issuer);
+            Claim promotionMobile1 = verify.getClaims().get("promotionId");*/
+            return JWT.create()
+                    .withIssuer(issuer)
+                    .withIssuedAt(new Date(currentMills))
+                    .withClaim("promotionId", promotionId)
+                    .withClaim("promotionMobile", promotionMobile)
+                    .withClaim("promotionType", promotionType)
+                    .withClaim("pageUrl", pageUrl)
+                    .withSubject("promotion")
+                    //设置过期时间为2小时
+                    .withExpiresAt(new Date(currentMills + expiration * 1000))
+                    .sign(algorithm);
+
+        } catch (Exception e) {
+            log.error("生产token异常:{}", e);
+            return null;
+        }
+    }
+
+    public Map<String, Claim> getPromotionFromToken(String token) {
+        try {
+            DecodedJWT decodedJWT = verify(token, secret, issuer);
+            return decodedJWT.getClaims();
+        } catch (Exception e) {
+            throw new BusinessException("获取用户身份异常，请退出重新登录");
+        }
+    }
+
+    public static DecodedJWT verify(String token, String secret, String issuer) {
+        DecodedJWT result = null;
+        try {
+            Algorithm algorithm = Algorithm.HMAC256(secret);
+            JWTVerifier verifier = JWT.require(algorithm)
+                    .withIssuer(issuer)
+                    .build();
+            DecodedJWT decodedJWT = verifier.verify(token);
+            Date expiresAt = decodedJWT.getExpiresAt();
+            result = expiresAt.after(new Date()) ? decodedJWT : null;
+        } finally {
+            return result;
+        }
+    }
+
+    public static void main(String[] args) {
+//        String token = generatePromotionToken(32232L, "13212120222", 1);
+//        System.out.println(token);
+//        String s = new JwtTokenUtil().generateToken(123);
+//        System.out.println(s);
+//
+        DecodedJWT result = null;
+        try {
+//            String tokenStr =  StrUtil.sub(token, 9, token.length());
+            String secret = TOKEN_KEY, issuer = TOKEN_ISSUER;
+            Algorithm algorithm = Algorithm.HMAC256(secret);
+            JWTVerifier verifier = JWT.require(algorithm)
+                    .withIssuer(issuer)
+                    .build();
+            String s = "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImlzcyI6Inprai1mcG0tc3RvcmVhZG1pbiIsImV4cCI6MTYwNjc3MjQwNywiaWF0IjoxNjA2NzI5MjA3LCJ1c2VySWQiOjEyM30.VLFq7RZ8a_e6d2AXI0hS31mAbFj1T-OrZ9Ol7KNIUA8";
+            DecodedJWT decodedJWT = verifier.verify(s);
+            Date expiresAt = decodedJWT.getExpiresAt();
+            result = expiresAt.after(new Date()) ? decodedJWT : null;
+            System.out.println(result.getId());
+            Map<String, Claim> claims = result.getClaims();
+//            Long promotionId = claims.get("promotionId").asLong();
+//            String promotionMobile = claims.get("promotionMobile").asString();
+//            Integer promotionType = claims.get("promotionType").asInt();
+//            System.out.println(promotionId + "_" + promotionMobile + "_" + promotionType);
+        } catch (Exception e) {
+        }
+    }
+
+    /**
+     * 获取jwt的属性值
+     *
+     * @param token  token信息
+     * @param pwtKey jwt的属性
+     * @return jwt属性对应的值
+     */
+    public Integer getPropertyFromToken(String token, String pwtKey) {
+        Algorithm algorithm = Algorithm.HMAC256(secret);
+        return JWT.require(algorithm).build()
+                .verify(token)
+                .getClaim(pwtKey)
+                .asInt();
+    }
+
+    public void removeToken(SysUser sysUser, DeptAllVo sysDept) {
+        long currentMills = System.currentTimeMillis();
+        Algorithm algorithm = Algorithm.HMAC256(secret);
+        JWT.create()
+                .withIssuer(issuer)
+                .withIssuedAt(new Date(currentMills))
+                .withClaim("userId", sysUser.getId())
+                .withClaim("userName", sysUser.getUserName())
+                .withClaim("userType", sysUser.getUserType())
+                .withClaim("userLoginName", sysUser.getLoginName())
+                .withClaim("inDustRialId", sysUser.getInDustRialId())
+                .withClaim("idEntityCard", sysUser.getIdEntityCard())
+                .withClaim("isVirtualUser", sysUser.getIsVirtualUser())
+                .withClaim("phone", sysUser.getMobile())
+                .withClaim("deptId", sysDept.getDeptid())
+                .withClaim("deptCode", sysDept.getDeptcode())
+                .withClaim("deptName", sysDept.getDeptname())
+                .withClaim("deptLevel", sysDept.getOrgLevel())
+                .withClaim("deptBizType", sysDept.getOrgBizType())
+                .withClaim("fxjDeptId", sysDept.getFxjid())
+                .withClaim("fxjDeptName", sysDept.getFxjname())
+                .withClaim("fxjDeptCode", sysDept.getFxjcode())
+                .withClaim("dszDeptId", sysDept.getDszid())
+                .withClaim("dszDeptName", sysDept.getDszname())
+                .withClaim("dszDeptCode", sysDept.getDszcode())
+                .withIssuedAt(new Date())
+                .withSubject("admin")
+                //设置立马过期
+                .withExpiresAt(new Date())
+                .sign(algorithm);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/LoginEntity.java b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginEntity.java
new file mode 100644
index 0000000..82e11d4
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginEntity.java
@@ -0,0 +1,32 @@
+package com.mosty.common.core.login;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ *  登陆服务
+ * @author kevin
+ * @date 2022/2/15 8:26 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("用户登陆请求")
+public class LoginEntity {
+
+    @NotEmpty(message = "用户名不能为空！")
+    @ApiModelProperty(value = "用户名", required = true)
+    private String userName;
+
+    @NotEmpty(message = "密码不能为空！")
+    @ApiModelProperty(value = "密码（密码需要进行base64 加密）", required = true)
+    private String password;
+
+    @ApiModelProperty(value = "加密token", required = true)
+    private String token;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/LoginRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginRequest.java
new file mode 100644
index 0000000..51dd6cf
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginRequest.java
@@ -0,0 +1,35 @@
+package com.mosty.common.core.login;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ *  登陆服务
+ * @author kevin
+ * @date 2022/2/15 8:26 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("用户登陆请求")
+public class LoginRequest {
+
+    @NotEmpty(message = "用户名不能为空！")
+    @ApiModelProperty(value = "用户名", required = true)
+    private String userName;
+
+    @NotEmpty(message = "密码不能为空！")
+    @ApiModelProperty(value = "密码（密码需要进行base64 加密）", required = true)
+    private String password;
+
+    @ApiModelProperty(value = "验证码", allowEmptyValue = true)
+    private String kaptcha;
+
+//    @ApiModelProperty("是否组装vue路由")
+//    private Boolean wrapRouter = Boolean.TRUE;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/LoginResponseVO.java b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginResponseVO.java
new file mode 100644
index 0000000..c65a816
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginResponseVO.java
@@ -0,0 +1,108 @@
+package com.mosty.common.core.login;
+
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.login.dto.DeptDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 登陆返回信息
+ *
+ * @author kevin
+ * @date 2022/2/15 10:24 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginResponseVO {
+//
+//    @ApiModelProperty("jwt token信息")
+//    private String jwtToken;
+//
+//    @ApiModelProperty("用户id")
+//    private Long userId;
+//
+//    @ApiModelProperty("用户名称")
+//    private String userName;
+//
+//    @ApiModelProperty("权限信息")
+//    private UserPermissionsInfo permissionsInfo;
+//
+//    @ApiModelProperty("用户挂的部门集合")
+//    private List<DeptDTO> deptList;
+//
+//    @ApiModelProperty("用户挂一级菜单和菜单组")
+//    private List<SysMenu> menuList;
+//
+//    @ApiModelProperty("菜单唯一编码集合")
+//    private Set<String> menuCodeSet;
+//
+//    @ApiModelProperty("分县局")
+//    private SysDept fxjDept;
+//
+//    @ApiModelProperty("地市州")
+//    private SysDept dszDept;
+//
+//    @ApiModelProperty(value = "身份证号")
+//    private String idEntityCard;
+
+
+    @ApiModelProperty("jwt token信息")
+    private String jwtToken;
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("用户部门")
+    private List<DeptDTO> deptList;
+
+    @ApiModelProperty("用户挂一级菜单和菜单组")
+    private List<SysMenu> menuList;
+
+    @ApiModelProperty("菜单唯一编码集合")
+    private Set<String> menuCodeSet;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idEntityCard;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "模块")
+    private String mk;
+
+
+    public LoginResponseVO(String jwtToken, Long userId, String userName, List<DeptDTO> deptList, String idEntityCard, String sfrh, String mk) {
+        this.jwtToken = jwtToken;
+        this.userId = userId;
+        this.userName = userName;
+        this.deptList = deptList;
+        this.idEntityCard = idEntityCard;
+        this.sfrh = sfrh;
+        this.mk = mk;
+    }
+
+    public LoginResponseVO(Long userId, String userName, List<DeptDTO> deptList,
+                           SysDept fxjDept, SysDept dszDept, String idEntityCard, String sfrh, String mk) {
+        this.userId = userId;
+        this.userName = userName;
+        this.deptList = deptList;
+//        this.fxjDept = fxjDept;
+//        this.dszDept = dszDept;
+        this.idEntityCard = idEntityCard;
+        this.sfrh = sfrh;
+        this.mk = mk;
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/LoginServiceController.java b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginServiceController.java
new file mode 100644
index 0000000..690025f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/LoginServiceController.java
@@ -0,0 +1,331 @@
+package com.mosty.common.core.login;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.google.code.kaptcha.Producer;
+import com.mosty.common.base.constant.Constants;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.Base64Util;
+import com.mosty.common.base.util.PasswordUtil;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.core.business.service.*;
+import com.mosty.common.core.config.CaptchaConfig;
+import com.mosty.common.core.login.dto.DeptAllVo;
+import com.mosty.common.core.login.dto.DeptDTO;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import static com.mosty.common.base.constant.Constants.LOGOUT;
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_PREFIX;
+
+/**
+ * 登陆服务
+ * <p>
+ * jwt:
+ * secret: "" # 验签的key
+ * #  expiration: 432000 # 配置文件中过期时间，单位秒
+ * issuer: ""
+ *
+ * @author kevin
+ * @date 2022/2/15 8:25 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/")
+@Api(tags = "登陆服务")
+public class LoginServiceController {
+
+    private final SysUserService sysUserService;
+    private final SysDeptService sysDeptService;
+    private final Producer captchaProducer;
+    private final RedisService redisService;
+    private final JwtTokenGenerator jwtTokenGenerator;
+    private final SysUserRoleService sysUserRoleService;
+    private final SysRoleService sysRoleService;
+    private final SysLogininforService sysLogininforService;
+    private final CaptchaConfig captchaConfig;
+    private final LoginService loginService;
+
+    @PostMapping("/login")
+    @ApiOperation(value = "根据账号和密码登录", httpMethod = "POST", response = LoginResponseVO.class)
+    public ResponseResult<LoginResponseVO> login(@Valid @RequestBody LoginRequest dto, HttpServletRequest httpServletRequest) throws Exception {
+        String status = "";
+        String message = "";
+        // 验证用户信息
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_entity_card", dto.getUserName());
+        queryWrapper.eq("xt_zxbz", "0");
+        queryWrapper.or().eq("in_dust_rial_id", dto.getUserName());
+        SysUser sysUser = sysUserService.getBaseMapper().selectOne(queryWrapper);
+        if (sysUser == null) return ResponseResult.fail(String.format("用户名或密码错误!"));
+        try {
+            // 验证密码
+            String password = new String(Base64Util.decryptBASE64(dto.getPassword().getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+            boolean match = PasswordUtil.match(password, sysUser.getPassword());
+            if (!match) return ResponseResult.fail("用户名或密码错误！");
+            // 查询用户关联的部门
+            List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+            DeptDTO dept = CollectionUtils.isNotEmpty(deptList) ? deptList.get(0) : null;
+            if (dept == null) throw new BusinessException("用户未绑定任何部门！");
+            //创建JWTToken
+            DeptAllVo allVo = this.sysDeptService.getOrgByDeptId(String.valueOf(dept.getDeptId()));
+            String jwtToken = jwtTokenGenerator.generateToken(sysUser, allVo);
+            LoginResponseVO loginResponseVO = new LoginResponseVO(jwtToken, sysUser.getId(),
+                    sysUser.getUserName(), deptList, sysUser.getIdEntityCard()
+                    , sysUser.getSfrh(), sysUser.getMk());
+            this.loginService.getMenus(dept, sysUser, loginResponseVO);
+            // 在数据库中排序，获取第一个作为当前登陆的用户部门
+            status = Constants.LOGIN_SUCCESS;
+            message = "登录成功";
+            loginResponseVO.setUserName(sysUser.getUserName());
+            redisService.setCacheObject(TOKEN_PREFIX + dept.getDeptId() + ":" + sysUser.getId(), System.currentTimeMillis());
+            return ResponseResult.success(loginResponseVO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            status = Constants.LOGIN_FAIL;
+            message = "登录失败" + e.getMessage();
+            throw new Exception(e.getMessage());
+        } finally {
+            try {
+                sysLogininforService.recordLogininfor(sysUser, status, message, httpServletRequest, "02");
+            } catch (Exception e) {
+                log.warn("记录日志失败，message={}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    @PostMapping("/loginOauth")
+    @ApiOperation(value = "根据账号和密码登录(无需权限信息和token)", httpMethod = "POST", response = SysUserVO.class)
+    public ResponseResult<LoginResponseVO> loginOauth(@Valid @RequestBody LoginEntity loginEntity, HttpServletRequest request) throws Exception {
+        String status = "", message = "";
+        // 验证用户信息
+        SysUserVO userVO = new SysUserVO();
+        SysUser sysUser = sysUserService.getBaseMapper().selectOne(
+                new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getXtZxbz, "0")
+                        .and(
+                                it -> it.eq(SysUser::getInDustRialId, loginEntity.getUserName())
+                                        .or()
+                                        .eq(SysUser::getIdEntityCard, loginEntity.getUserName())
+                        )
+                        .last(" limit 1")
+        );
+        if (sysUser == null) return ResponseResult.fail("用户名或密码错误");
+
+        try {
+            // 验证密码
+            String password = new String(Base64Util.decryptBASE64(loginEntity.getPassword().getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+            boolean match = PasswordUtil.match(password, sysUser.getPassword());
+            if (!match) return ResponseResult.fail("用户名或密码错误！");
+            // 查询用户关联的部门
+            List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+            DeptDTO dept = CollectionUtils.isNotEmpty(deptList) ? deptList.get(0) : null;
+            if (dept == null) throw new BusinessException("用户未绑定任何部门！");
+            //创建JWTToken
+            DeptAllVo allVo = this.sysDeptService.getOrgByDeptId(String.valueOf(dept.getDeptId()));
+            String jwtToken = jwtTokenGenerator.generateToken(sysUser, allVo);
+            LoginResponseVO loginResponseVO = new LoginResponseVO(jwtToken, sysUser.getId(),
+                    sysUser.getUserName(), deptList, sysUser.getIdEntityCard(), sysUser.getSfrh(), sysUser.getMk());
+            this.loginService.getMenus(dept, sysUser, loginResponseVO);
+            // 在数据库中排序，获取第一个作为当前登陆的用户部门
+            status = Constants.LOGIN_SUCCESS;
+            message = "登录成功";
+            loginResponseVO.setUserName(sysUser.getUserName());
+            redisService.setCacheObject(TOKEN_PREFIX + dept.getDeptId() + ":" + sysUser.getId(), System.currentTimeMillis());
+            return ResponseResult.success(loginResponseVO);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (Exception e) {
+            e.printStackTrace();
+            status = Constants.LOGIN_FAIL;
+            message = "登录失败" + e.getMessage();
+            throw new Exception(e.getMessage());
+        } finally {
+            try {
+                sysLogininforService.recordLogininfor(sysUser, status, message, request, "02");
+            } catch (Exception e) {
+                log.warn("记录日志失败，message={}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+
+    // 根据当前部门获取分县局部门
+    public SysDept getFxjDept(DeptDTO currentDept) {
+        if (currentDept == null) {
+            return null;
+        }
+        Long id = null;
+        String path = currentDept.getPath();
+        if (path.contains("_")) {
+            String[] paths = path.split("_");
+            log.info("paths length--->" + paths.length);
+            if (paths.length == 2) {
+                id = Long.valueOf(paths[1]);
+            } else if (paths.length == 3) {
+                id = Long.valueOf(paths[2]);
+            } else if (paths.length >= 4) {
+                id = Long.valueOf(paths[2]);
+            }
+        } else {
+            id = Long.valueOf(path);
+        }
+        return sysDeptService.getById(id);
+    }
+
+    // 根据当前地市州
+    public SysDept getDszDept(DeptDTO currentDept) {
+        if (currentDept == null) return null;
+        long id;
+        String path = currentDept.getPath();
+        if (path.contains("_")) {
+            String[] paths = path.split("_");
+            id = Long.parseLong(paths[1]);
+        } else {
+            id = Long.parseLong(path);
+        }
+        return sysDeptService.getById(id);
+    }
+
+    @PostMapping("/idCardNoLogin")
+    @ApiOperation(value = "APP--身份证号登陆", httpMethod = "POST", response = LoginResponseVO.class)
+    public ResponseResult<LoginResponseVO> idCardNoLogin(@Valid @RequestBody IdCardLoginRequest idCardLoginRequest,
+                                                         HttpServletRequest httpServletRequest) throws Exception {
+        String status = "";
+        String message = "";
+        SysUser sysUser = null;
+        try {
+            // 验证用户信息
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id_entity_card", idCardLoginRequest.getIdCardNo());
+            sysUser = sysUserService.getBaseMapper().selectOne(queryWrapper);
+            if (sysUser == null) return ResponseResult.fail("用户不存在！！");
+
+            // 查询用户关联的部门
+            List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+            DeptDTO dept = CollectionUtils.isNotEmpty(deptList) ? deptList.get(0) : null;
+            //除非用户是超级管理员，否则部门为空不允许登陆
+            if (dept == null) return ResponseResult.fail("用户未分配任何部门！！");
+            //创建JWTToken
+            DeptAllVo allVo = this.sysDeptService.getOrgByDeptId(String.valueOf(dept.getDeptId()));
+            String jwtToken = jwtTokenGenerator.generateToken(sysUser, allVo);
+            LoginResponseVO loginResponseVO = new LoginResponseVO(jwtToken, sysUser.getId(), sysUser.getUserName(), deptList,
+                    sysUser.getIdEntityCard(), sysUser.getSfrh(), sysUser.getMk());
+            // 在数据库中排序，获取第一个作为当前登陆的用户部门
+            status = Constants.LOGIN_SUCCESS;
+            message = "登录成功";
+            redisService.setCacheObject(TOKEN_PREFIX + dept.getDeptId() + ":" + sysUser.getId(), System.currentTimeMillis());
+            return ResponseResult.success(loginResponseVO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            status = Constants.LOGIN_FAIL;
+            message = "登录失败" + e.getMessage();
+            throw new Exception(e.getMessage());
+        } finally {
+            if (sysUser != null) {
+                try {
+                    sysLogininforService.recordLogininfor(sysUser, status, message, httpServletRequest, "01");
+                } catch (Exception e) {
+                    log.warn("记录日志失败，message={}", e.getMessage());
+                }
+            }
+        }
+    }
+
+    @PostMapping("/ssoLogin")
+    @ApiOperation(value = "APP--身份证号登陆", httpMethod = "POST", response = LoginResponseVO.class)
+    public ResponseResult<LoginResponseVO> ssoLogin(@RequestBody LoginEntity loginEntity,
+                                                    HttpServletRequest httpServletRequest) throws Exception {
+        if (StringUtils.isBlank(loginEntity.getToken())) {
+            return ResponseResult.fail("用户名不能为空");
+        }
+        String status = "", message = "", userName;
+        SysUser sysUser = null;
+        userName = new String(Base64Util.decryptBASE64(loginEntity.getToken().getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+
+        try {
+            // 验证用户信息
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id_entity_card", userName);
+            sysUser = sysUserService.getBaseMapper().selectOne(queryWrapper);
+            if (sysUser == null) return ResponseResult.fail("用户不存在！！");
+            // 查询用户关联的部门
+            List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+            DeptDTO dept = CollectionUtils.isNotEmpty(deptList) ? deptList.get(0) : null;
+            if (dept == null) throw new BusinessException("用户未绑定任何部门！");
+            //创建JWTToken
+            DeptAllVo allVo = this.sysDeptService.getOrgByDeptId(String.valueOf(dept.getDeptId()));
+            String jwtToken = jwtTokenGenerator.generateToken(sysUser, allVo);
+            LoginResponseVO loginResponseVO = new LoginResponseVO(jwtToken, sysUser.getId(),
+                    sysUser.getUserName(), deptList, sysUser.getIdEntityCard(), sysUser.getSfrh(), sysUser.getMk());
+            this.loginService.getMenus(dept, sysUser, loginResponseVO);
+            // 在数据库中排序，获取第一个作为当前登陆的用户部门
+            status = Constants.LOGIN_SUCCESS;
+            message = "登录成功";
+            loginResponseVO.setUserName(sysUser.getUserName());
+            redisService.setCacheObject(TOKEN_PREFIX + dept.getDeptId() + ":" + sysUser.getId(), System.currentTimeMillis());
+            return ResponseResult.success(loginResponseVO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            status = Constants.LOGIN_FAIL;
+            message = "登录失败" + e.getMessage();
+            throw new Exception(e.getMessage());
+        } finally {
+            if (sysUser != null) {
+                try {
+                    sysLogininforService.recordLogininfor(sysUser, status, message, httpServletRequest, "01");
+                } catch (Exception e) {
+                    log.warn("记录日志失败，message={}", e.getMessage());
+                }
+            }
+        }
+    }
+
+
+    @JwtSysUser
+    @PostMapping("/loginOut")
+    @ApiOperation(value = "登出", httpMethod = "POST", response = LoginResponseVO.class)
+    public ResponseResult<Boolean> loginOut(HttpServletRequest httpServletRequest) throws Exception {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (userInfo != null) {
+                SysUser sysUser = sysUserService.getUserInfo(userInfo.getUserId());
+                // 查询用户关联的部门
+                SysDept sysDept = sysDeptService.getById(userInfo.getDeptId());
+                DeptAllVo allVo = this.sysDeptService.getOrgByDeptId(String.valueOf(sysDept.getId()));
+                // 在数据库中排序，获取第一个作为当前登陆的用户部门
+                jwtTokenGenerator.removeToken(sysUser, allVo);
+                //清除用户jwtToken
+                redisService.deleteObject(TOKEN_PREFIX + userInfo.getDeptId() + ":" + sysUser.getId());
+                sysLogininforService.recordLogininfor(sysUser, LOGOUT, "用户登出", httpServletRequest, "02");
+            }
+            return ResponseResult.success(Boolean.TRUE);
+        } catch (Exception e) {
+            log.error("登出错误：", e);
+            e.printStackTrace();
+            throw new Exception(e.getMessage());
+        }
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/TokenRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/login/TokenRequest.java
new file mode 100644
index 0000000..b3cb4f7
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/TokenRequest.java
@@ -0,0 +1,33 @@
+package com.mosty.common.core.login;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ *  登陆服务
+ * @author kevin
+ * @date 2022/2/15 8:26 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("用户切换部门获取token请求")
+public class TokenRequest {
+
+    @NotNull(message = "部门id不能为空！")
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @NotEmpty(message = "token！")
+    @ApiModelProperty("token不能为空")
+    private String authorization;
+
+    @ApiModelProperty("是否组装vue路由")
+    private Boolean wrapRouter;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/UnifiedLoginRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/login/UnifiedLoginRequest.java
new file mode 100644
index 0000000..bb76457
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/UnifiedLoginRequest.java
@@ -0,0 +1,36 @@
+package com.mosty.common.core.login;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ *  登陆服务
+ * @author
+ * @date 2022/8/12 8:26 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("用户登陆请求")
+public class UnifiedLoginRequest {
+
+    /**
+     * 登陆token
+     */
+    @NotEmpty(message = "登陆token！")
+    @ApiModelProperty(value = "登陆token", required = true)
+    private String token;
+
+    /**
+     * 密码
+     */
+    @NotEmpty(message = "系统ID！")
+    @ApiModelProperty(value = "系统ID", required = false)
+    private String systemId;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/UserPermissionsInfo.java b/common-core-starter/src/main/java/com/mosty/common/core/login/UserPermissionsInfo.java
new file mode 100644
index 0000000..7e7c133
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/UserPermissionsInfo.java
@@ -0,0 +1,41 @@
+package com.mosty.common.core.login;
+
+import com.mosty.common.core.business.entity.SysMenu;
+import com.mosty.common.core.login.dto.DeptDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 用户权限信息
+ *
+ * @author Lhh
+ * @date 2022/06/27 17:24
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserPermissionsInfo {
+
+    @ApiModelProperty("权限过滤条件ids")
+    private String ids;
+
+    @ApiModelProperty("权限过滤条件orgcodes")
+    private String orgcodes;
+
+    @ApiModelProperty("权限等级（D_ZDY_SJQX）")
+    private String permissionsLevel;
+
+    @ApiModelProperty("权限SQL(ssbmid)")
+    private String permissionsSql;
+
+    @ApiModelProperty("权限SQL(ssbmdm)")
+    private String permissionsSqlCode;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptAllVo.java b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptAllVo.java
new file mode 100644
index 0000000..f3c8f5d
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptAllVo.java
@@ -0,0 +1,59 @@
+package com.mosty.common.core.login.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 返回的组织机构对象，包含所属部门 所属分县局 所属地市州
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "DeptAllVo 对象", description = "返回的组织机构对象，包含所属部门 所属分县局 所属地市州")
+public class DeptAllVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("所属部门ID")
+    private Long deptid;
+
+    @ApiModelProperty("所属部门代码")
+    private String deptcode;
+
+    @ApiModelProperty("所属部门名称")
+    private String deptname;
+
+    @ApiModelProperty("部门类型")
+    private String orgType;
+
+    @ApiModelProperty("部门等级")
+    private String orgLevel;
+
+    @ApiModelProperty("部门业务等级")
+    private String orgBizType;
+
+    @ApiModelProperty("所属分县局id")
+    private Long fxjid;
+
+    @ApiModelProperty("所属分县局代码")
+    private String fxjcode;
+
+    @ApiModelProperty("所属分现局名称")
+    private String fxjname;
+
+    @ApiModelProperty("所属地市州id")
+    private Long dszid;
+
+    @ApiModelProperty("所属地市州代码")
+    private String dszcode;
+
+    @ApiModelProperty("所属地市州名称")
+    private String dszname;
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptDTO.java b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptDTO.java
new file mode 100644
index 0000000..97db76c
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/DeptDTO.java
@@ -0,0 +1,40 @@
+package com.mosty.common.core.login.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *  部门信息对象
+ * @author kevin
+ * @date 2022/2/16 9:42 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+public class DeptDTO implements Serializable {
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门祖籍列表")
+    private String path;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("部门简称")
+    private String deptJc;
+
+    @ApiModelProperty("部门编码")
+    private String deptCode;
+
+    @ApiModelProperty("部门等级")
+    private String deptLevel;
+
+    @ApiModelProperty("所在部门业务类型代码")
+    private String deptBizType;
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/dto/ImageRequest.java b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/ImageRequest.java
new file mode 100644
index 0000000..605b0a1
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/dto/ImageRequest.java
@@ -0,0 +1,29 @@
+package com.mosty.common.core.login.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ *  图片请求参数
+ * @author
+ * @date 2022/2/15 8:26 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("图片请求参数")
+public class ImageRequest {
+
+    /**
+     * 图片地址
+     */
+    @NotEmpty(message = "图片地址不能为空！")
+    @ApiModelProperty(value = "图片地址", required = true)
+    private String url;
+
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/minio/UploadController.java b/common-core-starter/src/main/java/com/mosty/common/core/minio/UploadController.java
new file mode 100644
index 0000000..100ee65
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/minio/UploadController.java
@@ -0,0 +1,292 @@
+package com.mosty.common.core.minio;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.mapper.SysConfigMapper;
+import com.mosty.common.core.business.entity.SysOss;
+import com.mosty.common.core.business.entity.vo.Base64Str;
+import com.mosty.common.core.business.service.SysOssService;
+import com.mosty.common.core.config.MinIoClientConfig;
+import com.mosty.common.core.util.BASE64DecodedMultipartFile;
+import com.mosty.common.util.ImageUtils;
+import com.mosty.common.util.UUIDGenerator;
+import io.minio.*;
+import io.minio.errors.*;
+import io.minio.http.Method;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/minio")
+@AllArgsConstructor
+@Api(tags = "图片上传服务")
+@SuppressWarnings("unused")
+public class UploadController {
+
+    private final MinioClient minioClient;
+    private final MinIoClientConfig minIoClientConfig;
+    private final SysOssService sysOssService;
+    private final SysConfigMapper sysConfigMapper;
+
+
+    @GetMapping("/image/downloadBaes64/{id}")
+    @ApiOperation(value = "获取图片Base64", httpMethod = "GET", response = String.class)
+    public ResponseResult<String> downloadBaes64(@PathVariable("id") String id) {
+        try {
+            if (StringUtils.isEmpty(id)) {
+                return ResponseResult.success();
+            }
+            SysOss oss = sysOssService.getById(id);
+            if (!ObjectUtils.isEmpty(oss)) {
+                byte[] data = ImageUtils.encodeImageToByte(this.getMonioUrl() + oss.getUrl());
+                BASE64Encoder encoder = new BASE64Encoder();
+                String base64 = encoder.encode(data).replaceAll("[\\s*\t\n\r]", "");
+                return ResponseResult.success(base64);
+            }
+            return ResponseResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+
+    @PostMapping("/file/upload")
+    @ApiOperation(value = "前端上传组件使用：上传文件(返回文件的访问地址)", httpMethod = "POST", response = String.class)
+    public ResponseResult<String> uploadFile(@JSONField(serialize = false) @RequestParam("file") MultipartFile file)
+            throws Exception {
+        if (file.getSize() > 0) {
+            return uploadOssWithBucket(file, minIoClientConfig.getFileBucket());
+        }
+        return ResponseResult.fail("未选择任何文件，上传失败");
+    }
+
+    @PostMapping("/{bucketName}/upload")
+    @ApiOperation(value = "指定桶上传文件(返回文件的访问地址)", httpMethod = "POST", response = String.class)
+    public ResponseResult<String> upload(@JSONField(serialize = false) @RequestParam("file") MultipartFile file,
+                                         @PathVariable("bucketName") String bucketName) throws Exception {
+        Asserts.check(StringUtils.isEmpty(bucketName), "桶名称不能为空！");
+        boolean bucketExists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+        Asserts.check(!bucketExists, "桶%s不存在！", bucketName);
+        if (file.getSize() > 0) {
+            return uploadOssWithBucket(file, bucketName);
+        }
+        return ResponseResult.fail("未选择任何文件，上传失败");
+    }
+
+    @PostMapping("/image/upload/id")
+    @ApiOperation(value = "前端上传组件使用：上传图片(返回图片ID)", httpMethod = "POST", response = String.class)
+    public ResponseResult<String> uploadImageId(@JSONField(serialize = false) @RequestParam("file") MultipartFile file)
+            throws Exception {
+        if (file.getSize() > 0) {
+            return uploadOssWithBucketById(file, minIoClientConfig.getImageBucket());
+        }
+        return ResponseResult.fail("文件为空，或文件无内容！！");
+    }
+
+    @GetMapping("/image/download/{id}")
+    @ApiOperation(value = "根据ID下载图片(返回二进制文件)", httpMethod = "GET", response = String.class)
+    public ResponseEntity<byte[]> downloadImageId(@PathVariable("id") String id, HttpServletRequest request) {
+        try {
+            if (StringUtils.isEmpty(id)) {
+                return ResponseEntity.ok(null);
+            }
+            return downloadFile(id, request);
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    @GetMapping("/file/download/{id}")
+    @ApiOperation(value = "根据ID查询文件的访问地址", httpMethod = "GET", response = String.class)
+    public ResponseResult<Map<String, String>> downloadFileId(@PathVariable("id") String id) {
+        if (StringUtils.isEmpty(id)) {
+            throw new BusinessException("附件ID不能为空");
+        }
+        return downloadFileById(id);
+    }
+
+    @GetMapping("/file/getFileList")
+    @ApiOperation(value = "查询文件", httpMethod = "GET", response = String.class)
+    public ResponseResult<List<Map<String, String>>> getFileList(String fileIds) {
+        List<Map<String, String>> list = new ArrayList<>();
+        List<String> fileList = Arrays.asList(fileIds.split(","));
+        fileList.forEach(item -> {
+            SysOss oss = this.sysOssService.getById(item);
+            if (oss != null) {
+                Map<String, String> map = new HashMap<>();
+                map.put("id", oss.getId());
+                map.put("url", this.getMonioUrl() + oss.getUrl());
+                map.put("name", oss.getFileName());
+                map.put("originalName", oss.getOriginalName());
+                map.put("suffix", oss.getFileSuffix());
+                list.add(map);
+            }
+        });
+        return ResponseResult.success(list);
+    }
+
+    // 获取minio的请求地址
+    private String getMonioUrl() {
+        SysConfig config = this.sysConfigMapper.selectOne(
+                new LambdaQueryWrapper<SysConfig>()
+                        .eq(SysConfig::getPzj, "MINIO_URL")
+                        .eq(SysConfig::getXtZxbz, DeletedEnum.NATURE)
+        );
+        if (config != null) {
+            return config.getPzz();
+        }
+        return "http://80.35.1.150:9009/";
+    }
+
+    @NotNull
+    private ResponseResult<String> uploadOssWithBucket(MultipartFile file, String bucketName)
+            throws IOException, ServerException, InsufficientDataException, ErrorResponseException,
+            NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        // 原文件名
+        String fileName = file.getOriginalFilename();
+        if (StringUtils.isEmpty(fileName)) {
+            return ResponseResult.fail("文件名不能为空！");
+        }
+        // 文件类型
+        String suffixName = fileName.substring(fileName.lastIndexOf("."));
+        // 生成新文件名，确保唯一性
+        String objectName = UUIDGenerator.getUUID();
+        // 文件类型
+        String fileType = file.getContentType();
+        String fileUrl = DateUtils.datePathString() + "/" + objectName + suffixName;
+        // 使用putObject上传一个文件到存储桶中
+        PutObjectArgs build = PutObjectArgs.builder().object(fileUrl)
+                .bucket(bucketName)
+                .contentType(file.getContentType())
+                .stream(file.getInputStream(), file.getSize(), -1).build();
+
+        boolean exist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+        Asserts.check(!exist, "minio bucket %s 不存在，请联系管理员", bucketName);
+        minioClient.putObject(build);
+        // 得到文件 url
+        String url = bucketName + "/" + fileUrl;
+        SysOss oss = new SysOss();
+        oss.setId(objectName);
+        oss.setFileName(objectName + suffixName);
+        oss.setOriginalName(fileName);
+        oss.setFileSuffix(suffixName);
+        oss.setUrl(url);
+        oss.setXtCjsj(new Date());
+        oss.setXtLrsj(new Date());
+        oss.setXtZhxgsj(new Date());
+        oss.setXtZxbz("0");
+        sysOssService.save(oss);
+        return ResponseResult.success(this.getMonioUrl() + url);
+    }
+
+    @NotNull
+    private ResponseResult<String> uploadOssWithBucketById(MultipartFile file, String bucketName) throws IOException,
+            ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException,
+            InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        // 原文件名
+        String fileName = file.getOriginalFilename();
+        if (StringUtils.isEmpty(fileName)) {
+            return ResponseResult.fail("文件名不能为空！");
+        }
+        // 文件类型
+        String suffixName = fileName.substring(fileName.lastIndexOf("."));
+        // 生成新文件名，确保唯一性
+        String objectName = UUIDGenerator.getUUID();
+        // 文件类型
+        String fileType = file.getContentType();
+        String fileUrl = DateUtils.datePathString() + "/" + objectName + suffixName;
+        // 使用putObject上传一个文件到存储桶中
+        PutObjectArgs build = PutObjectArgs.builder().object(fileUrl)
+                .bucket(bucketName)
+                .contentType(file.getContentType())
+                .stream(file.getInputStream(), file.getSize(), -1).build();
+        boolean exist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+        Asserts.check(!exist, "minio bucket %s 不存在，请联系管理员", bucketName);
+        minioClient.putObject(build);
+        // 得到文件 url
+        String url = bucketName + "/" + fileUrl;
+        SysOss oss = new SysOss();
+        oss.setId(objectName);
+        oss.setFileName(objectName + suffixName);
+        oss.setOriginalName(fileName);
+        oss.setFileSuffix(suffixName);
+        oss.setUrl(url);
+        oss.setXtCjsj(new Date());
+        oss.setXtLrsj(new Date());
+        oss.setXtZhxgsj(new Date());
+        oss.setXtZxbz("0");
+        sysOssService.save(oss);
+        return ResponseResult.success(objectName);
+    }
+
+    // 下载图片（返回文件的URL）
+    public ResponseResult<Map<String, String>> downloadFileById(String id) {
+        try {
+            SysOss oss = sysOssService.getById(id);
+            Map<String, String> map = new HashMap<>();
+            map.put("id", oss.getId());
+            map.put("url", this.getMonioUrl() + oss.getUrl());
+            map.put("name", oss.getFileName());
+            map.put("originalName", oss.getOriginalName());
+            map.put("suffix", oss.getFileSuffix());
+            return ResponseResult.success(map);
+        } catch (Exception e) {
+            log.error("Minio-Obs下载对象失败：", e);
+            throw new BusinessException("获取附件下载地址失败！！");
+        }
+    }
+
+    //　下载图片(返回二进制)
+    public ResponseEntity<byte[]> downloadFile(String id, HttpServletRequest request) {
+        try {
+
+            SysOss oss = sysOssService.getById(id);
+            byte[] obsBytes = ImageUtils.encodeImageToByte(this.getMonioUrl() + oss.getUrl());
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentDispositionFormData("attachment", oss.getFileName());
+            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+            return new ResponseEntity<>(obsBytes, headers, HttpStatus.CREATED);
+        } catch (Exception e) {
+            log.error("Minio-Obs下载对象失败：", e);
+            throw new BusinessException("下载对象失败");
+        }
+    }
+
+    //　inputStream转换成byte数组
+    private byte[] inputStreamTobyte(InputStream inputStream) throws IOException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        byte[] buff = new byte[100];
+        int rc;
+        while ((rc = inputStream.read(buff, 0, 100)) > 0) {
+            byteArrayOutputStream.write(buff, 0, rc);
+        }
+        return byteArrayOutputStream.toByteArray();
+    }
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/BASE64DecodedMultipartFile.java b/common-core-starter/src/main/java/com/mosty/common/core/util/BASE64DecodedMultipartFile.java
new file mode 100644
index 0000000..1ccd367
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/BASE64DecodedMultipartFile.java
@@ -0,0 +1,59 @@
+package com.mosty.common.core.util;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+public class BASE64DecodedMultipartFile implements MultipartFile {
+
+
+    private final byte[] imgContent;
+    private final String header;
+
+    public BASE64DecodedMultipartFile(byte[] imgContent, String header) {
+        this.imgContent = imgContent;
+//        this.header = header.split(";")[0];
+        this.header = header.split(";")[0];
+    }
+
+    @Override
+    public String getName() {
+        // TODO - implementation depends on your requirements
+        return System.currentTimeMillis() + Math.random() + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getOriginalFilename() {
+        // TODO - implementation depends on your requirements
+        return System.currentTimeMillis() + (int)Math.random() * 10000 + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getContentType() {
+        // TODO - implementation depends on your requirements
+        return header.split(":")[1];
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return imgContent == null || imgContent.length == 0;
+    }
+
+    @Override
+    public long getSize() {
+        return imgContent.length;
+    }
+
+    @Override
+    public byte[] getBytes() throws IOException {
+        return imgContent;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return new ByteArrayInputStream(imgContent);
+    }
+
+    @Override
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+        new FileOutputStream(dest).write(imgContent);
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/Base64Util.java b/common-core-starter/src/main/java/com/mosty/common/core/util/Base64Util.java
new file mode 100644
index 0000000..634f7ff
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/Base64Util.java
@@ -0,0 +1,83 @@
+package com.mosty.common.core.util;
+
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.imageio.stream.FileImageInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Base64Util {
+    /**
+      * 字符串转图片
+      * @param base64Str
+     * @return
+     */
+     public static byte[] decode(String base64Str){
+        byte[] b = null;
+        BASE64Decoder decoder = new BASE64Decoder();
+        try {
+            b = decoder.decodeBuffer(replaceEnter(base64Str));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return b;
+    }
+
+    /**
+     * 图片转字符串
+     * @param image
+     * @return
+     */
+    public static String encode(byte[] image){
+        BASE64Encoder decoder = new BASE64Encoder();
+        return replaceEnter(decoder.encode(image));
+    }
+
+    public static String encode(String uri){
+        BASE64Encoder encoder = new BASE64Encoder();
+        return replaceEnter(encoder.encode(uri.getBytes()));
+    }
+         /**
+     *
+      * @path    图片路径
+      * @return
+     */
+
+    public static byte[] imageTobyte(String path){
+         byte[] data = null;
+         FileImageInputStream input = null;
+       try {
+             input = new FileImageInputStream(new File(path));
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
+            byte[] buf = new byte[1024];
+            int numBytesRead = 0;
+            while((numBytesRead = input.read(buf)) != -1){
+                output.write(buf, 0, numBytesRead);
+           }
+            data = output.toByteArray();
+            output.close();
+            input.close();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+         }
+
+        return data;
+    }
+
+
+    public static String replaceEnter(String str){
+        String reg ="[\n-\r]";
+        Pattern p = Pattern.compile(reg);
+        Matcher m = p.matcher(str);
+        return m.replaceAll("");
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/BeanUtils.java b/common-core-starter/src/main/java/com/mosty/common/core/util/BeanUtils.java
new file mode 100644
index 0000000..9101134
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/BeanUtils.java
@@ -0,0 +1,104 @@
+package com.mosty.common.core.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Bean 工具类
+ *
+ * @author ruoyi
+ */
+public class BeanUtils extends org.springframework.beans.BeanUtils {
+    /**
+     * Bean方法名中属性名开始的下标
+     */
+    private static final int BEAN_METHOD_PROP_INDEX = 3;
+
+    /**
+     * 匹配getter方法的正则表达式
+     */
+    private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
+
+    /**
+     * 匹配setter方法的正则表达式
+     */
+    private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
+
+    /**
+     * Bean属性复制工具方法。
+     *
+     * @param dest 目标对象
+     * @param src  源对象
+     */
+    public static void copyBeanProp(Object dest, Object src) {
+        try {
+            copyProperties(src, dest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取对象的setter方法。
+     *
+     * @param obj 对象
+     * @return 对象的setter方法列表
+     */
+    public static List<Method> getSetterMethods(Object obj) {
+        // setter方法列表
+        List<Method> setterMethods = new ArrayList<Method>();
+
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+
+        // 查找setter方法
+
+        for (Method method : methods) {
+            Matcher m = SET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 1)) {
+                setterMethods.add(method);
+            }
+        }
+        // 返回setter方法列表
+        return setterMethods;
+    }
+
+    /**
+     * 获取对象的getter方法。
+     *
+     * @param obj 对象
+     * @return 对象的getter方法列表
+     */
+
+    public static List<Method> getGetterMethods(Object obj) {
+        // getter方法列表
+        List<Method> getterMethods = new ArrayList<Method>();
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+        // 查找getter方法
+        for (Method method : methods) {
+            Matcher m = GET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 0)) {
+                getterMethods.add(method);
+            }
+        }
+        // 返回getter方法列表
+        return getterMethods;
+    }
+
+    /**
+     * 检查Bean方法名中的属性名是否相等。<br>
+     * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
+     *
+     * @param m1 方法名1
+     * @param m2 方法名2
+     * @return 属性名一样返回true，否则返回false
+     */
+
+    public static boolean isMethodPropEquals(String m1, String m2) {
+        return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/CacheUtils.java b/common-core-starter/src/main/java/com/mosty/common/core/util/CacheUtils.java
new file mode 100644
index 0000000..241b869
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/CacheUtils.java
@@ -0,0 +1,179 @@
+package com.mosty.common.core.util;
+
+import com.mosty.common.base.util.SpringIocContext;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.cache.Cache;
+import org.apache.shiro.cache.CacheManager;
+import org.apache.shiro.cache.ehcache.EhCacheManager;
+
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Cache工具类
+ *
+ * @author ruoyi
+ */
+@Slf4j
+public class CacheUtils {
+
+    private static CacheManager cacheManager = SpringIocContext.getBean(CacheManager.class);
+
+    private static final String SYS_CACHE = "sys-cache";
+
+    /**
+     * 获取SYS_CACHE缓存
+     *
+     * @param key
+     * @return
+     */
+    public static Object get(String key) {
+        return get(SYS_CACHE, key);
+    }
+
+    /**
+     * 获取SYS_CACHE缓存
+     *
+     * @param key
+     * @param defaultValue
+     * @return
+     */
+    public static Object get(String key, Object defaultValue) {
+        Object value = get(key);
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * 写入SYS_CACHE缓存
+     *
+     * @param key
+     * @return
+     */
+    public static void put(String key, Object value) {
+        put(SYS_CACHE, key, value);
+    }
+
+    /**
+     * 从SYS_CACHE缓存中移除
+     *
+     * @param key
+     * @return
+     */
+    public static void remove(String key) {
+        remove(SYS_CACHE, key);
+    }
+
+    /**
+     * 获取缓存
+     *
+     * @param cacheName
+     * @param key
+     * @return
+     */
+    public static Object get(String cacheName, String key) {
+        return getCache(cacheName).get(getKey(key));
+    }
+
+    /**
+     * 获取缓存
+     *
+     * @param cacheName
+     * @param key
+     * @param defaultValue
+     * @return
+     */
+    public static Object get(String cacheName, String key, Object defaultValue) {
+        Object value = get(cacheName, getKey(key));
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * 写入缓存
+     *
+     * @param cacheName
+     * @param key
+     * @param value
+     */
+    public static void put(String cacheName, String key, Object value) {
+        getCache(cacheName).put(getKey(key), value);
+    }
+
+    /**
+     * 从缓存中移除
+     *
+     * @param cacheName
+     * @param key
+     */
+    public static void remove(String cacheName, String key) {
+        getCache(cacheName).remove(getKey(key));
+    }
+
+    /**
+     * 从缓存中移除所有
+     *
+     * @param cacheName
+     */
+    public static void removeAll(String cacheName) {
+        Cache<String, Object> cache = getCache(cacheName);
+        Set<String> keys = cache.keys();
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            cache.remove(it.next());
+        }
+        log.info("清理缓存： {} => {}", cacheName, keys);
+    }
+
+    /**
+     * 从缓存中移除指定key
+     *
+     * @param keys
+     */
+    public static void removeByKeys(Set<String> keys) {
+        removeByKeys(SYS_CACHE, keys);
+    }
+
+    /**
+     * 从缓存中移除指定key
+     *
+     * @param cacheName
+     * @param keys
+     */
+    public static void removeByKeys(String cacheName, Set<String> keys) {
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            remove(it.next());
+        }
+        log.info("清理缓存： {} => {}", cacheName, keys);
+    }
+
+    /**
+     * 获取缓存键名
+     *
+     * @param key
+     * @return
+     */
+    private static String getKey(String key) {
+        return key;
+    }
+
+    /**
+     * 获得一个Cache，没有则显示日志。
+     *
+     * @param cacheName
+     * @return
+     */
+    public static Cache<String, Object> getCache(String cacheName) {
+        Cache<String, Object> cache = cacheManager.getCache(cacheName);
+        if (cache == null) {
+            throw new RuntimeException("当前系统中没有定义“" + cacheName + "”这个缓存。");
+        }
+        return cache;
+    }
+
+    /**
+     * 获取所有缓存
+     *
+     * @return 缓存组
+     */
+    public static String[] getCacheNames() {
+        return ((EhCacheManager) cacheManager).getCacheManager().getCacheNames();
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/HttpClientUtil.java b/common-core-starter/src/main/java/com/mosty/common/core/util/HttpClientUtil.java
new file mode 100644
index 0000000..6670c2f
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/HttpClientUtil.java
@@ -0,0 +1,129 @@
+package com.mosty.common.core.util;
+
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.util.CollectionUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Map;
+
+/**
+ * DATE: 18/9/3
+ *
+ * @author: wan
+ */
+@Slf4j
+public class HttpClientUtil {
+
+    private static final String UTF_8 = "UTF-8";
+
+    private static final int TIME_OUT = 60000;
+
+    /**
+     * post 参数json字符串，返回String
+     *
+     * @param uri 请求uri
+     * @return 返回结果
+     */
+    public static HttpResponse postRequest(String uri, Map<String, String> headerMap) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        log.info("httpclient调用地址为：{},加密后身份证号 ：{}", uri);
+//        String output;
+        HttpResponse response;
+        CloseableHttpClient httpClient;
+
+        if (uri.startsWith("https")) {
+            SSLConnectionSocketFactory scsf = new SSLConnectionSocketFactory(
+                    SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build(), NoopHostnameVerifier.INSTANCE);
+            httpClient = HttpClients.custom().setSSLSocketFactory(scsf).build();
+        } else {
+            httpClient = HttpClients.createDefault();
+        }
+        try {
+            HttpPost postRequest = new HttpPost(uri);
+            //设置超时时间。
+            RequestConfig requestConfig = setRequestConfig();
+            postRequest.setConfig(requestConfig);
+            if (!CollectionUtils.isEmpty(headerMap)) {
+                headerMap.forEach(postRequest::setHeader);
+            }
+
+            response = httpClient.execute(postRequest);
+
+//             = EntityUtils.toString(response.getEntity(), UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException("POST调用异常", e);
+        } finally {
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return response;
+    }
+
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        String uri ="http://10.68.2.210:7001/login/app?key=asdasd+";
+        String url = URLEncoder.encode(uri, "UTF-8");
+        System.out.println(url);
+
+    }
+
+    /**
+     * 绕过证书
+     * @return
+     */
+    public static CloseableHttpClient wrapHttpsClient() {
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+
+                public void checkClientTrusted(X509Certificate[] arg0,
+                                               String arg1) throws CertificateException {
+                }
+
+                public void checkServerTrusted(X509Certificate[] arg0,
+                                               String arg1) throws CertificateException {
+                }
+            };
+            ctx.init(null, new TrustManager[] { tm }, null);
+            SSLConnectionSocketFactory ssf = new SSLConnectionSocketFactory(
+                    ctx, NoopHostnameVerifier.INSTANCE);
+            CloseableHttpClient httpclient = HttpClients.custom()
+                    .setSSLSocketFactory(ssf).build();
+            return httpclient;
+        } catch (Exception e) {
+            log.error("顺丰HttpClient异常", e);
+            return HttpClients.createDefault();
+        }
+    }
+
+    private static RequestConfig setRequestConfig(){
+        return RequestConfig.custom().setSocketTimeout(TIME_OUT).setConnectTimeout(TIME_OUT).build();
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/KafkaProducerConfig.java b/common-core-starter/src/main/java/com/mosty/common/core/util/KafkaProducerConfig.java
new file mode 100644
index 0000000..a865465
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/KafkaProducerConfig.java
@@ -0,0 +1,70 @@
+package com.mosty.common.core.util;
+
+//import org.apache.kafka.clients.producer.ProducerConfig;
+//import org.apache.kafka.common.serialization.StringSerializer;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+//import org.springframework.kafka.core.KafkaTemplate;
+//import org.springframework.kafka.core.ProducerFactory;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Configuration
+public class KafkaProducerConfig {
+////    @Value("${spring.kafka.bootstrap-servers}")
+//    private static String servers = "82.157.32.48:9092";
+////    @Value("${spring.kafka.producer.retries}")
+//    private static int retries = 0;
+////    @Value("${spring.kafka.producer.acks}")
+//    private static String acks = "1";
+////    @Value("${spring.kafka.producer.batch-size}")
+//    private static int batchSize = 16384;
+////    @Value("${spring.kafka.producer.properties.linger.ms}")
+//    private static int linger = 0;
+////    @Value("${spring.kafka.producer.buffer-memory}")
+//    private static int bufferMemory = 33554432;
+//
+//    public static Map<String, Object> producerConfigs() {
+//        Map<String, Object> props = new HashMap<>();
+//        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, servers);
+//        props.put(ProducerConfig.RETRIES_CONFIG, retries);
+//        props.put(ProducerConfig.ACKS_CONFIG, acks);
+//        props.put(ProducerConfig.BATCH_SIZE_CONFIG, batchSize);
+//        props.put(ProducerConfig.LINGER_MS_CONFIG, linger);
+//        props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, bufferMemory);
+//        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        return props;
+//    }
+//
+//    public static ProducerFactory<String, Object> producerFactory() {
+//        return new DefaultKafkaProducerFactory<>(producerConfigs());
+//    }
+//
+////    @Bean
+//    public static KafkaTemplate<String, Object> kafkaTemplate() {
+//        KafkaTemplate template = new KafkaTemplate<String, Object>(producerFactory());
+//        template.setDefaultTopic("platform-log1"); // 设置默认的 topic
+//        return template;
+//    }
+//
+//    public static void main(String[] args) {
+//        KafkaTemplate<String, Object> template = KafkaProducerConfig.kafkaTemplate();
+//        template.setDefaultTopic("2022-09-16---aaaaaaaaaaaaa");
+//        template.send("platform-log1", "2022-09-16---bbbbbbbbbbb").addCallback(success -> {
+//                    // 消息发送到的topic
+//                    String topic = success.getRecordMetadata().topic();
+//                    // 消息发送到的分区
+//                    int partition = success.getRecordMetadata().partition();
+//                    // 消息在分区内的offset
+//                    long offset = success.getRecordMetadata().offset();
+//                    System.out.println("发送消息成功:" + topic + "-" + partition + "-" + offset);
+//                }, failure -> {
+//                    System.out.println("发送消息失败:" + failure.getMessage());
+//                });
+//    }
+
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/RSAUtil.java b/common-core-starter/src/main/java/com/mosty/common/core/util/RSAUtil.java
new file mode 100644
index 0000000..eaf26a7
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/RSAUtil.java
@@ -0,0 +1,278 @@
+package com.mosty.common.core.util;
+
+
+import org.apache.tomcat.util.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import java.security.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * RSA加密和解密工具
+ */
+public class RSAUtil {
+
+    /**
+     * 数字签名，密钥算法
+     */
+    private static final String RSA_KEY_ALGORITHM = "RSA";
+
+    /**
+     * 数字签名签名/验证算法
+     */
+    private static final String SIGNATURE_ALGORITHM = "MD5withRSA";
+
+    /**
+     * RSA密钥长度，RSA算法的默认密钥长度是1024密钥长度必须是64的倍数，在512到65536位之间
+     */
+    private static final int KEY_SIZE = 1024;
+
+    /**
+     * 生成密钥对
+     */
+    private static Map<String, String> initKey() throws Exception {
+        KeyPairGenerator keygen = KeyPairGenerator.getInstance(RSA_KEY_ALGORITHM);
+        SecureRandom secrand = new SecureRandom();
+        /**
+         * 初始化随机产生器
+         */
+        secrand.setSeed("initSeed".getBytes());
+        /**
+         * 初始化密钥生成器
+         */
+        keygen.initialize(KEY_SIZE, secrand);
+        KeyPair keys = keygen.genKeyPair();
+
+        byte[] pub_key = keys.getPublic().getEncoded();
+        String publicKeyString = Base64.encodeBase64String(pub_key);
+
+        byte[] pri_key = keys.getPrivate().getEncoded();
+        String privateKeyString = Base64.encodeBase64String(pri_key);
+
+        Map<String, String> keyPairMap = new HashMap<>();
+        keyPairMap.put("publicKeyString", publicKeyString);
+        keyPairMap.put("privateKeyString", privateKeyString);
+
+        return keyPairMap;
+    }
+
+    /**
+     * 密钥转成字符串
+     *
+     * @param key
+     * @return
+     */
+    public static String encodeBase64String(byte[] key) {
+        return Base64.encodeBase64String(key);
+    }
+
+    /**
+     * 密钥转成byte[]
+     *
+     * @param key
+     * @return
+     */
+    public static byte[] decodeBase64(String key) {
+        return Base64.decodeBase64(key);
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data      加密前的字符串
+     * @param publicKey 公钥
+     * @return 加密后的字符串
+     * @throws Exception
+     */
+    public static String encryptByPubKey(String data, String publicKey) throws Exception {
+        byte[] pubKey = RSAUtil.decodeBase64(publicKey);
+        byte[] enSign = encryptByPubKey(data.getBytes(), pubKey);
+        return Base64.encodeBase64String(enSign);
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data   待加密数据
+     * @param pubKey 公钥
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encryptByPubKey(byte[] data, byte[] pubKey) throws Exception {
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 私钥加密
+     *
+     * @param data       加密前的字符串
+     * @param privateKey 私钥
+     * @return 加密后的字符串
+     * @throws Exception
+     */
+    public static String encryptByPriKey(String data, String privateKey) throws Exception {
+        byte[] priKey = RSAUtil.decodeBase64(privateKey);
+        byte[] enSign = encryptByPriKey(data.getBytes(), priKey);
+        return Base64.encodeBase64String(enSign);
+    }
+
+    /**
+     * 私钥加密
+     *
+     * @param data   待加密的数据
+     * @param priKey 私钥
+     * @return 加密后的数据
+     * @throws Exception
+     */
+    public static byte[] encryptByPriKey(byte[] data, byte[] priKey) throws Exception {
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.ENCRYPT_MODE, privateKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 公钥解密
+     *
+     * @param data   待解密的数据
+     * @param pubKey 公钥
+     * @return 解密后的数据
+     * @throws Exception
+     */
+    public static byte[] decryptByPubKey(byte[] data, byte[] pubKey) throws Exception {
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.DECRYPT_MODE, publicKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 公钥解密
+     *
+     * @param data      解密前的字符串
+     * @param publicKey 公钥
+     * @return 解密后的字符串
+     * @throws Exception
+     */
+    public static String decryptByPubKey(String data, String publicKey) throws Exception {
+        byte[] pubKey = RSAUtil.decodeBase64(publicKey);
+        byte[] design = decryptByPubKey(Base64.decodeBase64(data), pubKey);
+        return new String(design);
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data   待解密的数据
+     * @param priKey 私钥
+     * @return
+     * @throws Exception
+     */
+    public static byte[] decryptByPriKey(byte[] data, byte[] priKey) throws Exception {
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.DECRYPT_MODE, privateKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data       解密前的字符串
+     * @param privateKey 私钥
+     * @return 解密后的字符串
+     * @throws Exception
+     */
+    public static String decryptByPriKey(String data, String privateKey) throws Exception {
+        byte[] priKey = RSAUtil.decodeBase64(privateKey);
+        byte[] design = decryptByPriKey(Base64.decodeBase64(data), priKey);
+        return new String(design);
+    }
+
+    /**
+     * RSA签名
+     *
+     * @param data   待签名数据
+     * @param priKey 私钥
+     * @return 签名
+     * @throws Exception
+     */
+    public static String sign(byte[] data, byte[] priKey) throws Exception {
+        // 取得私钥
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        // 生成私钥
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        // 实例化Signature
+        Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+        // 初始化Signature
+        signature.initSign(privateKey);
+        // 更新
+        signature.update(data);
+        return Base64.encodeBase64String(signature.sign());
+    }
+
+    /**
+     * RSA校验数字签名
+     *
+     * @param data   待校验数据
+     * @param sign   数字签名
+     * @param pubKey 公钥
+     * @return boolean 校验成功返回true，失败返回false
+     */
+    public boolean verify(byte[] data, byte[] sign, byte[] pubKey) throws Exception {
+        // 实例化密钥工厂
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        // 初始化公钥
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        // 产生公钥
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        // 实例化Signature
+        Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+        // 初始化Signature
+        signature.initVerify(publicKey);
+        // 更新
+        signature.update(data);
+        // 验证
+        return signature.verify(sign);
+    }
+
+    public static void main(String[] args) {
+        try {
+            Map<String, String> keyMap = initKey();
+            String publicKeyString = keyMap.get("publicKeyString");
+            String privateKeyString = keyMap.get("privateKeyString");
+            System.out.println("公钥:" + publicKeyString);
+            System.out.println("私钥:" + privateKeyString);
+
+            // 待加密数据
+            String data = "admin123";
+            // 公钥加密
+            String encrypt = RSAUtil.encryptByPubKey(data, publicKeyString);
+            // 私钥解密
+            String decrypt = RSAUtil.decryptByPriKey(encrypt, privateKeyString);
+
+            System.out.println("加密前:" + data);
+            System.out.println("加密后:" + encrypt);
+            System.out.println("解密后:" + decrypt);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+
+
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/ShiroUtils.java b/common-core-starter/src/main/java/com/mosty/common/core/util/ShiroUtils.java
new file mode 100644
index 0000000..839b228
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/ShiroUtils.java
@@ -0,0 +1,75 @@
+package com.mosty.common.core.util;
+
+import com.mosty.common.base.entity.realm.SysUser;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+
+import java.util.Objects;
+
+/**
+ * shiro 工具类
+ *
+ * @author ruoyi
+ */
+public class ShiroUtils {
+    public static Subject getSubject() {
+        return SecurityUtils.getSubject();
+    }
+
+    public static Session getSession() {
+        return SecurityUtils.getSubject().getSession();
+    }
+
+    public static void logout() {
+        getSubject().logout();
+    }
+
+    public static SysUser getSysUser() {
+        SysUser user = null;
+        Object obj = getSubject().getPrincipal();
+        if (!Objects.isNull(obj)) {
+            user = new SysUser();
+            BeanUtils.copyBeanProp(user, obj);
+        }
+        return user;
+    }
+
+    public static void setSysUser(SysUser user) {
+        Subject subject = getSubject();
+        PrincipalCollection principalCollection = subject.getPrincipals();
+        String realmName = principalCollection.getRealmNames().iterator().next();
+        PrincipalCollection newPrincipalCollection = new SimplePrincipalCollection(user, realmName);
+        // 重新加载Principal
+        subject.runAs(newPrincipalCollection);
+    }
+
+    public static Long getUserId() {
+        return getSysUser().getUserId().longValue();
+    }
+
+    public static String getLoginName() {
+        return getSysUser().getLoginName();
+    }
+
+    public static String getIp() {
+        return getSubject().getSession().getHost();
+    }
+
+    public static String getSessionId() {
+        return String.valueOf(getSubject().getSession().getId());
+    }
+
+    /**
+     * 生成随机盐
+     */
+    public static String randomSalt() {
+        // 一个Byte占两个字节，此处生成的3字节，字符串长度为6
+        SecureRandomNumberGenerator secureRandom = new SecureRandomNumberGenerator();
+        String hex = secureRandom.nextBytes(3).toHex();
+        return hex;
+    }
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpUtils.java b/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpUtils.java
new file mode 100644
index 0000000..959d38e
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpUtils.java
@@ -0,0 +1,463 @@
+package com.mosty.common.core.util.http;
+
+import java.io.*;
+import java.net.*;
+import java.util.Map;
+
+public class HttpUtils {
+
+    public static final String POST                 = "POST";
+
+    public static final String GET                  = "GET";
+
+    public static final int    CONNECTTIMEOUT       = 10 * 60 * 1000;
+
+    public static final int    READTIMEOUT          = 10 * 60 * 1000;
+
+    public static final String charset              = "utf-8";
+
+    public static final String DEFAULT_CONTENT_TYPE = "application/x-www-form-urlencoded";
+
+    public static final String JSON_CONTENT_TYPE    = "application/json";
+
+    public static final String XML_CONTENT_TYPE     = "application/xml";
+
+    public static String executePost(String urlStr, Map<String, Object> params,
+                                     Map<String, String> headerOpitions) {
+        return executeHttpMethod(POST, urlStr, params, headerOpitions);
+    }
+
+    /**
+     * post请求
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executePost(String urlStr, Map<String, Object> params) {
+        return executeHttpMethod(POST, urlStr, params);
+    }
+
+    /**
+     * @Title http POST json数据
+     * @author lijiaqi
+     * @description
+     * @param urlStr
+     * @param jsonStr
+     * @return
+     */
+    public static String executeHttpsPostJSON(String urlStr, String jsonStr, Map<String, String> headerOpitions) {
+        return executeHttpsPost(urlStr, jsonStr, JSON_CONTENT_TYPE, headerOpitions);
+    }
+
+    /**
+     * @Title http POST json数据
+     * @author lijiaqi
+     * @description
+     * @param urlStr
+     * @param jsonStr
+     * @return
+     */
+    public static String executePostJSON(String urlStr, String jsonStr, Map<String, String> headerOpitions) {
+        return executePost(urlStr, jsonStr, JSON_CONTENT_TYPE, headerOpitions);
+    }
+
+
+    /**
+     * 
+     * @Title http post xml数据
+     * @author lijiaqi
+     * @description
+     * @param urlStr
+     * @param xmlStr
+     * @return
+     */
+    public static String executePostXML(String urlStr, String xmlStr, Map<String, String> headerOpitions) {
+        return executePost(urlStr, xmlStr, XML_CONTENT_TYPE, headerOpitions);
+    }
+
+    public static String executePost(String urlStr, String postStr, String contenType, Map<String, String> headerOptions) {
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        String method = "POST";
+        InputStreamReader in = null;
+        try {
+
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type", contenType);
+            connection.setRequestProperty("Charset", "UTF-8");
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                dop.write(postStr.getBytes("UTF-8"));
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+            if (code > 400) {
+                System.err.println("请求出错状态码： " + code);
+                throw new RuntimeException("code " + code);
+
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+
+    }
+
+    /**
+     * https请求
+     * @param urlStr
+     * @param postStr
+     * @param contenType
+     * @param headerOptions
+     * @return
+     */
+    public static String executeHttpsPost(String urlStr, String postStr, String contenType,
+                                      Map<String, String> headerOptions) {
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        String method = "POST";
+        InputStreamReader in = null;
+        try {
+
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type", contenType);
+            connection.setRequestProperty("Charset", "UTF-8");
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                dop.write(postStr.getBytes("UTF-8"));
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+            System.err.println("请求出错状态码： " + code);
+            if (code > 400) {
+                System.err.println("请求出错状态码： " + code);
+                throw new RuntimeException("code " + code);
+
+            }
+        } catch (MalformedURLException e) {
+            System.out.println("MalformedURLException： " + e.getMessage());
+            e.printStackTrace();
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("IOException： " + e.getMessage());
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+
+    }
+
+    /**
+     * post请求
+     * @param urlStr
+     * @return
+     */
+    public static String executePost(String urlStr, String postStr, Map<String, String> headerOptions) {
+        return executePost(urlStr, postStr, "application/x-www-form-urlencoded", headerOptions);
+    }
+
+    /**
+     * get请求
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executeGet(String urlStr, Map<String, Object> params) {
+        return executeHttpMethod(GET, urlStr, params);
+    }
+
+    /**
+     * get请求
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executeGet(String urlStr, Map<String, Object> params,
+                                    Map<String, String> headerOpitions) {
+        return executeHttpMethod(GET, urlStr, params, headerOpitions);
+    }
+
+    public static String executeHttpMethod(String method, String urlStr,
+                                           Map<String, Object> params) {
+        return executeHttpMethod(method, urlStr, params, null);
+    }
+
+    public static String executeHttpMethod(String method, String urlStr, Map<String, Object> params,
+                                           Map<String, String> headerOptions, String proxyHost,
+                                           int proxyPort) {
+        Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        InputStreamReader in = null;
+        try {
+            if (method.equals(GET)) {
+                urlStr = String.format("%s?%s", urlStr, buildParamsString(params));
+            }
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection(proxy);
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type",
+                "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charset", "UTF-8");
+
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(10000);
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                // 构建传递参数
+                String paramStr = buildParamsString(params);
+                dop.write(paramStr.getBytes());
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+
+            if (code > 400) {
+                throw new RuntimeException("code " + code);
+            }
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+    }
+
+    public static String executeHttpMethod(String method, String urlStr, Map<String, Object> params,
+                                           Map<String, String> headerOptions) {
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        InputStreamReader in = null;
+        try {
+            if (method.equals(GET)) {
+                urlStr = String.format("%s?%s", urlStr, buildParamsString(params));
+            }
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setConnectTimeout(60000);
+            connection.setReadTimeout(60000);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type",
+                "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charset", "UTF-8");
+
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                // 构建传递参数
+                String paramStr = buildParamsString(params);
+                dop.write(paramStr.getBytes());
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+
+            if (code > 400) {
+                throw new RuntimeException("code " + code);
+            }
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 是否是存在的文件
+     * @param ulrStr
+     * @return
+     */
+    public static boolean isNetFileAvailable(String ulrStr) {
+        try {
+            //设置此类是否应该自动执行 HTTP 重定向（响应代码为 3xx 的请求）。
+            HttpURLConnection.setFollowRedirects(false);
+            //到 URL 所引用的远程对象的连接
+            HttpURLConnection con = (HttpURLConnection) new URL(ulrStr).openConnection();
+            /* 设置 URL 请求的方法， GET POST HEAD OPTIONS PUT DELETE TRACE 以上方法之一是合法的，具体取决于协议的限制。*/
+            con.setRequestMethod("HEAD");
+            //从 HTTP 响应消息获取状态码
+            return (con.getResponseCode() == HttpURLConnection.HTTP_OK);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 构建参数字符串
+     * 
+     * @param params
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    private static String buildParamsString(Map<String, Object> params) throws UnsupportedEncodingException {
+        StringBuffer paramsBuffer = new StringBuffer();
+        int flag = 0;
+        if (params != null) {
+            for (String key : params.keySet()) {
+                if (flag != 0) {
+                    paramsBuffer.append("&");
+                }
+                String value = URLEncoder.encode(String.valueOf(params.get(key)), "utf-8");
+                paramsBuffer.append(key).append("=").append(value);
+                flag = 1;
+            }
+        }
+        return paramsBuffer.toString();
+    }
+
+}
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpsPostUtil.java b/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpsPostUtil.java
new file mode 100644
index 0000000..ef82502
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/http/HttpsPostUtil.java
@@ -0,0 +1,259 @@
+package com.mosty.common.core.util.http;
+
+import org.apache.commons.lang3.StringUtils;
+
+import javax.net.ssl.*;
+import javax.servlet.http.HttpServletRequest;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpsPostUtil {
+    //添加主机名验证程序类，设置不验证主机
+    private final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
+        public boolean verify(String hostname, SSLSession session) {
+            return true;
+        }
+    };
+
+    //添加信任主机
+    private static void trustAllHosts() {
+        // 创建不验证证书链的信任管理器 这里使用的是x509证书
+        TrustManager[] trustAllCerts = new TrustManager[]{new MyX509TrustManager() {
+            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                return new java.security.cert.X509Certificate[]{};
+            }
+
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+        }};
+        // 安装所有信任的信任管理器
+        try {
+            SSLContext sc = SSLContext.getInstance("TLS");
+            sc.init(null, trustAllCerts, new java.security.SecureRandom());
+            //HttpsURLConnection通过SSLSocket来建立与HTTPS的安全连接，SSLSocket对象是由SSLSocketFactory生成的。
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     *  发送post 数据
+     * @param urls
+     * @return
+     */
+    public static String heart(String urls, String param, String contentType, String method) {
+        StringBuffer sb=new StringBuffer();
+        DataOutputStream out = null;
+        BufferedReader responseReader = null;
+        InputStream in1 = null;
+        try {
+            trustAllHosts();
+            // 创建url资源
+            URL url = new URL(urls);
+            // 建立http连接
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setHostnameVerifier(DO_NOT_VERIFY);
+            // 设置不用缓存
+            conn.setUseCaches(false);
+            // 设置允许输出
+            conn.setDoOutput(true);
+            // 设置允许输入
+            conn.setDoInput(true);
+            // 设置传递方式
+            conn.setRequestMethod(method);
+            //System.out.println(conn.getRequestMethod());
+            // 设置维持长连接
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            // 设置文件字符集:
+            conn.setRequestProperty("Charset", "UTF-8");
+            // 转换为字节数组
+//            byte[] data = (param).getBytes();
+//            // 设置文件长度
+//            conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+            // 设置文件类型:
+            conn.setRequestProperty("Content-Type", contentType);
+            conn.setRequestProperty("Authorization", param);
+            // 开始连接请求
+            conn.connect();
+            out = new DataOutputStream(conn.getOutputStream());
+            // 写入请求的字符串
+            out.writeBytes(param);
+            out.flush();
+
+            //System.out.println(conn.getResponseCode());
+
+            // 请求返回的状态
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()) {
+                System.out.println("连接成功");
+                // 请求返回的数据
+                in1 = conn.getInputStream();
+                String readLine;
+                responseReader = new BufferedReader(new InputStreamReader(in1));
+                while((readLine=responseReader.readLine()) != null){
+                    sb.append(readLine).append("\n");
+                }
+            } else {
+                System.out.println("error++");
+            }
+        } catch (Exception e) {
+
+        } finally {
+            try {
+                if (null != responseReader)
+                    responseReader.close();
+                if (null != in1)
+                    in1.close();
+            } catch(Exception e) {}
+            try {
+                out.close();
+            } catch(Exception e) {}
+        }
+
+        return sb.toString();
+
+    }
+    
+    /**
+     *  发送post 数据
+     * @param urls
+     * @return
+     */
+    public static String sendPost(String urls, String param, String contentType, String method, Map<String, String> headerOptions) {
+        StringBuffer sb=new StringBuffer();
+        DataOutputStream out = null;
+        BufferedReader responseReader = null;
+        InputStream in1 = null;
+        try {
+            trustAllHosts();
+            // 创建url资源
+            URL url = new URL(urls);
+            // 建立http连接
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setHostnameVerifier(DO_NOT_VERIFY);
+            // 设置不用缓存
+            conn.setUseCaches(false);
+            // 设置允许输出
+            conn.setDoOutput(true);
+            // 设置允许输入
+            conn.setDoInput(true);
+            // 设置传递方式
+            conn.setRequestMethod(method);
+            //System.out.println(conn.getRequestMethod());
+            // 设置维持长连接
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            // 设置文件字符集:
+            conn.setRequestProperty("Charset", "UTF-8");
+            // 转换为字节数组
+//            byte[] data = (param).getBytes();
+//            // 设置文件长度
+//            conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+            // 设置文件类型:
+            conn.setRequestProperty("Content-Type", contentType);
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    conn.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+            // 开始连接请求
+            conn.connect();
+            out = new DataOutputStream(conn.getOutputStream());
+            // 写入请求的字符串
+            if(StringUtils.isNotBlank(param)) {
+                out.writeBytes(param);
+            }
+            out.flush();
+
+            //System.out.println(conn.getResponseCode());
+
+            // 请求返回的状态
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()) {
+                System.out.println("连接成功");
+                // 请求返回的数据
+                in1 = conn.getInputStream();
+                String readLine;
+                responseReader = new BufferedReader(new InputStreamReader(in1));
+                while((readLine=responseReader.readLine()) != null){
+                    sb.append(readLine).append("\n");
+                }
+            } else {
+                System.out.println("error++");
+            }
+        } catch (Exception e) {
+
+        } finally {
+            try {
+                if (null != responseReader)
+                    responseReader.close();
+                if (null != in1)
+                    in1.close();
+            } catch(Exception e) {}
+            try {
+                out.close();
+            } catch(Exception e) {}
+        }
+        return sb.toString();
+    }
+
+    /**
+     * map转url参数
+     */
+    public static String map2Url(Map<String, String> paramToMap) {
+        if (null == paramToMap || paramToMap.isEmpty()) {
+            return null;
+        }
+        StringBuffer url  = new StringBuffer();
+        boolean      isfist = true;
+        for (Map.Entry<String, String> entry : paramToMap.entrySet()) {
+            if (isfist) {
+                isfist = false;
+            } else {
+                url.append("&");
+            }
+            url.append(entry.getKey()).append("=");
+            String value = entry.getValue();
+            if (!StringUtils.isEmpty(value)) {
+                url.append(value);
+            }
+        }
+        return url.toString();
+    }
+    
+    public static void main(String[] args) {
+//        System.out.println("123");
+//        Map<String, String> params = new HashMap<String, String>();
+//        params.put("client_id", "xx.cn");
+//        params.put("client_secret", "UY83SNFJWLU32NJSLJIK");
+//        params.put("code", "40ce7f41d6562e47dbdc33593ddce1b46444cdb93514b3aaced7be90eb51a16f");
+//        params.put("grant_type", "authorization_code");
+//        params.put("redirect_uri", "xxn/index.jsp");
+        //要发送的POST请求url?Key=Value&amp;Key2=Value2&amp;Key3=Value3的形式
+        //application/json;charset=UTF-8  application/x-www-form-urlencoded;charset=UTF-8
+//        String sb = sendPost("https://id.pdedu.sh.cn/connect/token",map2Url(params),"application/json;charset=UTF-8",
+//                "POST");
+        //System.out.println(sb);
+        String token = "NzdlZGU2MzctMWUxNS00YTg0LWFhZTktNDg0NGM2Yzk1YjhlLDssO3sibWVudXMiOltdLCJwZXJtaXNzaW9uIjp7InJlc291cmNlcyI6WyIxMDAwMDAyIiwiMTAwMDAwMSIsIjEwMDAwMDQiLCIxMDAwMDAzIiwiNzA0MmU3MTAtODYxNS00MjM2LWFkNTMtYWQxMjEwZGJmYzViIl19LCJ1c2VyIjp7InVzZXJJZCI6Ijc3ZWRlNjM3LTFlMTUtNGE4NC1hYWU5LTQ4NDRjNmM5NWI4ZSIsInVzZXJuYW1lIjoiemhqbXhmIiwic3RhdHVzIjoiMDEiLCJpZE51bSI6IjUxMzEyNzE5OTQwMjI1MTAxMyIsIm5pY2tOYW1lIjoi5pm65oWn6KGX6Z2i5beh6Ziy5rK75a6J566h5o6nIiwiaXBBZGRyZXNzIjoiMjIzLjg1LjIwMy4xNDUiLCJ1c2VySW1nIjpbXSwibG9naW5UaW1lIjoiMjAyMi0wOC0xNFQxNTozMzoxMi4yNzMiLCJ1c2VyVHlwZXMiOlt7InVzZXJUeXBlSWQiOiJlNzMyYjIyZC01YWE5LTQyOGYtODY2NS1hYjNkYzAzMDFmYjgiLCJ0eXBlQ29kZSI6IkpNWEYiLCJ0eXBlTmFtZSI6Iuihl+mdouW3oemYsiIsInh0cHp4eGJJZCI6IjAwOGM3MTI0LWU0ZTYtNDI2Zi1hODE3LWE0OTc3MWU1MGQ4MCJ9XSwianVyaXNkaWN0aW9ucyI6W3siY3JlYXRlQnkiOiJmNmIyNTEyMy01ZDk2LTQ0M2YtODU5OC0xMzc1ZDE3MTgxZTciLCJjcmVhdGVUaW1lIjoiMjAyMi0wNy0yNlQxNDo0OTowNyIsImxhc3RNb2RpZmllZEJ5IjoiZjZiMjUxMjMtNWQ5Ni00NDNmLTg1OTgtMTM3NWQxNzE4MWU3IiwibGFzdE1vZGlmaWVkVGltZSI6IjIwMjItMDctMjZUMTQ6NTI6NTYiLCJqdXJpc2RpY3Rpb25JZCI6ImJmOWE2NmE3LWRiYjYtNDljMi1hMGUyLWY2ZmY1NzJjNTBmOSIsImp1cmlzZGljdGlvbkNvZGUiOiIxMTExMTEiLCJqdXJpc2RpY3Rpb25OYW1lIjoi5LuB5a+/5Y6/5YWs5a6J5bGAIiwicGFyZW50Ijp7Imp1cmlzZGljdGlvbklkIjoiMCJ9LCJqdXJpc0Z1bGxDb2RlIjoiMDEwMDAwLjExMTExMS4iLCJqdXJpc1NpbXBsZUNvZGUiOiIxMTExMTEifV19fSw7LDsxNjYxMDExMjAwMDAw.b3770a53935980c9f413724f25541590";
+        token =  token.replace(" ","");
+        token = token.replace("\\s*|\r|\n|\t","");
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("Auth-Token", token);
+        params.put("System-Id", "XLFK_ZHJMXFZAGK");
+        String sb = sendPost("https://82.157.32.48:28080/api/user-auth", null,"application/json;charset=UTF-8",
+                "POST", params);
+        System.out.println(sb);
+        
+        
+    }
+   
+
+    
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/util/http/MyX509TrustManager.java b/common-core-starter/src/main/java/com/mosty/common/core/util/http/MyX509TrustManager.java
new file mode 100644
index 0000000..79dd262
--- /dev/null
+++ b/common-core-starter/src/main/java/com/mosty/common/core/util/http/MyX509TrustManager.java
@@ -0,0 +1,20 @@
+package com.mosty.common.core.util.http;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate; 
+   
+import javax.net.ssl.X509TrustManager;
+public class MyX509TrustManager implements X509TrustManager { 
+       
+    public void checkClientTrusted(X509Certificate[] chain, String authType) 
+            throws CertificateException { 
+    } 
+   
+    public void checkServerTrusted(X509Certificate[] chain, String authType) 
+            throws CertificateException { 
+    } 
+   
+    public X509Certificate[] getAcceptedIssuers() { 
+        return null; 
+    } 
+}
\ No newline at end of file
diff --git a/common-core-starter/src/main/resources/META-INF/spring.factories b/common-core-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..0a69e92
--- /dev/null
+++ b/common-core-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.core.config.DefaultRoleConfig
\ No newline at end of file
diff --git a/common-core-starter/src/main/resources/mapper/SysAppHomeconfigMapper.xml b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigMapper.xml
new file mode 100644
index 0000000..0c735b1
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigMapper">
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateListMapper.xml b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateListMapper.xml
new file mode 100644
index 0000000..d5566d1
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateListMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigPlateListMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByHomeid">
+        update sys_app_homeconfig_plate_list set xt_zxbz = 1 where plate_id = #{plateId}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateMapper.xml b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateMapper.xml
new file mode 100644
index 0000000..dd50971
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysAppHomeconfigPlateMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigPlateMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPlateId">
+        update sys_app_homeconfig_plate set xt_zxbz = 1 where homeid = #{homeid}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysDeptMapper.xml b/common-core-starter/src/main/resources/mapper/SysDeptMapper.xml
new file mode 100644
index 0000000..a591671
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysDeptMapper.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysDept">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+        <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
+        <result property="rootPath" column="root_path" jdbcType="VARCHAR"/>
+        <result property="orgType" column="org_type" jdbcType="VARCHAR"/>
+        <result property="orgLevel" column="org_level" jdbcType="VARCHAR"/>
+        <result property="orgBizType" column="org_biz_type" jdbcType="VARCHAR"/>
+        <result property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+        <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
+        <result property="bmpyszm" column="bmpyszm" jdbcType="VARCHAR"/>
+        <result property="orgJc" column="org_jc" jdbcType="VARCHAR"/>
+        <result property="orgQc" column="org_qc" jdbcType="VARCHAR"/>
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="linkTel" column="link_tel" jdbcType="VARCHAR"/>
+        <result property="linkMan" column="link_man" jdbcType="VARCHAR"/>
+        <result property="linkManTel" column="link_man_tel" jdbcType="VARCHAR"/>
+        <result property="webUrl" column="web_url" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="xzqh" column="xzqh" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+        <result property="hasChildren" column="hasChildren" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,org_code,org_name,root_path,
+        org_type,org_level,org_biz_type,
+        org_no,parent_id,bmpyszm,
+        org_jc,org_qc,address,
+        link_tel,link_man,link_man_tel,
+        web_url,email,xzqh,
+        bz,xt_zxbz,xt_zxyz,
+        xt_cjsj,xt_lrsj,xt_lrrxm,
+        xt_lrrid,xt_lrrbm,xt_lrrbmid,
+        xt_lrip,xt_zhxgsj,xt_zhxgrxm,
+        xt_zhxgid,xt_zhxgrbm,xt_zhxgrbmid,
+        xt_zhxgrip
+    </sql>
+    <select id="selectUserDeptList" resultType="com.mosty.common.core.login.dto.DeptDTO">
+        select a.id        as deptId,
+               a.root_path as path,
+               a.org_name  as deptName,
+               a.org_code  as deptCode,
+               a.org_level as deptLevel,
+               a.org_biz_type deptBizType,
+               a.org_jc deptJc
+        from sys_dept a
+                 inner join sys_user_dept b
+                            on
+                                a.id = b.dept_id
+        where b.user_id = #{userId}
+          and a.xt_zxbz = 0
+        order by a.id asc
+    </select>
+    <select id="selectUserPageByDept" resultType="com.mosty.common.core.business.entity.vo.UserDeptVO">
+        select b.dept_id,
+        b.user_id,
+        a.user_name,
+        a.login_name,
+        a.xt_zxbz,
+        a.xt_lrsj
+        from sys_user a
+        inner join sys_user_dept b
+        on
+        a.id = b.user_id
+        WHERE
+        a.xt_zxbz = 0
+        <if test="param.deptId!=null and param.deptId!=''">
+            and b.dept_id = #{param.deptId}
+        </if>
+        <if test="param.userId!=null and param.userId!=''">
+            and b.user_id = #{param.userId}
+        </if>
+        order by a.id asc
+    </select>
+    <select id="selectRolePageByDept" resultType="com.mosty.common.core.business.entity.vo.RoleDeptVO">
+        select b.id,
+        b.dept_id,
+        b.role_id,
+        a.role_name,
+        a.role_desc,
+        a.xt_zxbz,
+        a.xt_lrsj
+        from sys_role a
+        inner join sys_role_dept b
+        on
+        a.id = b.role_id
+        WHERE
+        a.xt_zxbz = 0
+        <if test="param.deptId!=null and param.deptId!=''">
+           AND b.dept_id = #{param.deptId}
+        </if>
+        <if test="param.roleId!=null and param.roleId!=''">
+           AND b.role_id = #{param.roleId}
+        </if>
+        order by a.id asc
+    </select>
+
+    <select id="getDeptByUserId" resultMap="BaseResultMap">
+        select * from sys_user_dept a, sys_dept b where a.dept_id = b.id and a.user_id = #{id}
+        and b.xt_zxbz = '0'
+    </select>
+
+    <select id="getDeptListByParentId" resultMap="BaseResultMap">
+        select a.*,
+        case when (select count(1) from sys_dept b where b.xt_zxbz = '0' and parent_id = a.id) > 0 then 'true'
+        else 'false' end hasChildren
+        from sys_dept a where xt_zxbz = '0'
+        <if test="parentid != null">
+            and a.parent_id = #{parentid}
+        </if>
+        <if test="deptname != null and deptname != ''">
+            and a.org_name like concat('%',#{deptname},'%')
+        </if>
+    </select>
+
+    <select id="getDeptListByOrgcode" resultMap="BaseResultMap">
+        select a.*,
+        case when (select count(1) from sys_dept b where b.xt_zxbz = '0' and parent_id = a.id) > 0 then 'true'
+        else 'false' end hasChildren
+        from sys_dept a where xt_zxbz = '0'
+        <if test="deptCode != null and deptCode != ''">
+            and a.org_code = #{deptCode}
+        </if>
+        <if test="deptname != null and deptname != ''">
+            and a.org_name like concat('%',#{deptname},'%')
+        </if>
+    </select>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysLogininforMapper.xml b/common-core-starter/src/main/resources/mapper/SysLogininforMapper.xml
new file mode 100644
index 0000000..ebc94f2
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysLogininforMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysLogininforMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysLogininfor">
+        <id property="infoId" column="info_id" jdbcType="BIGINT"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="ipaddr" column="ipaddr" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="CHAR"/>
+        <result property="msg" column="msg" jdbcType="VARCHAR"/>
+        <result property="accessTime" column="access_time" jdbcType="TIMESTAMP"/>
+        <result property="browser" column="browser" jdbcType="VARCHAR"/>
+        <result property="os" column="os" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        info_id
+        ,user_name,ipaddr,
+        status,msg,access_time,browser,os
+    </sql>
+    <!--清空-->
+    <update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
+    <!--删除-->
+    <delete id="deleteOperLogByIds" parameterType="String">
+        delete from sys_logininfor where oper_id in
+        <foreach collection="array" item="operId" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysMenuMapper.xml b/common-core-starter/src/main/resources/mapper/SysMenuMapper.xml
new file mode 100644
index 0000000..2560380
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysMenuMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysMenuMapper">
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysOperLogMapper.xml b/common-core-starter/src/main/resources/mapper/SysOperLogMapper.xml
new file mode 100644
index 0000000..769696e
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysOperLogMapper.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.operation.log.mapper.SysOperLogMapper">
+    <resultMap type="com.mosty.common.base.entity.log.SysOperLog" id="SysOperLogResult">
+        <id property="operId" column="oper_id"/>
+        <result property="title" column="title"/>
+        <result property="mkmc" column="mkmc"/>
+        <result property="businessType" column="business_type"/>
+        <result property="method" column="method"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="operatorType" column="operator_type"/>
+        <result property="operUserId" column="oper_user_id"/>
+        <result property="operSfzh" column="oper_sfzh"/>
+        <result property="operName" column="oper_name"/>
+        <result property="ssbmid" column="ssbmid"/>
+        <result property="ssbmdm" column="ssbmdm"/>
+        <result property="ssbm" column="ssbm"/>
+        <result property="operUrl" column="oper_url"/>
+        <result property="operIp" column="oper_ip"/>
+        <result property="operParam" column="oper_param"/>
+        <result property="jsonResult" column="json_result"/>
+        <result property="status" column="status"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="operTime" column="oper_time"/>
+    </resultMap>
+
+    <sql id="selectOperLogVo">
+        select *
+        from sys_oper_log
+    </sql>
+
+    <insert id="insertOperlog" parameterType="com.mosty.common.base.entity.log.SysOperLog">
+        insert into sys_oper_log(mkmc, title, business_type, method, request_method, operator_type, oper_name,
+                                 ssbm, oper_user_id, oper_sfzh, ssbmid, ssbmdm,
+                                 oper_url, oper_ip, oper_param, json_result, status, error_msg,
+                                 oper_time)
+        values (#{mkmc}, #{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName},
+                #{ssbm}, #{operUserId}, #{operSfzh}, #{ssbmid}, #{ssbmdm},
+                #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status},
+                #{errorMsg}, sysdate())
+    </insert>
+
+    <select id="selectOperLogList" parameterType="com.mosty.common.base.entity.log.SysOperLog"
+            resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        <where>
+            <if test="title != null and title != ''">
+                AND title like concat('%', #{title}, '%')
+            </if>
+            <if test="businessType != null">
+                AND business_type = #{businessType}
+            </if>
+            <if test="businessTypes != null and businessTypes.length > 0">
+                AND business_type in
+                <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+                    #{businessType}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="operName != null and operName != ''">
+                AND oper_name like concat('%', #{operName}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                <!-- 开始时间检索 -->
+                and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                <!-- 结束时间检索 -->
+                and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <delete id="deleteOperLogByIds" parameterType="String">
+        delete from sys_oper_log where oper_id in
+        <foreach collection="array" item="operId" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+
+    <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        where oper_id = #{operId}
+    </select>
+
+    <update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
+
+    <select id="getSycs" resultType="int">
+        select count(1) from sys_oper_log where 1 = 1
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="getFwrs" resultType="int">
+        select count(DISTINCT oper_user_id) from sys_oper_log where 1 = 1
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="bmStatistics" resultType="java.util.Map">
+        select count,ssbmid,ssbmdm,ssbm,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.ssbmid,a.ssbmdm,a.ssbm,
+        (select count(1) from sys_oper_log b where status = '0' and a.ssbmid = b.ssbmid
+        and b.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by ssbmid) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.ssbmid = b.ssbmid
+        and b.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by ssbmid) noPass
+        from sys_oper_log a where a.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.ssbmid,a.ssbmdm,a.ssbm order by count(1) desc limit 10
+        ) ta
+    </select>
+
+    <select id="ryStatistics" resultType="java.util.Map">
+        select count,oper_name,ssbm,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.oper_name,a.ssbm,
+        (select count(1) from sys_oper_log b where status = '0' and a.oper_user_id = b.oper_user_id
+        and b.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by oper_user_id) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.oper_user_id = b.oper_user_id
+        and b.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by oper_user_id) noPass
+        from sys_oper_log a where a.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.oper_name,a.ssbm order by count(1) desc limit 10
+        ) ta
+    </select>
+
+    <select id="mkStatistics" resultType="java.util.Map">
+        select count,mkmc,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.mkmc,
+        (select count(1) from sys_oper_log b where status = '0' and a.mkmc = b.mkmc
+        and b.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by mkmc) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.mkmc = b.mkmc
+        and b.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by mkmc) noPass
+        from sys_oper_log a where a.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.mkmc order by count(1) desc
+        ) ta
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/common-core-starter/src/main/resources/mapper/SysOssMapper.xml b/common-core-starter/src/main/resources/mapper/SysOssMapper.xml
new file mode 100644
index 0000000..7d31bdf
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysOssMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysOssMapper">
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysPositionMapper.xml b/common-core-starter/src/main/resources/mapper/SysPositionMapper.xml
new file mode 100644
index 0000000..ea2efcb
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysPositionMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysPositionMapper">
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysRoleDeptMapper.xml b/common-core-starter/src/main/resources/mapper/SysRoleDeptMapper.xml
new file mode 100644
index 0000000..fac3104
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysRoleDeptMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRoleDept">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_id,dept_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysRoleMapper.xml b/common-core-starter/src/main/resources/mapper/SysRoleMapper.xml
new file mode 100644
index 0000000..0ce5679
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysRoleMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRole">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
+            <result property="roleCode" column="role_code" jdbcType="VARCHAR"/>
+            <result property="roleDesc" column="role_desc" jdbcType="VARCHAR"/>
+            <result property="orderNo" column="order_no" jdbcType="INTEGER"/>
+            <result property="bz" column="bz" jdbcType="VARCHAR"/>
+            <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+            <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+            <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+            <result property="xtLrrid" column="xt_lrrid" jdbcType="VARCHAR"/>
+            <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+            <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+            <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+            <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+            <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrid" column="xt_zhxgrid" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="VARCHAR"/>
+            <result property="xtZhxgip" column="xt_zhxgip" jdbcType="VARCHAR"/>
+            <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+            <result property="xtZxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_name,role_code,role_desc,
+        order_no,bz,xt_cjsj,
+        xt_lrsj,xt_lrrxm,xt_lrrid,
+        xt_lrrbm,xt_lrrbmid,xt_lrip,
+        xt_zhxgsj,xt_zhxgrxm,xt_zhxgrid,
+        xt_zhxgrbm,xt_zhxgrbmid,xt_zhxgip,
+        xt_zxbz,xt_zxyy
+    </sql>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysRoleMenuMapper.xml b/common-core-starter/src/main/resources/mapper/SysRoleMenuMapper.xml
new file mode 100644
index 0000000..85c8092
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysRoleMenuMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleMenuMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRoleMenu">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+            <result property="menuId" column="menu_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_id,menu_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigMapper.xml
new file mode 100644
index 0000000..a436c93
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteBySfzh">
+        update sys_user_app_homeconfig set xt_scbz = '1' where user_sfzh = #{sfzh}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateListMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateListMapper.xml
new file mode 100644
index 0000000..9e6e7ca
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateListMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateListMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPzId">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = 1
+        where pz_id = #{pzId} and pz_plate_id = #{pzPlateId}
+    </update>
+
+    <update id="delByPzId">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = 1
+        where pz_id = #{pzId}
+    </update>
+
+    <update id="updateById">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = #{zxbz}
+        where pz_id = #{pzId} and pz_plate_id = #{pzPlateId} and plate_list_id = #{plateListId}
+    </update>
+
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateMapper.xml
new file mode 100644
index 0000000..8366a84
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserAppHomeconfigPlateMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPzid">
+        update sys_user_app_homeconfig_plate set xt_zxbz = 1 where pz_id = #{pzId}
+    </update>
+
+    <!--根据ID删除明细-->
+    <update id="updateById">
+        update sys_user_app_homeconfig_plate set xt_zxbz = #{zxbz} where id = #{id}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserDeptMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserDeptMapper.xml
new file mode 100644
index 0000000..b26947a
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserDeptMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUserDept">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,dept_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserMapper.xml
new file mode 100644
index 0000000..4c63b45
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserMapper.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserMapper">
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUser">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="managerOrgId" column="manager_org_id" jdbcType="BIGINT"/>
+        <result property="managerOrgName" column="manager_org_name" jdbcType="VARCHAR"/>
+        <result property="positionId" column="position_id" jdbcType="BIGINT"/>
+        <result property="positionName" column="position_name" jdbcType="VARCHAR"/>
+        <result property="isVirtualUser" column="is_virtual_user" jdbcType="VARCHAR"/>
+        <result property="loginName" column="login_name" jdbcType="VARCHAR"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="userType" column="user_type" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+        <result property="telePhone" column="tele_phone" jdbcType="VARCHAR"/>
+        <result property="idEntityCard" column="id_entity_card" jdbcType="VARCHAR"/>
+        <result property="inDustRialId" column="in_dust_rial_id" jdbcType="VARCHAR"/>
+        <result property="sex" column="sex" jdbcType="VARCHAR"/>
+        <result property="nation" column="nation" jdbcType="INTEGER"/>
+        <result property="politic" column="politic" jdbcType="VARCHAR"/>
+        <result property="marital" column="marital" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="whcd" column="whcd" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="birthday" column="birthday" jdbcType="VARCHAR"/>
+        <result property="beginTime" column="begin_time" jdbcType="TIMESTAMP"/>
+        <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
+        <result property="salt" column="salt" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtZxyz" column="xt_zxyz" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,manager_org_id,manager_org_name,
+                position_id,position_name,is_virtual_user,login_name,
+                password,user_name,user_type,
+                email,mobile,tele_phone,
+                id_entity_card,in_dust_rial_id,sex,
+                nation,politic, marital, type, whcd,bz,
+                birthday,begin_time,end_time,
+                salt,xt_zxbz,xt_zxyz,
+                xt_cjsj,xt_lrsj,xt_lrrxm,
+                xt_lrrid,xt_lrrbm,xt_lrrbmid,
+                xt_lrip,xt_zhxgsj,xt_zhxgrxm,
+                xt_zhxgid,xt_zhxgrbm,xt_zhxgrbmid,
+                xt_zhxgrip
+    </sql>
+
+
+    <select id="selectByCount" resultType="int">
+        SELECT
+        count(DISTINCT a.id)
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        INNER JOIN sys_dept c ON b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userPage.deptId != null and userPage.deptId != '' ">
+            and b.dept_id in (${userPage.deptId})
+        </if>
+        <if test="userPage.phone != null and userPage.phone != '' ">
+            and a.mobile = #{userPage.phone}
+        </if>
+        <if test="userPage.loginName != null and userPage.loginName != '' ">
+            and (
+            a.login_name like concat('%', #{userPage.loginName}, '%')
+            or a.user_name like concat('%', #{userPage.loginName}, '%')
+            )
+        </if>
+    </select>
+
+    <select id="selectByPage" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        SELECT
+        DISTINCT
+        a.id,
+        a.position_id,
+        a.position_name,
+        a.login_name,
+        a.user_name,
+        a.mobile,
+        a.tele_phone,
+        a.sex,
+        a.xt_lrsj,
+        a.in_dust_rial_id,
+        a.id_entity_card,
+        a.politic,
+        a.marital,
+        a.type,
+        c.id as deptId,
+        c.org_code as deptCode,
+        c.org_name as deptName
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        INNER JOIN sys_dept c ON b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userPage.orgcode != null and userPage.orgcode != '' ">
+            and c.org_code like concat(#{userPage.orgcode},'%')
+        </if>
+        <if test="userPage.phone != null and userPage.phone != '' ">
+            and a.mobile = #{userPage.phone}
+        </if>
+        <if test="userPage.loginName != null and userPage.loginName != '' ">
+            and (
+            a.login_name like concat('%', #{userPage.loginName}, '%')
+            or a.user_name like concat('%', #{userPage.loginName}, '%')
+            )
+        </if>
+        <if test="userPage.idEntityCard != null and userPage.idEntityCard !=''">
+            and   a.id_entity_card like  concat('%',#{userPage.idEntityCard},'%')
+        </if>
+        <if test="userPage.inDustRialId != null and userPage.inDustRialId !=''">
+            and   a.in_dust_rial_id like  concat('%',#{userPage.inDustRialId},'%')
+        </if>
+    </select>
+
+    <select id="selectUserDeptPage" resultType="com.mosty.common.core.business.entity.vo.SysUserDeptVO"
+            parameterType="com.mosty.common.core.business.entity.vo.UserDeptPage">
+        SELECT
+        a.id,
+        a.position_id as positionId,
+        a.position_name as positionName,
+        a.login_name as loginName,
+        a.user_name as userName,
+        a.mobile as mobile,
+        a.whcd as whcd,
+        a.in_dust_rial_id as inDustRialId,
+        a.tele_phone as telePhone,
+        a.sex as sex,
+        a.nation as nation,
+        a.id_entity_card as idEntityCard,
+        a.xt_lrsj as xtLrsj,
+        a.politic as politic,
+        a.marital as marital,
+        a.type as type,
+        c.id as deptId,
+        c.org_name as deptName
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        inner join sys_dept c on b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userDeptPage.orgcode != null and userDeptPage.orgcode != '' ">
+            and c.org_code like concat(#{userDeptPage.orgcode},'%')
+        </if>
+        <if test="userDeptPage.deptName != null and userDeptPage.deptName != '' ">
+            and c.org_name like concat('%', #{userDeptPage.deptName}, '%')
+        </if>
+        <if test="userDeptPage.phone != null and userDeptPage.phone != '' ">
+            and a.mobile like concat('%',#{userDeptPage.phone}, '%')
+        </if>
+        <if test="userDeptPage.loginName != null and userDeptPage.loginName != '' ">
+            and a.login_name like concat('%', #{userDeptPage.loginName}, '%')
+        </if>
+    </select>
+
+    <select id="getUserListByDeptId" resultMap="BaseResultMap">
+        select a.* from sys_user a ,sys_dept b,sys_user_dept c where a.id = c.user_id
+        and a.xt_zxbz = '0' and b.xt_zxbz = '0'
+        <if test="keyword != null and keyword != ''">
+            and (a.user_name like concat('%',#{keyword},'%')
+            or a.login_name like concat('%',#{keyword},'%'))
+        </if>
+        and c.dept_id = b.id and a.is_virtual_user = '02' and b.id in
+        <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getUserListByDeptIdOne" resultMap="BaseResultMap">
+        select a.*
+        from sys_user a,
+             sys_dept b,
+             sys_user_dept c
+        where a.id = c.user_id
+          and a.xt_zxbz = '0'
+          and b.xt_zxbz = '0'
+          and c.dept_id = b.id
+          and a.is_virtual_user = '02'
+          and b.id = #{id}
+    </select>
+
+
+    <delete id="delById">
+        delete from sys_user where id = #{id}
+    </delete>
+</mapper>
diff --git a/common-core-starter/src/main/resources/mapper/SysUserRoleMapper.xml b/common-core-starter/src/main/resources/mapper/SysUserRoleMapper.xml
new file mode 100644
index 0000000..0479b10
--- /dev/null
+++ b/common-core-starter/src/main/resources/mapper/SysUserRoleMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserRoleMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUserRole">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,role_id
+    </sql>
+
+    <select id="roleUserList" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        select * from
+            sys_user_role a
+        inner join
+            sys_user b on a.user_id = b.id
+        inner join
+            sys_dept c on b.dept_id = c.id and b.root_path like concat(#{roleUserPage.rootPath}, '%') and b.xt_zxbz = 0
+        where
+            a.role_id = #{roleUserPage.roleId}
+        <if test="roleUserPage.loginName != null and roleUserPage.loginName != '' ">
+            and b.login_name like concat('%', #{roleUserPage.loginName}, '%')
+        </if>
+        <if test="roleUserPage.phone != null and roleUserPage.phone != '' ">
+            and b.mobile = #{roleUserPage.mobile}
+        </if>
+        limit #{roleUserPage.current}, #{roleUserPage.size}
+
+    </select>
+
+    <select id="getRoleUserList" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        select * from sys_user_role a inner join
+        sys_user b on a.user_id = b.id and b.xt_zxbz = 0
+        where a.role_id = #{roleId}
+        <if test="userName != null and userName != ''">
+            and (
+                b.user_name like concat('%',#{userName},'%')
+                or b.login_name like concat('%',#{userName},'%')
+            )
+        </if>
+        <if test="phone != null and phone != ''">
+            and (
+            b.mobile like concat('%',#{phone},'%')
+            or b.tele_phone like concat('%',#{phone},'%')
+            )
+        </if>
+    </select>
+
+</mapper>
diff --git a/common-core-starter/target/classes/META-INF/spring.factories b/common-core-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..0a69e92
--- /dev/null
+++ b/common-core-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.core.config.DefaultRoleConfig
\ No newline at end of file
diff --git a/common-core-starter/target/classes/com/mosty/common/core/CoreAutoConfiguration.class b/common-core-starter/target/classes/com/mosty/common/core/CoreAutoConfiguration.class
new file mode 100644
index 0000000..ff7ccf9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/CoreAutoConfiguration.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigController.class
new file mode 100644
index 0000000..af4f05b
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.class
new file mode 100644
index 0000000..09367e2
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.class
new file mode 100644
index 0000000..dd915c3
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysAppHomeconfigPlateListController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysDeptController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysDeptController.class
new file mode 100644
index 0000000..d741128
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysDeptController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysLogininforController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysLogininforController.class
new file mode 100644
index 0000000..1a1919f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysLogininforController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysMenuController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysMenuController.class
new file mode 100644
index 0000000..381a97d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysMenuController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysPositionController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysPositionController.class
new file mode 100644
index 0000000..b354c0e
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysPositionController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysRoleController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysRoleController.class
new file mode 100644
index 0000000..c33fdf9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysRoleController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.class
new file mode 100644
index 0000000..8f09228
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.class
new file mode 100644
index 0000000..d6e9101
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.class
new file mode 100644
index 0000000..531be83
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserAppHomeconfigPlateListController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserController.class
new file mode 100644
index 0000000..fe2d7ea
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/SysUserController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/controller/TokenController.class b/common-core-starter/target/classes/com/mosty/common/core/business/controller/TokenController.class
new file mode 100644
index 0000000..9defd56
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/controller/TokenController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfig.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfig.class
new file mode 100644
index 0000000..f3f0027
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.class
new file mode 100644
index 0000000..5647f1f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlate.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.class
new file mode 100644
index 0000000..bf24630
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysAppHomeconfigPlateList.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysDept.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysDept.class
new file mode 100644
index 0000000..0e16853
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysDept.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysLogininfor.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysLogininfor.class
new file mode 100644
index 0000000..2d08a7a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysLogininfor.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysMenu.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysMenu.class
new file mode 100644
index 0000000..1cb522c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysMenu.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysOss.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysOss.class
new file mode 100644
index 0000000..3aeba20
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysOss.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysPosition.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysPosition.class
new file mode 100644
index 0000000..9822251
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysPosition.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRole.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRole.class
new file mode 100644
index 0000000..06100e4
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRole.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleDept.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleDept.class
new file mode 100644
index 0000000..b5ce8ac
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleDept.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleMenu.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleMenu.class
new file mode 100644
index 0000000..92f2ec5
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysRoleMenu.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUser.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUser.class
new file mode 100644
index 0000000..1978000
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUser.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfig.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfig.class
new file mode 100644
index 0000000..fbf35f1
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.class
new file mode 100644
index 0000000..1ded626
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlate.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.class
new file mode 100644
index 0000000..c186b46
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserAppHomeconfigPlateList.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserDept.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserDept.class
new file mode 100644
index 0000000..7900970
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserDept.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserRole.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserRole.class
new file mode 100644
index 0000000..2e220c5
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/SysUserRole.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/TbJcglXfll.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/TbJcglXfll.class
new file mode 100644
index 0000000..65479e3
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/TbJcglXfll.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/Ybmj.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/Ybmj.class
new file mode 100644
index 0000000..a7ce066
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/Ybmj.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/LoginLogPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/LoginLogPage.class
new file mode 100644
index 0000000..f4ae2ee
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/LoginLogPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.class
new file mode 100644
index 0000000..93cd40e
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.class
new file mode 100644
index 0000000..fa10f5f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlateListPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.class
new file mode 100644
index 0000000..a4ff263
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigPlatePage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.class
new file mode 100644
index 0000000..5923d74
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysAppHomeconfigQuery.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.class
new file mode 100644
index 0000000..d2c4b75
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.class
new file mode 100644
index 0000000..2331b5f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlateListPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.class
new file mode 100644
index 0000000..b6ef865
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigPlatePage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.class
new file mode 100644
index 0000000..26837cd
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserAppHomeconfigQuery.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.class
new file mode 100644
index 0000000..156e96a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/request/SysUserEditPasswordRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddDeptVO.class
new file mode 100644
index 0000000..1b0d19d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.class
new file mode 100644
index 0000000..93ca1b8
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDataPartitionVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.class
new file mode 100644
index 0000000..77415a8
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.class
new file mode 100644
index 0000000..a707512
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleMenuVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleVO.class
new file mode 100644
index 0000000..78d4056
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddRoleVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysMenuVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysMenuVO.class
new file mode 100644
index 0000000..6d691fe
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysMenuVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysUserVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysUserVO.class
new file mode 100644
index 0000000..9515e3c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddSysUserVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddUserDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddUserDeptVO.class
new file mode 100644
index 0000000..edcc71e
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/AddUserDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/Base64Str.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/Base64Str.class
new file mode 100644
index 0000000..a1920bf
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/Base64Str.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DataPermissionVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DataPermissionVO.class
new file mode 100644
index 0000000..7add3c9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DataPermissionVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteDeptVO.class
new file mode 100644
index 0000000..7ec2fc2
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteListVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteListVO.class
new file mode 100644
index 0000000..97b6669
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteListVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.class
new file mode 100644
index 0000000..75f7ddc
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteRoleDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.class
new file mode 100644
index 0000000..91776d9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeleteUserDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptPage.class
new file mode 100644
index 0000000..666c567
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptQuery.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptQuery.class
new file mode 100644
index 0000000..fbf0077
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptQuery.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptTreeVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptTreeVO.class
new file mode 100644
index 0000000..7c49075
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptTreeVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptVo.class
new file mode 100644
index 0000000..52bc613
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/DeptVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/EditSysMenuVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/EditSysMenuVO.class
new file mode 100644
index 0000000..ce63f4c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/EditSysMenuVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserPage.class
new file mode 100644
index 0000000..58539da
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.class
new file mode 100644
index 0000000..5261815
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/GetUserRoleListVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/LoginResponseVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/LoginResponseVO.class
new file mode 100644
index 0000000..59c01cb
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/LoginResponseVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuPage.class
new file mode 100644
index 0000000..8c8678b
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuQuery.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuQuery.class
new file mode 100644
index 0000000..b58ea54
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/MenuQuery.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/PositionPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/PositionPage.class
new file mode 100644
index 0000000..3843469
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/PositionPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleByDeptPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleByDeptPage.class
new file mode 100644
index 0000000..7e01566
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleByDeptPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleDeptVO.class
new file mode 100644
index 0000000..603295c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RolePage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RolePage.class
new file mode 100644
index 0000000..400d2b1
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RolePage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserPage.class
new file mode 100644
index 0000000..ba8db6f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserVO.class
new file mode 100644
index 0000000..c709e63
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/RoleUserVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.class
new file mode 100644
index 0000000..6acda51
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigPlateVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.class
new file mode 100644
index 0000000..43bd2f1
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigRsVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.class
new file mode 100644
index 0000000..63797ed
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysAppHomeconfigVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysDeptVO.class
new file mode 100644
index 0000000..f2ea537
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysRoleVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysRoleVO.class
new file mode 100644
index 0000000..0f50252
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysRoleVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.class
new file mode 100644
index 0000000..0849b96
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigPlateVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.class
new file mode 100644
index 0000000..a469f77
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserAppHomeconfigVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserDeptVO.class
new file mode 100644
index 0000000..0f366f2
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserEditVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserEditVO.class
new file mode 100644
index 0000000..7a43c44
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserEditVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.class
new file mode 100644
index 0000000..9139275
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserHomeconfigVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserInfoVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserInfoVO.class
new file mode 100644
index 0000000..dd67ebe
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserInfoVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserVO.class
new file mode 100644
index 0000000..a09dcbc
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/SysUserVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.class
new file mode 100644
index 0000000..2d59971
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UnboundUserRoleVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserByDeptPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserByDeptPage.class
new file mode 100644
index 0000000..7cc85b2
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserByDeptPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptPage.class
new file mode 100644
index 0000000..ff982ac
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptVO.class
new file mode 100644
index 0000000..b3ca160
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserDeptVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserPage.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserPage.class
new file mode 100644
index 0000000..06296ab
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserPage.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserRoleVO.class b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserRoleVO.class
new file mode 100644
index 0000000..e262bed
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/entity/vo/UserRoleVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.class
new file mode 100644
index 0000000..eda37b1
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.class
new file mode 100644
index 0000000..20ec1bb
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateListMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.class
new file mode 100644
index 0000000..2ecaba5
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysAppHomeconfigPlateMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysDeptMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysDeptMapper.class
new file mode 100644
index 0000000..eecb865
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysDeptMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysLogininforMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysLogininforMapper.class
new file mode 100644
index 0000000..ed9aefa
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysLogininforMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysMenuMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysMenuMapper.class
new file mode 100644
index 0000000..a78dc56
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysMenuMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysOssMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysOssMapper.class
new file mode 100644
index 0000000..8c1829e
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysOssMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysPositionMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysPositionMapper.class
new file mode 100644
index 0000000..e2de0c9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysPositionMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleDeptMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleDeptMapper.class
new file mode 100644
index 0000000..29581d2
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleDeptMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMapper.class
new file mode 100644
index 0000000..ae9f542
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMenuMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMenuMapper.class
new file mode 100644
index 0000000..c70e5d0
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysRoleMenuMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.class
new file mode 100644
index 0000000..be74063
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.class
new file mode 100644
index 0000000..9ee3d34
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateListMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.class
new file mode 100644
index 0000000..9d9f87d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserAppHomeconfigPlateMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserDeptMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserDeptMapper.class
new file mode 100644
index 0000000..620ebd3
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserDeptMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserMapper.class
new file mode 100644
index 0000000..cd40a40
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserRoleMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserRoleMapper.class
new file mode 100644
index 0000000..4f1101d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/SysUserRoleMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/mapper/YbmjMapper.class b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/YbmjMapper.class
new file mode 100644
index 0000000..5b4b06c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/mapper/YbmjMapper.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/LoginService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/LoginService.class
new file mode 100644
index 0000000..109dd4f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/LoginService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.class
new file mode 100644
index 0000000..78605b7
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateListService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.class
new file mode 100644
index 0000000..fe3c092
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigPlateService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigService.class
new file mode 100644
index 0000000..5fc3724
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysAppHomeconfigService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysDeptService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysDeptService.class
new file mode 100644
index 0000000..a5c4b8b
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysDeptService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysLogininforService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysLogininforService.class
new file mode 100644
index 0000000..ecc745f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysLogininforService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysMenuService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysMenuService.class
new file mode 100644
index 0000000..32a6382
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysMenuService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysOssService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysOssService.class
new file mode 100644
index 0000000..b5fdf04
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysOssService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysPositionService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysPositionService.class
new file mode 100644
index 0000000..3dff898
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysPositionService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleDeptService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleDeptService.class
new file mode 100644
index 0000000..5a0ff84
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleDeptService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleMenuService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleMenuService.class
new file mode 100644
index 0000000..ff82139
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleMenuService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleService.class
new file mode 100644
index 0000000..0321154
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysRoleService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.class
new file mode 100644
index 0000000..f5dbf6a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateListService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.class
new file mode 100644
index 0000000..339a23c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigPlateService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigService.class
new file mode 100644
index 0000000..43ba31a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserAppHomeconfigService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserDeptService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserDeptService.class
new file mode 100644
index 0000000..578d0ed
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserDeptService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserRoleService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserRoleService.class
new file mode 100644
index 0000000..c35ed61
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserRoleService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserService.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserService.class
new file mode 100644
index 0000000..342a1fd
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/SysUserService.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/LoginServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/LoginServiceImpl.class
new file mode 100644
index 0000000..b7a037a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/LoginServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.class
new file mode 100644
index 0000000..0ff3501
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateListServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.class
new file mode 100644
index 0000000..fb7ce81
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigPlateServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.class
new file mode 100644
index 0000000..02c9fd0
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysAppHomeconfigServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.class
new file mode 100644
index 0000000..bb91360
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysDeptServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.class
new file mode 100644
index 0000000..f64e62a
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysLogininforServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.class
new file mode 100644
index 0000000..e5ec0c5
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysMenuServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysOssServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysOssServiceImpl.class
new file mode 100644
index 0000000..68b49c9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysOssServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.class
new file mode 100644
index 0000000..b09886d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysPositionServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.class
new file mode 100644
index 0000000..726f936
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleDeptServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.class
new file mode 100644
index 0000000..f08db2f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleMenuServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.class
new file mode 100644
index 0000000..b9de167
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysRoleServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.class
new file mode 100644
index 0000000..bd0ade4
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateListServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.class
new file mode 100644
index 0000000..39522f0
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigPlateServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.class
new file mode 100644
index 0000000..34bf98c
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserAppHomeconfigServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.class
new file mode 100644
index 0000000..9684340
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserDeptServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.class
new file mode 100644
index 0000000..50f4cb7
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserRoleServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserServiceImpl.class b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserServiceImpl.class
new file mode 100644
index 0000000..cb80fd3
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/service/impl/SysUserServiceImpl.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/business/timer/DeptUserSys.class b/common-core-starter/target/classes/com/mosty/common/core/business/timer/DeptUserSys.class
new file mode 100644
index 0000000..3df0498
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/business/timer/DeptUserSys.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/config/CaptchaConfig.class b/common-core-starter/target/classes/com/mosty/common/core/config/CaptchaConfig.class
new file mode 100644
index 0000000..343f2a4
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/config/CaptchaConfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/config/DefaultRoleConfig.class b/common-core-starter/target/classes/com/mosty/common/core/config/DefaultRoleConfig.class
new file mode 100644
index 0000000..dbe7561
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/config/DefaultRoleConfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/config/MinIoClientConfig.class b/common-core-starter/target/classes/com/mosty/common/core/config/MinIoClientConfig.class
new file mode 100644
index 0000000..b7321c6
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/config/MinIoClientConfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/constant/DataPermissionConstant.class b/common-core-starter/target/classes/com/mosty/common/core/constant/DataPermissionConstant.class
new file mode 100644
index 0000000..de38ca7
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/constant/DataPermissionConstant.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/IdCardLoginRequest.class b/common-core-starter/target/classes/com/mosty/common/core/login/IdCardLoginRequest.class
new file mode 100644
index 0000000..54abc58
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/IdCardLoginRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/ImageController.class b/common-core-starter/target/classes/com/mosty/common/core/login/ImageController.class
new file mode 100644
index 0000000..ab92e72
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/ImageController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/JwtTokenGenerator.class b/common-core-starter/target/classes/com/mosty/common/core/login/JwtTokenGenerator.class
new file mode 100644
index 0000000..2638125
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/JwtTokenGenerator.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/LoginEntity.class b/common-core-starter/target/classes/com/mosty/common/core/login/LoginEntity.class
new file mode 100644
index 0000000..77b9f54
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/LoginEntity.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/LoginRequest.class b/common-core-starter/target/classes/com/mosty/common/core/login/LoginRequest.class
new file mode 100644
index 0000000..fc1d57f
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/LoginRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/LoginResponseVO.class b/common-core-starter/target/classes/com/mosty/common/core/login/LoginResponseVO.class
new file mode 100644
index 0000000..ae9b659
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/LoginResponseVO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/LoginServiceController.class b/common-core-starter/target/classes/com/mosty/common/core/login/LoginServiceController.class
new file mode 100644
index 0000000..5ac9ddf
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/LoginServiceController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/TokenRequest.class b/common-core-starter/target/classes/com/mosty/common/core/login/TokenRequest.class
new file mode 100644
index 0000000..a05e574
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/TokenRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/UnifiedLoginRequest.class b/common-core-starter/target/classes/com/mosty/common/core/login/UnifiedLoginRequest.class
new file mode 100644
index 0000000..40f5fca
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/UnifiedLoginRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/UserPermissionsInfo.class b/common-core-starter/target/classes/com/mosty/common/core/login/UserPermissionsInfo.class
new file mode 100644
index 0000000..95f653d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/UserPermissionsInfo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptAllVo.class b/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptAllVo.class
new file mode 100644
index 0000000..277d970
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptAllVo.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptDTO.class b/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptDTO.class
new file mode 100644
index 0000000..239ceb9
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/dto/DeptDTO.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/login/dto/ImageRequest.class b/common-core-starter/target/classes/com/mosty/common/core/login/dto/ImageRequest.class
new file mode 100644
index 0000000..59ec207
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/login/dto/ImageRequest.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/minio/UploadController.class b/common-core-starter/target/classes/com/mosty/common/core/minio/UploadController.class
new file mode 100644
index 0000000..01cbbec
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/minio/UploadController.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/BASE64DecodedMultipartFile.class b/common-core-starter/target/classes/com/mosty/common/core/util/BASE64DecodedMultipartFile.class
new file mode 100644
index 0000000..9945b45
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/BASE64DecodedMultipartFile.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/Base64Util.class b/common-core-starter/target/classes/com/mosty/common/core/util/Base64Util.class
new file mode 100644
index 0000000..67234db
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/Base64Util.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/BeanUtils.class b/common-core-starter/target/classes/com/mosty/common/core/util/BeanUtils.class
new file mode 100644
index 0000000..7bb5c74
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/BeanUtils.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/CacheUtils.class b/common-core-starter/target/classes/com/mosty/common/core/util/CacheUtils.class
new file mode 100644
index 0000000..a0e88c0
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/CacheUtils.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil$1.class b/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil$1.class
new file mode 100644
index 0000000..d5b7c1d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil$1.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil.class b/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil.class
new file mode 100644
index 0000000..835e88d
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/HttpClientUtil.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/KafkaProducerConfig.class b/common-core-starter/target/classes/com/mosty/common/core/util/KafkaProducerConfig.class
new file mode 100644
index 0000000..ec10e55
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/KafkaProducerConfig.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/RSAUtil.class b/common-core-starter/target/classes/com/mosty/common/core/util/RSAUtil.class
new file mode 100644
index 0000000..18b6180
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/RSAUtil.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/ShiroUtils.class b/common-core-starter/target/classes/com/mosty/common/core/util/ShiroUtils.class
new file mode 100644
index 0000000..1a939f5
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/ShiroUtils.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpUtils.class b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpUtils.class
new file mode 100644
index 0000000..f8e5c43
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpUtils.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$1.class b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$1.class
new file mode 100644
index 0000000..d50ff82
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$1.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$2.class b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$2.class
new file mode 100644
index 0000000..b0fc8fd
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil$2.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil.class b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil.class
new file mode 100644
index 0000000..a617dcb
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/http/HttpsPostUtil.class differ
diff --git a/common-core-starter/target/classes/com/mosty/common/core/util/http/MyX509TrustManager.class b/common-core-starter/target/classes/com/mosty/common/core/util/http/MyX509TrustManager.class
new file mode 100644
index 0000000..3113fe1
Binary files /dev/null and b/common-core-starter/target/classes/com/mosty/common/core/util/http/MyX509TrustManager.class differ
diff --git a/common-core-starter/target/classes/mapper/SysAppHomeconfigMapper.xml b/common-core-starter/target/classes/mapper/SysAppHomeconfigMapper.xml
new file mode 100644
index 0000000..0c735b1
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysAppHomeconfigMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigMapper">
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateListMapper.xml b/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateListMapper.xml
new file mode 100644
index 0000000..d5566d1
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateListMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigPlateListMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByHomeid">
+        update sys_app_homeconfig_plate_list set xt_zxbz = 1 where plate_id = #{plateId}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateMapper.xml b/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateMapper.xml
new file mode 100644
index 0000000..dd50971
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysAppHomeconfigPlateMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysAppHomeconfigPlateMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPlateId">
+        update sys_app_homeconfig_plate set xt_zxbz = 1 where homeid = #{homeid}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysDeptMapper.xml b/common-core-starter/target/classes/mapper/SysDeptMapper.xml
new file mode 100644
index 0000000..a591671
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysDeptMapper.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysDept">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+        <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
+        <result property="rootPath" column="root_path" jdbcType="VARCHAR"/>
+        <result property="orgType" column="org_type" jdbcType="VARCHAR"/>
+        <result property="orgLevel" column="org_level" jdbcType="VARCHAR"/>
+        <result property="orgBizType" column="org_biz_type" jdbcType="VARCHAR"/>
+        <result property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+        <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
+        <result property="bmpyszm" column="bmpyszm" jdbcType="VARCHAR"/>
+        <result property="orgJc" column="org_jc" jdbcType="VARCHAR"/>
+        <result property="orgQc" column="org_qc" jdbcType="VARCHAR"/>
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="linkTel" column="link_tel" jdbcType="VARCHAR"/>
+        <result property="linkMan" column="link_man" jdbcType="VARCHAR"/>
+        <result property="linkManTel" column="link_man_tel" jdbcType="VARCHAR"/>
+        <result property="webUrl" column="web_url" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="xzqh" column="xzqh" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+        <result property="hasChildren" column="hasChildren" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,org_code,org_name,root_path,
+        org_type,org_level,org_biz_type,
+        org_no,parent_id,bmpyszm,
+        org_jc,org_qc,address,
+        link_tel,link_man,link_man_tel,
+        web_url,email,xzqh,
+        bz,xt_zxbz,xt_zxyz,
+        xt_cjsj,xt_lrsj,xt_lrrxm,
+        xt_lrrid,xt_lrrbm,xt_lrrbmid,
+        xt_lrip,xt_zhxgsj,xt_zhxgrxm,
+        xt_zhxgid,xt_zhxgrbm,xt_zhxgrbmid,
+        xt_zhxgrip
+    </sql>
+    <select id="selectUserDeptList" resultType="com.mosty.common.core.login.dto.DeptDTO">
+        select a.id        as deptId,
+               a.root_path as path,
+               a.org_name  as deptName,
+               a.org_code  as deptCode,
+               a.org_level as deptLevel,
+               a.org_biz_type deptBizType,
+               a.org_jc deptJc
+        from sys_dept a
+                 inner join sys_user_dept b
+                            on
+                                a.id = b.dept_id
+        where b.user_id = #{userId}
+          and a.xt_zxbz = 0
+        order by a.id asc
+    </select>
+    <select id="selectUserPageByDept" resultType="com.mosty.common.core.business.entity.vo.UserDeptVO">
+        select b.dept_id,
+        b.user_id,
+        a.user_name,
+        a.login_name,
+        a.xt_zxbz,
+        a.xt_lrsj
+        from sys_user a
+        inner join sys_user_dept b
+        on
+        a.id = b.user_id
+        WHERE
+        a.xt_zxbz = 0
+        <if test="param.deptId!=null and param.deptId!=''">
+            and b.dept_id = #{param.deptId}
+        </if>
+        <if test="param.userId!=null and param.userId!=''">
+            and b.user_id = #{param.userId}
+        </if>
+        order by a.id asc
+    </select>
+    <select id="selectRolePageByDept" resultType="com.mosty.common.core.business.entity.vo.RoleDeptVO">
+        select b.id,
+        b.dept_id,
+        b.role_id,
+        a.role_name,
+        a.role_desc,
+        a.xt_zxbz,
+        a.xt_lrsj
+        from sys_role a
+        inner join sys_role_dept b
+        on
+        a.id = b.role_id
+        WHERE
+        a.xt_zxbz = 0
+        <if test="param.deptId!=null and param.deptId!=''">
+           AND b.dept_id = #{param.deptId}
+        </if>
+        <if test="param.roleId!=null and param.roleId!=''">
+           AND b.role_id = #{param.roleId}
+        </if>
+        order by a.id asc
+    </select>
+
+    <select id="getDeptByUserId" resultMap="BaseResultMap">
+        select * from sys_user_dept a, sys_dept b where a.dept_id = b.id and a.user_id = #{id}
+        and b.xt_zxbz = '0'
+    </select>
+
+    <select id="getDeptListByParentId" resultMap="BaseResultMap">
+        select a.*,
+        case when (select count(1) from sys_dept b where b.xt_zxbz = '0' and parent_id = a.id) > 0 then 'true'
+        else 'false' end hasChildren
+        from sys_dept a where xt_zxbz = '0'
+        <if test="parentid != null">
+            and a.parent_id = #{parentid}
+        </if>
+        <if test="deptname != null and deptname != ''">
+            and a.org_name like concat('%',#{deptname},'%')
+        </if>
+    </select>
+
+    <select id="getDeptListByOrgcode" resultMap="BaseResultMap">
+        select a.*,
+        case when (select count(1) from sys_dept b where b.xt_zxbz = '0' and parent_id = a.id) > 0 then 'true'
+        else 'false' end hasChildren
+        from sys_dept a where xt_zxbz = '0'
+        <if test="deptCode != null and deptCode != ''">
+            and a.org_code = #{deptCode}
+        </if>
+        <if test="deptname != null and deptname != ''">
+            and a.org_name like concat('%',#{deptname},'%')
+        </if>
+    </select>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysLogininforMapper.xml b/common-core-starter/target/classes/mapper/SysLogininforMapper.xml
new file mode 100644
index 0000000..ebc94f2
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysLogininforMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysLogininforMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysLogininfor">
+        <id property="infoId" column="info_id" jdbcType="BIGINT"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="ipaddr" column="ipaddr" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="CHAR"/>
+        <result property="msg" column="msg" jdbcType="VARCHAR"/>
+        <result property="accessTime" column="access_time" jdbcType="TIMESTAMP"/>
+        <result property="browser" column="browser" jdbcType="VARCHAR"/>
+        <result property="os" column="os" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        info_id
+        ,user_name,ipaddr,
+        status,msg,access_time,browser,os
+    </sql>
+    <!--清空-->
+    <update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
+    <!--删除-->
+    <delete id="deleteOperLogByIds" parameterType="String">
+        delete from sys_logininfor where oper_id in
+        <foreach collection="array" item="operId" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysMenuMapper.xml b/common-core-starter/target/classes/mapper/SysMenuMapper.xml
new file mode 100644
index 0000000..2560380
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysMenuMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysMenuMapper">
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysOperLogMapper.xml b/common-core-starter/target/classes/mapper/SysOperLogMapper.xml
new file mode 100644
index 0000000..769696e
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysOperLogMapper.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.operation.log.mapper.SysOperLogMapper">
+    <resultMap type="com.mosty.common.base.entity.log.SysOperLog" id="SysOperLogResult">
+        <id property="operId" column="oper_id"/>
+        <result property="title" column="title"/>
+        <result property="mkmc" column="mkmc"/>
+        <result property="businessType" column="business_type"/>
+        <result property="method" column="method"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="operatorType" column="operator_type"/>
+        <result property="operUserId" column="oper_user_id"/>
+        <result property="operSfzh" column="oper_sfzh"/>
+        <result property="operName" column="oper_name"/>
+        <result property="ssbmid" column="ssbmid"/>
+        <result property="ssbmdm" column="ssbmdm"/>
+        <result property="ssbm" column="ssbm"/>
+        <result property="operUrl" column="oper_url"/>
+        <result property="operIp" column="oper_ip"/>
+        <result property="operParam" column="oper_param"/>
+        <result property="jsonResult" column="json_result"/>
+        <result property="status" column="status"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="operTime" column="oper_time"/>
+    </resultMap>
+
+    <sql id="selectOperLogVo">
+        select *
+        from sys_oper_log
+    </sql>
+
+    <insert id="insertOperlog" parameterType="com.mosty.common.base.entity.log.SysOperLog">
+        insert into sys_oper_log(mkmc, title, business_type, method, request_method, operator_type, oper_name,
+                                 ssbm, oper_user_id, oper_sfzh, ssbmid, ssbmdm,
+                                 oper_url, oper_ip, oper_param, json_result, status, error_msg,
+                                 oper_time)
+        values (#{mkmc}, #{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName},
+                #{ssbm}, #{operUserId}, #{operSfzh}, #{ssbmid}, #{ssbmdm},
+                #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status},
+                #{errorMsg}, sysdate())
+    </insert>
+
+    <select id="selectOperLogList" parameterType="com.mosty.common.base.entity.log.SysOperLog"
+            resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        <where>
+            <if test="title != null and title != ''">
+                AND title like concat('%', #{title}, '%')
+            </if>
+            <if test="businessType != null">
+                AND business_type = #{businessType}
+            </if>
+            <if test="businessTypes != null and businessTypes.length > 0">
+                AND business_type in
+                <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+                    #{businessType}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="operName != null and operName != ''">
+                AND oper_name like concat('%', #{operName}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                <!-- 开始时间检索 -->
+                and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                <!-- 结束时间检索 -->
+                and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <delete id="deleteOperLogByIds" parameterType="String">
+        delete from sys_oper_log where oper_id in
+        <foreach collection="array" item="operId" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+
+    <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        where oper_id = #{operId}
+    </select>
+
+    <update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
+
+    <select id="getSycs" resultType="int">
+        select count(1) from sys_oper_log where 1 = 1
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="getFwrs" resultType="int">
+        select count(DISTINCT oper_user_id) from sys_oper_log where 1 = 1
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="bmStatistics" resultType="java.util.Map">
+        select count,ssbmid,ssbmdm,ssbm,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.ssbmid,a.ssbmdm,a.ssbm,
+        (select count(1) from sys_oper_log b where status = '0' and a.ssbmid = b.ssbmid
+        and b.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by ssbmid) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.ssbmid = b.ssbmid
+        and b.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by ssbmid) noPass
+        from sys_oper_log a where a.ssbmid is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.ssbmid,a.ssbmdm,a.ssbm order by count(1) desc limit 10
+        ) ta
+    </select>
+
+    <select id="ryStatistics" resultType="java.util.Map">
+        select count,oper_name,ssbm,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.oper_name,a.ssbm,
+        (select count(1) from sys_oper_log b where status = '0' and a.oper_user_id = b.oper_user_id
+        and b.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by oper_user_id) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.oper_user_id = b.oper_user_id
+        and b.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by oper_user_id) noPass
+        from sys_oper_log a where a.oper_user_id is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.oper_name,a.ssbm order by count(1) desc limit 10
+        ) ta
+    </select>
+
+    <select id="mkStatistics" resultType="java.util.Map">
+        select count,mkmc,IfNULL(pass,0) pass,IfNULL(noPass,0) noPass from (
+        select count(1) count,a.mkmc,
+        (select count(1) from sys_oper_log b where status = '0' and a.mkmc = b.mkmc
+        and b.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by mkmc) pass,
+        (select count(1) from sys_oper_log b where status = '1' and a.mkmc = b.mkmc
+        and b.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${bUseSql}
+        group by mkmc) noPass
+        from sys_oper_log a where a.mkmc is not null
+        <if test="kssj != null and kssj != ''">
+            and oper_time >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and oper_time &lt;= #{jssj}
+        </if>
+        ${aUseSql}
+        group by a.mkmc order by count(1) desc
+        ) ta
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/common-core-starter/target/classes/mapper/SysOssMapper.xml b/common-core-starter/target/classes/mapper/SysOssMapper.xml
new file mode 100644
index 0000000..7d31bdf
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysOssMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysOssMapper">
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysPositionMapper.xml b/common-core-starter/target/classes/mapper/SysPositionMapper.xml
new file mode 100644
index 0000000..ea2efcb
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysPositionMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysPositionMapper">
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysRoleDeptMapper.xml b/common-core-starter/target/classes/mapper/SysRoleDeptMapper.xml
new file mode 100644
index 0000000..fac3104
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysRoleDeptMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRoleDept">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_id,dept_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysRoleMapper.xml b/common-core-starter/target/classes/mapper/SysRoleMapper.xml
new file mode 100644
index 0000000..0ce5679
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysRoleMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRole">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
+            <result property="roleCode" column="role_code" jdbcType="VARCHAR"/>
+            <result property="roleDesc" column="role_desc" jdbcType="VARCHAR"/>
+            <result property="orderNo" column="order_no" jdbcType="INTEGER"/>
+            <result property="bz" column="bz" jdbcType="VARCHAR"/>
+            <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+            <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+            <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+            <result property="xtLrrid" column="xt_lrrid" jdbcType="VARCHAR"/>
+            <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+            <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+            <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+            <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+            <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrid" column="xt_zhxgrid" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+            <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="VARCHAR"/>
+            <result property="xtZhxgip" column="xt_zhxgip" jdbcType="VARCHAR"/>
+            <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+            <result property="xtZxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_name,role_code,role_desc,
+        order_no,bz,xt_cjsj,
+        xt_lrsj,xt_lrrxm,xt_lrrid,
+        xt_lrrbm,xt_lrrbmid,xt_lrip,
+        xt_zhxgsj,xt_zhxgrxm,xt_zhxgrid,
+        xt_zhxgrbm,xt_zhxgrbmid,xt_zhxgip,
+        xt_zxbz,xt_zxyy
+    </sql>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysRoleMenuMapper.xml b/common-core-starter/target/classes/mapper/SysRoleMenuMapper.xml
new file mode 100644
index 0000000..85c8092
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysRoleMenuMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysRoleMenuMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysRoleMenu">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+            <result property="menuId" column="menu_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_id,menu_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserAppHomeconfigMapper.xml b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigMapper.xml
new file mode 100644
index 0000000..a436c93
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteBySfzh">
+        update sys_user_app_homeconfig set xt_scbz = '1' where user_sfzh = #{sfzh}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateListMapper.xml b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateListMapper.xml
new file mode 100644
index 0000000..9e6e7ca
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateListMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateListMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPzId">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = 1
+        where pz_id = #{pzId} and pz_plate_id = #{pzPlateId}
+    </update>
+
+    <update id="delByPzId">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = 1
+        where pz_id = #{pzId}
+    </update>
+
+    <update id="updateById">
+        update sys_user_app_homeconfig_plate_list set xt_zxbz = #{zxbz}
+        where pz_id = #{pzId} and pz_plate_id = #{pzPlateId} and plate_list_id = #{plateListId}
+    </update>
+
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateMapper.xml b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateMapper.xml
new file mode 100644
index 0000000..8366a84
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserAppHomeconfigPlateMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserAppHomeconfigPlateMapper">
+
+    <!--根据ID删除明细-->
+    <update id="deleteByPzid">
+        update sys_user_app_homeconfig_plate set xt_zxbz = 1 where pz_id = #{pzId}
+    </update>
+
+    <!--根据ID删除明细-->
+    <update id="updateById">
+        update sys_user_app_homeconfig_plate set xt_zxbz = #{zxbz} where id = #{id}
+    </update>
+
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserDeptMapper.xml b/common-core-starter/target/classes/mapper/SysUserDeptMapper.xml
new file mode 100644
index 0000000..b26947a
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserDeptMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserDeptMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUserDept">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,dept_id
+    </sql>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserMapper.xml b/common-core-starter/target/classes/mapper/SysUserMapper.xml
new file mode 100644
index 0000000..4c63b45
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserMapper.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserMapper">
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUser">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="managerOrgId" column="manager_org_id" jdbcType="BIGINT"/>
+        <result property="managerOrgName" column="manager_org_name" jdbcType="VARCHAR"/>
+        <result property="positionId" column="position_id" jdbcType="BIGINT"/>
+        <result property="positionName" column="position_name" jdbcType="VARCHAR"/>
+        <result property="isVirtualUser" column="is_virtual_user" jdbcType="VARCHAR"/>
+        <result property="loginName" column="login_name" jdbcType="VARCHAR"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="userType" column="user_type" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+        <result property="telePhone" column="tele_phone" jdbcType="VARCHAR"/>
+        <result property="idEntityCard" column="id_entity_card" jdbcType="VARCHAR"/>
+        <result property="inDustRialId" column="in_dust_rial_id" jdbcType="VARCHAR"/>
+        <result property="sex" column="sex" jdbcType="VARCHAR"/>
+        <result property="nation" column="nation" jdbcType="INTEGER"/>
+        <result property="politic" column="politic" jdbcType="VARCHAR"/>
+        <result property="marital" column="marital" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="whcd" column="whcd" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="birthday" column="birthday" jdbcType="VARCHAR"/>
+        <result property="beginTime" column="begin_time" jdbcType="TIMESTAMP"/>
+        <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
+        <result property="salt" column="salt" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtZxyz" column="xt_zxyz" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,manager_org_id,manager_org_name,
+                position_id,position_name,is_virtual_user,login_name,
+                password,user_name,user_type,
+                email,mobile,tele_phone,
+                id_entity_card,in_dust_rial_id,sex,
+                nation,politic, marital, type, whcd,bz,
+                birthday,begin_time,end_time,
+                salt,xt_zxbz,xt_zxyz,
+                xt_cjsj,xt_lrsj,xt_lrrxm,
+                xt_lrrid,xt_lrrbm,xt_lrrbmid,
+                xt_lrip,xt_zhxgsj,xt_zhxgrxm,
+                xt_zhxgid,xt_zhxgrbm,xt_zhxgrbmid,
+                xt_zhxgrip
+    </sql>
+
+
+    <select id="selectByCount" resultType="int">
+        SELECT
+        count(DISTINCT a.id)
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        INNER JOIN sys_dept c ON b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userPage.deptId != null and userPage.deptId != '' ">
+            and b.dept_id in (${userPage.deptId})
+        </if>
+        <if test="userPage.phone != null and userPage.phone != '' ">
+            and a.mobile = #{userPage.phone}
+        </if>
+        <if test="userPage.loginName != null and userPage.loginName != '' ">
+            and (
+            a.login_name like concat('%', #{userPage.loginName}, '%')
+            or a.user_name like concat('%', #{userPage.loginName}, '%')
+            )
+        </if>
+    </select>
+
+    <select id="selectByPage" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        SELECT
+        DISTINCT
+        a.id,
+        a.position_id,
+        a.position_name,
+        a.login_name,
+        a.user_name,
+        a.mobile,
+        a.tele_phone,
+        a.sex,
+        a.xt_lrsj,
+        a.in_dust_rial_id,
+        a.id_entity_card,
+        a.politic,
+        a.marital,
+        a.type,
+        c.id as deptId,
+        c.org_code as deptCode,
+        c.org_name as deptName
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        INNER JOIN sys_dept c ON b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userPage.orgcode != null and userPage.orgcode != '' ">
+            and c.org_code like concat(#{userPage.orgcode},'%')
+        </if>
+        <if test="userPage.phone != null and userPage.phone != '' ">
+            and a.mobile = #{userPage.phone}
+        </if>
+        <if test="userPage.loginName != null and userPage.loginName != '' ">
+            and (
+            a.login_name like concat('%', #{userPage.loginName}, '%')
+            or a.user_name like concat('%', #{userPage.loginName}, '%')
+            )
+        </if>
+        <if test="userPage.idEntityCard != null and userPage.idEntityCard !=''">
+            and   a.id_entity_card like  concat('%',#{userPage.idEntityCard},'%')
+        </if>
+        <if test="userPage.inDustRialId != null and userPage.inDustRialId !=''">
+            and   a.in_dust_rial_id like  concat('%',#{userPage.inDustRialId},'%')
+        </if>
+    </select>
+
+    <select id="selectUserDeptPage" resultType="com.mosty.common.core.business.entity.vo.SysUserDeptVO"
+            parameterType="com.mosty.common.core.business.entity.vo.UserDeptPage">
+        SELECT
+        a.id,
+        a.position_id as positionId,
+        a.position_name as positionName,
+        a.login_name as loginName,
+        a.user_name as userName,
+        a.mobile as mobile,
+        a.whcd as whcd,
+        a.in_dust_rial_id as inDustRialId,
+        a.tele_phone as telePhone,
+        a.sex as sex,
+        a.nation as nation,
+        a.id_entity_card as idEntityCard,
+        a.xt_lrsj as xtLrsj,
+        a.politic as politic,
+        a.marital as marital,
+        a.type as type,
+        c.id as deptId,
+        c.org_name as deptName
+        FROM
+        sys_user a
+        INNER JOIN sys_user_dept b ON a.id = b.user_id
+        inner join sys_dept c on b.dept_id = c.id
+        where
+        a.xt_zxbz = 0
+        <if test="userDeptPage.orgcode != null and userDeptPage.orgcode != '' ">
+            and c.org_code like concat(#{userDeptPage.orgcode},'%')
+        </if>
+        <if test="userDeptPage.deptName != null and userDeptPage.deptName != '' ">
+            and c.org_name like concat('%', #{userDeptPage.deptName}, '%')
+        </if>
+        <if test="userDeptPage.phone != null and userDeptPage.phone != '' ">
+            and a.mobile like concat('%',#{userDeptPage.phone}, '%')
+        </if>
+        <if test="userDeptPage.loginName != null and userDeptPage.loginName != '' ">
+            and a.login_name like concat('%', #{userDeptPage.loginName}, '%')
+        </if>
+    </select>
+
+    <select id="getUserListByDeptId" resultMap="BaseResultMap">
+        select a.* from sys_user a ,sys_dept b,sys_user_dept c where a.id = c.user_id
+        and a.xt_zxbz = '0' and b.xt_zxbz = '0'
+        <if test="keyword != null and keyword != ''">
+            and (a.user_name like concat('%',#{keyword},'%')
+            or a.login_name like concat('%',#{keyword},'%'))
+        </if>
+        and c.dept_id = b.id and a.is_virtual_user = '02' and b.id in
+        <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getUserListByDeptIdOne" resultMap="BaseResultMap">
+        select a.*
+        from sys_user a,
+             sys_dept b,
+             sys_user_dept c
+        where a.id = c.user_id
+          and a.xt_zxbz = '0'
+          and b.xt_zxbz = '0'
+          and c.dept_id = b.id
+          and a.is_virtual_user = '02'
+          and b.id = #{id}
+    </select>
+
+
+    <delete id="delById">
+        delete from sys_user where id = #{id}
+    </delete>
+</mapper>
diff --git a/common-core-starter/target/classes/mapper/SysUserRoleMapper.xml b/common-core-starter/target/classes/mapper/SysUserRoleMapper.xml
new file mode 100644
index 0000000..0479b10
--- /dev/null
+++ b/common-core-starter/target/classes/mapper/SysUserRoleMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.core.business.mapper.SysUserRoleMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUserRole">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,role_id
+    </sql>
+
+    <select id="roleUserList" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        select * from
+            sys_user_role a
+        inner join
+            sys_user b on a.user_id = b.id
+        inner join
+            sys_dept c on b.dept_id = c.id and b.root_path like concat(#{roleUserPage.rootPath}, '%') and b.xt_zxbz = 0
+        where
+            a.role_id = #{roleUserPage.roleId}
+        <if test="roleUserPage.loginName != null and roleUserPage.loginName != '' ">
+            and b.login_name like concat('%', #{roleUserPage.loginName}, '%')
+        </if>
+        <if test="roleUserPage.phone != null and roleUserPage.phone != '' ">
+            and b.mobile = #{roleUserPage.mobile}
+        </if>
+        limit #{roleUserPage.current}, #{roleUserPage.size}
+
+    </select>
+
+    <select id="getRoleUserList" resultType="com.mosty.common.core.business.entity.vo.SysUserVO">
+        select * from sys_user_role a inner join
+        sys_user b on a.user_id = b.id and b.xt_zxbz = 0
+        where a.role_id = #{roleId}
+        <if test="userName != null and userName != ''">
+            and (
+                b.user_name like concat('%',#{userName},'%')
+                or b.login_name like concat('%',#{userName},'%')
+            )
+        </if>
+        <if test="phone != null and phone != ''">
+            and (
+            b.mobile like concat('%',#{phone},'%')
+            or b.tele_phone like concat('%',#{phone},'%')
+            )
+        </if>
+    </select>
+
+</mapper>
diff --git a/common-core-starter/target/common-core-starter-1.0.0-SNAPSHOT.jar b/common-core-starter/target/common-core-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..c7ab9d4
Binary files /dev/null and b/common-core-starter/target/common-core-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-core-starter/target/maven-archiver/pom.properties b/common-core-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..c30e5b1
--- /dev/null
+++ b/common-core-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:21 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-core-starter
diff --git a/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..d672e94
--- /dev/null
+++ b/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,178 @@
+com\mosty\common\core\business\entity\vo\DeleteDeptVO.class
+com\mosty\common\core\config\CaptchaConfig.class
+com\mosty\common\core\business\mapper\SysMenuMapper.class
+com\mosty\common\core\business\service\SysAppHomeconfigPlateService.class
+com\mosty\common\core\business\service\SysRoleDeptService.class
+com\mosty\common\core\business\entity\vo\SysAppHomeconfigPlateVo.class
+com\mosty\common\core\business\mapper\YbmjMapper.class
+com\mosty\common\core\business\mapper\SysUserMapper.class
+com\mosty\common\core\business\mapper\SysAppHomeconfigMapper.class
+com\mosty\common\core\config\MinIoClientConfig.class
+com\mosty\common\core\business\entity\SysOss.class
+com\mosty\common\core\CoreAutoConfiguration.class
+com\mosty\common\core\business\entity\vo\MenuQuery.class
+com\mosty\common\core\business\controller\SysUserAppHomeconfigPlateController.class
+com\mosty\common\core\business\mapper\SysRoleMapper.class
+com\mosty\common\core\business\controller\SysUserAppHomeconfigController.class
+com\mosty\common\core\business\mapper\SysAppHomeconfigPlateMapper.class
+com\mosty\common\core\business\entity\vo\SysUserDeptVO.class
+com\mosty\common\core\business\entity\vo\DataPermissionVO.class
+com\mosty\common\core\business\entity\vo\DeptVo.class
+com\mosty\common\core\business\entity\vo\GetUserRoleListVo.class
+com\mosty\common\core\business\entity\TbJcglXfll.class
+com\mosty\common\core\util\http\MyX509TrustManager.class
+com\mosty\common\core\business\controller\SysUserAppHomeconfigPlateListController.class
+com\mosty\common\core\business\entity\request\SysAppHomeconfigPage.class
+com\mosty\common\core\business\entity\request\SysAppHomeconfigPlateListPage.class
+com\mosty\common\core\business\entity\vo\DeleteUserDeptVO.class
+com\mosty\common\core\login\LoginRequest.class
+com\mosty\common\core\business\service\impl\SysDeptServiceImpl.class
+com\mosty\common\core\business\service\SysUserAppHomeconfigService.class
+com\mosty\common\core\business\timer\DeptUserSys.class
+com\mosty\common\core\business\controller\SysRoleController.class
+com\mosty\common\core\business\entity\vo\RoleUserPage.class
+com\mosty\common\core\business\controller\SysMenuController.class
+com\mosty\common\core\business\entity\SysUser.class
+com\mosty\common\core\business\entity\vo\SysUserAppHomeconfigPlateVo.class
+com\mosty\common\core\business\mapper\SysOssMapper.class
+com\mosty\common\core\business\service\SysMenuService.class
+com\mosty\common\core\util\RSAUtil.class
+com\mosty\common\core\business\entity\vo\AddUserDeptVO.class
+com\mosty\common\core\business\mapper\SysUserAppHomeconfigPlateMapper.class
+com\mosty\common\core\business\entity\request\SysUserEditPasswordRequest.class
+com\mosty\common\core\business\entity\vo\PositionPage.class
+com\mosty\common\core\business\mapper\SysAppHomeconfigPlateListMapper.class
+com\mosty\common\core\business\controller\SysPositionController.class
+com\mosty\common\core\business\service\impl\SysUserServiceImpl.class
+com\mosty\common\core\business\entity\vo\DeptTreeVO.class
+com\mosty\common\core\login\ImageController.class
+com\mosty\common\core\business\service\SysUserService.class
+com\mosty\common\core\util\CacheUtils.class
+com\mosty\common\core\business\entity\request\LoginLogPage.class
+com\mosty\common\core\business\controller\TokenController.class
+com\mosty\common\core\business\service\SysRoleService.class
+com\mosty\common\core\business\entity\vo\Base64Str.class
+com\mosty\common\core\business\service\SysOssService.class
+com\mosty\common\core\login\LoginEntity.class
+com\mosty\common\core\login\TokenRequest.class
+com\mosty\common\core\business\mapper\SysRoleMenuMapper.class
+com\mosty\common\core\login\dto\DeptDTO.class
+com\mosty\common\core\business\entity\vo\DeptQuery.class
+com\mosty\common\core\business\controller\SysAppHomeconfigPlateController.class
+com\mosty\common\core\business\entity\vo\SysUserVO.class
+com\mosty\common\core\business\entity\vo\AddDeptVO.class
+com\mosty\common\core\business\entity\vo\SysUserEditVO.class
+com\mosty\common\core\business\entity\SysAppHomeconfigPlate.class
+com\mosty\common\core\business\service\impl\SysLogininforServiceImpl.class
+com\mosty\common\core\business\entity\vo\GetUserPage.class
+com\mosty\common\core\business\entity\vo\DeleteRoleDeptVO.class
+com\mosty\common\core\business\controller\SysDeptController.class
+com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPlateListPage.class
+com\mosty\common\core\business\entity\vo\UserDeptVO.class
+com\mosty\common\core\login\IdCardLoginRequest.class
+com\mosty\common\core\business\service\impl\SysOssServiceImpl.class
+com\mosty\common\core\util\HttpClientUtil.class
+com\mosty\common\core\business\entity\SysUserAppHomeconfigPlate.class
+com\mosty\common\core\business\entity\vo\UserDeptPage.class
+com\mosty\common\core\business\service\impl\SysUserAppHomeconfigPlateListServiceImpl.class
+com\mosty\common\core\business\entity\vo\SysAppHomeconfigVO.class
+com\mosty\common\core\business\entity\request\SysAppHomeconfigPlatePage.class
+com\mosty\common\core\business\entity\vo\SysUserInfoVO.class
+com\mosty\common\core\business\entity\vo\DeleteListVO.class
+com\mosty\common\core\util\KafkaProducerConfig.class
+com\mosty\common\core\business\entity\SysAppHomeconfig.class
+com\mosty\common\core\business\entity\SysAppHomeconfigPlateList.class
+com\mosty\common\core\business\service\SysUserRoleService.class
+com\mosty\common\core\business\service\SysAppHomeconfigPlateListService.class
+com\mosty\common\core\business\entity\vo\UnboundUserRoleVO.class
+com\mosty\common\core\util\http\HttpsPostUtil.class
+com\mosty\common\core\business\entity\SysLogininfor.class
+com\mosty\common\core\business\entity\vo\AddSysMenuVO.class
+com\mosty\common\core\business\entity\vo\RoleUserVO.class
+com\mosty\common\core\business\service\SysRoleMenuService.class
+com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPage.class
+com\mosty\common\core\business\entity\SysUserDept.class
+com\mosty\common\core\util\HttpClientUtil$1.class
+com\mosty\common\core\util\BASE64DecodedMultipartFile.class
+com\mosty\common\core\business\entity\vo\LoginResponseVO.class
+com\mosty\common\core\business\entity\vo\RolePage.class
+com\mosty\common\core\business\entity\vo\AddSysUserVO.class
+com\mosty\common\core\business\entity\vo\RoleDeptVO.class
+com\mosty\common\core\business\entity\SysDept.class
+com\mosty\common\core\business\controller\SysAppHomeconfigController.class
+com\mosty\common\core\business\mapper\SysLogininforMapper.class
+com\mosty\common\core\business\entity\vo\DeptPage.class
+com\mosty\common\core\business\entity\SysPosition.class
+com\mosty\common\core\business\service\impl\SysAppHomeconfigPlateServiceImpl.class
+com\mosty\common\core\business\entity\vo\SysAppHomeconfigRsVO.class
+com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPlatePage.class
+com\mosty\common\core\business\entity\vo\UserRoleVO.class
+com\mosty\common\core\business\entity\SysMenu.class
+com\mosty\common\core\login\LoginResponseVO.class
+com\mosty\common\core\business\service\impl\SysUserAppHomeconfigServiceImpl.class
+com\mosty\common\core\business\service\SysLogininforService.class
+com\mosty\common\core\business\service\impl\SysUserDeptServiceImpl.class
+com\mosty\common\core\business\service\impl\SysRoleMenuServiceImpl.class
+com\mosty\common\core\business\service\LoginService.class
+com\mosty\common\core\business\service\SysUserAppHomeconfigPlateService.class
+com\mosty\common\core\config\DefaultRoleConfig.class
+com\mosty\common\core\business\service\impl\LoginServiceImpl.class
+com\mosty\common\core\business\mapper\SysDeptMapper.class
+com\mosty\common\core\login\dto\DeptAllVo.class
+com\mosty\common\core\business\mapper\SysUserAppHomeconfigPlateListMapper.class
+com\mosty\common\core\util\Base64Util.class
+com\mosty\common\core\business\entity\SysRoleMenu.class
+com\mosty\common\core\business\service\impl\SysRoleDeptServiceImpl.class
+com\mosty\common\core\business\entity\SysUserAppHomeconfigPlateList.class
+com\mosty\common\core\business\service\impl\SysMenuServiceImpl.class
+com\mosty\common\core\business\service\impl\SysUserAppHomeconfigPlateServiceImpl.class
+com\mosty\common\core\util\http\HttpUtils.class
+com\mosty\common\core\login\dto\ImageRequest.class
+com\mosty\common\core\business\entity\SysUserAppHomeconfig.class
+com\mosty\common\core\login\UserPermissionsInfo.class
+com\mosty\common\core\minio\UploadController.class
+com\mosty\common\core\business\entity\Ybmj.class
+com\mosty\common\core\business\controller\SysAppHomeconfigPlateListController.class
+com\mosty\common\core\business\entity\SysRole.class
+com\mosty\common\core\business\controller\SysLogininforController.class
+com\mosty\common\core\business\service\impl\SysUserRoleServiceImpl.class
+com\mosty\common\core\login\JwtTokenGenerator.class
+com\mosty\common\core\business\service\impl\SysPositionServiceImpl.class
+com\mosty\common\core\business\service\SysDeptService.class
+com\mosty\common\core\business\entity\vo\AddRoleVO.class
+com\mosty\common\core\business\entity\vo\EditSysMenuVO.class
+com\mosty\common\core\business\entity\vo\UserByDeptPage.class
+com\mosty\common\core\business\entity\vo\SysDeptVO.class
+com\mosty\common\core\business\service\SysPositionService.class
+com\mosty\common\core\login\LoginServiceController.class
+com\mosty\common\core\business\entity\vo\RoleByDeptPage.class
+com\mosty\common\core\business\entity\vo\UserPage.class
+com\mosty\common\core\business\entity\vo\AddRoleDataPartitionVO.class
+com\mosty\common\core\business\service\impl\SysAppHomeconfigServiceImpl.class
+com\mosty\common\core\business\entity\request\SysUserAppHomeconfigQuery.class
+com\mosty\common\core\business\entity\vo\AddRoleDeptVO.class
+com\mosty\common\core\business\entity\vo\MenuPage.class
+com\mosty\common\core\business\mapper\SysRoleDeptMapper.class
+com\mosty\common\core\business\mapper\SysUserAppHomeconfigMapper.class
+com\mosty\common\core\business\entity\vo\SysRoleVO.class
+com\mosty\common\core\business\mapper\SysPositionMapper.class
+com\mosty\common\core\business\service\SysUserAppHomeconfigPlateListService.class
+com\mosty\common\core\business\entity\request\SysAppHomeconfigQuery.class
+com\mosty\common\core\business\entity\vo\AddRoleMenuVO.class
+com\mosty\common\core\util\http\HttpsPostUtil$2.class
+com\mosty\common\core\business\entity\vo\SysUserAppHomeconfigVo.class
+com\mosty\common\core\business\service\SysAppHomeconfigService.class
+com\mosty\common\core\business\entity\SysRoleDept.class
+com\mosty\common\core\business\mapper\SysUserDeptMapper.class
+com\mosty\common\core\util\BeanUtils.class
+com\mosty\common\core\business\mapper\SysUserRoleMapper.class
+com\mosty\common\core\business\controller\SysUserController.class
+com\mosty\common\core\business\entity\SysUserRole.class
+com\mosty\common\core\business\service\impl\SysRoleServiceImpl.class
+com\mosty\common\core\util\ShiroUtils.class
+com\mosty\common\core\constant\DataPermissionConstant.class
+com\mosty\common\core\util\http\HttpsPostUtil$1.class
+com\mosty\common\core\login\UnifiedLoginRequest.class
+com\mosty\common\core\business\entity\vo\SysUserHomeconfigVo.class
+com\mosty\common\core\business\service\impl\SysAppHomeconfigPlateListServiceImpl.class
+com\mosty\common\core\business\service\SysUserDeptService.class
diff --git a/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..5c3336a
--- /dev/null
+++ b/common-core-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,175 @@
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysAppHomeconfigPlate.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysAppHomeconfigMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserAppHomeconfigPlateService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysLogininfor.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\MenuPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysPositionController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysAppHomeconfigPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\LoginServiceController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\EditSysMenuVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysMenu.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddSysMenuVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysRoleMenu.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysRoleVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysOssServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysAppHomeconfigController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysAppHomeconfigQuery.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UserDeptPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddRoleMenuVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserInfoVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\RoleUserPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysDeptMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysDeptController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\config\DefaultRoleConfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\http\HttpsPostUtil.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\TokenRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysRoleDeptServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\BASE64DecodedMultipartFile.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\Base64Util.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\ShiroUtils.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUser.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysRoleDept.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddUserDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserAppHomeconfigPlateServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysRoleDeptService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysAppHomeconfigPlateController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\MenuQuery.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysPositionServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UserPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUserAppHomeconfigPlate.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\LoginRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysAppHomeconfigPlateServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysDeptService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysLogininforMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysAppHomeconfigPlateVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysRoleMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUserRole.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeptVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\IdCardLoginRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUserAppHomeconfigPlateList.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysUserAppHomeconfigPlateController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeleteListVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysRoleMenuServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysOssService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserRoleServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\Ybmj.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\dto\DeptDTO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\config\CaptchaConfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUserAppHomeconfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\RolePage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\LoginResponseVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\LoginLogPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\UnifiedLoginRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UnboundUserRoleVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\UserPermissionsInfo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\GetUserRoleListVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserDeptMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\HttpClientUtil.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\YbmjMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysLogininforServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysRoleMenuMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserAppHomeconfigService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DataPermissionVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserEditVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysRoleDeptMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\CacheUtils.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysAppHomeconfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\timer\DeptUserSys.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\RSAUtil.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysOssMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysPositionMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeptPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysAppHomeconfigPlateListController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddSysUserVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysDeptServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeptQuery.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\ImageController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\GetUserPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\http\HttpUtils.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\RoleByDeptPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysAppHomeconfigPlateListMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\constant\DataPermissionConstant.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysPosition.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\PositionPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysAppHomeconfigVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserAppHomeconfigPlateMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysAppHomeconfigServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysPositionService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysRoleService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserAppHomeconfigVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysMenuServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysUserAppHomeconfigController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\LoginServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysMenuController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddRoleVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\TokenController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\RoleUserVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysUserDept.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserHomeconfigVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysOss.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysRoleMenuService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysAppHomeconfigPlateListService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\dto\ImageRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysAppHomeconfigPlateListPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysUserEditPasswordRequest.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserRoleService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\KafkaProducerConfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserAppHomeconfigServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\LoginEntity.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserAppHomeconfigMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\LoginResponseVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserAppHomeconfigPlateListMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UserByDeptPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysMenuService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\Base64Str.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\minio\UploadController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeleteDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysAppHomeconfigPlateListServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserDeptService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysAppHomeconfigPlatePage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UserRoleVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\LoginService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\config\MinIoClientConfig.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddRoleDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysRoleController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\UserDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysLogininforController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysUserAppHomeconfigPlateListController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysDept.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserDeptServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\dto\DeptAllVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\http\MyX509TrustManager.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeptTreeVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysLogininforService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysRole.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysUserAppHomeconfigPlateVo.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysUserAppHomeconfigPlateListServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPlateListPage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\SysAppHomeconfigPlateList.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysMenuMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysUserAppHomeconfigQuery.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\request\SysUserAppHomeconfigPlatePage.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\SysAppHomeconfigRsVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\util\BeanUtils.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\RoleDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysAppHomeconfigPlateMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysUserAppHomeconfigPlateListService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeleteUserDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysAppHomeconfigService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\DeleteRoleDeptVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\CoreAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\login\JwtTokenGenerator.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\mapper\SysUserRoleMapper.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\impl\SysRoleServiceImpl.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\vo\AddRoleDataPartitionVO.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\service\SysAppHomeconfigPlateService.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\controller\SysUserController.java
+C:\tools\dy外网\mosty-common\common-core-starter\src\main\java\com\mosty\common\core\business\entity\TbJcglXfll.java
diff --git a/common-dynamic-datasource-starter/common-dynamic-datasource-starter.iml b/common-dynamic-datasource-starter/common-dynamic-datasource-starter.iml
new file mode 100644
index 0000000..13dbd0b
--- /dev/null
+++ b/common-dynamic-datasource-starter/common-dynamic-datasource-starter.iml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.6" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-dynamic-datasource-starter/pom.xml b/common-dynamic-datasource-starter/pom.xml
new file mode 100644
index 0000000..98819e6
--- /dev/null
+++ b/common-dynamic-datasource-starter/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-dynamic-datasource-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>5.3.6</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DataSource.java b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DataSource.java
new file mode 100644
index 0000000..0ffe6e7
--- /dev/null
+++ b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DataSource.java
@@ -0,0 +1,19 @@
+package com.common.dynamic.datasource;
+
+import java.lang.annotation.*;
+
+/**
+ *  切换数据注解 可以用于类或者方法级别 方法级别优先级 > 类级别
+ *
+ * @author kevin
+ * @date 2022/4/29 8:59 上午
+ * @since 1.0.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER})
+public @interface DataSource {
+
+    String value() default "master";
+
+}
diff --git a/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceAspect.java b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceAspect.java
new file mode 100644
index 0000000..6038c38
--- /dev/null
+++ b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceAspect.java
@@ -0,0 +1,32 @@
+package com.common.dynamic.datasource;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Aspect
+@Component
+public class DynamicDataSourceAspect {
+
+    @Before("@annotation(ds)")
+    public void changeDataSource(JoinPoint point, DataSource ds) throws Throwable {
+        String dsId = ds.value();
+        if (DynamicDataSourceContextHolder.dataSourceIds.contains(dsId)) {
+            log.debug("Use DataSource :{} >", dsId, point.getSignature());
+        } else {
+            log.info("数据源[{}]不存在，使用默认数据源 >{}", dsId, point.getSignature());
+            DynamicDataSourceContextHolder.setDataSourceRouterKey(dsId);
+        }
+    }
+
+    @After("@annotation(ds)")
+    public void restoreDataSource(JoinPoint point, DataSource ds) {
+        log.debug("Revert DataSource : " + ds.value() + " > " + point.getSignature());
+        DynamicDataSourceContextHolder.removeDataSourceRouterKey();
+
+    }
+}
diff --git a/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceContextHolder.java b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceContextHolder.java
new file mode 100644
index 0000000..c20b1af
--- /dev/null
+++ b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceContextHolder.java
@@ -0,0 +1,55 @@
+package com.common.dynamic.datasource;
+
+import com.alibaba.ttl.TransmittableThreadLocal;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  动态数据源处理器
+ * @author kevin
+ * @date 2022/4/29 9:02 上午
+ * @since 1.0.0
+ */
+@Slf4j
+public class DynamicDataSourceContextHolder {
+
+    /**
+     * 存储已经注册的数据源的key
+     */
+    public static List<String> dataSourceIds = new ArrayList<>();
+
+    /**
+     * 使用{@link TransmittableThreadLocal} 进行存储，使用线程池等后还能获取到
+     */
+    private static final ThreadLocal<String> HOLDER = TransmittableThreadLocal.withInitial(() -> null);
+
+    public static String getDataSourceRouterKey () {
+        return HOLDER.get();
+    }
+
+    public static void setDataSourceRouterKey (String dataSourceRouterKey) {
+        log.info("切换至{}数据源", dataSourceRouterKey);
+        HOLDER.set(dataSourceRouterKey);
+    }
+
+    /**
+     * 设置数据源之前一定要先移除
+     */
+    public static void removeDataSourceRouterKey () {
+        HOLDER.remove();
+    }
+
+    /**
+     * 判断指定DataSrouce当前是否存在
+     *
+     * @param dataSourceId
+     * @return
+     */
+    public static boolean containsDataSource(String dataSourceId){
+        return dataSourceIds.contains(dataSourceId);
+    }
+
+}
diff --git a/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceRegister.java b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceRegister.java
new file mode 100644
index 0000000..823ae58
--- /dev/null
+++ b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicDataSourceRegister.java
@@ -0,0 +1,175 @@
+package com.common.dynamic.datasource;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
+import org.springframework.boot.context.properties.source.ConfigurationPropertyNameAliases;
+import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
+import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 动态数据源注册
+ * 实现 ImportBeanDefinitionRegistrar 实现数据源注册
+ * 实现 EnvironmentAware 用于读取application.yml配置
+ */
+@Slf4j
+public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar, EnvironmentAware {
+
+    /**
+     * 配置上下文（也可以理解为配置文件的获取工具）
+     */
+    private Environment evn;
+
+    /**
+     * 别名
+     */
+    private final static ConfigurationPropertyNameAliases aliases = new ConfigurationPropertyNameAliases();
+
+    /**
+     * 由于部分数据源配置不同，所以在此处添加别名，避免切换数据源出现某些参数无法注入的情况
+     */
+    static {
+        aliases.addAliases("url", new String[]{"jdbc-url"});
+        aliases.addAliases("username", new String[]{"user"});
+    }
+
+    /**
+     * 存储我们注册的数据源
+     */
+    private Map<String, DataSource> customDataSources = new HashMap<String, DataSource>();
+
+    /**
+     * 参数绑定工具 springboot2.0新推出
+     */
+    private Binder binder;
+
+    /**
+     * ImportBeanDefinitionRegistrar接口的实现方法，通过该方法可以按照自己的方式注册bean
+     *
+     * @param annotationMetadata
+     * @param beanDefinitionRegistry
+     */
+    @Override
+    public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry beanDefinitionRegistry) {
+        // 获取所有数据源配置
+        Map config, defauleDataSourceProperties;
+        defauleDataSourceProperties = binder.bind("spring.datasource.master", Map.class).get();
+        // 获取数据源类型
+        String typeStr = evn.getProperty("spring.datasource.master.type");
+        // 获取数据源类型
+        Class<? extends DataSource> clazz = getDataSourceType(typeStr);
+        // 绑定默认数据源参数 也就是主数据源
+        DataSource consumerDatasource, defaultDatasource = bind(clazz, defauleDataSourceProperties);
+        DynamicDataSourceContextHolder.dataSourceIds.add("master");
+        log.info("注册默认数据源成功");
+        // 获取其他数据源配置
+        List<Map> configs = binder.bind("spring.datasource.cluster", Bindable.listOf(Map.class)).get();
+        // 遍历从数据源
+        for (int i = 0; i < configs.size(); i++) {
+            config = configs.get(i);
+            clazz = getDataSourceType((String) config.get("type"));
+            defauleDataSourceProperties = config;
+            // 绑定参数
+            consumerDatasource = bind(clazz, defauleDataSourceProperties);
+            // 获取数据源的key，以便通过该key可以定位到数据源
+            String key = config.get("key").toString();
+            customDataSources.put(key, consumerDatasource);
+            // 数据源上下文，用于管理数据源与记录已经注册的数据源key
+            DynamicDataSourceContextHolder.dataSourceIds.add(key);
+            log.info("注册数据源{}成功", key);
+        }
+        // bean定义类
+        GenericBeanDefinition define = new GenericBeanDefinition();
+        // 设置bean的类型，此处DynamicRoutingDataSource是继承AbstractRoutingDataSource的实现类
+        define.setBeanClass(DynamicRoutingDataSource.class);
+        // 需要注入的参数
+        MutablePropertyValues mpv = define.getPropertyValues();
+        // 添加默认数据源，避免key不存在的情况没有数据源可用
+        mpv.add("defaultTargetDataSource", defaultDatasource);
+        // 添加其他数据源
+        mpv.add("targetDataSources", customDataSources);
+        // 将该bean注册为datasource，不使用springboot自动生成的datasource
+        beanDefinitionRegistry.registerBeanDefinition("datasource", define);
+        log.info("注册数据源成功，一共注册{}个数据源", customDataSources.keySet().size() + 1);
+    }
+
+    /**
+     * 通过字符串获取数据源class对象
+     *
+     * @param typeStr
+     * @return
+     */
+    private Class<? extends DataSource> getDataSourceType(String typeStr) {
+        Class<? extends DataSource> type = null;
+        try {
+            if (StringUtils.hasLength(typeStr)) {
+                // 字符串不为空则通过反射获取class对象
+                type = (Class<? extends DataSource>) Class.forName(typeStr);
+            } else {
+                // 默认为hikariCP数据源，与springboot默认数据源保持一致
+//                type = HikariDataSource.class;
+            }
+            return type;
+        } catch (Exception e) {
+            throw new IllegalArgumentException("can not resolve class with type: " + typeStr); //无法通过反射获取class对象的情况则抛出异常，该情况一般是写错了，所以此次抛出一个runtimeexception
+        }
+    }
+
+    /**
+     * 绑定参数，以下三个方法都是参考DataSourceBuilder的bind方法实现的，目的是尽量保证我们自己添加的数据源构造过程与springboot保持一致
+     *
+     * @param result
+     * @param properties
+     */
+    private void bind(DataSource result, Map properties) {
+        ConfigurationPropertySource source = new MapConfigurationPropertySource(properties);
+        Binder binder = new Binder(new ConfigurationPropertySource[]{source.withAliases(aliases)});
+        // 将参数绑定到对象
+        binder.bind(ConfigurationPropertyName.EMPTY, Bindable.ofInstance(result));
+    }
+
+    private <T extends DataSource> T bind(Class<T> clazz, Map properties) {
+        ConfigurationPropertySource source = new MapConfigurationPropertySource(properties);
+        Binder binder = new Binder(new ConfigurationPropertySource[]{source.withAliases(aliases)});
+        // 通过类型绑定参数并获得实例对象
+        return binder.bind(ConfigurationPropertyName.EMPTY, Bindable.of(clazz)).get();
+    }
+
+    /**
+     * @param clazz
+     * @param sourcePath 参数路径，对应配置文件中的值，如: spring.datasource
+     * @param <T>
+     * @return
+     */
+    private <T extends DataSource> T bind(Class<T> clazz, String sourcePath) {
+        Map properties = binder.bind(sourcePath, Map.class).get();
+        return bind(clazz, properties);
+    }
+
+    /**
+     * EnvironmentAware接口的实现方法，通过aware的方式注入，此处是environment对象
+     *
+     * @param environment
+     */
+    @Override
+    public void setEnvironment(Environment environment) {
+        log.info("开始注册数据源");
+        this.evn = environment;
+        // 绑定配置器
+        binder = Binder.get(evn);
+    }
+
+}
diff --git a/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicRoutingDataSource.java b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicRoutingDataSource.java
new file mode 100644
index 0000000..32f4354
--- /dev/null
+++ b/common-dynamic-datasource-starter/src/main/java/com/common/dynamic/datasource/DynamicRoutingDataSource.java
@@ -0,0 +1,21 @@
+package com.common.dynamic.datasource;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+
+/**
+ * @Auther: yukong
+ * @Date: 2018/8/15 10:47
+ * @Description: 动态数据源路由配置
+ */
+@Slf4j
+public class DynamicRoutingDataSource extends AbstractRoutingDataSource {
+
+
+    @Override
+    protected Object determineCurrentLookupKey() {
+        String dataSourceName = DynamicDataSourceContextHolder.getDataSourceRouterKey();
+        log.info("当前数据源是：{}", dataSourceName);
+        return DynamicDataSourceContextHolder.getDataSourceRouterKey();
+    }
+}
diff --git a/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DataSource.class b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DataSource.class
new file mode 100644
index 0000000..0b43083
Binary files /dev/null and b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DataSource.class differ
diff --git a/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceAspect.class b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceAspect.class
new file mode 100644
index 0000000..6ea5c88
Binary files /dev/null and b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceAspect.class differ
diff --git a/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceContextHolder.class b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceContextHolder.class
new file mode 100644
index 0000000..a84546d
Binary files /dev/null and b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceContextHolder.class differ
diff --git a/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceRegister.class b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceRegister.class
new file mode 100644
index 0000000..e66e89c
Binary files /dev/null and b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicDataSourceRegister.class differ
diff --git a/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicRoutingDataSource.class b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicRoutingDataSource.class
new file mode 100644
index 0000000..f18526e
Binary files /dev/null and b/common-dynamic-datasource-starter/target/classes/com/common/dynamic/datasource/DynamicRoutingDataSource.class differ
diff --git a/common-dynamic-datasource-starter/target/common-dynamic-datasource-starter-1.0.0-SNAPSHOT.jar b/common-dynamic-datasource-starter/target/common-dynamic-datasource-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..ceaad88
Binary files /dev/null and b/common-dynamic-datasource-starter/target/common-dynamic-datasource-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-dynamic-datasource-starter/target/maven-archiver/pom.properties b/common-dynamic-datasource-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..185bd96
--- /dev/null
+++ b/common-dynamic-datasource-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:24 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-dynamic-datasource-starter
diff --git a/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..a2d6f6e
--- /dev/null
+++ b/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,5 @@
+com\common\dynamic\datasource\DataSource.class
+com\common\dynamic\datasource\DynamicRoutingDataSource.class
+com\common\dynamic\datasource\DynamicDataSourceAspect.class
+com\common\dynamic\datasource\DynamicDataSourceContextHolder.class
+com\common\dynamic\datasource\DynamicDataSourceRegister.class
diff --git a/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..b756e6b
--- /dev/null
+++ b/common-dynamic-datasource-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,5 @@
+C:\tools\dy外网\mosty-common\common-dynamic-datasource-starter\src\main\java\com\common\dynamic\datasource\DataSource.java
+C:\tools\dy外网\mosty-common\common-dynamic-datasource-starter\src\main\java\com\common\dynamic\datasource\DynamicDataSourceAspect.java
+C:\tools\dy外网\mosty-common\common-dynamic-datasource-starter\src\main\java\com\common\dynamic\datasource\DynamicDataSourceRegister.java
+C:\tools\dy外网\mosty-common\common-dynamic-datasource-starter\src\main\java\com\common\dynamic\datasource\DynamicDataSourceContextHolder.java
+C:\tools\dy外网\mosty-common\common-dynamic-datasource-starter\src\main\java\com\common\dynamic\datasource\DynamicRoutingDataSource.java
diff --git a/common-generator-starter/common-generator-starter.iml b/common-generator-starter/common-generator-starter.iml
new file mode 100644
index 0000000..fae5a59
--- /dev/null
+++ b/common-generator-starter/common-generator-starter.iml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-log-base-starter" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.8" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-generator-starter/pom.xml b/common-generator-starter/pom.xml
new file mode 100644
index 0000000..b92e8ae
--- /dev/null
+++ b/common-generator-starter/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-generator-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-log-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <!-- 阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <!-- pagehelper 分页插件 -->
+<!--        <dependency>-->
+<!--            <groupId>com.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
+<!--            <version>1.4.0</version>-->
+<!--        </dependency>-->
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+        <!-- 文件上传工具类 -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/GeneratorAutoConfiguration.java b/common-generator-starter/src/main/java/com/mosty/common/generator/GeneratorAutoConfiguration.java
new file mode 100644
index 0000000..4418f30
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/GeneratorAutoConfiguration.java
@@ -0,0 +1,16 @@
+package com.mosty.common.generator;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  代码生成自动装配
+ * @author kevin
+ * @date 2022/2/3 3:34 PM
+ * @since 1.0.0
+ */
+@Configuration
+@MapperScan("com.mosty.common.generator.mapper")
+public class GeneratorAutoConfiguration {
+
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/config/BaseEntity.java b/common-generator-starter/src/main/java/com/mosty/common/generator/config/BaseEntity.java
new file mode 100644
index 0000000..b9c2a84
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/config/BaseEntity.java
@@ -0,0 +1,113 @@
+package com.mosty.common.generator.config;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ *
+ * @author ruoyi
+ */
+public class BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params;
+
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams() {
+        if (params == null) {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig.java b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig.java
new file mode 100644
index 0000000..f989255
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig.java
@@ -0,0 +1,65 @@
+package com.mosty.common.generator.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 代码生成相关配置
+ *
+ * @author ruoyi
+ */
+@Component
+@ConfigurationProperties(prefix = "gen")
+public class GenConfig {
+    /**
+     * 作者
+     */
+    public static String author;
+
+    /**
+     * 生成包路径
+     */
+    public static String packageName;
+
+    /**
+     * 自动去除表前缀，默认是false
+     */
+    public static boolean autoRemovePre;
+
+    /**
+     * 表前缀(类名不会包含表前缀)
+     */
+    public static String tablePrefix;
+
+    public static String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        GenConfig.author = author;
+    }
+
+    public static String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        GenConfig.packageName = packageName;
+    }
+
+    public static boolean getAutoRemovePre() {
+        return autoRemovePre;
+    }
+
+    public void setAutoRemovePre(boolean autoRemovePre) {
+        GenConfig.autoRemovePre = autoRemovePre;
+    }
+
+    public static String getTablePrefix() {
+        return tablePrefix;
+    }
+
+    public void setTablePrefix(String tablePrefix) {
+        GenConfig.tablePrefix = tablePrefix;
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig_bak.java
new file mode 100644
index 0000000..12bb2b4
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConfig_bak.java
@@ -0,0 +1,72 @@
+//package com.mosty.common.generator.config;
+//
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.PropertySource;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 读取代码生成相关配置
+// *
+// * @author ruoyi
+// */
+//@Component
+//@ConfigurationProperties(prefix = "gen")
+//@PropertySource(value = {"classpath:generator.yml"})
+//public class GenConfig {
+//    /**
+//     * 作者
+//     */
+//    public static String author;
+//‰
+//    /**
+//     * 生成包路径
+//     */
+//    public static String packageName;
+//
+//    /**
+//     * 自动去除表前缀，默认是false
+//     */
+//    public static boolean autoRemovePre;
+//
+//    /**
+//     * 表前缀(类名不会包含表前缀)
+//     */
+//    public static String tablePrefix;
+//
+//    public static String getAuthor() {
+//        return author;
+//    }
+//
+//    @Value("${author}")
+//    public void setAuthor(String author) {
+//        GenConfig.author = author;
+//    }
+//
+//    public static String getPackageName() {
+//        return packageName;
+//    }
+//
+//    @Value("${packageName}")
+//    public void setPackageName(String packageName) {
+//        GenConfig.packageName = packageName;
+//    }
+//
+//    public static boolean getAutoRemovePre() {
+//        return autoRemovePre;
+//    }
+//
+//    @Value("${autoRemovePre}")
+//    public void setAutoRemovePre(boolean autoRemovePre) {
+//        GenConfig.autoRemovePre = autoRemovePre;
+//    }
+//
+//    public static String getTablePrefix() {
+//        return tablePrefix;
+//    }
+//
+//    @Value("${tablePrefix}")
+//    public void setTablePrefix(String tablePrefix) {
+//        GenConfig.tablePrefix = tablePrefix;
+//    }
+//}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConstants.java b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConstants.java
new file mode 100644
index 0000000..52d637d
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/config/GenConstants.java
@@ -0,0 +1,181 @@
+package com.mosty.common.generator.config;
+
+/**
+ * 代码生成通用常量
+ *
+ * @author ruoyi
+ */
+public class GenConstants {
+    /**
+     * 单表（增删改查）
+     */
+    public static final String TPL_CRUD = "crud";
+
+    /**
+     * 树表（增删改查）
+     */
+    public static final String TPL_TREE = "tree";
+
+    /**
+     * 主子表（增删改查）
+     */
+    public static final String TPL_SUB = "sub";
+
+    /**
+     * 树编码字段
+     */
+    public static final String TREE_CODE = "treeCode";
+
+    /**
+     * 树父编码字段
+     */
+    public static final String TREE_PARENT_CODE = "treeParentCode";
+
+    /**
+     * 树名称字段
+     */
+    public static final String TREE_NAME = "treeName";
+
+    /**
+     * 上级菜单ID字段
+     */
+    public static final String PARENT_MENU_ID = "parentMenuId";
+
+    /**
+     * 上级菜单名称字段
+     */
+    public static final String PARENT_MENU_NAME = "parentMenuName";
+
+    /**
+     * 数据库字符串类型
+     */
+    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+
+    /**
+     * 数据库文本类型
+     */
+    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+
+    /**
+     * 数据库时间类型
+     */
+    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+
+    /**
+     * 数据库数字类型
+     */
+    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bigint", "float", "double", "decimal"};
+
+    /**
+     * 页面不需要编辑字段
+     */
+    public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
+
+    /**
+     * 页面不需要显示的列表字段
+     */
+    public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time"};
+
+    /**
+     * 页面不需要查询字段
+     */
+    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark"};
+
+    /**
+     * Entity基类字段
+     */
+    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
+
+    /**
+     * Tree基类字段
+     */
+    public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
+
+    /**
+     * 文本框
+     */
+    public static final String HTML_INPUT = "input";
+
+    /**
+     * 文本域
+     */
+    public static final String HTML_TEXTAREA = "textarea";
+
+    /**
+     * 下拉框
+     */
+    public static final String HTML_SELECT = "select";
+
+    /**
+     * 单选框
+     */
+    public static final String HTML_RADIO = "radio";
+
+    /**
+     * 复选框
+     */
+    public static final String HTML_CHECKBOX = "checkbox";
+
+    /**
+     * 日期控件
+     */
+    public static final String HTML_DATETIME = "datetime";
+
+    /**
+     * 图片上传控件
+     */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /**
+     * 文件上传控件
+     */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
+
+    /**
+     * 富文本控件
+     */
+    public static final String HTML_EDITOR = "editor";
+
+    /**
+     * 字符串类型
+     */
+    public static final String TYPE_STRING = "String";
+
+    /**
+     * 整型
+     */
+    public static final String TYPE_INTEGER = "Integer";
+
+    /**
+     * 长整型
+     */
+    public static final String TYPE_LONG = "Long";
+
+    /**
+     * 浮点型
+     */
+    public static final String TYPE_DOUBLE = "Double";
+
+    /**
+     * 高精度计算类型
+     */
+    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /**
+     * 时间类型
+     */
+    public static final String TYPE_DATE = "Date";
+
+    /**
+     * 模糊查询
+     */
+    public static final String QUERY_LIKE = "LIKE";
+
+    /**
+     * 需要
+     */
+    public static final String REQUIRE = "1";
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController.java b/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController.java
new file mode 100644
index 0000000..e101e1a
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController.java
@@ -0,0 +1,194 @@
+package com.mosty.common.generator.controller;
+
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.domain.TableDataInfo;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.generator.domain.GenTable;
+import com.mosty.common.generator.domain.GenTableColumn;
+import com.mosty.common.generator.service.IGenTableColumnService;
+import com.mosty.common.generator.service.IGenTableService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.operation.log.util.Convert;
+import io.swagger.annotations.Api;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成 操作处理
+ *
+ * @author ruoyi
+ */
+@RequestMapping("/gen")
+@RestController
+@Api(tags = "代码生成")
+public class GenController extends BaseController {
+    @Autowired
+    private IGenTableService genTableService;
+
+    @Autowired
+    private IGenTableColumnService genTableColumnService;
+
+    /**
+     * 查询代码生成列表
+     */
+//    @RequiresPermissions("tool:gen:list")
+    @GetMapping("/list")
+    public ResponseResult<TableDataInfo> genList(GenTable genTable) {
+        startPage();
+        List<GenTable> list = genTableService.selectGenTableList(genTable);
+        return ResponseResult.success(getDataTable(list));
+    }
+
+    /**
+     * 修改代码生成业务
+     */
+//    @RequiresPermissions("tool:gen:query")
+    @GetMapping(value = "/{talbleId}")
+    public ResponseResult<Map<String, Object>> getInfo(@PathVariable Long tableId) {
+        GenTable table = genTableService.selectGenTableById(tableId);
+        List<GenTable> tables = genTableService.selectGenTableAll();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("info", table);
+        map.put("rows", list);
+        map.put("tables", tables);
+        return ResponseResult.success(map);
+    }
+
+    /**
+     * 查询数据库列表
+     */
+//    @RequiresPermissions("tool:gen:list")
+    @GetMapping("/db/list")
+    public ResponseResult<TableDataInfo> dataList(GenTable genTable) {
+        startPage();
+        List<GenTable> list = genTableService.selectDbTableList(genTable);
+        return ResponseResult.success(getDataTable(list));
+    }
+
+    /**
+     * 查询数据表字段列表
+     */
+    @GetMapping(value = "/column/{talbleId}")
+    public ResponseResult<TableDataInfo> columnList(Long tableId) {
+        TableDataInfo dataInfo = new TableDataInfo();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+        dataInfo.setRows(list);
+        dataInfo.setTotal(list.size());
+        return ResponseResult.success(dataInfo);
+    }
+
+    /**
+     * 导入表结构（保存）
+     */
+//    @RequiresPermissions("tool:gen:import")
+    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+    @PostMapping("/importTable")
+    @JwtSysUser
+    public ResponseResult<Boolean> importTableSave(String tables) {
+        String[] tableNames = Convert.toStrArray(tables);
+        // 查询表信息
+        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
+        genTableService.importGenTable(tableList);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 修改保存代码生成业务
+     */
+//    @RequiresPermissions("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResponseResult<Boolean> editSave(@Validated @RequestBody GenTable genTable) {
+        genTableService.validateEdit(genTable);
+        genTableService.updateGenTable(genTable);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 删除代码生成
+     */
+//    @RequiresPermissions("tool:gen:remove")
+    @Log(title = "代码生成", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{tableIds}")
+    public ResponseResult<Boolean> remove(@PathVariable Long[] tableIds) {
+        genTableService.deleteGenTableByIds(tableIds);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 预览代码
+     */
+//    @RequiresPermissions("tool:gen:preview")
+    @GetMapping("/preview/{tableId}")
+    public ResponseResult<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
+        Map<String, String> dataMap = genTableService.previewCode(tableId);
+        return ResponseResult.success(dataMap);
+    }
+
+    /**
+     * 生成代码（下载方式）
+     */
+//    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/download/{tableName}")
+    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException {
+        byte[] data = genTableService.downloadCode(tableName);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     */
+//    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/genCode/{tableName}")
+    public ResponseResult<Boolean> genCode(@PathVariable("tableName") String tableName) {
+        genTableService.generatorCode(tableName);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 同步数据库
+     */
+//    @RequiresPermissions("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @GetMapping("/synchDb/{tableName}")
+    public ResponseResult synchDb(@PathVariable("tableName") String tableName) {
+        genTableService.synchDb(tableName);
+        return ResponseResult.success();
+    }
+
+    /**
+     * 批量生成代码
+     */
+//    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/batchGenCode")
+    public void batchGenCode(HttpServletResponse response, String tables) throws IOException {
+        String[] tableNames = Convert.toStrArray(tables);
+        byte[] data = genTableService.downloadCode(tableNames);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成zip文件
+     */
+    private void genCode(HttpServletResponse response, byte[] data) throws IOException {
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+        IOUtils.write(data, response.getOutputStream());
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController_bak.java
new file mode 100644
index 0000000..2707f0c
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/controller/GenController_bak.java
@@ -0,0 +1,281 @@
+//package com.mosty.common.generator.controller;
+//
+//import cn.hutool.core.convert.Convert;
+//import com.alibaba.druid.DbType;
+//import com.alibaba.druid.sql.SQLUtils;
+//import com.alibaba.druid.sql.ast.SQLStatement;
+//import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
+//import com.alibaba.fastjson.JSON;
+//import com.mosty.common.base.domain.BaseController;
+//import com.mosty.common.base.domain.CxSelect;
+//import com.mosty.common.base.domain.ResponseResult;
+//import com.mosty.common.base.domain.TableDataInfo;
+//import com.mosty.common.base.domain.page.SqlUtil;
+//import com.mosty.common.base.entity.log.BusinessType;
+//import com.mosty.common.base.entity.log.Log;
+//import com.mosty.common.generator.domain.GenTable;
+//import com.mosty.common.generator.domain.GenTableColumn;
+//import com.mosty.common.generator.service.GenTableColumnService;
+//import com.mosty.common.generator.service.GenTableService;
+//import io.swagger.annotations.Api;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.io.IOUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.ModelMap;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Objects;
+//
+///**
+// * 代码生成 操作处理
+// *
+// * @author ruoyi
+// */
+//@Slf4j
+//@Controller
+//@RequestMapping("/tool/gen")
+//@Api(tags = "代码生成")
+//public class GenController extends BaseController {
+//
+//    /** 前缀标识 */
+//    private String prefix = "tool/gen";
+//
+//    @Autowired
+//    private GenTableService genTableService;
+//
+//    @Autowired
+//    private GenTableColumnService genTableColumnService;
+//
+//    //    @RequiresPermissions("tool:gen:view")
+//    @GetMapping()
+//    public String gen() {
+//        return prefix + "/gen";
+//    }
+//
+//    /**
+//     * 查询代码生成列表
+//     */
+////    @RequiresPermissions("tool:gen:list")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ResponseResult<TableDataInfo> genList(GenTable genTable) {
+//        startPage();
+//        List<GenTable> list = genTableService.selectGenTableList(genTable);
+//        TableDataInfo dataTable = getDataTable(list);
+//        return ResponseResult.success(dataTable);
+//    }
+//
+//    /**
+//     * 查询数据库列表
+//     */
+////    @RequiresPermissions("tool:gen:list")
+//    @PostMapping("/db/list")
+//    @ResponseBody
+//    public ResponseResult<TableDataInfo> dataList(GenTable genTable) {
+//        startPage();
+//        List<GenTable> list = genTableService.selectDbTableList(genTable);
+//        TableDataInfo dataTable = getDataTable(list);
+//        return ResponseResult.success(dataTable);
+//    }
+//
+//    /**
+//     * 查询数据表字段列表
+//     */
+////    @RequiresPermissions("tool:gen:list")
+//    @PostMapping("/column/list")
+//    @ResponseBody
+//    public ResponseResult<TableDataInfo> columnList(GenTableColumn genTableColumn) {
+//        TableDataInfo dataInfo = new TableDataInfo();
+//        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(genTableColumn);
+//        dataInfo.setRows(list);
+//        dataInfo.setTotal(list.size());
+//        return ResponseResult.success(dataInfo);
+//    }
+//
+//    /**
+//     * 导入表结构
+//     */
+////    @RequiresPermissions("tool:gen:list")
+//    @GetMapping("/importTable")
+//    public ResponseResult<String> importTable() {
+//        return ResponseResult.success(prefix + "/importTable");
+//    }
+//
+//    /**
+//     * 创建表结构
+//     */
+//    @GetMapping("/createTable")
+//    public ResponseResult<String> createTable() {
+//        return ResponseResult.success(prefix + "/createTable");
+//    }
+//
+//    /**
+//     * 导入表结构（保存）
+//     */
+////    @RequiresPermissions("tool:gen:list")
+//    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+//    @PostMapping("/importTable")
+//    @ResponseBody
+//    public ResponseResult<Boolean> importTableSave(String tables) {
+//        String[] tableNames = Convert.toStrArray(tables);
+//        // 查询表信息
+//        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
+////        String operName = Convert.toStr(PermissionUtils.getPrincipalProperty("loginName"));
+//        String operName = "kevin";
+//        genTableService.importGenTable(tableList, operName);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    /**
+//     * 修改代码生成业务
+//     */
+////    @RequiresPermissions("tool:gen:edit")
+//    @GetMapping("/edit/{tableId}")
+//    public ResponseResult<String> edit(@PathVariable("tableId") Long tableId, ModelMap mmap) {
+//        GenTable table = genTableService.selectGenTableById(tableId);
+//        List<GenTable> genTables = genTableService.selectGenTableAll();
+//        List<CxSelect> cxSelect = new ArrayList<CxSelect>();
+//        for (GenTable genTable : genTables) {
+//            if (!Objects.equals(table.getTableName(), genTable.getTableName())) {
+//                CxSelect cxTable = new CxSelect(genTable.getTableName(), genTable.getTableName() + '：' + genTable.getTableComment());
+//                List<CxSelect> cxColumns = new ArrayList<CxSelect>();
+//                for (GenTableColumn tableColumn : genTable.getColumns()) {
+//                    cxColumns.add(new CxSelect(tableColumn.getColumnName(), tableColumn.getColumnName() + '：' + tableColumn.getColumnComment()));
+//                }
+//                cxTable.setS(cxColumns);
+//                cxSelect.add(cxTable);
+//            }
+//        }
+//        mmap.put("table", table);
+//        mmap.put("data", JSON.toJSON(cxSelect));
+//        return ResponseResult.success(prefix + "/edit");
+//    }
+//
+//    /**
+//     * 修改保存代码生成业务
+//     */
+////    @RequiresPermissions("tool:gen:edit")
+//    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+//    @PostMapping("/edit")
+//    @ResponseBody
+//    public ResponseResult<Boolean> editSave(@Validated GenTable genTable) {
+//        genTableService.validateEdit(genTable);
+//        genTableService.updateGenTable(genTable);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    //    @RequiresPermissions("tool:gen:remove")
+//    @Log(title = "代码生成", businessType = BusinessType.DELETE)
+//    @PostMapping("/remove")
+//    @ResponseBody
+//    public ResponseResult<Boolean> remove(String ids) {
+//        genTableService.deleteGenTableByIds(ids);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    //    @RequiresRoles("admin")
+//    @Log(title = "创建表", businessType = BusinessType.OTHER)
+//    @PostMapping("/createTable")
+//    @ResponseBody
+//    public ResponseResult<Boolean> create(String sql) {
+//        try {
+//            SqlUtil.filterKeyword(sql);
+//            List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
+//            List<String> tableNames = new ArrayList<>();
+//            for (SQLStatement sqlStatement : sqlStatements) {
+//                if (sqlStatement instanceof MySqlCreateTableStatement) {
+//                    MySqlCreateTableStatement createTableStatement = (MySqlCreateTableStatement) sqlStatement;
+//                    if (genTableService.createTable(createTableStatement.toString())) {
+//                        String tableName = createTableStatement.getTableName().replaceAll("`", "");
+//                        tableNames.add(tableName);
+//                    }
+//                }
+//            }
+//            List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
+////            String operName = Convert.toStr(PermissionUtils.getPrincipalProperty("loginName"));
+//            String operName = "kevin";
+//            genTableService.importGenTable(tableList, operName);
+//            return ResponseResult.success(Boolean.TRUE);
+//        } catch (Exception e) {
+//            log.error(e.getMessage(), e);
+//            return ResponseResult.fail("创建表结构异常[" + e.getMessage() + "]");
+//        }
+//    }
+//
+//    /**
+//     * 预览代码
+//     */
+////    @RequiresPermissions("tool:gen:preview")
+//    @GetMapping("/preview/{tableId}")
+//    @ResponseBody
+//    public ResponseResult<Map<String,String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
+//        Map<String, String> dataMap = genTableService.previewCode(tableId);
+//        return ResponseResult.success(dataMap);
+//    }
+//
+//    /**
+//     * 生成代码（下载方式）
+//     */
+////    @RequiresPermissions("tool:gen:code")
+//    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+//    @GetMapping("/download/{tableName}")
+//    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException {
+//        byte[] data = genTableService.downloadCode(tableName);
+//        genCode(response, data);
+//    }
+//
+//    /**
+//     * 生成代码（自定义路径）
+//     */
+////    @RequiresPermissions("tool:gen:code")
+//    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+//    @GetMapping("/genCode/{tableName}")
+//    @ResponseBody
+//    public ResponseResult<Boolean> genCode(@PathVariable("tableName") String tableName) {
+//        genTableService.generatorCode(tableName);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    /**
+//     * 同步数据库
+//     */
+////    @RequiresPermissions("tool:gen:edit")
+//    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+//    @GetMapping("/synchDb/{tableName}")
+//    @ResponseBody
+//    public ResponseResult<Boolean> synchDb(@PathVariable("tableName") String tableName) {
+//        genTableService.synchDb(tableName);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    /**
+//     * 批量生成代码
+//     */
+////    @RequiresPermissions("tool:gen:code")
+//    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+//    @GetMapping("/batchGenCode")
+//    @ResponseBody
+//    public void batchGenCode(HttpServletResponse response, String tables) throws IOException {
+//        String[] tableNames = Convert.toStrArray(tables);
+//        byte[] data = genTableService.downloadCode(tableNames);
+//        genCode(response, data);
+//    }
+//
+//    /**
+//     * 生成zip文件
+//     */
+//    private void genCode(HttpServletResponse response, byte[] data) throws IOException {
+//        response.reset();
+//        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+//        response.addHeader("Content-Length", "" + data.length);
+//        response.setContentType("application/octet-stream; charset=UTF-8");
+//        IOUtils.write(data, response.getOutputStream());
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable.java b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable.java
new file mode 100644
index 0000000..9ff86fe
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable.java
@@ -0,0 +1,370 @@
+package com.mosty.common.generator.domain;
+
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+
+import com.mosty.common.base.constant.GenConstants;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.generator.config.BaseEntity;
+import org.apache.commons.lang3.ArrayUtils;
+
+/**
+ * 业务表 gen_table
+ * 
+ * @author ruoyi
+ */
+public class GenTable extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long tableId;
+
+    /** 表名称 */
+    @NotBlank(message = "表名称不能为空")
+    private String tableName;
+
+    /** 表描述 */
+    @NotBlank(message = "表描述不能为空")
+    private String tableComment;
+
+    /** 关联父表的表名 */
+    private String subTableName;
+
+    /** 本表关联父表的外键名 */
+    private String subTableFkName;
+
+    /** 实体类名称(首字母大写) */
+    @NotBlank(message = "实体类名称不能为空")
+    private String className;
+
+    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
+    private String tplCategory;
+
+    /** 生成包路径 */
+    @NotBlank(message = "生成包路径不能为空")
+    private String packageName;
+
+    /** 生成模块名 */
+    @NotBlank(message = "生成模块名不能为空")
+    private String moduleName;
+
+    /** 生成业务名 */
+    @NotBlank(message = "生成业务名不能为空")
+    private String businessName;
+
+    /** 生成功能名 */
+    @NotBlank(message = "生成功能名不能为空")
+    private String functionName;
+
+    /** 生成作者 */
+    @NotBlank(message = "作者不能为空")
+    private String functionAuthor;
+
+    /** 生成代码方式（0zip压缩包 1自定义路径） */
+    private String genType;
+
+    /** 生成路径（不填默认项目路径） */
+    private String genPath;
+
+    /** 主键信息 */
+    private GenTableColumn pkColumn;
+
+    /** 子表信息 */
+    private GenTable subTable;
+
+    /** 表列信息 */
+    @Valid
+    private List<GenTableColumn> columns;
+
+    /** 其它生成选项 */
+    private String options;
+
+    /** 树编码字段 */
+    private String treeCode;
+
+    /** 树父编码字段 */
+    private String treeParentCode;
+
+    /** 树名称字段 */
+    private String treeName;
+
+    /** 上级菜单ID字段 */
+    private String parentMenuId;
+
+    /** 上级菜单名称字段 */
+    private String parentMenuName;
+
+    public Long getTableId()
+    {
+        return tableId;
+    }
+
+    public void setTableId(Long tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public String getTableName()
+    {
+        return tableName;
+    }
+
+    public void setTableName(String tableName)
+    {
+        this.tableName = tableName;
+    }
+
+    public String getTableComment()
+    {
+        return tableComment;
+    }
+
+    public void setTableComment(String tableComment)
+    {
+        this.tableComment = tableComment;
+    }
+
+    public String getSubTableName()
+    {
+        return subTableName;
+    }
+
+    public void setSubTableName(String subTableName)
+    {
+        this.subTableName = subTableName;
+    }
+
+    public String getSubTableFkName()
+    {
+        return subTableFkName;
+    }
+
+    public void setSubTableFkName(String subTableFkName)
+    {
+        this.subTableFkName = subTableFkName;
+    }
+
+    public String getClassName()
+    {
+        return className;
+    }
+
+    public void setClassName(String className)
+    {
+        this.className = className;
+    }
+
+    public String getTplCategory()
+    {
+        return tplCategory;
+    }
+
+    public void setTplCategory(String tplCategory)
+    {
+        this.tplCategory = tplCategory;
+    }
+
+    public String getPackageName()
+    {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        this.packageName = packageName;
+    }
+
+    public String getModuleName()
+    {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName)
+    {
+        this.moduleName = moduleName;
+    }
+
+    public String getBusinessName()
+    {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName)
+    {
+        this.businessName = businessName;
+    }
+
+    public String getFunctionName()
+    {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName)
+    {
+        this.functionName = functionName;
+    }
+
+    public String getFunctionAuthor()
+    {
+        return functionAuthor;
+    }
+
+    public void setFunctionAuthor(String functionAuthor)
+    {
+        this.functionAuthor = functionAuthor;
+    }
+
+    public String getGenType()
+    {
+        return genType;
+    }
+
+    public void setGenType(String genType)
+    {
+        this.genType = genType;
+    }
+
+    public String getGenPath()
+    {
+        return genPath;
+    }
+
+    public void setGenPath(String genPath)
+    {
+        this.genPath = genPath;
+    }
+
+    public GenTableColumn getPkColumn()
+    {
+        return pkColumn;
+    }
+
+    public void setPkColumn(GenTableColumn pkColumn)
+    {
+        this.pkColumn = pkColumn;
+    }
+
+    public GenTable getSubTable()
+    {
+        return subTable;
+    }
+
+    public void setSubTable(GenTable subTable)
+    {
+        this.subTable = subTable;
+    }
+    public List<GenTableColumn> getColumns()
+    {
+        return columns;
+    }
+
+    public void setColumns(List<GenTableColumn> columns)
+    {
+        this.columns = columns;
+    }
+
+    public String getOptions()
+    {
+        return options;
+    }
+
+    public void setOptions(String options)
+    {
+        this.options = options;
+    }
+
+    public String getTreeCode()
+    {
+        return treeCode;
+    }
+
+    public void setTreeCode(String treeCode)
+    {
+        this.treeCode = treeCode;
+    }
+
+    public String getTreeParentCode()
+    {
+        return treeParentCode;
+    }
+
+    public void setTreeParentCode(String treeParentCode)
+    {
+        this.treeParentCode = treeParentCode;
+    }
+
+    public String getTreeName()
+    {
+        return treeName;
+    }
+
+    public void setTreeName(String treeName)
+    {
+        this.treeName = treeName;
+    }
+
+    public String getParentMenuId()
+    {
+        return parentMenuId;
+    }
+
+    public void setParentMenuId(String parentMenuId)
+    {
+        this.parentMenuId = parentMenuId;
+    }
+
+    public String getParentMenuName()
+    {
+        return parentMenuName;
+    }
+
+    public void setParentMenuName(String parentMenuName)
+    {
+        this.parentMenuName = parentMenuName;
+    }
+
+    public boolean isSub()
+    {
+        return isSub(this.tplCategory);
+    }
+
+    public static boolean isSub(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+    }
+    public boolean isTree()
+    {
+        return isTree(this.tplCategory);
+    }
+
+    public static boolean isTree(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+    }
+
+    public boolean isCrud()
+    {
+        return isCrud(this.tplCategory);
+    }
+
+    public static boolean isCrud(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+    }
+
+    public boolean isSuperColumn(String javaField)
+    {
+        return isSuperColumn(this.tplCategory, javaField);
+    }
+
+    public static boolean isSuperColumn(String tplCategory, String javaField)
+    {
+        if (isTree(tplCategory))
+        {
+            return StringUtils.equalsAnyIgnoreCase(javaField,
+                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+        }
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn.java b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn.java
new file mode 100644
index 0000000..32f931b
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn.java
@@ -0,0 +1,349 @@
+package com.mosty.common.generator.domain;
+
+
+import com.mosty.common.generator.config.BaseEntity;
+import com.mosty.common.generator.util.StringUtils;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 代码生成业务字段表 gen_table_column
+ *
+ * @author ruoyi
+ */
+public class GenTableColumn extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long columnId;
+
+    /**
+     * 归属表编号
+     */
+    private Long tableId;
+
+    /**
+     * 列名称
+     */
+    private String columnName;
+
+    /**
+     * 列描述
+     */
+    private String columnComment;
+
+    /**
+     * 列类型
+     */
+    private String columnType;
+
+    /**
+     * JAVA类型
+     */
+    private String javaType;
+
+    /**
+     * JAVA字段名
+     */
+    @NotBlank(message = "Java属性不能为空")
+    private String javaField;
+
+    /**
+     * 是否主键（1是）
+     */
+    private String isPk;
+
+    /**
+     * 是否自增（1是）
+     */
+    private String isIncrement;
+
+    /**
+     * 是否必填（1是）
+     */
+    private String isRequired;
+
+    /**
+     * 是否为插入字段（1是）
+     */
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（1是）
+     */
+    private String isEdit;
+
+    /**
+     * 是否列表字段（1是）
+     */
+    private String isList;
+
+    /**
+     * 是否查询字段（1是）
+     */
+    private String isQuery;
+
+    /**
+     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+     */
+    private String queryType;
+
+    /**
+     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    public void setColumnId(Long columnId) {
+        this.columnId = columnId;
+    }
+
+    public Long getColumnId() {
+        return columnId;
+    }
+
+    public void setTableId(Long tableId) {
+        this.tableId = tableId;
+    }
+
+    public Long getTableId() {
+        return tableId;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnComment(String columnComment) {
+        this.columnComment = columnComment;
+    }
+
+    public String getColumnComment() {
+        return columnComment;
+    }
+
+    public void setColumnType(String columnType) {
+        this.columnType = columnType;
+    }
+
+    public String getColumnType() {
+        return columnType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaField(String javaField) {
+        this.javaField = javaField;
+    }
+
+    public String getJavaField() {
+        return javaField;
+    }
+
+    public String getCapJavaField() {
+        return StringUtils.capitalize(javaField);
+    }
+
+    public void setIsPk(String isPk) {
+        this.isPk = isPk;
+    }
+
+    public String getIsPk() {
+        return isPk;
+    }
+
+    public boolean isPk() {
+        return isPk(this.isPk);
+    }
+
+    public boolean isPk(String isPk) {
+        return isPk != null && StringUtils.equals("1", isPk);
+    }
+
+    public String getIsIncrement() {
+        return isIncrement;
+    }
+
+    public void setIsIncrement(String isIncrement) {
+        this.isIncrement = isIncrement;
+    }
+
+    public boolean isIncrement() {
+        return isIncrement(this.isIncrement);
+    }
+
+    public boolean isIncrement(String isIncrement) {
+        return isIncrement != null && StringUtils.equals("1", isIncrement);
+    }
+
+    public void setIsRequired(String isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public String getIsRequired() {
+        return isRequired;
+    }
+
+    public boolean isRequired() {
+        return isRequired(this.isRequired);
+    }
+
+    public boolean isRequired(String isRequired) {
+        return isRequired != null && StringUtils.equals("1", isRequired);
+    }
+
+    public void setIsInsert(String isInsert) {
+        this.isInsert = isInsert;
+    }
+
+    public String getIsInsert() {
+        return isInsert;
+    }
+
+    public boolean isInsert() {
+        return isInsert(this.isInsert);
+    }
+
+    public boolean isInsert(String isInsert) {
+        return isInsert != null && StringUtils.equals("1", isInsert);
+    }
+
+    public void setIsEdit(String isEdit) {
+        this.isEdit = isEdit;
+    }
+
+    public String getIsEdit() {
+        return isEdit;
+    }
+
+    public boolean isEdit() {
+        return isInsert(this.isEdit);
+    }
+
+    public boolean isEdit(String isEdit) {
+        return isEdit != null && StringUtils.equals("1", isEdit);
+    }
+
+    public void setIsList(String isList) {
+        this.isList = isList;
+    }
+
+    public String getIsList() {
+        return isList;
+    }
+
+    public boolean isList() {
+        return isList(this.isList);
+    }
+
+    public boolean isList(String isList) {
+        return isList != null && StringUtils.equals("1", isList);
+    }
+
+    public void setIsQuery(String isQuery) {
+        this.isQuery = isQuery;
+    }
+
+    public String getIsQuery() {
+        return isQuery;
+    }
+
+    public boolean isQuery() {
+        return isQuery(this.isQuery);
+    }
+
+    public boolean isQuery(String isQuery) {
+        return isQuery != null && StringUtils.equals("1", isQuery);
+    }
+
+    public void setQueryType(String queryType) {
+        this.queryType = queryType;
+    }
+
+    public String getQueryType() {
+        return queryType;
+    }
+
+    public String getHtmlType() {
+        return htmlType;
+    }
+
+    public void setHtmlType(String htmlType) {
+        this.htmlType = htmlType;
+    }
+
+    public void setDictType(String dictType) {
+        this.dictType = dictType;
+    }
+
+    public String getDictType() {
+        return dictType;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public boolean isSuperColumn() {
+        return isSuperColumn(this.javaField);
+    }
+
+    public static boolean isSuperColumn(String javaField) {
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                // BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                // TreeEntity
+                "parentName", "parentId", "orderNum", "ancestors");
+    }
+
+    public boolean isUsableColumn() {
+        return isUsableColumn(javaField);
+    }
+
+    public static boolean isUsableColumn(String javaField) {
+        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+    }
+
+    public String readConverterExp() {
+        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+        StringBuffer sb = new StringBuffer();
+        if (StringUtils.isNotEmpty(remarks)) {
+            for (String value : remarks.split(" ")) {
+                if (StringUtils.isNotEmpty(value)) {
+                    Object startStr = value.subSequence(0, 1);
+                    String endStr = value.substring(1);
+                    sb.append("").append(startStr).append("=").append(endStr).append(",");
+                }
+            }
+            return sb.deleteCharAt(sb.length() - 1).toString();
+        } else {
+            return this.columnComment;
+        }
+    }
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn_bak.java
new file mode 100644
index 0000000..b296b2a
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTableColumn_bak.java
@@ -0,0 +1,349 @@
+//package com.mosty.common.generator.domain;
+//
+//
+//import com.mosty.common.base.entity.log.BaseEntity;
+//import com.mosty.common.base.util.StringUtils;
+//
+////import javax.validation.constraints.NotBlank;
+//
+///**
+// * 代码生成业务字段表 gen_table_column
+// *
+// * @author ruoyi
+// */
+//public class GenTableColumn extends BaseEntity {
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * 编号
+//     */
+//    private Long columnId;
+//
+//    /**
+//     * 归属表编号
+//     */
+//    private Long tableId;
+//
+//    /**
+//     * 列名称
+//     */
+//    private String columnName;
+//
+//    /**
+//     * 列描述
+//     */
+//    private String columnComment;
+//
+//    /**
+//     * 列类型
+//     */
+//    private String columnType;
+//
+//    /**
+//     * JAVA类型
+//     */
+//    private String javaType;
+//
+//    /**
+//     * JAVA字段名
+//     */
+////    @NotBlank(message = "Java属性不能为空")
+//    private String javaField;
+//
+//    /**
+//     * 是否主键（1是）
+//     */
+//    private String isPk;
+//
+//    /**
+//     * 是否自增（1是）
+//     */
+//    private String isIncrement;
+//
+//    /**
+//     * 是否必填（1是）
+//     */
+//    private String isRequired;
+//
+//    /**
+//     * 是否为插入字段（1是）
+//     */
+//    private String isInsert;
+//
+//    /**
+//     * 是否编辑字段（1是）
+//     */
+//    private String isEdit;
+//
+//    /**
+//     * 是否列表字段（1是）
+//     */
+//    private String isList;
+//
+//    /**
+//     * 是否查询字段（1是）
+//     */
+//    private String isQuery;
+//
+//    /**
+//     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+//     */
+//    private String queryType;
+//
+//    /**
+//     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件、summernote富文本控件）
+//     */
+//    private String htmlType;
+//
+//    /**
+//     * 字典类型
+//     */
+//    private String dictType;
+//
+//    /**
+//     * 排序
+//     */
+//    private Integer sort;
+//
+//    public void setColumnId(Long columnId) {
+//        this.columnId = columnId;
+//    }
+//
+//    public Long getColumnId() {
+//        return columnId;
+//    }
+//
+//    public void setTableId(Long tableId) {
+//        this.tableId = tableId;
+//    }
+//
+//    public Long getTableId() {
+//        return tableId;
+//    }
+//
+//    public void setColumnName(String columnName) {
+//        this.columnName = columnName;
+//    }
+//
+//    public String getColumnName() {
+//        return columnName;
+//    }
+//
+//    public void setColumnComment(String columnComment) {
+//        this.columnComment = columnComment;
+//    }
+//
+//    public String getColumnComment() {
+//        return columnComment;
+//    }
+//
+//    public void setColumnType(String columnType) {
+//        this.columnType = columnType;
+//    }
+//
+//    public String getColumnType() {
+//        return columnType;
+//    }
+//
+//    public void setJavaType(String javaType) {
+//        this.javaType = javaType;
+//    }
+//
+//    public String getJavaType() {
+//        return javaType;
+//    }
+//
+//    public void setJavaField(String javaField) {
+//        this.javaField = javaField;
+//    }
+//
+//    public String getJavaField() {
+//        return javaField;
+//    }
+//
+//    public String getCapJavaField() {
+//        return StringUtils.capitalize(javaField);
+//    }
+//
+//    public void setIsPk(String isPk) {
+//        this.isPk = isPk;
+//    }
+//
+//    public String getIsPk() {
+//        return isPk;
+//    }
+//
+//    public boolean isPk() {
+//        return isPk(this.isPk);
+//    }
+//
+//    public boolean isPk(String isPk) {
+//        return isPk != null && StringUtils.equals("1", isPk);
+//    }
+//
+//    public String getIsIncrement() {
+//        return isIncrement;
+//    }
+//
+//    public void setIsIncrement(String isIncrement) {
+//        this.isIncrement = isIncrement;
+//    }
+//
+//    public boolean isIncrement() {
+//        return isIncrement(this.isIncrement);
+//    }
+//
+//    public boolean isIncrement(String isIncrement) {
+//        return isIncrement != null && StringUtils.equals("1", isIncrement);
+//    }
+//
+//    public void setIsRequired(String isRequired) {
+//        this.isRequired = isRequired;
+//    }
+//
+//    public String getIsRequired() {
+//        return isRequired;
+//    }
+//
+//    public boolean isRequired() {
+//        return isRequired(this.isRequired);
+//    }
+//
+//    public boolean isRequired(String isRequired) {
+//        return isRequired != null && StringUtils.equals("1", isRequired);
+//    }
+//
+//    public void setIsInsert(String isInsert) {
+//        this.isInsert = isInsert;
+//    }
+//
+//    public String getIsInsert() {
+//        return isInsert;
+//    }
+//
+//    public boolean isInsert() {
+//        return isInsert(this.isInsert);
+//    }
+//
+//    public boolean isInsert(String isInsert) {
+//        return isInsert != null && StringUtils.equals("1", isInsert);
+//    }
+//
+//    public void setIsEdit(String isEdit) {
+//        this.isEdit = isEdit;
+//    }
+//
+//    public String getIsEdit() {
+//        return isEdit;
+//    }
+//
+//    public boolean isEdit() {
+//        return isInsert(this.isEdit);
+//    }
+//
+//    public boolean isEdit(String isEdit) {
+//        return isEdit != null && StringUtils.equals("1", isEdit);
+//    }
+//
+//    public void setIsList(String isList) {
+//        this.isList = isList;
+//    }
+//
+//    public String getIsList() {
+//        return isList;
+//    }
+//
+//    public boolean isList() {
+//        return isList(this.isList);
+//    }
+//
+//    public boolean isList(String isList) {
+//        return isList != null && StringUtils.equals("1", isList);
+//    }
+//
+//    public void setIsQuery(String isQuery) {
+//        this.isQuery = isQuery;
+//    }
+//
+//    public String getIsQuery() {
+//        return isQuery;
+//    }
+//
+//    public boolean isQuery() {
+//        return isQuery(this.isQuery);
+//    }
+//
+//    public boolean isQuery(String isQuery) {
+//        return isQuery != null && StringUtils.equals("1", isQuery);
+//    }
+//
+//    public void setQueryType(String queryType) {
+//        this.queryType = queryType;
+//    }
+//
+//    public String getQueryType() {
+//        return queryType;
+//    }
+//
+//    public String getHtmlType() {
+//        return htmlType;
+//    }
+//
+//    public void setHtmlType(String htmlType) {
+//        this.htmlType = htmlType;
+//    }
+//
+//    public void setDictType(String dictType) {
+//        this.dictType = dictType;
+//    }
+//
+//    public String getDictType() {
+//        return dictType;
+//    }
+//
+//    public void setSort(Integer sort) {
+//        this.sort = sort;
+//    }
+//
+//    public Integer getSort() {
+//        return sort;
+//    }
+//
+//    public boolean isSuperColumn() {
+//        return isSuperColumn(this.javaField);
+//    }
+//
+//    public static boolean isSuperColumn(String javaField) {
+//        return StringUtils.equalsAnyIgnoreCase(javaField,
+//                // BaseEntity
+//                "createBy", "createTime", "updateBy", "updateTime", "remark",
+//                // TreeEntity
+//                "parentName", "parentId", "orderNum", "ancestors");
+//    }
+//
+//    public boolean isUsableColumn() {
+//        return isUsableColumn(javaField);
+//    }
+//
+//    public static boolean isUsableColumn(String javaField) {
+//        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+//        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+//    }
+//
+//    public String readConverterExp() {
+//        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+//        StringBuffer sb = new StringBuffer();
+//        if (StringUtils.isNotEmpty(remarks)) {
+//            for (String value : remarks.split(" ")) {
+//                if (StringUtils.isNotEmpty(value)) {
+//                    Object startStr = value.subSequence(0, 1);
+//                    String endStr = value.substring(1);
+//                    sb.append("").append(startStr).append("=").append(endStr).append(",");
+//                }
+//            }
+//            return sb.deleteCharAt(sb.length() - 1).toString();
+//        } else {
+//            return this.columnComment;
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable_bak.java
new file mode 100644
index 0000000..f1ad2ab
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/domain/GenTable_bak.java
@@ -0,0 +1,365 @@
+//package com.mosty.common.generator.domain;
+//
+//import com.mosty.common.base.constant.GenConstants;
+//import com.mosty.common.base.entity.log.BaseEntity;
+//import org.apache.commons.lang3.ArrayUtils;
+//import org.apache.commons.lang3.StringUtils;
+//
+//import javax.validation.Valid;
+//import javax.validation.constraints.NotBlank;
+//import java.util.List;
+//import java.util.Objects;
+//
+///**
+// * 业务表 gen_table
+// *
+// * @author ruoyi
+// */
+//public class GenTable extends BaseEntity {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * 编号
+//     */
+//    private Long tableId;
+//
+//    /**
+//     * 表名称
+//     */
+//    @NotBlank(message = "表名称不能为空")
+//    private String tableName;
+//
+//    /**
+//     * 表描述
+//     */
+//    @NotBlank(message = "表描述不能为空")
+//    private String tableComment;
+//
+//    /**
+//     * 关联父表的表名
+//     */
+//    private String subTableName;
+//
+//    /**
+//     * 本表关联父表的外键名
+//     */
+//    private String subTableFkName;
+//
+//    /**
+//     * 实体类名称(首字母大写)
+//     */
+//    @NotBlank(message = "实体类名称不能为空")
+//    private String className;
+//
+//    /**
+//     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+//     */
+//    private String tplCategory;
+//
+//    /**
+//     * 生成包路径
+//     */
+//    @NotBlank(message = "生成包路径不能为空")
+//    private String packageName;
+//
+//    /**
+//     * 生成模块名
+//     */
+//    @NotBlank(message = "生成模块名不能为空")
+//    private String moduleName;
+//
+//    /**
+//     * 生成业务名
+//     */
+//    @NotBlank(message = "生成业务名不能为空")
+//    private String businessName;
+//
+//    /**
+//     * 生成功能名
+//     */
+//    @NotBlank(message = "生成功能名不能为空")
+//    private String functionName;
+//
+//    /**
+//     * 生成作者
+//     */
+//    @NotBlank(message = "作者不能为空")
+//    private String functionAuthor;
+//
+//    /**
+//     * 生成代码方式（0zip压缩包 1自定义路径）
+//     */
+//    private String genType;
+//
+//    /**
+//     * 生成路径（不填默认项目路径）
+//     */
+//    private String genPath;
+//
+//    /**
+//     * 主键信息
+//     */
+//    private GenTableColumn pkColumn;
+//
+//    /**
+//     * 子表信息
+//     */
+//    private GenTable subTable;
+//
+//    /**
+//     * 表列信息
+//     */
+//    @Valid
+//    private List<GenTableColumn> columns;
+//
+//    /**
+//     * 其它生成选项
+//     */
+//    private String options;
+//
+//    /**
+//     * 树编码字段
+//     */
+//    private String treeCode;
+//
+//    /**
+//     * 树父编码字段
+//     */
+//    private String treeParentCode;
+//
+//    /**
+//     * 树名称字段
+//     */
+//    private String treeName;
+//
+//    /**
+//     * 上级菜单ID字段
+//     */
+//    private String parentMenuId;
+//
+//    /**
+//     * 上级菜单名称字段
+//     */
+//    private String parentMenuName;
+//
+//    public Long getTableId() {
+//        return tableId;
+//    }
+//
+//    public void setTableId(Long tableId) {
+//        this.tableId = tableId;
+//    }
+//
+//    public String getTableName() {
+//        return tableName;
+//    }
+//
+//    public void setTableName(String tableName) {
+//        this.tableName = tableName;
+//    }
+//
+//    public String getTableComment() {
+//        return tableComment;
+//    }
+//
+//    public void setTableComment(String tableComment) {
+//        this.tableComment = tableComment;
+//    }
+//
+//    public String getSubTableName() {
+//        return subTableName;
+//    }
+//
+//    public void setSubTableName(String subTableName) {
+//        this.subTableName = subTableName;
+//    }
+//
+//    public String getSubTableFkName() {
+//        return subTableFkName;
+//    }
+//
+//    public void setSubTableFkName(String subTableFkName) {
+//        this.subTableFkName = subTableFkName;
+//    }
+//
+//    public String getClassName() {
+//        return className;
+//    }
+//
+//    public void setClassName(String className) {
+//        this.className = className;
+//    }
+//
+//    public String getTplCategory() {
+//        return tplCategory;
+//    }
+//
+//    public void setTplCategory(String tplCategory) {
+//        this.tplCategory = tplCategory;
+//    }
+//
+//    public String getPackageName() {
+//        return packageName;
+//    }
+//
+//    public void setPackageName(String packageName) {
+//        this.packageName = packageName;
+//    }
+//
+//    public String getModuleName() {
+//        return moduleName;
+//    }
+//
+//    public void setModuleName(String moduleName) {
+//        this.moduleName = moduleName;
+//    }
+//
+//    public String getBusinessName() {
+//        return businessName;
+//    }
+//
+//    public void setBusinessName(String businessName) {
+//        this.businessName = businessName;
+//    }
+//
+//    public String getFunctionName() {
+//        return functionName;
+//    }
+//
+//    public void setFunctionName(String functionName) {
+//        this.functionName = functionName;
+//    }
+//
+//    public String getFunctionAuthor() {
+//        return functionAuthor;
+//    }
+//
+//    public void setFunctionAuthor(String functionAuthor) {
+//        this.functionAuthor = functionAuthor;
+//    }
+//
+//    public String getGenType() {
+//        return genType;
+//    }
+//
+//    public void setGenType(String genType) {
+//        this.genType = genType;
+//    }
+//
+//    public String getGenPath() {
+//        return genPath;
+//    }
+//
+//    public void setGenPath(String genPath) {
+//        this.genPath = genPath;
+//    }
+//
+//    public GenTableColumn getPkColumn() {
+//        return pkColumn;
+//    }
+//
+//    public void setPkColumn(GenTableColumn pkColumn) {
+//        this.pkColumn = pkColumn;
+//    }
+//
+//    public GenTable getSubTable() {
+//        return subTable;
+//    }
+//
+//    public void setSubTable(GenTable subTable) {
+//        this.subTable = subTable;
+//    }
+//
+//    public List<GenTableColumn> getColumns() {
+//        return columns;
+//    }
+//
+//    public void setColumns(List<GenTableColumn> columns) {
+//        this.columns = columns;
+//    }
+//
+//    public String getOptions() {
+//        return options;
+//    }
+//
+//    public void setOptions(String options) {
+//        this.options = options;
+//    }
+//
+//    public String getTreeCode() {
+//        return treeCode;
+//    }
+//
+//    public void setTreeCode(String treeCode) {
+//        this.treeCode = treeCode;
+//    }
+//
+//    public String getTreeParentCode() {
+//        return treeParentCode;
+//    }
+//
+//    public void setTreeParentCode(String treeParentCode) {
+//        this.treeParentCode = treeParentCode;
+//    }
+//
+//    public String getTreeName() {
+//        return treeName;
+//    }
+//
+//    public void setTreeName(String treeName) {
+//        this.treeName = treeName;
+//    }
+//
+//    public String getParentMenuId() {
+//        return parentMenuId;
+//    }
+//
+//    public void setParentMenuId(String parentMenuId) {
+//        this.parentMenuId = parentMenuId;
+//    }
+//
+//    public String getParentMenuName() {
+//        return parentMenuName;
+//    }
+//
+//    public void setParentMenuName(String parentMenuName) {
+//        this.parentMenuName = parentMenuName;
+//    }
+//
+//    public boolean isSub() {
+//        return isSub(this.tplCategory);
+//    }
+//
+//    public static boolean isSub(String tplCategory) {
+//        return tplCategory != null && Objects.equals(GenConstants.TPL_SUB, tplCategory);
+//    }
+//
+//    public boolean isTree() {
+//        return isTree(this.tplCategory);
+//    }
+//
+//    public static boolean isTree(String tplCategory) {
+//        return tplCategory != null && Objects.equals(GenConstants.TPL_TREE, tplCategory);
+//    }
+//
+//    public boolean isCrud() {
+//        return isCrud(this.tplCategory);
+//    }
+//
+//    public static boolean isCrud(String tplCategory) {
+//        return tplCategory != null && Objects.equals(GenConstants.TPL_CRUD, tplCategory);
+//    }
+//
+//    public boolean isSuperColumn(String javaField) {
+//        return isSuperColumn(this.tplCategory, javaField);
+//    }
+//
+//    public static boolean isSuperColumn(String tplCategory, String javaField) {
+//        if (isTree(tplCategory)) {
+//            return StringUtils.equalsAnyIgnoreCase(javaField,
+//                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+//        }
+//        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper.java b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper.java
new file mode 100644
index 0000000..991c275
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper.java
@@ -0,0 +1,61 @@
+package com.mosty.common.generator.mapper;
+
+
+import com.mosty.common.generator.domain.GenTableColumn;
+
+import java.util.List;
+
+/**
+ * 业务字段 数据层
+ *
+ * @author ruoyi
+ */
+public interface GenTableColumnMapper {
+    /**
+     * 根据表名称查询列信息
+     *
+     * @param tableName 表名称
+     * @return 列信息
+     */
+    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+
+    /**
+     * 查询业务字段列表
+     *
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段
+     *
+     * @param genTableColumns 列数据
+     * @return 结果
+     */
+    public int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
+
+    /**
+     * 批量删除业务字段
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(Long[] ids);
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper_bak.java
new file mode 100644
index 0000000..c5aa647
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableColumnMapper_bak.java
@@ -0,0 +1,60 @@
+//package com.mosty.common.generator.mapper;
+//
+//import com.mosty.common.generator.domain.GenTableColumn;
+//
+//import java.util.List;
+//
+///**
+// * 业务字段 数据层
+// *
+// * @author ruoyi
+// */
+//public interface GenTableColumnMapper {
+//    /**
+//     * 根据表名称查询列信息
+//     *
+//     * @param tableName 表名称
+//     * @return 列信息
+//     */
+//    List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+//
+//    /**
+//     * 查询业务字段列表
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 业务字段集合
+//     */
+//    List<GenTableColumn> selectGenTableColumnListByTableId(GenTableColumn genTableColumn);
+//
+//    /**
+//     * 新增业务字段
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 结果
+//     */
+//    int insertGenTableColumn(GenTableColumn genTableColumn);
+//
+//    /**
+//     * 修改业务字段
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 结果
+//     */
+//    int updateGenTableColumn(GenTableColumn genTableColumn);
+//
+//    /**
+//     * 删除业务字段
+//     *
+//     * @param genTableColumns 列数据
+//     * @return 结果
+//     */
+//    int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
+//
+//    /**
+//     * 批量删除业务字段
+//     *
+//     * @param ids 需要删除的数据ID
+//     * @return 结果
+//     */
+//    int deleteGenTableColumnByIds(Long[] ids);
+//}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper.java b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper.java
new file mode 100644
index 0000000..0106115
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper.java
@@ -0,0 +1,84 @@
+package com.mosty.common.generator.mapper;
+
+
+import com.mosty.common.generator.domain.GenTable;
+
+import java.util.List;
+
+/**
+ * 业务 数据层
+ *
+ * @author ruoyi
+ */
+public interface GenTableMapper {
+    /**
+     * 查询业务列表
+     *
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     *
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     *
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询表ID业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 查询表名称业务信息
+     *
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    public GenTable selectGenTableByName(String tableName);
+
+    /**
+     * 新增业务
+     *
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int insertGenTable(GenTable genTable);
+
+    /**
+     * 修改业务
+     *
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int updateGenTable(GenTable genTable);
+
+    /**
+     * 批量删除业务
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableByIds(Long[] ids);
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper_bak.java
new file mode 100644
index 0000000..f485ff4
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/mapper/GenTableMapper_bak.java
@@ -0,0 +1,91 @@
+//package com.mosty.common.generator.mapper;
+//
+//import com.mosty.common.generator.domain.GenTable;
+//
+//import java.util.List;
+//
+///**
+// * 业务 数据层
+// *
+// * @author ruoyi
+// */
+//public interface GenTableMapper {
+//    /**
+//     * 查询业务列表
+//     *
+//     * @param genTable 业务信息
+//     * @return 业务集合
+//     */
+//    List<GenTable> selectGenTableList(GenTable genTable);
+//
+//    /**
+//     * 查询据库列表
+//     *
+//     * @param genTable 业务信息
+//     * @return 数据库表集合
+//     */
+//    List<GenTable> selectDbTableList(GenTable genTable);
+//
+//    /**
+//     * 查询据库列表
+//     *
+//     * @param tableNames 表名称组
+//     * @return 数据库表集合
+//     */
+//    List<GenTable> selectDbTableListByNames(String[] tableNames);
+//
+//    /**
+//     * 查询所有表信息
+//     *
+//     * @return 表信息集合
+//     */
+//    List<GenTable> selectGenTableAll();
+//
+//    /**
+//     * 查询表ID业务信息
+//     *
+//     * @param id 业务ID
+//     * @return 业务信息
+//     */
+//    GenTable selectGenTableById(Long id);
+//
+//    /**
+//     * 查询表名称业务信息
+//     *
+//     * @param tableName 表名称
+//     * @return 业务信息
+//     */
+//    GenTable selectGenTableByName(String tableName);
+//
+//    /**
+//     * 新增业务
+//     *
+//     * @param genTable 业务信息
+//     * @return 结果
+//     */
+//    int insertGenTable(GenTable genTable);
+//
+//    /**
+//     * 修改业务
+//     *
+//     * @param genTable 业务信息
+//     * @return 结果
+//     */
+//    int updateGenTable(GenTable genTable);
+//
+//    /**
+//     * 批量删除业务
+//     *
+//     * @param ids 需要删除的数据ID
+//     * @return 结果
+//     */
+//    int deleteGenTableByIds(Long[] ids);
+//
+//    /**
+//     * 创建表
+//     *
+//     * @param sql
+//     * @return 结果
+//     */
+//    int createTable(String sql);
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnServiceImpl.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnServiceImpl.java
new file mode 100644
index 0000000..2edafc5
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnServiceImpl.java
@@ -0,0 +1,64 @@
+package com.mosty.common.generator.service;
+
+import com.mosty.common.generator.domain.GenTableColumn;
+import com.mosty.common.generator.mapper.GenTableColumnMapper;
+import com.mosty.common.generator.util.Convert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 业务字段 服务层实现
+ *
+ * @author ruoyi
+ */
+@Service
+public class GenTableColumnServiceImpl implements IGenTableColumnService {
+    @Autowired
+    private GenTableColumnMapper genTableColumnMapper;
+
+    /**
+     * 查询业务字段列表
+     *
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    @Override
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
+        return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+    }
+
+    /**
+     * 新增业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    @Override
+    public int insertGenTableColumn(GenTableColumn genTableColumn) {
+        return genTableColumnMapper.insertGenTableColumn(genTableColumn);
+    }
+
+    /**
+     * 修改业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    @Override
+    public int updateGenTableColumn(GenTableColumn genTableColumn) {
+        return genTableColumnMapper.updateGenTableColumn(genTableColumn);
+    }
+
+    /**
+     * 删除业务字段对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteGenTableColumnByIds(String ids) {
+        return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+    }
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnService_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnService_bak.java
new file mode 100644
index 0000000..c5d16d0
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableColumnService_bak.java
@@ -0,0 +1,63 @@
+//package com.mosty.common.generator.service;
+//
+//import cn.hutool.core.convert.Convert;
+//import com.mosty.common.generator.mapper.GenTableColumnMapper;
+//import com.mosty.common.generator.domain.GenTableColumn;
+//import lombok.AllArgsConstructor;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+///**
+// * 业务字段 服务层实现
+// *
+// * @author ruoyi
+// */
+//@Service
+//
+//@AllArgsConstructor
+//public class GenTableColumnService {
+//
+//    private final GenTableColumnMapper genTableColumnMapper;
+//
+//    /**
+//     * 查询业务字段列表
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 业务字段集合
+//     */
+//    public List<GenTableColumn> selectGenTableColumnListByTableId(GenTableColumn genTableColumn) {
+//        return genTableColumnMapper.selectGenTableColumnListByTableId(genTableColumn);
+//    }
+//
+//    /**
+//     * 新增业务字段
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 结果
+//     */
+//    public int insertGenTableColumn(GenTableColumn genTableColumn) {
+//        return genTableColumnMapper.insertGenTableColumn(genTableColumn);
+//    }
+//
+//    /**
+//     * 修改业务字段
+//     *
+//     * @param genTableColumn 业务字段信息
+//     * @return 结果
+//     */
+//    public int updateGenTableColumn(GenTableColumn genTableColumn) {
+//        return genTableColumnMapper.updateGenTableColumn(genTableColumn);
+//    }
+//
+//    /**
+//     * 删除业务字段对象
+//     *
+//     * @param ids 需要删除的数据ID
+//     * @return 结果
+//     */
+//    public int deleteGenTableColumnByIds(String ids) {
+//        return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+//    }
+//
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableServiceImpl.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableServiceImpl.java
new file mode 100644
index 0000000..dee4bbc
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableServiceImpl.java
@@ -0,0 +1,443 @@
+package com.mosty.common.generator.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.common.base.constant.Constants;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.generator.config.GenConstants;
+import com.mosty.common.generator.domain.GenTable;
+import com.mosty.common.generator.domain.GenTableColumn;
+import com.mosty.common.generator.mapper.GenTableColumnMapper;
+import com.mosty.common.generator.mapper.GenTableMapper;
+import com.mosty.common.generator.util.*;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 业务 服务层实现
+ *
+ * @author ruoyi
+ */
+@Service
+public class GenTableServiceImpl implements IGenTableService {
+    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
+
+    @Autowired
+    private GenTableMapper genTableMapper;
+
+    @Autowired
+    private GenTableColumnMapper genTableColumnMapper;
+
+    /**
+     * 查询业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    @Override
+    public GenTable selectGenTableById(Long id) {
+        GenTable genTable = genTableMapper.selectGenTableById(id);
+        setTableFromOptions(genTable);
+        return genTable;
+    }
+
+    /**
+     * 查询业务列表
+     *
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    @Override
+    public List<GenTable> selectGenTableList(GenTable genTable) {
+        return genTableMapper.selectGenTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     *
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableList(GenTable genTable) {
+        return genTableMapper.selectDbTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     *
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableListByNames(String[] tableNames) {
+        return genTableMapper.selectDbTableListByNames(tableNames);
+    }
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    @Override
+    public List<GenTable> selectGenTableAll() {
+        return genTableMapper.selectGenTableAll();
+    }
+
+    /**
+     * 修改业务
+     *
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void updateGenTable(GenTable genTable) {
+        String options = JSON.toJSONString(genTable.getParams());
+        genTable.setOptions(options);
+        int row = genTableMapper.updateGenTable(genTable);
+        if (row > 0) {
+            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
+                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+            }
+        }
+    }
+
+    /**
+     * 删除业务对象
+     *
+     * @param tableIds 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void deleteGenTableByIds(Long[] tableIds) {
+        genTableMapper.deleteGenTableByIds(tableIds);
+        genTableColumnMapper.deleteGenTableColumnByIds(tableIds);
+    }
+
+    /**
+     * 导入表结构
+     *
+     * @param tableList 导入表列表
+     */
+    @Override
+    @Transactional
+    public void importGenTable(List<GenTable> tableList) {
+        String operName = /*SecurityUtils.getUsername()*/UserInfoManager.get().userName;
+        try {
+            for (GenTable table : tableList) {
+                String tableName = table.getTableName();
+                GenUtils.initTable(table, operName);
+                int row = genTableMapper.insertGenTable(table);
+                if (row > 0) {
+                    // 保存列信息
+                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+                    for (GenTableColumn column : genTableColumns) {
+                        GenUtils.initColumnField(column, table);
+                        genTableColumnMapper.insertGenTableColumn(column);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 预览代码
+     *
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    @Override
+    public Map<String, String> previewCode(Long tableId) {
+        Map<String, String> dataMap = new LinkedHashMap<>();
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableById(tableId);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            dataMap.put(template, sw.toString());
+        }
+        return dataMap;
+    }
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableName 表名称
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String tableName) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableName, zip);
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     *
+     * @param tableName 表名称
+     */
+    @Override
+    public void generatorCode(String tableName) {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
+                // 渲染模板
+                StringWriter sw = new StringWriter();
+                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+                tpl.merge(context, sw);
+                try {
+                    String path = getGenPath(table, template);
+                    FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);
+                } catch (IOException e) {
+                    throw new BusinessException("渲染模板失败，表名：" + table.getTableName());
+                }
+            }
+        }
+    }
+
+    /**
+     * 同步数据库
+     *
+     * @param tableName 表名称
+     */
+    @Override
+    @Transactional
+    public void synchDb(String tableName) {
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        List<GenTableColumn> tableColumns = table.getColumns();
+        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
+
+        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+        if (StringUtils.isEmpty(dbTableColumns)) {
+            throw new BusinessException("同步数据失败，原表结构不存在");
+        }
+        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+
+        dbTableColumns.forEach(column -> {
+            GenUtils.initColumnField(column, table);
+            if (tableColumnMap.containsKey(column.getColumnName())) {
+                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+                column.setColumnId(prevColumn.getColumnId());
+                if (column.isList()) {
+                    // 如果是列表，继续保留字典类型
+                    column.setDictType(prevColumn.getDictType());
+                }
+                genTableColumnMapper.updateGenTableColumn(column);
+            } else {
+                genTableColumnMapper.insertGenTableColumn(column);
+            }
+        });
+
+        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(delColumns)) {
+            genTableColumnMapper.deleteGenTableColumns(delColumns);
+        }
+    }
+
+    /**
+     * 批量生成代码（下载方式）
+     *
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String[] tableNames) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        for (String tableName : tableNames) {
+            generatorCode(tableName, zip);
+        }
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 查询表信息并生成代码
+     */
+    private void generatorCode(String tableName, ZipOutputStream zip) {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            try {
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IOUtils.write(sw.toString(), zip, Constants.UTF8);
+                IOUtils.closeQuietly(sw);
+                zip.flush();
+                zip.closeEntry();
+            } catch (IOException e) {
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            }
+        }
+    }
+
+    /**
+     * 修改保存参数校验
+     *
+     * @param genTable 业务信息
+     */
+    @Override
+    public void validateEdit(GenTable genTable) {
+        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
+            String options = JSON.toJSONString(genTable.getParams());
+            JSONObject paramsObj = JSONObject.parseObject(options);
+            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) {
+                throw new BusinessException("树编码字段不能为空");
+            } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) {
+                throw new BusinessException("树父编码字段不能为空");
+            } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
+                throw new BusinessException("树名称字段不能为空");
+            } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
+                if (StringUtils.isEmpty(genTable.getSubTableName())) {
+                    throw new BusinessException("关联子表的表名不能为空");
+                } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
+                    throw new BusinessException("子表关联的外键名不能为空");
+                }
+            }
+        }
+    }
+
+    /**
+     * 设置主键列信息
+     *
+     * @param table 业务表信息
+     */
+    public void setPkColumn(GenTable table) {
+        for (GenTableColumn column : table.getColumns()) {
+            if (column.isPk()) {
+                table.setPkColumn(column);
+                break;
+            }
+        }
+        if (StringUtils.isNull(table.getPkColumn())) {
+            table.setPkColumn(table.getColumns().get(0));
+        }
+        if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
+            for (GenTableColumn column : table.getSubTable().getColumns()) {
+                if (column.isPk()) {
+                    table.getSubTable().setPkColumn(column);
+                    break;
+                }
+            }
+            if (StringUtils.isNull(table.getSubTable().getPkColumn())) {
+                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+            }
+        }
+    }
+
+    /**
+     * 设置主子表信息
+     *
+     * @param table 业务表信息
+     */
+    public void setSubTable(GenTable table) {
+        String subTableName = table.getSubTableName();
+        if (StringUtils.isNotEmpty(subTableName)) {
+            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
+        }
+    }
+
+    /**
+     * 设置代码生成其他选项值
+     *
+     * @param genTable 设置后的生成对象
+     */
+    public void setTableFromOptions(GenTable genTable) {
+        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
+        if (StringUtils.isNotNull(paramsObj)) {
+            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
+            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
+            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
+
+            genTable.setTreeCode(treeCode);
+            genTable.setTreeParentCode(treeParentCode);
+            genTable.setTreeName(treeName);
+            genTable.setParentMenuId(parentMenuId);
+            genTable.setParentMenuName(parentMenuName);
+        }
+    }
+
+    /**
+     * 获取代码生成地址
+     *
+     * @param table    业务表信息
+     * @param template 模板文件路径
+     * @return 生成地址
+     */
+    public static String getGenPath(GenTable table, String template) {
+        String genPath = table.getGenPath();
+        if (StringUtils.equals(genPath, "/")) {
+            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
+        }
+        return genPath + File.separator + VelocityUtils.getFileName(template, table);
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableService_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableService_bak.java
new file mode 100644
index 0000000..de51f4c
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/GenTableService_bak.java
@@ -0,0 +1,439 @@
+//package com.mosty.common.generator.service;
+//
+//import cn.hutool.core.collection.CollectionUtil;
+//import cn.hutool.core.convert.Convert;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.mosty.common.base.constant.Constants;
+//import com.mosty.common.base.constant.GenConstants;
+//import com.mosty.common.base.exception.BusinessException;
+//import com.mosty.common.generator.domain.GenTable;
+//import com.mosty.common.generator.domain.GenTableColumn;
+//import com.mosty.common.generator.mapper.GenTableColumnMapper;
+//import com.mosty.common.generator.mapper.GenTableMapper;
+//import com.mosty.common.generator.util.GenUtils;
+//import com.mosty.common.generator.util.VelocityInitializer;
+//import com.mosty.common.generator.util.VelocityUtils;
+//import lombok.AllArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.io.FileUtils;
+//import org.apache.commons.io.IOUtils;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.velocity.Template;
+//import org.apache.velocity.VelocityContext;
+//import org.apache.velocity.app.Velocity;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import java.io.ByteArrayOutputStream;
+//import java.io.File;
+//import java.io.IOException;
+//import java.io.StringWriter;
+//import java.util.LinkedHashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Objects;
+//import java.util.function.Function;
+//import java.util.stream.Collectors;
+//import java.util.zip.ZipEntry;
+//import java.util.zip.ZipOutputStream;
+//
+///**
+// * 业务 服务层实现
+// *
+// * @author ruoyi
+// */
+//@Slf4j
+//@Service
+//@AllArgsConstructor
+//public class GenTableService {
+//
+//    private final GenTableMapper genTableMapper;
+//    private final GenTableColumnMapper genTableColumnMapper;
+//
+//    /**
+//     * 查询业务信息
+//     *
+//     * @param id 业务ID
+//     * @return 业务信息
+//     */
+//    public GenTable selectGenTableById(Long id) {
+//        GenTable genTable = genTableMapper.selectGenTableById(id);
+//        setTableFromOptions(genTable);
+//        return genTable;
+//    }
+//
+//    /**
+//     * 查询业务列表
+//     *
+//     * @param genTable 业务信息
+//     * @return 业务集合
+//     */
+//    public List<GenTable> selectGenTableList(GenTable genTable) {
+//        return genTableMapper.selectGenTableList(genTable);
+//    }
+//
+//    /**
+//     * 查询据库列表
+//     *
+//     * @param genTable 业务信息
+//     * @return 数据库表集合
+//     */
+//    public List<GenTable> selectDbTableList(GenTable genTable) {
+//        return genTableMapper.selectDbTableList(genTable);
+//    }
+//
+//    /**
+//     * 查询据库列表
+//     *
+//     * @param tableNames 表名称组
+//     * @return 数据库表集合
+//     */
+//    public List<GenTable> selectDbTableListByNames(String[] tableNames) {
+//        return genTableMapper.selectDbTableListByNames(tableNames);
+//    }
+//
+//    /**
+//     * 查询所有表信息
+//     *
+//     * @return 表信息集合
+//     */
+//    public List<GenTable> selectGenTableAll() {
+//        return genTableMapper.selectGenTableAll();
+//    }
+//
+//    /**
+//     * 修改业务
+//     *
+//     * @param genTable 业务信息
+//     */
+//    @Transactional
+//    public void updateGenTable(GenTable genTable) {
+//        String options = JSON.toJSONString(genTable.getParams());
+//        genTable.setOptions(options);
+//        int row = genTableMapper.updateGenTable(genTable);
+//        if (row > 0) {
+//            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
+//                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 删除业务对象
+//     *
+//     * @param ids 需要删除的数据ID
+//     */
+//    @Transactional
+//    public void deleteGenTableByIds(String ids) {
+//        genTableMapper.deleteGenTableByIds(Convert.toLongArray(ids));
+//        genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+//    }
+//
+//    /**
+//     * 创建表
+//     *
+//     * @param sql 创建表语句
+//     * @return 结果
+//     */
+//    public boolean createTable(String sql) {
+//        return genTableMapper.createTable(sql) == 0;
+//    }
+//
+//    /**
+//     * 导入表结构
+//     *
+//     * @param tableList 导入表列表
+//     * @param operName  操作人员
+//     */
+//    @Transactional
+//    public void importGenTable(List<GenTable> tableList, String operName) {
+//        try {
+//            for (GenTable table : tableList) {
+//                String tableName = table.getTableName();
+//                GenUtils.initTable(table, operName);
+//                int row = genTableMapper.insertGenTable(table);
+//                if (row > 0) {
+//                    // 保存列信息
+//                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+//                    for (GenTableColumn column : genTableColumns) {
+//                        GenUtils.initColumnField(column, table);
+//                        genTableColumnMapper.insertGenTableColumn(column);
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            throw new BusinessException("导入失败：" + e.getMessage());
+//        }
+//    }
+//
+//    /**
+//     * 预览代码
+//     *
+//     * @param tableId 表编号
+//     * @return 预览数据列表
+//     */
+//    public Map<String, String> previewCode(Long tableId) {
+//        Map<String, String> dataMap = new LinkedHashMap<>();
+//        // 查询表信息
+//        GenTable table = genTableMapper.selectGenTableById(tableId);
+//        // 设置主子表信息
+//        setSubTable(table);
+//        // 设置主键列信息
+//        setPkColumn(table);
+//        VelocityInitializer.initVelocity();
+//
+//        VelocityContext context = VelocityUtils.prepareContext(table);
+//
+//        // 获取模板列表
+//        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+//        for (String template : templates) {
+//            // 渲染模板
+//            StringWriter sw = new StringWriter();
+//            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+//            tpl.merge(context, sw);
+//            dataMap.put(template, sw.toString());
+//        }
+//        return dataMap;
+//    }
+//
+//    /**
+//     * 生成代码（下载方式）
+//     *
+//     * @param tableName 表名称
+//     * @return 数据
+//     */
+//    public byte[] downloadCode(String tableName) {
+//        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+//        ZipOutputStream zip = new ZipOutputStream(outputStream);
+//        generatorCode(tableName, zip);
+//        IOUtils.closeQuietly(zip);
+//        return outputStream.toByteArray();
+//    }
+//
+//    /**
+//     * 生成代码（自定义路径）
+//     *
+//     * @param tableName 表名称
+//     */
+//    public void generatorCode(String tableName) {
+//        // 查询表信息
+//        GenTable table = genTableMapper.selectGenTableByName(tableName);
+//        // 设置主子表信息
+//        setSubTable(table);
+//        // 设置主键列信息
+//        setPkColumn(table);
+//
+//        VelocityInitializer.initVelocity();
+//
+//        VelocityContext context = VelocityUtils.prepareContext(table);
+//
+//        // 获取模板列表
+//        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+//        for (String template : templates) {
+//            if (!StringUtils.contains(template, "sql.vm")) {
+//                // 渲染模板
+//                StringWriter sw = new StringWriter();
+//                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+//                tpl.merge(context, sw);
+//                try {
+//                    String path = getGenPath(table, template);
+//                    FileUtils.writeStringToFile(new File(path), sw.toString(), Constants.UTF8);
+//                } catch (IOException e) {
+//                    throw new BusinessException("渲染模板失败，表名：" + table.getTableName());
+//                }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 同步数据库
+//     *
+//     * @param tableName 表名称
+//     */
+//    @Transactional
+//    public void synchDb(String tableName) {
+//        GenTable table = genTableMapper.selectGenTableByName(tableName);
+//        List<GenTableColumn> tableColumns = table.getColumns();
+//        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
+//
+//        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+//        if (CollectionUtil.isEmpty(dbTableColumns)) {
+//            throw new BusinessException("同步数据失败，原表结构不存在");
+//        }
+//        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+//
+//        dbTableColumns.forEach(column -> {
+//            GenUtils.initColumnField(column, table);
+//            if (tableColumnMap.containsKey(column.getColumnName())) {
+//                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+//                column.setColumnId(prevColumn.getColumnId());
+//                if (column.isList()) {
+//                    // 如果是列表，继续保留字典类型
+//                    column.setDictType(prevColumn.getDictType());
+//                }
+//                genTableColumnMapper.updateGenTableColumn(column);
+//            } else {
+//                genTableColumnMapper.insertGenTableColumn(column);
+//            }
+//        });
+//
+//        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
+//        if (CollectionUtil.isNotEmpty(delColumns)) {
+//            genTableColumnMapper.deleteGenTableColumns(delColumns);
+//        }
+//    }
+//
+//    /**
+//     * 批量生成代码（下载方式）
+//     *
+//     * @param tableNames 表数组
+//     * @return 数据
+//     */
+//    public byte[] downloadCode(String[] tableNames) {
+//        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+//        ZipOutputStream zip = new ZipOutputStream(outputStream);
+//        for (String tableName : tableNames) {
+//            generatorCode(tableName, zip);
+//        }
+//        IOUtils.closeQuietly(zip);
+//        return outputStream.toByteArray();
+//    }
+//
+//    /**
+//     * 查询表信息并生成代码
+//     */
+//    private void generatorCode(String tableName, ZipOutputStream zip) {
+//        // 查询表信息
+//        GenTable table = genTableMapper.selectGenTableByName(tableName);
+//        // 设置主子表信息
+//        setSubTable(table);
+//        // 设置主键列信息
+//        setPkColumn(table);
+//
+//        VelocityInitializer.initVelocity();
+//
+//        VelocityContext context = VelocityUtils.prepareContext(table);
+//
+//        // 获取模板列表
+//        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+//        for (String template : templates) {
+//            // 渲染模板
+//            StringWriter sw = new StringWriter();
+//            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+//            tpl.merge(context, sw);
+//            try {
+//                // 添加到zip
+//                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+//                IOUtils.write(sw.toString(), zip, Constants.UTF8);
+//                IOUtils.closeQuietly(sw);
+//                zip.flush();
+//                zip.closeEntry();
+//            } catch (IOException e) {
+//                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 修改保存参数校验
+//     *
+//     * @param genTable 业务信息
+//     */
+//    public void validateEdit(GenTable genTable) {
+//        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
+//            String options = JSON.toJSONString(genTable.getParams());
+//            JSONObject paramsObj = JSONObject.parseObject(options);
+//            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) {
+//                throw new BusinessException("树编码字段不能为空");
+//            } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) {
+//                throw new BusinessException("树父编码字段不能为空");
+//            } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
+//                throw new BusinessException("树名称字段不能为空");
+//            }
+//        } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
+//            if (StringUtils.isEmpty(genTable.getSubTableName())) {
+//                throw new BusinessException("关联子表的表名不能为空");
+//            } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
+//                throw new BusinessException("子表关联的外键名不能为空");
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 设置主键列信息
+//     *
+//     * @param table 业务表信息
+//     */
+//    public void setPkColumn(GenTable table) {
+//        for (GenTableColumn column : table.getColumns()) {
+//            if (column.isPk()) {
+//                table.setPkColumn(column);
+//                break;
+//            }
+//        }
+//        if (Objects.isNull(table.getPkColumn())) {
+//            table.setPkColumn(table.getColumns().get(0));
+//        }
+//        if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
+//            for (GenTableColumn column : table.getSubTable().getColumns()) {
+//                if (column.isPk()) {
+//                    table.getSubTable().setPkColumn(column);
+//                    break;
+//                }
+//            }
+//            if (Objects.isNull(table.getSubTable().getPkColumn())) {
+//                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 设置主子表信息
+//     *
+//     * @param table 业务表信息
+//     */
+//    public void setSubTable(GenTable table) {
+//        String subTableName = table.getSubTableName();
+//        if (StringUtils.isNotEmpty(subTableName)) {
+//            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
+//        }
+//    }
+//
+//    /**
+//     * 设置代码生成其他选项值
+//     *
+//     * @param genTable 设置后的生成对象
+//     */
+//    public void setTableFromOptions(GenTable genTable) {
+//        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
+//        if (!Objects.isNull(paramsObj)) {
+//            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
+//            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
+//            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+//            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+//            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
+//
+//            genTable.setTreeCode(treeCode);
+//            genTable.setTreeParentCode(treeParentCode);
+//            genTable.setTreeName(treeName);
+//            genTable.setParentMenuId(parentMenuId);
+//            genTable.setParentMenuName(parentMenuName);
+//        }
+//    }
+//
+//    /**
+//     * 获取代码生成地址
+//     *
+//     * @param table    业务表信息
+//     * @param template 模板文件路径
+//     * @return 生成地址
+//     */
+//    public static String getGenPath(GenTable table, String template) {
+//        String genPath = table.getGenPath();
+//        if (StringUtils.equals(genPath, "/")) {
+//            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
+//        }
+//        return genPath + File.separator + VelocityUtils.getFileName(template, table);
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableColumnService.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableColumnService.java
new file mode 100644
index 0000000..7ab46a1
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableColumnService.java
@@ -0,0 +1,45 @@
+package com.mosty.common.generator.service;
+
+
+import com.mosty.common.generator.domain.GenTableColumn;
+
+import java.util.List;
+
+/**
+ * 业务字段 服务层
+ *
+ * @author ruoyi
+ */
+public interface IGenTableColumnService {
+    /**
+     * 查询业务字段列表
+     *
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     *
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(String ids);
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableService.java b/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableService.java
new file mode 100644
index 0000000..fd9b3ad
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/service/IGenTableService.java
@@ -0,0 +1,122 @@
+package com.mosty.common.generator.service;
+
+
+import com.mosty.common.generator.domain.GenTable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业务 服务层
+ *
+ * @author ruoyi
+ */
+public interface IGenTableService {
+    /**
+     * 查询业务列表
+     *
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     *
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     *
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 修改业务
+     *
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public void updateGenTable(GenTable genTable);
+
+    /**
+     * 删除业务信息
+     *
+     * @param tableIds 需要删除的表数据ID
+     * @return 结果
+     */
+    public void deleteGenTableByIds(Long[] tableIds);
+
+    /**
+     * 导入表结构
+     *
+     * @param tableList 导入表列表
+     */
+    public void importGenTable(List<GenTable> tableList);
+
+    /**
+     * 预览代码
+     *
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    public Map<String, String> previewCode(Long tableId);
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public byte[] downloadCode(String tableName);
+
+    /**
+     * 生成代码（自定义路径）
+     *
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public void generatorCode(String tableName);
+
+    /**
+     * 同步数据库
+     *
+     * @param tableName 表名称
+     */
+    public void synchDb(String tableName);
+
+    /**
+     * 批量生成代码（下载方式）
+     *
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    public byte[] downloadCode(String[] tableNames);
+
+    /**
+     * 修改保存参数校验
+     *
+     * @param genTable 业务信息
+     */
+    public void validateEdit(GenTable genTable);
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/CharsetKit.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/CharsetKit.java
new file mode 100644
index 0000000..f4a6cdd
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/CharsetKit.java
@@ -0,0 +1,89 @@
+package com.mosty.common.generator.util;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 字符集工具类
+ *
+ * @author ruoyi
+ */
+public class CharsetKit {
+    /**
+     * ISO-8859-1
+     */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+    /**
+     * UTF-8
+     */
+    public static final String UTF_8 = "UTF-8";
+    /**
+     * GBK
+     */
+    public static final String GBK = "GBK";
+
+    /**
+     * ISO-8859-1
+     */
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    /**
+     * UTF-8
+     */
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    /**
+     * GBK
+     */
+    public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+    /**
+     * 转换为Charset对象
+     *
+     * @param charset 字符集，为空则返回默认字符集
+     * @return Charset
+     */
+    public static Charset charset(String charset) {
+        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, String srcCharset, String destCharset) {
+        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, Charset srcCharset, Charset destCharset) {
+        if (null == srcCharset) {
+            srcCharset = StandardCharsets.ISO_8859_1;
+        }
+
+        if (null == destCharset) {
+            destCharset = StandardCharsets.UTF_8;
+        }
+
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
+            return source;
+        }
+        return new String(source.getBytes(srcCharset), destCharset);
+    }
+
+    /**
+     * @return 系统字符集编码
+     */
+    public static String systemCharset() {
+        return Charset.defaultCharset().name();
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/Convert.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/Convert.java
new file mode 100644
index 0000000..8841384
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/Convert.java
@@ -0,0 +1,854 @@
+package com.mosty.common.generator.util;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+
+/**
+ * 类型转换器
+ *
+ * @author ruoyi
+ */
+public class Convert {
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static String toStr(Object value, String defaultValue) {
+        if (null == value) {
+            return defaultValue;
+        }
+        if (value instanceof String) {
+            return (String) value;
+        }
+        return value.toString();
+    }
+
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static String toStr(Object value) {
+        return toStr(value, null);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Character toChar(Object value, Character defaultValue) {
+        if (null == value) {
+            return defaultValue;
+        }
+        if (value instanceof Character) {
+            return (Character) value;
+        }
+
+        final String valueStr = toStr(value, null);
+        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Character toChar(Object value) {
+        return toChar(value, null);
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Byte toByte(Object value, Byte defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Byte) {
+            return (Byte) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).byteValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Byte.parseByte(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Byte toByte(Object value) {
+        return toByte(value, null);
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Short toShort(Object value, Short defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Short) {
+            return (Short) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).shortValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Short.parseShort(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Short toShort(Object value) {
+        return toShort(value, null);
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Number toNumber(Object value, Number defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Number) {
+            return (Number) value;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return NumberFormat.getInstance().parse(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Number toNumber(Object value) {
+        return toNumber(value, null);
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Integer toInt(Object value, Integer defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Integer) {
+            return (Integer) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).intValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Integer.parseInt(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Integer toInt(Object value) {
+        return toInt(value, null);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String str) {
+        return toIntArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str) {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String split, String str) {
+        if (StringUtils.isEmpty(str)) {
+            return new Integer[]{};
+        }
+        String[] arr = str.split(split);
+        final Integer[] ints = new Integer[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            final Integer v = toInt(arr[i], 0);
+            ints[i] = v;
+        }
+        return ints;
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str   被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str) {
+        if (StringUtils.isEmpty(str)) {
+            return new Long[]{};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            final Long v = toLong(arr[i], null);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str) {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str) {
+        return str.split(split);
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Long toLong(Object value, Long defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Long) {
+            return (Long) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).longValue();
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Long toLong(Object value) {
+        return toLong(value, null);
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Double toDouble(Object value, Double defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Double) {
+            return (Double) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).doubleValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).doubleValue();
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Double toDouble(Object value) {
+        return toDouble(value, null);
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Float toFloat(Object value, Float defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Float) {
+            return (Float) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).floatValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Float.parseFloat(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Float toFloat(Object value) {
+        return toFloat(value, null);
+    }
+
+    /**
+     * 转换为boolean<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value, Boolean defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Boolean) {
+            return (Boolean) value;
+        }
+        String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        valueStr = valueStr.trim().toLowerCase();
+        switch (valueStr) {
+            case "true":
+                return true;
+            case "false":
+                return false;
+            case "yes":
+                return true;
+            case "ok":
+                return true;
+            case "no":
+                return false;
+            case "1":
+                return true;
+            case "0":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为boolean<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value) {
+        return toBool(value, null);
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     *
+     * @param clazz        Enum的Class
+     * @param value        值
+     * @param defaultValue 默认值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (clazz.isAssignableFrom(value.getClass())) {
+            @SuppressWarnings("unchecked")
+            E myE = (E) value;
+            return myE;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Enum.valueOf(clazz, valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
+        return toEnum(clazz, value, null);
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof BigInteger) {
+            return (BigInteger) value;
+        }
+        if (value instanceof Long) {
+            return BigInteger.valueOf((Long) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return new BigInteger(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value) {
+        return toBigInteger(value, null);
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof BigDecimal) {
+            return (BigDecimal) value;
+        }
+        if (value instanceof Long) {
+            return new BigDecimal((Long) value);
+        }
+        if (value instanceof Double) {
+            return new BigDecimal((Double) value);
+        }
+        if (value instanceof Integer) {
+            return new BigDecimal((Integer) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return new BigDecimal(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value) {
+        return toBigDecimal(value, null);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @return 字符串
+     */
+//    public static String utf8Str(Object obj)
+//    {
+//        return str(obj, CharsetKit.CHARSET_UTF_8);
+//    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj         对象
+     * @param charsetName 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, String charsetName) {
+        return str(obj, Charset.forName(charsetName));
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj     对象
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, Charset charset) {
+        if (null == obj) {
+            return null;
+        }
+
+        if (obj instanceof String) {
+            return (String) obj;
+        } else if (obj instanceof byte[]) {
+            return str((byte[]) obj, charset);
+        } else if (obj instanceof Byte[]) {
+            byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
+            return str(bytes, charset);
+        } else if (obj instanceof ByteBuffer) {
+            return str((ByteBuffer) obj, charset);
+        }
+        return obj.toString();
+    }
+
+    /**
+     * 将byte数组转为字符串
+     *
+     * @param bytes   byte数组
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(byte[] bytes, String charset) {
+        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+    }
+
+    /**
+     * 解码字节码
+     *
+     * @param data    字符串
+     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
+     * @return 解码后的字符串
+     */
+    public static String str(byte[] data, Charset charset) {
+        if (data == null) {
+            return null;
+        }
+
+        if (null == charset) {
+            return new String(data);
+        }
+        return new String(data, charset);
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data    数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, String charset) {
+        if (data == null) {
+            return null;
+        }
+
+        return str(data, Charset.forName(charset));
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data    数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, Charset charset) {
+        if (null == charset) {
+            charset = Charset.defaultCharset();
+        }
+        return charset.decode(data).toString();
+    }
+
+    // ----------------------------------------------------------------------- 全角半角转换
+
+    /**
+     * 半角转全角
+     *
+     * @param input String.
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input) {
+        return toSBC(input, null);
+    }
+
+    /**
+     * 半角转全角
+     *
+     * @param input         String
+     * @param notConvertSet 不替换的字符集合
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input, Set<Character> notConvertSet) {
+        char c[] = input.toCharArray();
+        for (int i = 0; i < c.length; i++) {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == ' ') {
+                c[i] = '\u3000';
+            } else if (c[i] < '\177') {
+                c[i] = (char) (c[i] + 65248);
+
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 全角转半角
+     *
+     * @param input String.
+     * @return 半角字符串
+     */
+    public static String toDBC(String input) {
+        return toDBC(input, null);
+    }
+
+    /**
+     * 替换全角为半角
+     *
+     * @param text          文本
+     * @param notConvertSet 不替换的字符集合
+     * @return 替换后的字符
+     */
+    public static String toDBC(String text, Set<Character> notConvertSet) {
+        char c[] = text.toCharArray();
+        for (int i = 0; i < c.length; i++) {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == '\u3000') {
+                c[i] = ' ';
+            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
+                c[i] = (char) (c[i] - 65248);
+            }
+        }
+        String returnString = new String(c);
+
+        return returnString;
+    }
+
+    /**
+     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+     *
+     * @param n 数字
+     * @return 中文大写数字
+     */
+    public static String digitUppercase(double n) {
+        String[] fraction = {"角", "分"};
+        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
+
+        String head = n < 0 ? "负" : "";
+        n = Math.abs(n);
+
+        String s = "";
+        for (int i = 0; i < fraction.length; i++) {
+            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+        }
+        if (s.length() < 1) {
+            s = "整";
+        }
+        int integerPart = (int) Math.floor(n);
+
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
+            String p = "";
+            for (int j = 0; j < unit[1].length && n > 0; j++) {
+                p = digit[integerPart % 10] + unit[1][j] + p;
+                integerPart = integerPart / 10;
+            }
+            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+        }
+        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils.java
new file mode 100644
index 0000000..a5fae12
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils.java
@@ -0,0 +1,221 @@
+package com.mosty.common.generator.util;
+
+import com.mosty.common.generator.config.GenConfig;
+import com.mosty.common.generator.config.GenConstants;
+import com.mosty.common.generator.domain.GenTable;
+import com.mosty.common.generator.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
+
+/**
+ * 代码生成器 工具类
+ *
+ * @author ruoyi
+ */
+public class GenUtils {
+    /**
+     * 初始化表信息
+     */
+    public static void initTable(GenTable genTable, String operName) {
+        genTable.setClassName(convertClassName(genTable.getTableName()));
+        genTable.setPackageName(GenConfig.getPackageName());
+        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
+        genTable.setFunctionName(replaceText(genTable.getTableComment()));
+        genTable.setFunctionAuthor(GenConfig.getAuthor());
+        genTable.setCreateBy(operName);
+    }
+
+    /**
+     * 初始化列属性字段
+     */
+    public static void initColumnField(GenTableColumn column, GenTable table) {
+        String dataType = getDbType(column.getColumnType());
+        String columnName = column.getColumnName();
+        column.setTableId(table.getTableId());
+        column.setCreateBy(table.getCreateBy());
+        // 设置java字段名
+        column.setJavaField(StringUtils.toCamelCase(columnName));
+        // 设置默认类型
+        column.setJavaType(GenConstants.TYPE_STRING);
+
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
+            // 字符串长度超过500设置为文本域
+            Integer columnLength = getColumnLength(column.getColumnType());
+            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+            column.setHtmlType(htmlType);
+        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
+            column.setJavaType(GenConstants.TYPE_DATE);
+            column.setHtmlType(GenConstants.HTML_DATETIME);
+        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
+            column.setHtmlType(GenConstants.HTML_INPUT);
+
+            // 如果是浮点型 统一用BigDecimal
+            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
+                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+            }
+            // 如果是整形
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
+                column.setJavaType(GenConstants.TYPE_INTEGER);
+            }
+            // 长整形
+            else {
+                column.setJavaType(GenConstants.TYPE_LONG);
+            }
+        }
+
+        // 插入字段（默认所有字段都需要插入）
+        column.setIsInsert(GenConstants.REQUIRE);
+
+        // 编辑字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) {
+            column.setIsEdit(GenConstants.REQUIRE);
+        }
+        // 列表字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) {
+            column.setIsList(GenConstants.REQUIRE);
+        }
+        // 查询字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
+            column.setIsQuery(GenConstants.REQUIRE);
+        }
+
+        // 查询字段类型
+        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
+            column.setQueryType(GenConstants.QUERY_LIKE);
+        }
+        // 状态字段设置单选框
+        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
+            column.setHtmlType(GenConstants.HTML_RADIO);
+        }
+        // 类型&性别字段设置下拉框
+        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
+            column.setHtmlType(GenConstants.HTML_SELECT);
+        }
+        // 图片字段设置图片上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 文件字段设置文件上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
+        }
+        // 内容字段设置富文本控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
+            column.setHtmlType(GenConstants.HTML_EDITOR);
+        }
+    }
+
+    /**
+     * 校验数组是否包含指定值
+     *
+     * @param arr         数组
+     * @param targetValue 值
+     * @return 是否包含
+     */
+    public static boolean arraysContains(String[] arr, String targetValue) {
+        return Arrays.asList(arr).contains(targetValue);
+    }
+
+    /**
+     * 获取模块名
+     *
+     * @param packageName 包名
+     * @return 模块名
+     */
+    public static String getModuleName(String packageName) {
+        int lastIndex = packageName.lastIndexOf(".");
+        int nameLength = packageName.length();
+        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
+        return moduleName;
+    }
+
+    /**
+     * 获取业务名
+     *
+     * @param tableName 表名
+     * @return 业务名
+     */
+    public static String getBusinessName(String tableName) {
+        int lastIndex = tableName.lastIndexOf("_");
+        int nameLength = tableName.length();
+        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
+        return businessName;
+    }
+
+    /**
+     * 表名转换成Java类名
+     *
+     * @param tableName 表名称
+     * @return 类名
+     */
+    public static String convertClassName(String tableName) {
+        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+        String tablePrefix = GenConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
+            String[] searchList = StringUtils.split(tablePrefix, ",");
+            tableName = replaceFirst(tableName, searchList);
+        }
+        return StringUtils.convertToCamelCase(tableName);
+    }
+
+    /**
+     * 批量替换前缀
+     *
+     * @param replacementm 替换值
+     * @param searchList   替换列表
+     * @return
+     */
+    public static String replaceFirst(String replacementm, String[] searchList) {
+        String text = replacementm;
+        for (String searchString : searchList) {
+            if (replacementm.startsWith(searchString)) {
+                text = replacementm.replaceFirst(searchString, "");
+                break;
+            }
+        }
+        return text;
+    }
+
+    /**
+     * 关键字替换
+     *
+     * @param text 需要被替换的名字
+     * @return 替换后的名字
+     */
+    public static String replaceText(String text) {
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+    }
+
+    /**
+     * 获取数据库类型字段
+     *
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static String getDbType(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
+            return StringUtils.substringBefore(columnType, "(");
+        } else {
+            return columnType;
+        }
+    }
+
+    /**
+     * 获取字段长度
+     *
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static Integer getColumnLength(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
+            String length = StringUtils.substringBetween(columnType, "(", ")");
+            return Integer.valueOf(length);
+        } else {
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils_bak.java
new file mode 100644
index 0000000..5e1286a
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/GenUtils_bak.java
@@ -0,0 +1,219 @@
+//package com.mosty.common.generator.util;
+//
+//import com.mosty.common.base.constant.GenConstants;
+//import com.mosty.common.base.util.StringUtils;
+//import com.mosty.common.generator.config.GenConfig;
+//import com.mosty.common.generator.domain.GenTable;
+//import com.mosty.common.generator.domain.GenTableColumn;
+//import org.apache.commons.lang3.RegExUtils;
+//
+//import java.util.Arrays;
+//
+///**
+// * 代码生成器 工具类
+// *
+// * @author ruoyi
+// */
+//public class GenUtils {
+//
+//    /**
+//     * 初始化表信息
+//     */
+//    public static void initTable(GenTable genTable, String operName) {
+//        genTable.setClassName(convertClassName(genTable.getTableName()));
+//        genTable.setPackageName(GenConfig.getPackageName());
+//        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+//        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
+//        genTable.setFunctionName(replaceText(genTable.getTableComment()));
+//        genTable.setFunctionAuthor(GenConfig.getAuthor());
+//        genTable.setCreateName(operName);
+//    }
+//
+//    /**
+//     * 初始化列属性字段
+//     */
+//    public static void initColumnField(GenTableColumn column, GenTable table) {
+//        String dataType = getDbType(column.getColumnType());
+//        String columnName = column.getColumnName();
+//        column.setTableId(table.getTableId());
+//        column.setCreateBy(table.getCreateBy());
+//        // 设置java字段名
+//        column.setJavaField(StringUtils.toCamelCase(columnName));
+//        // 设置默认类型
+//        column.setJavaType(GenConstants.TYPE_STRING);
+//
+//        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
+//            // 字符串长度超过500设置为文本域
+//            Integer columnLength = getColumnLength(column.getColumnType());
+//            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+//            column.setHtmlType(htmlType);
+//        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
+//            column.setJavaType(GenConstants.TYPE_DATE);
+//            column.setHtmlType(GenConstants.HTML_DATETIME);
+//        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
+//            column.setHtmlType(GenConstants.HTML_INPUT);
+//
+//            // 如果是浮点型 统一用BigDecimal
+//            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+//            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
+//                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+//            }
+//            // 如果是整形
+//            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
+//                column.setJavaType(GenConstants.TYPE_INTEGER);
+//            }
+//            // 长整形
+//            else {
+//                column.setJavaType(GenConstants.TYPE_LONG);
+//            }
+//        }
+//
+//        // 插入字段（默认所有字段都需要插入）
+//        column.setIsInsert(GenConstants.REQUIRE);
+//
+//        // 编辑字段
+//        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) {
+//            column.setIsEdit(GenConstants.REQUIRE);
+//        }
+//        // 列表字段
+//        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) {
+//            column.setIsList(GenConstants.REQUIRE);
+//        }
+//        // 查询字段
+//        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
+//            column.setIsQuery(GenConstants.REQUIRE);
+//        }
+//
+//        // 查询字段类型
+//        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
+//            column.setQueryType(GenConstants.QUERY_LIKE);
+//        }
+//        // 状态字段设置单选框
+//        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
+//            column.setHtmlType(GenConstants.HTML_RADIO);
+//        }
+//        // 类型&性别字段设置下拉框
+//        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+//                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
+//            column.setHtmlType(GenConstants.HTML_SELECT);
+//        }
+//        // 文件字段设置上传控件
+//        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
+//            column.setHtmlType(GenConstants.HTML_UPLOAD);
+//        }
+//        // 内容字段设置富文本控件
+//        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
+//            column.setHtmlType(GenConstants.HTML_SUMMERNOTE);
+//        }
+//    }
+//
+//    /**
+//     * 校验数组是否包含指定值
+//     *
+//     * @param arr         数组
+//     * @param targetValue 值
+//     * @return 是否包含
+//     */
+//    public static boolean arraysContains(String[] arr, String targetValue) {
+//        return Arrays.asList(arr).contains(targetValue);
+//    }
+//
+//    /**
+//     * 获取模块名
+//     *
+//     * @param packageName 包名
+//     * @return 模块名
+//     */
+//    public static String getModuleName(String packageName) {
+//        int lastIndex = packageName.lastIndexOf(".");
+//        int nameLength = packageName.length();
+//        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
+//        return moduleName;
+//    }
+//
+//    /**
+//     * 获取业务名
+//     *
+//     * @param tableName 表名
+//     * @return 业务名
+//     */
+//    public static String getBusinessName(String tableName) {
+//        int lastIndex = tableName.lastIndexOf("_");
+//        int nameLength = tableName.length();
+//        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
+//        return businessName;
+//    }
+//
+//    /**
+//     * 表名转换成Java类名
+//     *
+//     * @param tableName 表名称
+//     * @return 类名
+//     */
+//    public static String convertClassName(String tableName) {
+//        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+//        String tablePrefix = GenConfig.getTablePrefix();
+//        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
+//            String[] searchList = StringUtils.split(tablePrefix, ",");
+//            tableName = replaceFirst(tableName, searchList);
+//        }
+//        return StringUtils.convertToCamelCase(tableName);
+//    }
+//
+//    /**
+//     * 批量替换前缀
+//     *
+//     * @param replacementm 替换值
+//     * @param searchList   替换列表
+//     * @return
+//     */
+//    public static String replaceFirst(String replacementm, String[] searchList) {
+//        String text = replacementm;
+//        for (String searchString : searchList) {
+//            if (replacementm.startsWith(searchString)) {
+//                text = replacementm.replaceFirst(searchString, "");
+//                break;
+//            }
+//        }
+//        return text;
+//    }
+//
+//    /**
+//     * 关键字替换
+//     *
+//     * @param text 需要被替换的名字
+//     * @return 替换后的名字
+//     */
+//    public static String replaceText(String text) {
+//        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+//    }
+//
+//    /**
+//     * 获取数据库类型字段
+//     *
+//     * @param columnType 列类型
+//     * @return 截取后的列类型
+//     */
+//    public static String getDbType(String columnType) {
+//        if (StringUtils.indexOf(columnType, "(") > 0) {
+//            return StringUtils.substringBefore(columnType, "(");
+//        } else {
+//            return columnType;
+//        }
+//    }
+//
+//    /**
+//     * 获取字段长度
+//     *
+//     * @param columnType 列类型
+//     * @return 截取后的列类型
+//     */
+//    public static Integer getColumnLength(String columnType) {
+//        if (StringUtils.indexOf(columnType, "(") > 0) {
+//            String length = StringUtils.substringBetween(columnType, "(", ")");
+//            return Integer.valueOf(length);
+//        } else {
+//            return 0;
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/StringUtils.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/StringUtils.java
new file mode 100644
index 0000000..f8ba6ad
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/StringUtils.java
@@ -0,0 +1,418 @@
+package com.mosty.common.generator.util;
+
+import cn.hutool.core.text.StrFormatter;
+import com.mosty.common.base.constant.Constants;
+import org.springframework.util.AntPathMatcher;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    /**
+     * 空字符串
+     */
+    private static final String NULLSTR = "";
+
+    /**
+     * 下划线
+     */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue) {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll) {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll) {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     *                * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects) {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects) {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map) {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str) {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object) {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object) {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     *
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object) {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str) {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (start > str.length()) {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @param end   结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (end < 0) {
+            end = str.length() + end;
+        }
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (end > str.length()) {
+            end = str.length();
+        }
+
+        if (start > end) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (end < 0) {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 判断是否为空，并且不是空白字符
+     *
+     * @param str 要判断的value
+     * @return 结果
+     */
+    public static boolean hasText(String str) {
+        return (str != null && !str.isEmpty() && containsText(str));
+    }
+
+    private static boolean containsText(CharSequence str) {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(str.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params   参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params) {
+        if (isEmpty(params) || isEmpty(template)) {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+    /**
+     * 是否为http(s)://开头
+     *
+     * @param link 链接
+     * @return 结果
+     */
+    public static boolean ishttp(String link) {
+        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str) {
+        if (str == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (i > 0) {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            } else {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1)) {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str  验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        if (str != null && strs != null) {
+            for (String s : strs) {
+                if (str.equalsIgnoreCase(trim(s))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name) {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty()) {
+            // 没必要转换
+            return "";
+        } else if (!name.contains("_")) {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels) {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty()) {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法 例如：user_name->userName
+     */
+    public static String toCamelCase(String s) {
+        if (s == null) {
+            return null;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR) {
+                upperCase = true;
+            } else if (upperCase) {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str  指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs) {
+        if (isEmpty(str) || isEmpty(strs)) {
+            return false;
+        }
+        for (String pattern : strs) {
+            if (isMatch(pattern, str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url     需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url) {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj) {
+        return (T) obj;
+    }
+}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer.java
new file mode 100644
index 0000000..3936ae8
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer.java
@@ -0,0 +1,30 @@
+package com.mosty.common.generator.util;
+
+import com.mosty.common.base.constant.Constants;
+import org.apache.velocity.app.Velocity;
+
+import java.util.Properties;
+
+/**
+ * VelocityEngine工厂
+ *
+ * @author ruoyi
+ */
+public class VelocityInitializer {
+    /**
+     * 初始化vm方法
+     */
+    public static void initVelocity() {
+        Properties p = new Properties();
+        try {
+            // 加载classpath目录下的vm文件
+            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+            // 定义字符集
+            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
+            // 初始化Velocity引擎，指定配置Properties
+            Velocity.init(p);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer_bak.java
new file mode 100644
index 0000000..957d5ee
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityInitializer_bak.java
@@ -0,0 +1,30 @@
+//package com.mosty.common.generator.util;
+//
+//import com.mosty.common.base.constant.Constants;
+//import org.apache.velocity.app.Velocity;
+//
+//import java.util.Properties;
+//
+///**
+// * VelocityEngine工厂
+// *
+// * @author ruoyi
+// */
+//public class VelocityInitializer {
+//    /**
+//     * 初始化vm方法
+//     */
+//    public static void initVelocity() {
+//        Properties p = new Properties();
+//        try {
+//            // 加载classpath目录下的vm文件
+//            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+//      ‰      // 定义字符集
+//            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
+//            // 初始化Velocity引擎，指定配置Properties
+//            Velocity.init(p);
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+//}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils.java
new file mode 100644
index 0000000..365ba9f
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils.java
@@ -0,0 +1,333 @@
+package com.mosty.common.generator.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.common.base.constant.GenConstants;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.generator.domain.GenTable;
+import com.mosty.common.generator.domain.GenTableColumn;
+import org.apache.velocity.VelocityContext;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 模板工具类
+ *
+ * @author ruoyi
+ */
+public class VelocityUtils {
+    /**
+     * 项目空间路径
+     */
+    private static final String PROJECT_PATH = "main/java";
+
+    /**
+     * mybatis空间路径
+     */
+    private static final String MYBATIS_PATH = "main/resources/mapper";
+
+    /**
+     * 默认上级菜单，系统工具
+     */
+    private static final String DEFAULT_PARENT_MENU_ID = "3";
+
+    /**
+     * 设置模板变量信息
+     *
+     * @return 模板列表
+     */
+    public static VelocityContext prepareContext(GenTable genTable) {
+        String moduleName = genTable.getModuleName();
+        String businessName = genTable.getBusinessName();
+        String packageName = genTable.getPackageName();
+        String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
+
+        VelocityContext velocityContext = new VelocityContext();
+        velocityContext.put("tplCategory", genTable.getTplCategory());
+        velocityContext.put("tableName", genTable.getTableName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+        velocityContext.put("ClassName", genTable.getClassName());
+        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+        velocityContext.put("moduleName", genTable.getModuleName());
+        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+        velocityContext.put("businessName", genTable.getBusinessName());
+        velocityContext.put("basePackage", getPackagePrefix(packageName));
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("author", genTable.getFunctionAuthor());
+        velocityContext.put("datetime", DateUtils.getDate());
+        velocityContext.put("pkColumn", genTable.getPkColumn());
+        velocityContext.put("importList", getImportList(genTable));
+        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("columns", genTable.getColumns());
+        velocityContext.put("table", genTable);
+        velocityContext.put("dicts", getDicts(genTable));
+        setMenuVelocityContext(velocityContext, genTable);
+        if (GenConstants.TPL_TREE.equals(tplCategory)) {
+            setTreeVelocityContext(velocityContext, genTable);
+        }
+        if (GenConstants.TPL_SUB.equals(tplCategory)) {
+            setSubVelocityContext(velocityContext, genTable);
+        }
+        return velocityContext;
+    }
+
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String parentMenuId = getParentMenuId(paramsObj);
+        context.put("parentMenuId", parentMenuId);
+    }
+
+    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String treeCode = getTreecode(paramsObj);
+        String treeParentCode = getTreeParentCode(paramsObj);
+        String treeName = getTreeName(paramsObj);
+
+        context.put("treeCode", treeCode);
+        context.put("treeParentCode", treeParentCode);
+        context.put("treeName", treeName);
+        context.put("expandColumn", getExpandColumn(genTable));
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+            context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+            context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
+        }
+    }
+
+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable) {
+        GenTable subTable = genTable.getSubTable();
+        String subTableName = genTable.getSubTableName();
+        String subTableFkName = genTable.getSubTableFkName();
+        String subClassName = genTable.getSubTable().getClassName();
+        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+
+        context.put("subTable", subTable);
+        context.put("subTableName", subTableName);
+        context.put("subTableFkName", subTableFkName);
+        context.put("subTableFkClassName", subTableFkClassName);
+        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+        context.put("subClassName", subClassName);
+        context.put("subclassName", StringUtils.uncapitalize(subClassName));
+        context.put("subImportList", getImportList(genTable.getSubTable()));
+    }
+
+    /**
+     * 获取模板信息
+     *
+     * @return 模板列表
+     */
+    public static List<String> getTemplateList(String tplCategory) {
+        List<String> templates = new ArrayList<String>();
+        templates.add("vm/java/domain.java.vm");
+        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/service.java.vm");
+        templates.add("vm/java/serviceImpl.java.vm");
+        templates.add("vm/java/controller.java.vm");
+        templates.add("vm/xml/mapper.xml.vm");
+        templates.add("vm/sql/sql.vm");
+        templates.add("vm/js/api.js.vm");
+        if (GenConstants.TPL_CRUD.equals(tplCategory)) {
+            templates.add("vm/vue/index.vue.vm");
+        } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
+            templates.add("vm/vue/index-tree.vue.vm");
+        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
+            templates.add("vm/vue/index.vue.vm");
+            templates.add("vm/java/sub-domain.java.vm");
+        }
+        return templates;
+    }
+
+    /**
+     * 获取文件名
+     */
+    public static String getFileName(String template, GenTable genTable) {
+        // 文件名称
+        String fileName = "";
+        // 包路径
+        String packageName = genTable.getPackageName();
+        // 模块名
+        String moduleName = genTable.getModuleName();
+        // 大写类名
+        String className = genTable.getClassName();
+        // 业务名称
+        String businessName = genTable.getBusinessName();
+
+        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
+        String vuePath = "vue";
+
+        if (template.contains("domain.java.vm")) {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
+        }
+        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
+        } else if (template.contains("mapper.java.vm")) {
+            fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
+        } else if (template.contains("service.java.vm")) {
+            fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+        } else if (template.contains("serviceImpl.java.vm")) {
+            fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
+        } else if (template.contains("controller.java.vm")) {
+            fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
+        } else if (template.contains("mapper.xml.vm")) {
+            fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
+        } else if (template.contains("sql.vm")) {
+            fileName = businessName + "Menu.sql";
+        } else if (template.contains("api.js.vm")) {
+            fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
+        } else if (template.contains("index.vue.vm")) {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        } else if (template.contains("index-tree.vue.vm")) {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        return fileName;
+    }
+
+    /**
+     * 获取包前缀
+     *
+     * @param packageName 包名称
+     * @return 包前缀名称
+     */
+    public static String getPackagePrefix(String packageName) {
+        int lastIndex = packageName.lastIndexOf(".");
+        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
+        return basePackage;
+    }
+
+    /**
+     * 根据列类型获取导入包
+     *
+     * @param genTable 业务表对象
+     * @return 返回需要导入的包列表
+     */
+    public static HashSet<String> getImportList(GenTable genTable) {
+        List<GenTableColumn> columns = genTable.getColumns();
+        GenTable subGenTable = genTable.getSubTable();
+        HashSet<String> importList = new HashSet<String>();
+        if (StringUtils.isNotNull(subGenTable)) {
+            importList.add("java.util.List");
+        }
+        for (GenTableColumn column : columns) {
+            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
+                importList.add("java.util.Date");
+                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
+            } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
+                importList.add("java.math.BigDecimal");
+            }
+        }
+        return importList;
+    }
+
+    /**
+     * 根据列类型获取字典组
+     *
+     * @param genTable 业务表对象
+     * @return 返回字典组
+     */
+    public static String getDicts(GenTable genTable) {
+        List<GenTableColumn> columns = genTable.getColumns();
+        Set<String> dicts = new HashSet<String>();
+        for (GenTableColumn column : columns) {
+            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
+                    column.getHtmlType(),
+                    new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
+                dicts.add("'" + column.getDictType() + "'");
+            }
+        }
+        return StringUtils.join(dicts, ", ");
+    }
+
+    /**
+     * 获取权限前缀
+     *
+     * @param moduleName   模块名称
+     * @param businessName 业务名称
+     * @return 返回权限前缀
+     */
+    public static String getPermissionPrefix(String moduleName, String businessName) {
+        return StringUtils.format("{}:{}", moduleName, businessName);
+    }
+
+    /**
+     * 获取上级菜单ID字段
+     *
+     * @param paramsObj 生成其他选项
+     * @return 上级菜单ID字段
+     */
+    public static String getParentMenuId(JSONObject paramsObj) {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) {
+            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+        }
+        return DEFAULT_PARENT_MENU_ID;
+    }
+
+    /**
+     * 获取树编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树编码
+     */
+    public static String getTreecode(JSONObject paramsObj) {
+        if (paramsObj.containsKey(GenConstants.TREE_CODE)) {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树父编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树父编码
+     */
+    public static String getTreeParentCode(JSONObject paramsObj) {
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树名称
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树名称
+     */
+    public static String getTreeName(JSONObject paramsObj) {
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取需要在哪一列上面显示展开按钮
+     *
+     * @param genTable 业务表对象
+     * @return 展开按钮列序号
+     */
+    public static int getExpandColumn(GenTable genTable) {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+        int num = 0;
+        for (GenTableColumn column : genTable.getColumns()) {
+            if (column.isList()) {
+                num++;
+                String columnName = column.getColumnName();
+                if (columnName.equals(treeName)) {
+                    break;
+                }
+            }
+        }
+        return num;
+    }
+}
diff --git a/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils_bak.java b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils_bak.java
new file mode 100644
index 0000000..209c402
--- /dev/null
+++ b/common-generator-starter/src/main/java/com/mosty/common/generator/util/VelocityUtils_bak.java
@@ -0,0 +1,333 @@
+//package com.mosty.common.generator.util;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.mosty.common.base.constant.GenConstants;
+//import com.mosty.common.base.util.DateUtils;
+//import com.mosty.common.base.util.StringUtils;
+//import com.mosty.common.generator.config.GenConfig;
+//import com.mosty.common.generator.domain.GenTable;
+//import com.mosty.common.generator.domain.GenTableColumn;
+//import org.apache.velocity.VelocityContext;
+//
+//import java.util.ArrayList;
+//import java.util.HashSet;
+//import java.util.List;
+//
+//public class VelocityUtils {
+//    /**
+//     * 项目空间路径
+//     */
+//    private static final String PROJECT_PATH = "main/java";
+//
+//    /**
+//     * mybatis空间路径
+//     */
+//    private static final String MYBATIS_PATH = "main/resources/mapper";
+//
+//    /**
+//     * html空间路径
+//     */
+//    private static final String TEMPLATES_PATH = "main/resources/templates";
+//
+//    /**
+//     * 默认上级菜单，系统工具
+//     */
+//    private static final String DEFAULT_PARENT_MENU_ID = "3";
+//
+//    /**
+//     * 设置模板变量信息
+//     *
+//     * @return 模板列表
+//     */
+//    public static VelocityContext prepareContext(GenTable genTable) {
+//        String moduleName = genTable.getModuleName();
+//        String businessName = genTable.getBusinessName();
+//        String packageName = genTable.getPackageName();
+//        String tplCategory = genTable.getTplCategory();
+//        String functionName = genTable.getFunctionName();
+//
+//        VelocityContext velocityContext = new VelocityContext();
+//        velocityContext.put("tplCategory", genTable.getTplCategory());
+//        velocityContext.put("tableName", genTable.getTableName());
+//        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+//        velocityContext.put("ClassName", genTable.getClassName());
+//        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+//        velocityContext.put("moduleName", genTable.getModuleName());
+//        velocityContext.put("businessName", genTable.getBusinessName());
+//        velocityContext.put("basePackage", getPackagePrefix(packageName));
+//        velocityContext.put("packageName", packageName);
+//        velocityContext.put("author", genTable.getFunctionAuthor());
+//        velocityContext.put("datetime", DateUtils.getDate());
+//        velocityContext.put("pkColumn", genTable.getPkColumn());
+//        velocityContext.put("importList", getImportList(genTable));
+//        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+//        velocityContext.put("columns", genTable.getColumns());
+//        velocityContext.put("table", genTable);
+//        setMenuVelocityContext(velocityContext, genTable);
+//        if (GenConstants.TPL_TREE.equals(tplCategory)) {
+//            setTreeVelocityContext(velocityContext, genTable);
+//        }
+//        if (GenConstants.TPL_SUB.equals(tplCategory)) {
+//            setSubVelocityContext(velocityContext, genTable);
+//        }
+//        return velocityContext;
+//    }
+//
+//    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
+//        String options = genTable.getOptions();
+//        JSONObject paramsObj = JSONObject.parseObject(options);
+//        String parentMenuId = getParentMenuId(paramsObj);
+//        context.put("parentMenuId", parentMenuId);
+//    }
+//
+//    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
+//        String options = genTable.getOptions();
+//        JSONObject paramsObj = JSONObject.parseObject(options);
+//        String treeCode = getTreecode(paramsObj);
+//        String treeParentCode = getTreeParentCode(paramsObj);
+//        String treeName = getTreeName(paramsObj);
+//
+//        context.put("treeCode", treeCode);
+//        context.put("treeParentCode", treeParentCode);
+//        context.put("treeName", treeName);
+//        context.put("expandColumn", getExpandColumn(genTable));
+//        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+//            context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+//        }
+//        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+//            context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
+//        }
+//    }
+//
+//    public static void setSubVelocityContext(VelocityContext context, GenTable genTable) {
+//        GenTable subTable = genTable.getSubTable();
+//        String subTableName = genTable.getSubTableName();
+//        String subTableFkName = genTable.getSubTableFkName();
+//        String subClassName = genTable.getSubTable().getClassName();
+//        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+//
+//        context.put("subTable", subTable);
+//        context.put("subTableName", subTableName);
+//        context.put("subTableFkName", subTableFkName);
+//        context.put("subTableFkClassName", subTableFkClassName);
+//        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+//        context.put("subClassName", subClassName);
+//        context.put("subclassName", StringUtils.uncapitalize(subClassName));
+//        context.put("subImportList", getImportList(genTable.getSubTable()));
+//    }
+//
+//    /**
+//     * 获取模板信息
+//     *
+//     * @return 模板列表
+//     */
+//    public static List<String> getTemplateList(String tplCategory) {
+//        List<String> templates = new ArrayList<String>();
+//        templates.add("vm/java/domain.java.vm");
+//        templates.add("vm/java/mapper.java.vm");
+//        templates.add("vm/java/service.java.vm");
+//        templates.add("vm/java/serviceImpl.java.vm");
+//        templates.add("vm/java/controller.java.vm");
+//        templates.add("vm/xml/mapper.xml.vm");
+//        if (GenConstants.TPL_CRUD.equals(tplCategory)) {
+//            templates.add("vm/html/list.html.vm");
+//        } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
+//            templates.add("vm/html/tree.html.vm");
+//            templates.add("vm/html/list-tree.html.vm");
+//        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
+//            templates.add("vm/html/list.html.vm");
+//            templates.add("vm/java/sub-domain.java.vm");
+//        }
+//        templates.add("vm/html/add.html.vm");
+//        templates.add("vm/html/edit.html.vm");
+//        templates.add("vm/sql/sql.vm");
+//        return templates;
+//    }
+//
+//    /**
+//     * 获取文件名
+//     */
+//    public static String getFileName(String template, GenTable genTable) {
+//        // 文件名称
+//        String fileName = "";
+//        // 包路径
+//        String packageName = genTable.getPackageName();
+//        // 模块名
+//        String moduleName = genTable.getModuleName();
+//        // 大写类名
+//        String className = genTable.getClassName();
+//        // 业务名称
+//        String businessName = genTable.getBusinessName();
+//
+//        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+//        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
+//        String htmlPath = TEMPLATES_PATH + "/" + moduleName + "/" + businessName;
+//
+//        if (template.contains("domain.java.vm")) {
+//            fileName = String.format("%s/domain/%s.java", javaPath, className);
+//        }
+//        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
+//            fileName = String.format("%s/domain/%s.java", javaPath, genTable.getSubTable().getClassName());
+//        } else if (template.contains("mapper.java.vm")) {
+//            fileName = String.format("%s/mapper/%sMapper.java", javaPath, className);
+//        } else if (template.contains("service.java.vm")) {
+//            fileName = String.format("%s/service/I%sService.java", javaPath, className);
+//        } else if (template.contains("serviceImpl.java.vm")) {
+//            fileName = String.format("%s/service/impl/%sServiceImpl.java", javaPath, className);
+//        } else if (template.contains("controller.java.vm")) {
+//            fileName = String.format("%s/controller/%sController.java", javaPath, className);
+//        } else if (template.contains("mapper.xml.vm")) {
+//            fileName = String.format("%s/%sMapper.xml", mybatisPath, className);
+//        } else if (template.contains("list.html.vm")) {
+//            fileName = String.format("%s/%s.html", htmlPath, businessName);
+//        } else if (template.contains("list-tree.html.vm")) {
+//            fileName = String.format("%s/%s.html", htmlPath, businessName);
+//        } else if (template.contains("tree.html.vm")) {
+//            fileName = String.format("%s/tree.html", htmlPath);
+//        } else if (template.contains("add.html.vm")) {
+//            fileName = String.format("%s/add.html", htmlPath);
+//        } else if (template.contains("edit.html.vm")) {
+//            fileName = String.format("%s/edit.html", htmlPath);
+//        } else if (template.contains("sql.vm")) {
+//            fileName = businessName + "Menu.sql";
+//        }
+//        return fileName;
+//    }
+//
+//    /**
+//     * 获取项目文件路径
+//     *
+//     * @return 路径
+//     */
+//    public static String getProjectPath() {
+//        String packageName = GenConfig.getPackageName();
+//        StringBuffer projectPath = new StringBuffer();
+//        projectPath.append("main/java/");
+//        projectPath.append(packageName.replace(".", "/"));
+//        projectPath.append("/");
+//        return projectPath.toString();
+//    }
+//
+//    /**
+//     * 获取包前缀
+//     *
+//     * @param packageName 包名称
+//     * @return 包前缀名称
+//     */
+//    public static String getPackagePrefix(String packageName) {
+//        int lastIndex = packageName.lastIndexOf(".");
+//        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
+//        return basePackage;
+//    }
+//
+//    /**
+//     * 根据列类型获取导入包
+//     *
+//     * @param genTable 业务表对象
+//     * @return 返回需要导入的包列表
+//     */
+//    public static HashSet<String> getImportList(GenTable genTable) {
+//        List<GenTableColumn> columns = genTable.getColumns();
+//        GenTable subGenTable = genTable.getSubTable();
+//        HashSet<String> importList = new HashSet<String>();
+//        if (StringUtils.isNotNull(subGenTable)) {
+//            importList.add("java.util.List");
+//        }
+//        for (GenTableColumn column : columns) {
+//            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
+//                importList.add("java.util.Date");
+//                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
+//            } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
+//                importList.add("java.math.BigDecimal");
+//            }
+//        }
+//        return importList;
+//    }
+//
+//    /**
+//     * 获取权限前缀
+//     *
+//     * @param moduleName   模块名称
+//     * @param businessName 业务名称
+//     * @return 返回权限前缀
+//     */
+//    public static String getPermissionPrefix(String moduleName, String businessName) {
+//        return String.format("%s:%s", moduleName, businessName);
+//    }
+//
+//    /**
+//     * 获取上级菜单ID字段
+//     *
+//     * @param paramsObj 生成其他选项
+//     * @return 上级菜单ID字段
+//     */
+//    public static String getParentMenuId(JSONObject paramsObj) {
+//        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+//                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) {
+//            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+//        }
+//        return DEFAULT_PARENT_MENU_ID;
+//    }
+//
+//    /**
+//     * 获取树编码
+//     *
+//     * @param paramsObj 生成其他选项
+//     * @return 树编码
+//     */
+//    public static String getTreecode(JSONObject paramsObj) {
+//        if (paramsObj.containsKey(GenConstants.TREE_CODE)) {
+//            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+//        }
+//        return StringUtils.EMPTY;
+//    }
+//
+//    /**
+//     * 获取树父编码
+//     *
+//     * @param paramsObj 生成其他选项
+//     * @return 树父编码
+//     */
+//    public static String getTreeParentCode(JSONObject paramsObj) {
+//        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+//            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+//        }
+//        return StringUtils.EMPTY;
+//    }
+//
+//    /**
+//     * 获取树名称
+//     *
+//     * @param paramsObj 生成其他选项
+//     * @return 树名称
+//     */
+//    public static String getTreeName(JSONObject paramsObj) {
+//        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+//            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+//        }
+//        return StringUtils.EMPTY;
+//    }
+//
+//    /**
+//     * 获取需要在哪一列上面显示展开按钮
+//     *
+//     * @param genTable 业务表对象
+//     * @return 展开按钮列序号
+//     */
+//    public static int getExpandColumn(GenTable genTable) {
+//        String options = genTable.getOptions();
+//        JSONObject paramsObj = JSONObject.parseObject(options);
+//        String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+//        int num = 0;
+//        for (GenTableColumn column : genTable.getColumns()) {
+//            if (column.isList()) {
+//                num++;
+//                String columnName = column.getColumnName();
+//                if (columnName.equals(treeName)) {
+//                    break;
+//                }
+//            }
+//        }
+//        return num;
+//    }
+//}
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/META-INF/spring.factories b/common-generator-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..7fab0be
--- /dev/null
+++ b/common-generator-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.generator.GeneratorAutoConfiguration
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/generator.yml b/common-generator-starter/src/main/resources/generator.yml
new file mode 100644
index 0000000..f70a072
--- /dev/null
+++ b/common-generator-starter/src/main/resources/generator.yml
@@ -0,0 +1,11 @@
+
+# 代码生成
+gen: 
+  # 作者
+  author: kevin
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: com.mosty.base
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: sys_
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/mapper/GenTableColumnMapper.xml_bak b/common-generator-starter/src/main/resources/mapper/GenTableColumnMapper.xml_bak
new file mode 100644
index 0000000..1b3c411
--- /dev/null
+++ b/common-generator-starter/src/main/resources/mapper/GenTableColumnMapper.xml_bak
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableColumnMapper">
+    
+    <resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="com.mosty.common.generator.domain.GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/mapper/GenTableMapper.xml_bak b/common-generator-starter/src/main/resources/mapper/GenTableMapper.xml_bak
new file mode 100644
index 0000000..b53664d
--- /dev/null
+++ b/common-generator-starter/src/main/resources/mapper/GenTableMapper.xml_bak
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableMapper">
+
+	<resultMap type="com.mosty.common.generator.domain.GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
+	</resultMap>
+
+	<resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+
+	<sql id="selectGenTableVo">
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+    </sql>
+
+    <select id="selectGenTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		<include refid="selectGenTableVo"/>
+		<where>
+			<if test="tableName != null and tableName != ''">
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+			</if>
+			<if test="tableComment != null and tableComment != ''">
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			</if>
+		</where>
+	</select>
+
+	<select id="selectDbTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_schema = (select database())
+		AND table_name NOT LIKE 'QRTZ_%' AND table_name NOT LIKE 'gen_%'
+		AND table_name NOT IN (select table_name from gen_table)
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+        order by create_time desc
+	</select>
+
+	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach>
+	</select>
+
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+
+	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_id = #{tableId} order by c.sort
+	</select>
+
+	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_name = #{tableName} order by c.sort
+	</select>
+
+	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		order by c.sort
+	</select>
+
+	<insert id="insertGenTable" parameterType="com.mosty.common.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+
+	<update id="createTable">
+        ${sql}
+	</update>
+
+	<update id="updateGenTable" parameterType="com.mosty.common.generator.domain.GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
+            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper> 
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/common-generator-starter/src/main/resources/mapper/generator/GenTableColumnMapper.xml
new file mode 100644
index 0000000..7b2c6cc
--- /dev/null
+++ b/common-generator-starter/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableColumnMapper">
+    
+    <resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="com.mosty.common.generator.domain.GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/mapper/generator/GenTableMapper.xml b/common-generator-starter/src/main/resources/mapper/generator/GenTableMapper.xml
new file mode 100644
index 0000000..167a8c3
--- /dev/null
+++ b/common-generator-starter/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableMapper">
+
+	<resultMap type="com.mosty.common.generator.domain.GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
+	
+	<resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableVo">
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+    </sql>
+    
+    <select id="selectGenTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		<include refid="selectGenTableVo"/>
+		<where>
+			<if test="tableName != null and tableName != ''">
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+			</if>
+			<if test="tableComment != null and tableComment != ''">
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+	</select>
+
+	<select id="selectDbTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_schema = (select database())
+		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+		AND table_name NOT IN (select table_name from gen_table)
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+        order by create_time desc
+	</select>
+	
+	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach> 
+	</select>
+	
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+	
+	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_id = #{tableId} order by c.sort
+	</select>
+	
+	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_name = #{tableName} order by c.sort
+	</select>
+	
+	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		order by c.sort
+	</select>
+	
+	<insert id="insertGenTable" parameterType="com.mosty.common.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+    
+    <update id="updateGenTable" parameterType="com.mosty.common.generator.domain.GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
+            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+    
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/templates/tool/gen/createTable.html b/common-generator-starter/src/main/resources/templates/tool/gen/createTable.html
new file mode 100644
index 0000000..c9b9dcf
--- /dev/null
+++ b/common-generator-starter/src/main/resources/templates/tool/gen/createTable.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('创建表结构')"/>
+</head>
+<body>
+<div class="main-content">
+    <label class="col-sm-6 control-label">创建表语句(支持多个建表语句)：</label>
+    <div class="col-sm-11 col">
+        <textarea class="form-control" id="text_create" name="" placeholder="请输入文本" rows="12" type="text"></textarea>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+
+<script type="text/javascript">
+    var prefix = ctx + "tool/gen";
+
+    /* 创建表结构 */
+    function submitHandler() {
+        var rows = $("#text_create").val();
+        if (rows.length == 0) {
+            $.modal.alertWarning("请输入建表语句");
+            return;
+        }
+        var data = {"sql": rows};
+        $.operate.save(prefix + "/createTable", data);
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/templates/tool/gen/edit.html b/common-generator-starter/src/main/resources/templates/tool/gen/edit.html
new file mode 100644
index 0000000..56ededc
--- /dev/null
+++ b/common-generator-starter/src/main/resources/templates/tool/gen/edit.html
@@ -0,0 +1,607 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('修改生成信息')" />
+	<th:block th:include="include :: select2-css" />
+	<style type="text/css">
+	    .select-table table{table-layout:fixed;}.table>thead>tr>th{text-align:center;}.select-table .table td{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.form-control{padding:3px 6px 4px;height:30px;}.icheckbox-blue{top:0px;left:6px;}.form-control.select2-hidden-accessible{position:static!important;}.select-table table label.error{position: inherit;}select + label.error{z-index:1;right:40px;}
+	</style>
+</head>
+<body class="gray-bg" style="font: 14px Helvetica Neue, Helvetica, PingFang SC, 微软雅黑, Tahoma, Arial, sans-serif !important;">
+    <section class="section-content">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content" style="border-style:none;">
+                    <div class="nav-tabs-custom">
+                        <ul class="nav nav-tabs">
+                            <li><a href="#tab-basic" data-toggle="tab" aria-expanded="false">基本信息</a></li>
+                            <li class="active"><a href="#tab-field" data-toggle="tab" aria-expanded="true">字段信息</a></li>
+                            <li><a href="#tab-gen" data-toggle="tab" aria-expanded="false">生成信息</a></li>
+                            <li class="pull-right header">
+								<i class="fa fa-code"></i> 生成配置
+							</li>
+                        </ul>
+                        <form id="form-gen-edit" class="form-horizontal" th:object="${table}">
+                        <input name="tableId" type="hidden" th:field="*{tableId}" />
+                        <div class="tab-content">
+                            <!-- 基本信息 -->
+                            <div class="tab-pane" id="tab-basic">
+				            <div class="row mt20">
+				            	<div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">表名称：</label>
+				                        <div class="col-sm-8">
+				                            <input name="tableName" class="form-control" type="text" placeholder="请输入表名称" maxlength="200" th:field="*{tableName}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">表描述：</label>
+				                        <div class="col-sm-8">
+				                            <input name="tableComment" class="form-control" type="text" placeholder="请输入表描述" maxlength="500" th:field="*{tableComment}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+				            <div class="row">
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">实体类名称：</label>
+				                        <div class="col-sm-8">
+				                            <input name="className" class="form-control" type="text" placeholder="请输入实体类名称" maxlength="100" th:field="*{className}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">作者：</label>
+				                        <div class="col-sm-8">
+				                            <input name="functionAuthor" class="form-control" type="text" placeholder="请输入作者" maxlength="50" th:field="*{functionAuthor}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+				            <div class="row">
+				                <div class="col-sm-12">
+				                    <div class="form-group">
+				                        <label class="col-xs-2 control-label">备注：</label>
+				                        <div class="col-xs-10">
+				                            <textarea name="remark" maxlength="500" class="form-control" rows="3"></textarea>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+                            </div>
+                            
+                            <!-- 字段信息 -->
+                            <div class="tab-pane active" id="tab-field">
+                                <div class="select-table table-striped" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;">
+								    <table id="bootstrap-table" data-use-row-attr-func="true" data-reorderable-rows="true"></table>
+								</div>
+                            </div>
+                            
+                            <!-- 生成信息 -->
+                            <div class="tab-pane" id="tab-gen">
+					            <div class="row mt20">
+					            	<div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required">生成模板：</label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="tplCategory" name='tplCategory' style="width: 100%">
+												    <option value="crud" th:field="*{tplCategory}">单表（增删改查）</option>
+												    <option value="tree" th:field="*{tplCategory}">树表（增删改查）</option>
+												    <option value="sub" th:field="*{tplCategory}">主子表（增删改查）</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="生成在哪个java包下，例如 com.ruoyi.project.system">生成包路径：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="packageName" class="form-control" type="text" placeholder="请输入生成包路径" maxlength="100" th:field="*{packageName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="可理解为子系统名，例如 system">生成模块名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="moduleName" class="form-control" type="text" placeholder="请输入生成模块名" maxlength="30" th:field="*{moduleName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="可理解为功能英文名，例如 user">生成业务名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="businessName" class="form-control" type="text" placeholder="请输入生成业务名" maxlength="50" th:field="*{businessName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="用作类描述，例如 用户">生成功能名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="functionName" class="form-control" type="text" placeholder="请输入生成功能名" maxlength="50" th:field="*{functionName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="分配到指定菜单下，例如 系统管理">上级菜单：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input id="parentMenuId" name="params[parentMenuId]" type="hidden" th:value="*{parentMenuId}"/>
+					                            <div class="input-group">
+												    <input id="parentMenuName" name="params[parentMenuName]" class="form-control" type="text" onclick="selectMenuTree()" placeholder="请选择上级菜单" maxlength="50" th:value="*{parentMenuName}" required>
+											        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+											    </div>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label" title="默认为zip压缩包下载，也可以自定义生成路径">生成代码方式：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+                                                <label class="radio-box"> <input type="radio" name="genType" value="0" th:field="*{genType}" /> zip压缩包 </label> 
+                                                <label class="radio-box"> <input type="radio" name="genType" value="1" th:field="*{genType}" /> 自定义路径</label> 
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="hidden row" id="pathinfo">
+					                <div class="col-sm-12">
+					                    <div class="form-group">
+					                        <label class="col-xs-2 control-label" title="填写磁盘绝对路径，若不填写，则生成到当前Web项目下">生成基础路径：<i class="fa fa-question-circle-o"></i></label>
+						                    <div class="col-xs-10">
+						                        <div class="input-group input-group-sm">
+						                            <input id="genPath" name="genPath" class="form-control" type="text" th:field="*{genPath}" placeholder="请输入项目路径" maxlength="200">
+						                            <div class="input-group-btn">
+						                               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">最近路径快速选择 <span class="caret"></span></button>
+															<ul class="dropdown-menu dropdown-menu-right" role="menu">
+																<li><a href="javascript:$('#genPath').val('/')"><i class="fa fa-refresh"></i>恢复默认的生成基础路径</a></li>
+															</ul>
+														</div>
+													</div>
+						                    </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="hidden" id="subInfo">
+					            <h4 class="form-header h4">关联信息</h4>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="关联子表的表名， 如：sys_user">关联子表的表名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='type form-control' id="subTableName" name='subTableName' th:attr='data-value=*{subTableName}' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="子表关联的外键名， 如：user_id">子表关联的外键名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='router form-control' id="subTableFkName" name='subTableFkName' th:attr='data-value=*{subTableFkName}' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            </div>
+					            <div class="hidden" id="otherInfo">
+					            <h4 class="form-header h4">其他信息</h4>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树显示的编码字段名， 如：dept_id">树编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeCode" name='params[treeCode]' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeCode}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树显示的父编码字段名， 如：parent_Id">树父编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeParentCode" name='params[treeParentCode]' style="width: 100%">
+												    <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeParentCode}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树节点的显示名称字段名， 如：dept_name">树名称字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeName" name='params[treeName]' style="width: 100%">
+												    <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeName}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            </div>
+                            </div>
+                        </div>
+                        </form>
+                    </div>
+                </div>
+               <div class="box-footer">
+			       <div class="col-sm-offset-5 col-sm-6">
+			           <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+			           <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+			       </div>
+           	   </div>
+            </div>
+        </div>
+    </div>
+	</section>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: select2-js" />
+    <th:block th:include="include :: bootstrap-table-reorder-rows-js" />
+    <script th:src="@{/js/jquery.tmpl.js}"></script>
+    <th:block th:include="include :: jquery-cxselect-js" />
+    <script th:inline="javascript">
+	    /* 用户信息-修改 */
+	    $("#form-table-edit").validate({
+	    	rules: {
+	    	    tableName: {
+	    	        required: true,
+	    	    },
+	    	},
+			focusCleanup: true
+		});
+	    
+	    /* 表级联信息 */
+   		var data = [[${data}]];
+    	$('#subInfo').cxSelect({
+    	  selects: ['type', 'router'],
+    	  jsonValue: 'v',
+    	  data: data
+    	});
+	    
+	    function submitHandler() {
+	        if ($.validate.form()) {
+	        	$.operate.saveTab(prefix + "/edit", $("#form-gen-edit").serializeArray());
+	        }
+	    }
+	    
+	    var prefix = ctx + "tool/gen";
+		$(function() {
+		    var options = {
+		        url: prefix + "/column/list",
+		        sortName: "sort",
+		        sortOrder: "desc",
+		        height: $(window).height() - 166,
+		        pagination: false,
+		        showSearch: false,
+		        showRefresh: false,
+		        showToggle: false,
+		        showColumns: false,
+		        onLoadSuccess: onLoadSuccess,
+		        onReorderRow: onReorderRow,
+		        columns: [{
+                    title: "序号",
+                    width: "5%",
+                    formatter: function (value, row, index) {
+                    	// 编号隐藏域
+                    	var columnIdHtml = $.common.sprintf("<input type='hidden' name='columns[%s].columnId' value='%s'>", index, row.columnId);
+                    	// 排序隐藏域
+                    	var sortHtml = $.common.sprintf("<input type='hidden' name='columns[%s].sort' value='%s' id='columns_sort_%s'>", index, row.sort, row.columnId);
+                    	return columnIdHtml + sortHtml + $.table.serialNumber(index);
+                    },
+                    cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "move" } };
+                    }
+                },
+		        {
+		            field: 'columnName',
+		            title: '字段列名',
+		            width: "10%",
+		            class: "nodrag",
+		            cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        },
+		        {
+		            field: 'columnComment',
+		            title: '字段描述',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		            	var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, value);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'columnType',
+		            title: '物理类型',
+		            width: "10%",
+		            class: "nodrag",
+		            cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        },
+		        {
+		            field: 'javaType',
+		            title: 'Java类型',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		        		var data = [{ index: index, javaType: value }];
+		                return $("#javaTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'javaField',
+		            title: 'Java属性',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		        		var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].javaField' value='%s' required>", index, value);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isInsert',
+		            title: '插入',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isEdit',
+		            title: '编辑',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isEdit' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isList',
+		            title: '列表',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isList' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isQuery',
+		            title: '查询',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isQuery' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'queryType',
+		            title: '查询方式',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		            	var data = [{ index: index, queryType: value }];
+		                return $("#queryTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'isRequired',
+		            title: '必填',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isRequired' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'htmlType',
+		            title: '显示类型',
+		            width: "12%",
+		            formatter: function (value, row, index) {
+		            	var data = [{ index: index, htmlType: value }];
+		                return $("#htmlTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'dictType',
+		            title: '字典类型',
+		            width: "13%",
+		            formatter: function (value, row, index) {
+		        		var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].dictType' value='%s' id='columns_dict_%s'>", index, (value === undefined ? '' : value), row.columnId);
+		        		return "<div class='input-group'>" + html + "<span class='input-group-addon input-sm' onclick='selectDictTree(" + row.columnId + ", this)'><i class='fa fa-search'></i></span></div>";
+		        	},
+		        	cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		// 当所有数据被加载时触发处理函数
+		function onLoadSuccess(data){
+			$.fn.select2.defaults.set( "theme", "bootstrap" );
+			$("select.form-control").each(function () {
+				$(this).select2().on("change", function () {
+					$(this).valid();
+				})
+			})
+			$(".check-box").each(function() {
+	            $(this).iCheck({
+	                checkboxClass: 'icheckbox-blue'
+            	})
+        	})
+        }
+		
+		// 当拖拽结束后处理函数
+		function onReorderRow(data) {
+	        for (var i = 0; i < data.length; i++) {
+			    $("#columns_sort_" + data[i].columnId).val(i+1);
+			}
+       }
+		
+		$(function() {
+            var tplCategory = $("#tplCategory option:selected").val();
+            tplCategoryVisible(tplCategory);
+            var genType = $('input[name="genType"]:checked').val();
+            pathInfoVisible(genType);
+        });
+		
+		$('#tplCategory').on('select2:select', function (event) {
+			var tplCategory = $(event.target).val();
+			tplCategoryVisible(tplCategory);
+		});
+		
+		function tplCategoryVisible(tplCategory) {
+			if("crud" == tplCategory){
+				$("#treeCode").select2("val", [""]);
+				$("#treeParentCode").select2("val", [""]);
+				$("#treeName").select2("val", [""]);
+				$("#otherInfo").addClass("hidden");
+				$("#subInfo").addClass("hidden");
+			} else if("tree" == tplCategory){
+				$("#otherInfo").removeClass("hidden");
+				$("#treeCode").attr("required", "true");
+				$("#treeParentCode").attr("required", "true");
+				$("#treeName").attr("required", "true");
+				$("#subInfo").addClass("hidden");
+			} else if("sub" == tplCategory){
+				$("#subInfo").removeClass("hidden");
+				$("#treeCode").select2("val", [""]);
+				$("#treeParentCode").select2("val", [""]);
+				$("#treeName").select2("val", [""]);
+				$("#subTableName").attr("required", "true");
+				$("#subTableFkName").attr("required", "true");
+				$("#otherInfo").addClass("hidden");
+			}
+        }
+		
+		$('input').on('ifChecked', function(event){
+			var genType = $(event.target).val();
+			pathInfoVisible(genType);
+		});
+		
+		function pathInfoVisible(genType) {
+			if("0" == genType){
+				$("#genPath").val("/");
+				$("#pathinfo").addClass("hidden");
+			} else if("1" == genType){
+				$("#pathinfo").removeClass("hidden");
+			}
+		}
+		
+		// 选择字典处理函数
+		function selectDictTree(columnId, obj) {
+			var dictType = $.common.nullToStr($(obj).parent().find("input").val());
+        	var url = ctx + "system/dict/selectDictTree/" + columnId + "/" + dictType;
+			var options = {
+				title: '选择字典类型',
+				width: "380",
+				url: url,
+				callBack: doDictSubmit
+			};
+			$.modal.openOptions(options);
+		}
+		
+		// 选择菜单处理函数
+        function selectMenuTree() {
+        	var parentMenuId = $("#parentMenuId").val();
+        	var menuId = parentMenuId > 0 ? parentMenuId : 1;
+        	var url = ctx + "system/menu/selectMenuTree/" + menuId;
+			var options = {
+				title: '菜单选择',
+				width: "380",
+				url: url,
+				callBack: doMenuSubmit
+			};
+			$.modal.openOptions(options);
+		}
+		
+		function doDictSubmit(index, layero){
+			var body = $.modal.getChildFrame(index);
+   			var columnId = body.find('#columnId').val();
+   			var dictType = body.find('#dictType').val();
+   			$.modal.close(index);
+   			$("#columns_dict_" + columnId).val(dictType);
+		}
+		
+		function doMenuSubmit(index, layero){
+			var body = $.modal.getChildFrame(index);
+   			$("#parentMenuId").val(body.find('#treeId').val());
+   			$("#parentMenuName").val(body.find('#treeName').val());
+   			$.modal.close(index);
+		}
+    </script>
+</body>
+</html>
+
+
+<!-- java类型 -->
+<script id="javaTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].javaType'>
+    <option value="Long" {{if javaType==="Long"}}selected{{/if}}>Long</option>
+    <option value="String" {{if javaType==="String"}}selected{{/if}}>String</option>
+    <option value="Integer" {{if javaType==="Integer"}}selected{{/if}}>Integer</option>
+    <option value="Double" {{if javaType==="Double"}}selected{{/if}}>Double</option>
+    <option value="BigDecimal" {{if javaType==="BigDecimal"}}selected{{/if}}>BigDecimal</option>
+    <option value="Date" {{if javaType==="Date"}}selected{{/if}}>Date</option>
+</select>
+</div>
+</script>
+
+<!-- 查询方式 -->
+<script id="queryTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].queryType'>
+    <option value="EQ" {{if queryType==="EQ"}}selected{{/if}}>=</option>
+    <option value="NE" {{if queryType==="NE"}}selected{{/if}}>!=</option>
+    <option value="GT" {{if queryType==="GT"}}selected{{/if}}>></option>
+    <option value="GTE" {{if queryType==="GTE"}}selected{{/if}}>>=</option>
+    <option value="LT" {{if queryType==="LT"}}selected{{/if}}><</option>
+    <option value="LTE" {{if queryType==="LTE"}}selected{{/if}}><=</option>
+    <option value="LIKE" {{if queryType==="LIKE"}}selected{{/if}}>Like</option>
+    <option value="BETWEEN" {{if queryType==="BETWEEN"}}selected{{/if}}>Between</option>
+</select>
+</div>
+</script>
+
+<!-- 显示类型 -->
+<script id="htmlTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].htmlType'>
+    <option value="input" {{if htmlType==="input"}}selected{{/if}}>文本框</option>
+    <option value="textarea" {{if htmlType==="textarea"}}selected{{/if}}>文本域</option>
+    <option value="select" {{if htmlType==="select"}}selected{{/if}}>下拉框</option>
+    <option value="radio" {{if htmlType==="radio"}}selected{{/if}}>单选框</option>
+    <option value="checkbox" {{if htmlType==="checkbox"}}selected{{/if}}>复选框</option>
+    <option value="summernote" {{if htmlType==="summernote"}}selected{{/if}}>富文本</option>
+    <option value="datetime" {{if htmlType==="datetime"}}selected{{/if}}>日期控件</option>
+    <option value="upload" {{if htmlType==="upload"}}selected{{/if}}>上传控件</option>
+</select>
+</div>
+</script>
diff --git a/common-generator-starter/src/main/resources/templates/tool/gen/gen.html b/common-generator-starter/src/main/resources/templates/tool/gen/gen.html
new file mode 100644
index 0000000..a0150f1
--- /dev/null
+++ b/common-generator-starter/src/main/resources/templates/tool/gen/gen.html
@@ -0,0 +1,218 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('代码生成列表')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="gen-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								表名称：<input type="text" name="tableName"/>
+							</li>
+							<li>
+								表描述：<input type="text" name="tableComment"/>
+							</li>
+							<li class="select-time">
+								<label>表时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			
+			<div class="btn-group-sm" id="toolbar" role="group">
+			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
+			        <i class="fa fa-download"></i> 生成
+			    </a>
+				<a class="btn btn-success" onclick="createTable()" shiro:hasRole="admin">
+					<i class="fa fa-plus"></i> 创建
+				</a>
+				<a class="btn btn-info" onclick="importTable()">
+			        <i class="fa fa-upload"></i> 导入
+			    </a>
+			    <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="tool:gen:edit">
+		            <i class="fa fa-edit"></i> 修改
+		        </a>
+			    <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="tool:gen:remove">
+		            <i class="fa fa-remove"></i> 删除
+		        </a>
+		    </div>
+		
+		    <div class="col-sm-12 select-table table-striped">
+			    <table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: bootstrap-table-export-js" />
+	<script th:src="@{/ajax/libs/highlight/highlight.min.js}"></script>
+	<script th:inline="javascript">
+		var prefix = ctx + "tool/gen";
+		var editFlag = [[${@permission.hasPermi('tool:gen:edit')}]];
+		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
+		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
+		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
+	
+		$(function() {
+		    var options = {
+		        url: prefix + "/list",
+		        updateUrl: prefix + "/edit/{id}",
+		        removeUrl: prefix + "/remove",
+		        sortName: "createTime",
+		        sortOrder: "desc",
+		        showExport: true,
+		        modalName: "生成配置",
+		        rememberSelected: true,
+		        uniqueId: "tableId",
+		        columns: [{
+		        	field: 'state',
+		            checkbox: true
+		        },
+		        {
+		            field: 'tableId',
+		            title: '编号',
+		            visible: false
+		        },
+		        {
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                 	    return $.table.serialNumber(index);
+                    }
+                },
+		        {
+		            field: 'tableName',
+		            title: '表名称',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'tableComment',
+		            title: '表描述',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value, 15);
+                    }
+		        },
+		        {
+		            field: 'className',
+		            title: '实体类名称',
+		            sortable: true
+		        },
+		        {
+		            field: 'createTime',
+		            title: '创建时间',
+		            sortable: true
+		        },
+		        {
+		            field: 'updateTime',
+		            title: '更新时间',
+		            sortable: true
+		        },
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		                var actions = [];
+		                actions.push('<a class="btn btn-info btn-xs ' + previewFlag + '" href="javascript:void(0)" onclick="preview(\'' + row.tableId + '\')"><i class="fa fa-search"></i>预览</a> ');
+		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.tableId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tableId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+		                actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="synchDb(\'' + row.tableName + '\')"><i class="fa fa-refresh"></i>同步</a> ');
+		                actions.push('<a class="btn btn-primary btn-xs ' + codeFlag + '" href="javascript:void(0)" onclick="genCode(\'' + row.tableName + '\',\'' + row.genType + '\')"><i class="fa fa-bug"></i>生成代码</a> ');
+		                return actions.join('');
+		            }
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		// 预览代码
+		function preview(tableId) {
+			var preViewUrl = prefix + "/preview/" + tableId;
+			$.modal.loading("正在加载数据，请稍候...");
+			$.get(preViewUrl, function(result) {
+				if (result.code == web_status.SUCCESS) {
+					 var items = [];
+		                $.each(result.data, function(index, value) {
+		                    var templateName = index.substring(index.lastIndexOf("/") + 1, index.length).replace(/\.vm/g, "");
+		                    if(!$.common.equals("sql", templateName) && !$.common.equals("tree.html", templateName) && !$.common.equals("sub-domain.java", templateName)){
+		                    	var language = templateName.substring(templateName.lastIndexOf(".") + 1);
+			                    var highCode = hljs.highlight(language, value).value;
+		                    	items.push({
+			                        title: templateName , content: "<pre class=\"layui-code\"><code>" + highCode + "</code></pre>"
+			                    })
+		                    }
+		                });
+		                top.layer.tab({
+                            area: ['90%', '90%'],
+                            shadeClose: true,
+                            success: function(layero, index){
+                                parent.loadCss(ctx + "ajax/libs/highlight/default.min.css");
+                            },
+	                        tab: items
+		                });
+				} else {
+					$.modal.alertError(result.msg);
+				}
+				$.modal.closeLoading();
+			});
+		}
+	
+		// 生成代码
+		function genCode(tableName, genType) {
+		    $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() {
+		    	if(genType === "0") {
+			    	location.href = prefix + "/download/" + tableName;
+			        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
+				} else if(genType === "1") {
+					$.operate.get(prefix + "/genCode/" + tableName);
+				}
+		    })
+		}
+		
+		// 同步数据库
+		function synchDb(tableName){
+			$.modal.confirm("确认要强制同步" + tableName + "表结构吗？", function() {
+			    $.operate.get(prefix + "/synchDb/" + tableName);
+			})
+		}
+	
+		// 批量生成代码
+		function batchGenCode() {
+		    var rows = $.table.selectColumns("tableName");
+		    if (rows.length == 0) {
+		        $.modal.alertWarning("请选择要生成的数据");
+		        return;
+		    }
+		    $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
+		    	location.href = prefix + "/batchGenCode?tables=" + rows;
+		        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
+		    });
+		}
+
+		// 导入表结构
+		function importTable() {
+			var importTableUrl = prefix + "/importTable";
+			$.modal.open("导入表结构", importTableUrl);
+		}
+
+		// 创建表结构
+		function createTable() {
+			var creatTableUrl = prefix + "/createTable";
+			$.modal.open("创建表结构", creatTableUrl);
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/templates/tool/gen/importTable.html b/common-generator-starter/src/main/resources/templates/tool/gen/importTable.html
new file mode 100644
index 0000000..91562e7
--- /dev/null
+++ b/common-generator-starter/src/main/resources/templates/tool/gen/importTable.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('导入表结构')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="gen-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								表名称：<input type="text" name="tableName"/>
+							</li>
+							<li>
+								表描述：<input type="text" name="tableComment"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			
+		    <div class="col-sm-12 select-table table-striped">
+			    <table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<script type="text/javascript">
+		var prefix = ctx + "tool/gen";
+	
+		$(function() {
+		    var options = {
+		        url: prefix + "/db/list",
+		        showSearch: false,
+		        showRefresh: false,
+		        showToggle: false,
+		        showColumns: false,
+		        clickToSelect: true,
+		        rememberSelected: true,
+		        uniqueId: "tableName",
+		        columns: [{
+		        	field: 'state',
+		            checkbox: true
+		        },
+		        {
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                 	    return $.table.serialNumber(index);
+                    }
+                },
+		        {
+		            field: 'tableName',
+		            title: '表名称',
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'tableComment',
+		            title: '表描述',
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'createTime',
+		            title: '创建时间'
+		        },
+		        {
+		            field: 'updateTime',
+		            title: '更新时间'
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		/* 导入表结构-选择表结构-提交 */
+		function submitHandler() {
+			var rows = $.table.selectColumns("tableName");
+			if (rows.length == 0) {
+       			$.modal.alertWarning("请至少选择一条记录");
+       			return;
+       		}
+			var data = {"tables": rows.join()};
+			$.operate.save(prefix + "/importTable", data);
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/html/add.html.vm b/common-generator-starter/src/main/resources/vm/html/add.html.vm
new file mode 100644
index 0000000..b7f1781
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/html/add.html.vm
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增${functionName}')" />
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-css" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-css" />
+#break
+#end
+#end
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-${businessName}-add">
+#if($table.sub)
+            <h4 class="form-header h4">${functionName}信息</h4>
+#end
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group">
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+#set($treeId = "${className}?.${treeCode}")
+                        <input id="treeId" name="${treeParentCode}" type="hidden" th:value="${${treeId}}"/>
+                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:value="${${treeName}}"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "input")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input name="${field}" class="form-control" type="text"#if($column.required) required#end>
+                </div>
+            </div>
+#elseif($column.htmlType == "upload")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="${field}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="${field}" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "summernote")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" name="${field}">
+                    <div class="summernote" id="${field}"></div>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b"#if($column.required) required#end>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
+                    <label th:each="dict : ${type}" class="check-box">
+                        <input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"#if($column.required) required#end>
+                    </label>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <label class="check-box">
+                        <input name="${field}" type="checkbox"#if($column.required) required#end> 无
+                    </label>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
+                        <input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:checked="${dict.default}"#if($column.required) required#end>
+                        <label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="${field}" value=""#if($column.required) required#end>
+                        <label th:for="${field}" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "datetime")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="${field}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "textarea")
+            <div class="form-group">
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end></textarea>
+                </div>
+            </div>
+#end
+#end
+#end
+#end
+#if($table.sub)
+            <h4 class="form-header h4">${subTable.functionName}信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+#end
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-js" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-js" />
+#break
+#end
+#end
+    <script th:inline="javascript">
+        var prefix = ctx + "${moduleName}/${businessName}"
+#if($table.sub)
+#foreach($column in $subTable.columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+#end
+        $("#form-${businessName}-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-${businessName}-add').serialize());
+            }
+        }
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+
+        $("input[name='$column.javaField']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+
+        $(".file-upload").fileinput({
+            uploadUrl: ctx + 'common/upload',
+            maxFileCount: 1,
+            autoReplace: true
+        }).on('fileuploaded', function (event, data, previewId, index) {
+            $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+        }).on('fileremoved', function (event, id, index) {
+            $("input[name='" + event.currentTarget.id + "']").val('')
+        })
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+
+        $(function() {
+            $('.summernote').summernote({
+                lang: 'zh-CN',
+                dialogsInBody: true,
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function(files) {
+                        var obj = this;
+                    	var data = new FormData();
+                    	data.append("file", files[0]);
+                    	$.ajax({
+                            type: "post",
+                            url: ctx + "common/upload",
+                    		data: data,
+                    		cache: false,
+                    		contentType: false,
+                    		processData: false,
+                    		dataType: 'json',
+                    		success: function(result) {
+                    		    if (result.code == web_status.SUCCESS) {
+                    		        $('#' + obj.id).summernote('insertImage', result.url);
+                    		    } else {
+                    		        $.modal.alertError(result.msg);
+                    		    }
+                    		},
+                    		error: function(error) {
+                    		    $.modal.alertWarning("图片上传失败。");
+                    		}
+                    	});
+                    }
+                }
+            });
+        });
+#break
+#end
+#end
+#if($table.tree)
+
+        /*${functionName}-新增-选择父${functionName}树*/
+        function select${BusinessName}Tree() {
+            var options = {
+                title: '${functionName}选择',
+                width: "380",
+                url: prefix + "/select${BusinessName}Tree/" + $("#treeId").val(),
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
+#end
+#if($table.sub)
+
+        $(function() {
+            var options = {
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+#foreach($column in $subTable.columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
+                        return $.common.dictToSelect(${javaField}Datas, value, name);
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#else
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
+                        return html;
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#end
+#end
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#if($column.pk || $javaField == ${subTableFkclassName})
+#else
+                    ${javaField}: ""#if($foreach.count != $subTable.columns.size()),#end
+
+#end
+#end
+                }
+            });
+        }
+#end
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/html/edit.html.vm b/common-generator-starter/src/main/resources/vm/html/edit.html.vm
new file mode 100644
index 0000000..53e0451
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/html/edit.html.vm
@@ -0,0 +1,392 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改${functionName}')" />
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-css" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-css" />
+#break
+#end
+#end
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-${businessName}-edit" th:object="${${className}}">
+#if($table.sub)
+            <h4 class="form-header h4">${functionName}信息</h4>
+#end
+            <input name="${pkColumn.javaField}" th:field="*{${pkColumn.javaField}}" type="hidden">
+#foreach($column in $columns)
+#if($column.edit && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($field=$column.javaField)
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group">
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+                        <input id="treeId" name="${treeParentCode}" type="hidden" th:field="*{${treeParentCode}}" />
+                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:field="*{parentName}"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "input")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end>
+                </div>
+            </div>
+#elseif($column.htmlType == "upload")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="${field}" th:field="*{${field}}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="${field}" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "summernote")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" th:field="*{${field}}">
+                    <div class="summernote" id="${field}"></div>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{${field}}"></option>
+                    </select>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b"#if($column.required) required#end>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
+                    <label th:each="dict : ${type}" class="check-box">
+                        <input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" th:attr="checked=${${className}.${field}.contains(dict.dictValue)?true:false}"#if($column.required) required#end>
+                    </label>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <label class="check-box">
+                        <input name="${field}" type="checkbox"#if($column.required) required#end> 无
+                    </label>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
+                        <input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:field="*{${field}}"#if($column.required) required#end>
+                        <label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="${field}" value=""#if($column.required) required#end>
+                        <label th:for="${field}" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "datetime")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="${field}" th:value="${#dates.format(${className}.${field}, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "textarea")
+            <div class="form-group">
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end>[[*{${field}}]]</textarea>
+                </div>
+            </div>
+#end
+#end
+#end
+#end
+#if($table.sub)
+            <h4 class="form-header h4">${subTable.functionName}信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+#end
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-js" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-js" />
+#break
+#end
+#end
+    <script th:inline="javascript">
+        var prefix = ctx + "${moduleName}/${businessName}";
+#if($table.sub)
+#foreach($column in $subTable.columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+#end
+        $("#form-${businessName}-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-${businessName}-edit').serialize());
+            }
+        }
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+
+        $("input[name='$column.javaField']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+
+        $(".file-upload").each(function (i) {
+            var val = $("input[name='" + this.id + "']").val()
+            $(this).fileinput({
+                'uploadUrl': ctx + 'common/upload',
+                initialPreviewAsData: true,
+                initialPreview: [val],
+                maxFileCount: 1,
+                autoReplace: true
+            }).on('fileuploaded', function (event, data, previewId, index) {
+                $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+            }).on('fileremoved', function (event, id, index) {
+                $("input[name='" + event.currentTarget.id + "']").val('')
+            })
+            $(this).fileinput('_initFileActions');
+        });
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+
+        $(function() {
+            $('.summernote').each(function(i) {
+                $('#' + this.id).summernote({
+                    lang: 'zh-CN',
+                    dialogsInBody: true,
+                    callbacks: {
+                        onChange: function(contents, $edittable) {
+                            $("input[name='" + this.id + "']").val(contents);
+                        },
+                        onImageUpload: function(files) {
+                            var obj = this;
+                            var data = new FormData();
+                            data.append("file", files[0]);
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: data,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function(result) {
+                                    if (result.code == web_status.SUCCESS) {
+                                        $('#' + obj.id).summernote('insertImage', result.url);
+                                    } else {
+                                        $.modal.alertError(result.msg);
+                                    }
+                                },
+                                error: function(error) {
+                                    $.modal.alertWarning("图片上传失败。");
+                                }
+                            });
+                        }
+                    }
+                });
+                var content = $("input[name='" + this.id + "']").val();
+                $('#' + this.id).summernote('code', content);
+            })
+        });
+#break
+#end
+#end
+#if($table.tree)
+
+        /*${functionName}-编辑-选择父${functionName}树*/
+        function select${BusinessName}Tree() {
+            var options = {
+                title: '${functionName}选择',
+                width: "380",
+                url: prefix + "/select${BusinessName}Tree/" + $("#treeId").val(),
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
+#end
+#if($table.sub)
+
+        $(function() {
+            var options = {
+                data: [[${${className}.${subclassName}List}]],
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+#foreach($column in $subTable.columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
+                        return $.common.dictToSelect(${javaField}Datas, value, name);
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#else
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
+                        return html;
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#end
+#end
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#if($column.pk || $javaField == ${subTableFkclassName})
+#else
+                    ${javaField}: ""#if($foreach.count != $subTable.columns.size()),#end
+
+#end
+#end
+        	    }
+            });
+        }
+#end
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/html/list-tree.html.vm b/common-generator-starter/src/main/resources/vm/html/list-tree.html.vm
new file mode 100644
index 0000000..f7f797d
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/html/list-tree.html.vm
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('${functionName}列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else  
+#set($comment=$column.columnComment)
+#end  
+#if($column.htmlType == "input")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" name="${column.javaField}"/>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" placeholder="请选择${comment}" name="${column.javaField}"/>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
+                            </li>                
+#end
+#end
+#end
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="${permissionPrefix}:add">
+                    <i class="fa fa-plus"></i> 新增
+                </a>
+                <a class="btn btn-primary" onclick="$.operate.edit()" shiro:hasPermission="${permissionPrefix}:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-info" id="expandAllBtn">
+                    <i class="fa fa-exchange"></i> 展开/折叠
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-tree-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var addFlag = [[${@permission.hasPermi('${permissionPrefix}:add')}]];
+        var editFlag = [[${@permission.hasPermi('${permissionPrefix}:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('${permissionPrefix}:remove')}]];
+#foreach($column in $columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+        var prefix = ctx + "${moduleName}/${businessName}";
+
+        $(function() {
+            var options = {
+                code: "${treeCode}",
+                parentCode: "${treeParentCode}",
+                expandColumn: "${expandColumn}",
+                uniqueId: "${pkColumn.javaField}",
+                url: prefix + "/list",
+                createUrl: prefix + "/add/{id}",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "${functionName}",
+                columns: [{
+                    field: 'selectItem',
+                    radio: true
+                },
+#foreach($column in $columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    align: 'left',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
+                    }
+                },
+#elseif($column.list && "" != $javaField)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    align: 'left'
+                },
+#end                
+#end
+                {
+                    title: '操作',
+                    align: 'center',
+                    align: 'left',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info  btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-plus"></i>新增</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.treeTable.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/html/list.html.vm b/common-generator-starter/src/main/resources/vm/html/list.html.vm
new file mode 100644
index 0000000..f2e9c5a
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/html/list.html.vm
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('${functionName}列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else  
+#set($comment=$column.columnComment)
+#end  
+#if($column.htmlType == "input")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" name="${column.javaField}"/>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" placeholder="请选择${comment}" name="${column.javaField}"/>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
+                            </li>
+#end
+#end
+#end
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="${permissionPrefix}:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="${permissionPrefix}:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="${permissionPrefix}:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="${permissionPrefix}:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('${permissionPrefix}:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('${permissionPrefix}:remove')}]];
+#foreach($column in $columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+        var prefix = ctx + "${moduleName}/${businessName}";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "${functionName}",
+                columns: [{
+                    checkbox: true
+                },
+#foreach($column in $columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    visible: false
+                },
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
+                    }
+                },
+#elseif($column.list && "" != $javaField)
+                {
+                    field: '${javaField}',
+                    title: '${comment}'
+                },
+#end                
+#end
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/html/tree.html.vm b/common-generator-starter/src/main/resources/vm/html/tree.html.vm
new file mode 100644
index 0000000..80364ad
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/html/tree.html.vm
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('${functionName}树选择')" />
+    <th:block th:include="include :: ztree-css" />
+</head>
+<style>
+    body{height:auto;font-family: "Microsoft YaHei";}
+    button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
+</style>
+<body class="hold-transition box box-main">
+#set($treeId = "${className}?." + $treeCode)
+#set($treeName = "${className}?." + $treeName)
+    <input id="treeId"   name="treeId"    type="hidden" th:value="${${treeId}}"/>
+    <input id="treeName" name="treeName"  type="hidden" th:value="${${treeName}}"/>
+    <div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
+        <label id="btnShow" title="显示搜索" style="display:none;">︾</label>
+        <label id="btnHide" title="隐藏搜索">︽</label>
+    </div>
+    <div class="treeSearchInput" id="search">
+        <label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
+        <button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
+    </div>
+    <div class="treeExpandCollapse">
+        <a href="#" onclick="$.tree.expand()">展开</a> /
+        <a href="#" onclick="$.tree.collapse()">折叠</a>
+    </div>
+    <div id="tree" class="ztree treeselect"></div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: ztree-js" />
+    <script th:inline="javascript">
+        $(function() {
+            var url = ctx + "${moduleName}/${businessName}/treeData";
+            var options = {
+                url: url,
+                expandLevel: 2,
+                onClick : zOnClick
+            };
+            $.tree.init(options);
+        });
+
+        function zOnClick(event, treeId, treeNode) {
+            var treeId = treeNode.id;
+            var treeName = treeNode.name;
+            $("#treeId").val(treeId);
+            $("#treeName").val(treeName);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/java/controller.java.vm b/common-generator-starter/src/main/resources/vm/java/controller.java.vm
new file mode 100644
index 0000000..e826fd4
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/controller.java.vm
@@ -0,0 +1,202 @@
+package ${packageName}.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+#elseif($table.tree)
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.domain.Ztree;
+#end
+
+/**
+ * ${functionName}Controller
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Controller
+@RequestMapping("/${moduleName}/${businessName}")
+public class ${ClassName}Controller extends BaseController
+{
+    private String prefix = "${moduleName}/${businessName}";
+
+    @Autowired
+    private I${ClassName}Service ${className}Service;
+
+    @RequiresPermissions("${permissionPrefix}:view")
+    @GetMapping()
+    public String ${businessName}()
+    {
+        return prefix + "/${businessName}";
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 查询${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(${ClassName} ${className})
+    {
+        startPage();
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return getDataTable(list);
+    }
+#elseif($table.tree)
+    /**
+     * 查询${functionName}树列表
+     */
+    @RequiresPermissions("${permissionPrefix}:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public List<${ClassName}> list(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return list;
+    }
+#end
+
+    /**
+     * 导出${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:export")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        return util.exportExcel(list, "${functionName}数据");
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 新增${functionName}
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+#elseif($table.tree)
+    /**
+     * 新增${functionName}
+     */
+    @GetMapping(value = { "/add/{${pkColumn.javaField}}", "/add/" })
+    public String add(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(${pkColumn.javaField}))
+        {
+            mmap.put("${className}", ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        }
+        return prefix + "/add";
+    }
+#end
+
+    /**
+     * 新增保存${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:add")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(${ClassName} ${className})
+    {
+        return toAjax(${className}Service.insert${ClassName}(${className}));
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:edit")
+    @GetMapping("/edit/{${pkColumn.javaField}}")
+    public String edit(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap)
+    {
+        ${ClassName} ${className} = ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        mmap.put("${className}", ${className});
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:edit")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(${ClassName} ${className})
+    {
+        return toAjax(${className}Service.update${ClassName}(${className}));
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 删除${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(ids));
+    }
+#elseif($table.tree)
+    /**
+     * 删除
+     */
+    @RequiresPermissions("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{${pkColumn.javaField}}")
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+    }
+#end
+#if($table.tree)
+
+    /**
+     * 选择${functionName}树
+     */
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+    @GetMapping(value = { "/select${BusinessName}Tree/{${pkColumn.javaField}}", "/select${BusinessName}Tree/" })
+    public String select${BusinessName}Tree(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(${pkColumn.javaField}))
+        {
+            mmap.put("${className}", ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        }
+        return prefix + "/tree";
+    }
+
+    /**
+     * 加载${functionName}树列表
+     */
+    @GetMapping("/treeData")
+    @ResponseBody
+    public List<Ztree> treeData()
+    {
+        List<Ztree> ztrees = ${className}Service.select${ClassName}Tree();
+        return ztrees;
+    }
+#end
+}
diff --git a/common-generator-starter/src/main/resources/vm/java/domain.java.vm b/common-generator-starter/src/main/resources/vm/java/domain.java.vm
new file mode 100644
index 0000000..bd51c17
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/domain.java.vm
@@ -0,0 +1,105 @@
+package ${packageName}.domain;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud || $table.sub)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
+public class ${ClassName} extends ${Entity}
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#if($table.sub)
+    /** $table.subTable.functionName信息 */
+    private List<${subClassName}> ${subclassName}List;
+
+#end
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+#if($table.sub)
+    public List<${subClassName}> get${subClassName}List()
+    {
+        return ${subclassName}List;
+    }
+
+    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+    {
+        this.${subclassName}List = ${subclassName}List;
+    }
+
+#end
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+#if($table.sub)
+            .append("${subclassName}List", get${subClassName}List())
+#end
+            .toString();
+    }
+}
diff --git a/common-generator-starter/src/main/resources/vm/java/mapper.java.vm b/common-generator-starter/src/main/resources/vm/java/mapper.java.vm
new file mode 100644
index 0000000..ebee538
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/mapper.java.vm
@@ -0,0 +1,91 @@
+package ${packageName}.mapper;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+#if($table.sub)
+import ${packageName}.domain.${subClassName};
+#end
+
+/**
+ * ${functionName}Mapper接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface ${ClassName}Mapper 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 删除${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String[] ${pkColumn.javaField}s);
+#if($table.sub)
+
+    /**
+     * 批量删除${subTable.functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}s(String[] ${pkColumn.javaField}s);
+    
+    /**
+     * 批量新增${subTable.functionName}
+     * 
+     * @param ${subclassName}List ${subTable.functionName}列表
+     * @return 结果
+     */
+    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    
+
+    /**
+     * 通过${functionName}主键删除${subTable.functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}ID
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+#end
+}
diff --git a/common-generator-starter/src/main/resources/vm/java/service.java.vm b/common-generator-starter/src/main/resources/vm/java/service.java.vm
new file mode 100644
index 0000000..765c9d6
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/service.java.vm
@@ -0,0 +1,73 @@
+package ${packageName}.service;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+#if($table.tree)
+import com.ruoyi.common.core.domain.Ztree;
+#end
+
+/**
+ * ${functionName}Service接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface I${ClassName}Service 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s);
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+#if($table.tree)
+
+    /**
+     * 查询${functionName}树列表
+     * 
+     * @return 所有${functionName}信息
+     */
+    public List<Ztree> select${ClassName}Tree();
+#end
+}
diff --git a/common-generator-starter/src/main/resources/vm/java/serviceImpl.java.vm b/common-generator-starter/src/main/resources/vm/java/serviceImpl.java.vm
new file mode 100644
index 0000000..242b1c7
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/serviceImpl.java.vm
@@ -0,0 +1,213 @@
+package ${packageName}.service.impl;
+
+import java.util.List;
+#if($table.tree)
+import java.util.ArrayList;
+import com.ruoyi.common.core.domain.Ztree;
+#end
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
+import com.ruoyi.common.utils.DateUtils;
+#break
+#end
+#end
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+#if($table.sub)
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import ${packageName}.domain.${subClassName};
+#end
+import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * ${functionName}Service业务层处理
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+{
+    @Autowired
+    private ${ClassName}Mapper ${className}Mapper;
+
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
+    @Override
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
+    {
+        return ${className}Mapper.select${ClassName}List(${className});
+    }
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int insert${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime')
+        ${className}.setCreateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        int rows = ${className}Mapper.insert${ClassName}(${className});
+        insert${subClassName}(${className});
+        return rows;
+#else
+        return ${className}Mapper.insert${ClassName}(${className});
+#end
+    }
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int update${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'updateTime')
+        ${className}.setUpdateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+#end
+        return ${className}Mapper.update${ClassName}(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s)
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(Convert.toStrArray(${pkColumn.javaField}s));
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(Convert.toStrArray(${pkColumn.javaField}s));
+    }
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+#if($table.tree)
+
+    /**
+     * 查询${functionName}树列表
+     * 
+     * @return 所有${functionName}信息
+     */
+    @Override
+    public List<Ztree> select${ClassName}Tree()
+    {
+        List<${ClassName}> ${className}List = ${className}Mapper.select${ClassName}List(new ${ClassName}());
+        List<Ztree> ztrees = new ArrayList<Ztree>();
+        for (${ClassName} ${className} : ${className}List)
+        {
+            Ztree ztree = new Ztree();
+#if($treeCode.length() > 2 && $treeCode.substring(1,2).matches("[A-Z]"))
+#set($TreeCode=$treeCode)
+#else
+#set($TreeCode=$treeCode.substring(0,1).toUpperCase() + ${treeCode.substring(1)})
+#end
+#if($treeParentCode.length() > 2 && $treeParentCode.substring(1,2).matches("[A-Z]"))
+#set($TreeParentCode=$treeParentCode)
+#else
+#set($TreeParentCode=$treeParentCode.substring(0,1).toUpperCase() + ${treeParentCode.substring(1)})
+#end
+#if($treeName.length() > 2 && $treeName.substring(1,2).matches("[A-Z]"))
+#set($TreeName=$treeName)
+#else
+#set($TreeName=$treeName.substring(0,1).toUpperCase() + ${treeName.substring(1)})
+#end
+            ztree.setId(${className}.get${TreeCode}());
+            ztree.setpId(${className}.get${TreeParentCode}());
+            ztree.setName(${className}.get${TreeName}());
+            ztree.setTitle(${className}.get${TreeName}());
+            ztrees.add(ztree);
+        }
+        return ztrees;
+    }
+#end
+#if($table.sub)
+
+    /**
+     * 新增${subTable.functionName}信息
+     * 
+     * @param ${className} ${functionName}对象
+     */
+    public void insert${subClassName}(${ClassName} ${className})
+    {
+        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        if (StringUtils.isNotNull(${subclassName}List))
+        {
+            List<${subClassName}> list = new ArrayList<${subClassName}>();
+            for (${subClassName} ${subclassName} : ${subclassName}List)
+            {
+                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+                list.add(${subclassName});
+            }
+            if (list.size() > 0)
+            {
+                ${className}Mapper.batch${subClassName}(list);
+            }
+        }
+    }
+#end
+}
diff --git a/common-generator-starter/src/main/resources/vm/java/sub-domain.java.vm b/common-generator-starter/src/main/resources/vm/java/sub-domain.java.vm
new file mode 100644
index 0000000..a3f53eb
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/java/sub-domain.java.vm
@@ -0,0 +1,76 @@
+package ${packageName}.domain;
+
+#foreach ($import in $subImportList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * ${subTable.functionName}对象 ${subTableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public class ${subClassName} extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $subTable.columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+            .toString();
+    }
+}
diff --git a/common-generator-starter/src/main/resources/vm/js/api.js.vm b/common-generator-starter/src/main/resources/vm/js/api.js.vm
new file mode 100644
index 0000000..9295524
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/js/api.js.vm
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询${functionName}列表
+export function list${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询${functionName}详细
+export function get${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'get'
+  })
+}
+
+// 新增${functionName}
+export function add${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改${functionName}
+export function update${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除${functionName}
+export function del${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'delete'
+  })
+}
diff --git a/common-generator-starter/src/main/resources/vm/sql/sql.vm b/common-generator-starter/src/main/resources/vm/sql/sql.vm
new file mode 100644
index 0000000..d5121af
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/sql/sql.vm
@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}查询', @parentId, '1',  '#',  'F', '0', '${permissionPrefix}:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}新增', @parentId, '2',  '#',  'F', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}修改', @parentId, '3',  '#',  'F', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}删除', @parentId, '4',  '#',  'F', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}导出', @parentId, '5',  '#',  'F', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');
diff --git a/common-generator-starter/src/main/resources/vm/vue/index-tree.vue.vm b/common-generator-starter/src/main/resources/vm/vue/index-tree.vue.vm
new file mode 100644
index 0000000..bfb61b5
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/vue/index-tree.vue.vm
@@ -0,0 +1,482 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    size="small"
+                                    @keyup.enter.native="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+                                <el-option
+                                        v-for="dict in dict.type.${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+                                <el-option label="请选择字典生成" value="" />
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable size="small"
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="yyyy-MM-dd"
+                                            placeholder="选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    size="small"
+                                    style="width: 240px"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+                v-loading="loading"
+                :data="${businessName}List"
+                row-key="${treeCode}"
+                default-expand-all
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        >
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template slot-scope="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template slot-scope="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    #if(${foreach.index} == 1)
+                        <el-table-column label="${comment}" prop="${javaField}" />
+                    #else
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" />
+                    #end
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改</el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-plus"
+                            @click="handleAdd(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:add']"
+                    >新增</el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if("" != $treeParentCode && $column.javaField == $treeParentCode)
+                                <el-form-item label="${comment}" prop="${treeParentCode}">
+                                    <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option label="请选择字典生成" value="" />
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+                                        >{{dict.label}}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable size="small"
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+    import Treeselect from "@riophae/vue-treeselect";
+    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+    export default {
+        name: "${BusinessName}",
+        #if(${dicts} != '')
+            dicts: [${dicts}],
+        #end
+        components: {
+            Treeselect
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 显示搜索条件
+                showSearch: true,
+                // ${functionName}表格数据
+                    ${businessName}List: [],
+                // ${functionName}树选项
+                    ${businessName}Options: [],
+                // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        // $comment时间范围
+                        daterange${AttrName}: [],
+                    #end
+                #end
+                // 查询参数
+                queryParams: {
+            #foreach ($column in $columns)
+                #if($column.query)
+                    $column.javaField: null#if($foreach.count != $columns.size()),#end
+                #end
+            #end
+        },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                #foreach ($column in $columns)
+                    #if($column.required)
+                        #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                        #if($parentheseIndex != -1)
+                            #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                        #else
+                            #set($comment=$column.columnComment)
+                        #end
+                        $column.javaField: [
+                        { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+                    ]#if($foreach.count != $columns.size()),#end
+                    #end
+                #end
+            }
+        };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+            /** 查询${functionName}列表 */
+            getList() {
+                this.loading = true;
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        this.queryParams.params = {};
+                        #break
+                    #end
+                #end
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+                            this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+                            this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+                        }
+                    #end
+                #end
+                list${BusinessName}(this.queryParams).then(response => {
+                    this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                    this.loading = false;
+                });
+            },
+            /** 转换${functionName}数据结构 */
+            normalizer(node) {
+                if (node.children && !node.children.length) {
+                    delete node.children;
+                }
+                return {
+                    id: node.${treeCode},
+                    label: node.${treeName},
+                    children: node.children
+                };
+            },
+            /** 查询${functionName}下拉树结构 */
+            getTreeselect() {
+                list${BusinessName}().then(response => {
+                    this.${businessName}Options = [];
+                    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+                    data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                    this.${businessName}Options.push(data);
+                });
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "radio")
+                        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+                    #elseif($column.htmlType == "checkbox")
+                        $column.javaField: []#if($foreach.count != $columns.size()),#end
+                    #else
+                        $column.javaField: null#if($foreach.count != $columns.size()),#end
+                    #end
+                #end
+            };
+                this.resetForm("form");
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        this.daterange${AttrName} = [];
+                    #end
+                #end
+                this.resetForm("queryForm");
+                this.handleQuery();
+            },
+            /** 新增按钮操作 */
+            handleAdd(row) {
+                this.reset();
+                this.getTreeselect();
+                if (row != null && row.${treeCode}) {
+                    this.form.${treeParentCode} = row.${treeCode};
+                } else {
+                    this.form.${treeParentCode} = 0;
+                }
+                this.open = true;
+                this.title = "添加${functionName}";
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset();
+                this.getTreeselect();
+                if (row != null) {
+                    this.form.${treeParentCode} = row.${treeCode};
+                }
+                get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+                    this.form = response.data;
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                            this.form.$column.javaField = this.form.${column.javaField}.split(",");
+                        #end
+                    #end
+                    this.open = true;
+                    this.title = "修改${functionName}";
+                });
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.#[[$]]#refs["form"].validate(valid => {
+                    if (valid) {
+                        #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                        this.form.$column.javaField = this.form.${column.javaField}.join(",");
+                        #end
+                        #end
+                        if (this.form.${pkColumn.javaField} != null) {
+                            update${BusinessName}(this.form).then(response => {
+                                this.#[[$modal]]#.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        } else {
+                            add${BusinessName}(this.form).then(response => {
+                                this.#[[$modal]]#.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    }
+                });
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+                    return del${BusinessName}(row.${pkColumn.javaField});
+                }).then(() => {
+                    this.getList();
+                    this.#[[$modal]]#.msgSuccess("删除成功");
+                }).catch(() => {});
+            }
+        }
+    };
+</script>
diff --git a/common-generator-starter/src/main/resources/vm/vue/index.vue.vm b/common-generator-starter/src/main/resources/vm/vue/index.vue.vm
new file mode 100644
index 0000000..65620b4
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/vue/index.vue.vm
@@ -0,0 +1,573 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable size="small"
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+          <el-table-column label="$comment" prop="${javaField}">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+export default {
+  name: "${BusinessName}",
+#if(${dicts} != '')
+  dicts: [${dicts}],
+#end
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+#if($table.sub)
+      // 子表选中数据
+      checked${subClassName}: [],
+#end
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+#if($table.sub)
+      // ${subTable.functionName}表格数据
+      ${subclassName}List: [],
+#end
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      };
+#if($table.sub)
+      this.${subclassName}List = [];
+#end
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.${pkColumn.javaField})
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+      get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+        this.${subclassName}List = response.data.${subclassName}List;
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+          this.form.${subclassName}List = this.${subclassName}List;
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
+      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+        return del${BusinessName}(${pkColumn.javaField}s);
+      }).then(() => {
+        this.getList();
+        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+#if($table.sub)
+	/** ${subTable.functionName}序号 */
+    row${subClassName}Index({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** ${subTable.functionName}添加按钮操作 */
+    handleAdd${subClassName}() {
+      let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+      obj.$column.javaField = "";
+#end
+#end
+      this.${subclassName}List.push(obj);
+    },
+    /** ${subTable.functionName}删除按钮操作 */
+    handleDelete${subClassName}() {
+      if (this.checked${subClassName}.length == 0) {
+        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+      } else {
+        const ${subclassName}List = this.${subclassName}List;
+        const checked${subClassName} = this.checked${subClassName};
+        this.${subclassName}List = ${subclassName}List.filter(function(item) {
+          return checked${subClassName}.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handle${subClassName}SelectionChange(selection) {
+      this.checked${subClassName} = selection.map(item => item.index)
+    },
+#end
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('${moduleName}/${businessName}/export', {
+        ...this.queryParams
+      }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/common-generator-starter/src/main/resources/vm/vue/v3/index-tree.vue.vm b/common-generator-starter/src/main/resources/vm/vue/v3/index-tree.vue.vm
new file mode 100644
index 0000000..5342e91
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -0,0 +1,464 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    @keyup.enter="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option
+                                        v-for="dict in ${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option label="请选择字典生成" value="" />
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="YYYY-MM-DD"
+                                            placeholder="选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}" style="width: 308px">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    value-format="YYYY-MM-DD"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="Plus"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+                v-loading="loading"
+                :data="${businessName}List"
+                row-key="${treeCode}"
+                default-expand-all
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        >
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template #default="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template #default="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template #default="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    #if(${foreach.index} == 1)
+                        <el-table-column label="${comment}" prop="${javaField}" />
+                    #else
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" />
+                    #end
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template #default="scope">
+                    <el-button
+                            type="text"
+                            icon="Edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改</el-button>
+                    <el-button
+                            type="text"
+                            icon="Plus"
+                            @click="handleAdd(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:add']"
+                    >新增</el-button>
+                    <el-button
+                            type="text"
+                            icon="Delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if("" != $treeParentCode && $column.javaField == $treeParentCode)
+                                <el-form-item label="${comment}" prop="${treeParentCode}">
+                                    <tree-select
+                                            v-model:value="form.${treeParentCode}"
+                                            :options="${businessName}Options"
+                                            :objMap="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+                                            placeholder="请选择${comment}"
+                                    />
+                                </el-form-item>
+                            #elseif($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option label="请选择字典生成" value="" />
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+                                        >{{dict.label}}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="YYYY-MM-DD"
+                                                    placeholder="选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="${BusinessName}">
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+    const { proxy } = getCurrentInstance();
+        #if(${dicts} != '')
+            #set($dictsNoSymbol=$dicts.replace("'", ""))
+        const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+        #end
+
+    const ${businessName}List = ref([]);
+    const ${businessName}Options = ref([]);
+    const open = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const title = ref("");
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            const daterange${AttrName} = ref([]);
+            #end
+        #end
+
+    const data = reactive({
+        form: {},
+        queryParams: {
+        #foreach ($column in $columns)
+            #if($column.query)
+                $column.javaField: null#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    },
+    rules: {
+        #foreach ($column in $columns)
+            #if($column.required)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                $column.javaField: [
+                { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+            ]#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询${functionName}列表 */
+    function getList() {
+        loading.value = true;
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                queryParams.value.params = {};
+                #break
+            #end
+        #end
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+                    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+                    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+                }
+            #end
+        #end
+        list${BusinessName}(queryParams.value).then(response => {
+                ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+            loading.value = false;
+        });
+    }
+
+    /** 查询${functionName}下拉树结构 */
+    async function getTreeselect() {
+        await list${BusinessName}().then(response => {
+                ${businessName}Options.value = [];
+            const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+            data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                ${businessName}Options.value.push(data);
+        });
+    }
+
+    // 取消按钮
+    function cancel() {
+        open.value = false;
+        reset();
+    }
+
+    // 表单重置
+    function reset() {
+        form.value = {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "radio")
+                $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+            #elseif($column.htmlType == "checkbox")
+                $column.javaField: []#if($foreach.count != $columns.size()),#end
+            #else
+                $column.javaField: null#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    };
+        proxy.resetForm("${businessName}Ref");
+    }
+
+    /** 搜索按钮操作 */
+    function handleQuery() {
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    function resetQuery() {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                daterange${AttrName}.value = [];
+            #end
+        #end
+        proxy.resetForm("queryRef");
+        handleQuery();
+    }
+
+    /** 新增按钮操作 */
+    async function handleAdd(row) {
+        reset();
+        await getTreeselect();
+        if (row != null && row.${treeCode}) {
+            form.value.${treeParentCode} = row.${treeCode};
+        } else {
+            form.value.${treeParentCode} = 0;
+        }
+        open.value = true;
+        title.value = "添加${functionName}";
+    }
+
+    /** 修改按钮操作 */
+    async function handleUpdate(row) {
+        reset();
+        await getTreeselect();
+        if (row != null) {
+            form.value.${treeParentCode} = row.${treeCode};
+        }
+        get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+            form.value = response.data;
+            #foreach ($column in $columns)
+                #if($column.htmlType == "checkbox")
+                    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+                #end
+            #end
+            open.value = true;
+            title.value = "修改${functionName}";
+        });
+    }
+
+    /** 提交按钮 */
+    function submitForm() {
+        proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+            if (valid) {
+                #foreach ($column in $columns)
+                #if($column.htmlType == "checkbox")
+                form.value.$column.javaField = form.value.${column.javaField}.join(",");
+                #end
+                #end
+                if (form.value.${pkColumn.javaField} != null) {
+                    update${BusinessName}(form.value).then(response => {
+                        proxy.#[[$modal]]#.msgSuccess("修改成功");
+                        open.value = false;
+                        getList();
+                    });
+                } else {
+                    add${BusinessName}(form.value).then(response => {
+                        proxy.#[[$modal]]#.msgSuccess("新增成功");
+                        open.value = false;
+                        getList();
+                    });
+                }
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    function handleDelete(row) {
+        proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+            return del${BusinessName}(row.${pkColumn.javaField});
+        }).then(() => {
+            getList();
+            proxy.#[[$modal]]#.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+
+    getList();
+</script>
diff --git a/common-generator-starter/src/main/resources/vm/vue/v3/index.vue.vm b/common-generator-starter/src/main/resources/vm/vue/v3/index.vue.vm
new file mode 100644
index 0000000..08bb071
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/vue/v3/index.vue.vm
@@ -0,0 +1,564 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in ${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}" style="width: 308px">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template #default="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+          <el-table-column label="$comment" prop="${javaField}">
+            <template #default="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}">
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+const { proxy } = getCurrentInstance();
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+#end
+
+const ${businessName}List = ref([]);
+#if($table.sub)
+const ${subclassName}List = ref([]);
+#end
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+#if($table.sub)
+const checked${subClassName} = ref([]);
+#end
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+const daterange${AttrName} = ref([]);
+#end
+#end
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    #foreach ($column in $columns)
+#if($column.query)
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  },
+  rules: {
+    #foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    $column.javaField: [
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+    ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询${functionName}列表 */
+function getList() {
+  loading.value = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+  queryParams.value.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+  }
+#end
+#end
+  list${BusinessName}(queryParams.value).then(response => {
+    ${businessName}List.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  };
+#if($table.sub)
+  ${subclassName}List.value = [];
+#end
+  proxy.resetForm("${businessName}Ref");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  daterange${AttrName}.value = [];
+#end
+#end
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.${pkColumn.javaField});
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加${functionName}";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
+  get${BusinessName}(${pkColumn.javaField}).then(response => {
+    form.value = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+    ${subclassName}List.value = response.data.${subclassName}List;
+#end
+    open.value = true;
+    title.value = "修改${functionName}";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+    if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+      form.value.${subclassName}List = ${subclassName}List.value;
+#end
+      if (form.value.${pkColumn.javaField} != null) {
+        update${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        add${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+    return del${BusinessName}(${pkColumn.javaField}s);
+  }).then(() => {
+    getList();
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+#if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1;
+}
+
+/** ${subTable.functionName}添加按钮操作 */
+function handleAdd${subClassName}() {
+  let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+  obj.$column.javaField = "";
+#end
+#end
+  ${subclassName}List.value.push(obj);
+}
+
+/** ${subTable.functionName}删除按钮操作 */
+function handleDelete${subClassName}() {
+  if (checked${subClassName}.value.length == 0) {
+    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+  } else {
+    const ${subclassName}s = ${subclassName}List.value;
+    const checked${subClassName}s = checked${subClassName}.value;
+    ${subclassName}List.value = ${subclassName}s.filter(function(item) {
+      return checked${subClassName}s.indexOf(item.index) == -1
+    });
+  }
+}
+
+/** 复选框选中数据 */
+function handle${subClassName}SelectionChange(selection) {
+  checked${subClassName}.value = selection.map(item => item.index)
+}
+
+#end
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('${moduleName}/${businessName}/export', {
+    ...queryParams.value
+  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+}
+
+getList();
+</script>
diff --git a/common-generator-starter/src/main/resources/vm/vue/v3/readme.txt b/common-generator-starter/src/main/resources/vm/vue/v3/readme.txt
new file mode 100644
index 0000000..10362d6
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/vue/v3/readme.txt
@@ -0,0 +1 @@
+���ʹ�õ���RuoYi-Cloud-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼��
\ No newline at end of file
diff --git a/common-generator-starter/src/main/resources/vm/xml/mapper.xml.vm b/common-generator-starter/src/main/resources/vm/xml/mapper.xml.vm
new file mode 100644
index 0000000..9de59b5
--- /dev/null
+++ b/common-generator-starter/src/main/resources/vm/xml/mapper.xml.vm
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
+    
+    <resultMap type="${ClassName}" id="${ClassName}Result">
+#foreach ($column in $columns)
+        <result property="${column.javaField}"    column="${column.columnName}"    />
+#end
+#if($table.tree)
+        <result property="parentName" column="parent_name" />
+#end
+    </resultMap>
+#if($table.sub)
+
+    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+    </resultMap>
+
+    <resultMap type="${subClassName}" id="${subClassName}Result">
+#foreach ($column in $subTable.columns)
+        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
+#end
+    </resultMap>
+#end
+
+    <sql id="select${ClassName}Vo">
+        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+    </sql>
+
+    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+        <include refid="select${ClassName}Vo"/>
+        <where>  
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+#if($column.queryType == "EQ")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
+#elseif($queryType == "NE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
+#elseif($queryType == "GT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
+#elseif($queryType == "GTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
+#elseif($queryType == "LT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
+#elseif($queryType == "LTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
+#elseif($queryType == "LIKE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
+#elseif($queryType == "BETWEEN")
+            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
+#end
+#end
+#end
+        </where>
+#if($table.tree)
+        order by ${tree_parent_code}
+#end
+    </select>
+    
+    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+#if($table.crud)
+        <include refid="select${ClassName}Vo"/>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+#elseif($table.tree)
+        select#foreach($column in $columns) t.$column.columnName,#end p.${tree_name} as parent_name
+        from ${tableName} t
+        left join ${tableName} p on p.${pkColumn.columnName} = t.${tree_parent_code}
+        where t.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#elseif($table.sub)
+        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
+           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
+
+        from ${tableName} a
+        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
+        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#end
+    </select>
+        
+    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+        insert into ${tableName}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
+#end
+#end
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
+#end
+#end
+         </trim>
+    </insert>
+
+    <update id="update${ClassName}" parameterType="${ClassName}">
+        update ${tableName}
+        <trim prefix="SET" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
+#end
+#end
+        </trim>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </update>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </delete>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+        delete from ${tableName} where ${pkColumn.columnName} in 
+        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
+            #{${pkColumn.javaField}}
+        </foreach>
+    </delete>
+#if($table.sub)
+    
+    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
+        delete from ${subTableName} where ${subTableFkName} in 
+        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+            #{${subTableFkclassName}}
+        </foreach>
+    </delete>
+
+    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
+        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+    </delete>
+
+    <insert id="batch${subClassName}">
+        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
+        </foreach>
+    </insert>
+#end
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/META-INF/spring.factories b/common-generator-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..7fab0be
--- /dev/null
+++ b/common-generator-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.generator.GeneratorAutoConfiguration
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/GeneratorAutoConfiguration.class b/common-generator-starter/target/classes/com/mosty/common/generator/GeneratorAutoConfiguration.class
new file mode 100644
index 0000000..9aeedbd
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/GeneratorAutoConfiguration.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/config/BaseEntity.class b/common-generator-starter/target/classes/com/mosty/common/generator/config/BaseEntity.class
new file mode 100644
index 0000000..f0f092d
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/config/BaseEntity.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConfig.class b/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConfig.class
new file mode 100644
index 0000000..2644676
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConfig.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConstants.class b/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConstants.class
new file mode 100644
index 0000000..94a4a4a
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/config/GenConstants.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/controller/GenController.class b/common-generator-starter/target/classes/com/mosty/common/generator/controller/GenController.class
new file mode 100644
index 0000000..591fa90
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/controller/GenController.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTable.class b/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTable.class
new file mode 100644
index 0000000..30335d2
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTable.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTableColumn.class b/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTableColumn.class
new file mode 100644
index 0000000..1de2836
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/domain/GenTableColumn.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableColumnMapper.class b/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableColumnMapper.class
new file mode 100644
index 0000000..093c53b
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableColumnMapper.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableMapper.class b/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableMapper.class
new file mode 100644
index 0000000..b483262
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/mapper/GenTableMapper.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableColumnServiceImpl.class b/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableColumnServiceImpl.class
new file mode 100644
index 0000000..fc94008
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableColumnServiceImpl.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableServiceImpl.class b/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableServiceImpl.class
new file mode 100644
index 0000000..3aa6d66
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/service/GenTableServiceImpl.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableColumnService.class b/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableColumnService.class
new file mode 100644
index 0000000..37fed65
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableColumnService.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableService.class b/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableService.class
new file mode 100644
index 0000000..32e577e
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/service/IGenTableService.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/CharsetKit.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/CharsetKit.class
new file mode 100644
index 0000000..098febf
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/CharsetKit.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/Convert.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/Convert.class
new file mode 100644
index 0000000..200f8a9
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/Convert.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/GenUtils.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/GenUtils.class
new file mode 100644
index 0000000..48c4904
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/GenUtils.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/StringUtils.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/StringUtils.class
new file mode 100644
index 0000000..86096e0
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/StringUtils.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityInitializer.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityInitializer.class
new file mode 100644
index 0000000..2c84064
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityInitializer.class differ
diff --git a/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityUtils.class b/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityUtils.class
new file mode 100644
index 0000000..7186eae
Binary files /dev/null and b/common-generator-starter/target/classes/com/mosty/common/generator/util/VelocityUtils.class differ
diff --git a/common-generator-starter/target/classes/generator.yml b/common-generator-starter/target/classes/generator.yml
new file mode 100644
index 0000000..f70a072
--- /dev/null
+++ b/common-generator-starter/target/classes/generator.yml
@@ -0,0 +1,11 @@
+
+# 代码生成
+gen: 
+  # 作者
+  author: kevin
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: com.mosty.base
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: sys_
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/mapper/GenTableColumnMapper.xml_bak b/common-generator-starter/target/classes/mapper/GenTableColumnMapper.xml_bak
new file mode 100644
index 0000000..1b3c411
--- /dev/null
+++ b/common-generator-starter/target/classes/mapper/GenTableColumnMapper.xml_bak
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableColumnMapper">
+    
+    <resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="com.mosty.common.generator.domain.GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/mapper/GenTableMapper.xml_bak b/common-generator-starter/target/classes/mapper/GenTableMapper.xml_bak
new file mode 100644
index 0000000..b53664d
--- /dev/null
+++ b/common-generator-starter/target/classes/mapper/GenTableMapper.xml_bak
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableMapper">
+
+	<resultMap type="com.mosty.common.generator.domain.GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
+	</resultMap>
+
+	<resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+
+	<sql id="selectGenTableVo">
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+    </sql>
+
+    <select id="selectGenTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		<include refid="selectGenTableVo"/>
+		<where>
+			<if test="tableName != null and tableName != ''">
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+			</if>
+			<if test="tableComment != null and tableComment != ''">
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			</if>
+		</where>
+	</select>
+
+	<select id="selectDbTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_schema = (select database())
+		AND table_name NOT LIKE 'QRTZ_%' AND table_name NOT LIKE 'gen_%'
+		AND table_name NOT IN (select table_name from gen_table)
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+        order by create_time desc
+	</select>
+
+	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach>
+	</select>
+
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+
+	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_id = #{tableId} order by c.sort
+	</select>
+
+	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_name = #{tableName} order by c.sort
+	</select>
+
+	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		order by c.sort
+	</select>
+
+	<insert id="insertGenTable" parameterType="com.mosty.common.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+
+	<update id="createTable">
+        ${sql}
+	</update>
+
+	<update id="updateGenTable" parameterType="com.mosty.common.generator.domain.GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
+            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper> 
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/mapper/generator/GenTableColumnMapper.xml b/common-generator-starter/target/classes/mapper/generator/GenTableColumnMapper.xml
new file mode 100644
index 0000000..7b2c6cc
--- /dev/null
+++ b/common-generator-starter/target/classes/mapper/generator/GenTableColumnMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableColumnMapper">
+    
+    <resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="com.mosty.common.generator.domain.GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="com.mosty.common.generator.domain.GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/mapper/generator/GenTableMapper.xml b/common-generator-starter/target/classes/mapper/generator/GenTableMapper.xml
new file mode 100644
index 0000000..167a8c3
--- /dev/null
+++ b/common-generator-starter/target/classes/mapper/generator/GenTableMapper.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.generator.mapper.GenTableMapper">
+
+	<resultMap type="com.mosty.common.generator.domain.GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
+	
+	<resultMap type="com.mosty.common.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableVo">
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+    </sql>
+    
+    <select id="selectGenTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		<include refid="selectGenTableVo"/>
+		<where>
+			<if test="tableName != null and tableName != ''">
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+			</if>
+			<if test="tableComment != null and tableComment != ''">
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+	</select>
+
+	<select id="selectDbTableList" parameterType="com.mosty.common.generator.domain.GenTable" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_schema = (select database())
+		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+		AND table_name NOT IN (select table_name from gen_table)
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+        order by create_time desc
+	</select>
+	
+	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach> 
+	</select>
+	
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+	
+	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_id = #{tableId} order by c.sort
+	</select>
+	
+	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_name = #{tableName} order by c.sort
+	</select>
+	
+	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		order by c.sort
+	</select>
+	
+	<insert id="insertGenTable" parameterType="com.mosty.common.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+    
+    <update id="updateGenTable" parameterType="com.mosty.common.generator.domain.GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
+            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+    
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/templates/tool/gen/createTable.html b/common-generator-starter/target/classes/templates/tool/gen/createTable.html
new file mode 100644
index 0000000..c9b9dcf
--- /dev/null
+++ b/common-generator-starter/target/classes/templates/tool/gen/createTable.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('创建表结构')"/>
+</head>
+<body>
+<div class="main-content">
+    <label class="col-sm-6 control-label">创建表语句(支持多个建表语句)：</label>
+    <div class="col-sm-11 col">
+        <textarea class="form-control" id="text_create" name="" placeholder="请输入文本" rows="12" type="text"></textarea>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+
+<script type="text/javascript">
+    var prefix = ctx + "tool/gen";
+
+    /* 创建表结构 */
+    function submitHandler() {
+        var rows = $("#text_create").val();
+        if (rows.length == 0) {
+            $.modal.alertWarning("请输入建表语句");
+            return;
+        }
+        var data = {"sql": rows};
+        $.operate.save(prefix + "/createTable", data);
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/templates/tool/gen/edit.html b/common-generator-starter/target/classes/templates/tool/gen/edit.html
new file mode 100644
index 0000000..56ededc
--- /dev/null
+++ b/common-generator-starter/target/classes/templates/tool/gen/edit.html
@@ -0,0 +1,607 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('修改生成信息')" />
+	<th:block th:include="include :: select2-css" />
+	<style type="text/css">
+	    .select-table table{table-layout:fixed;}.table>thead>tr>th{text-align:center;}.select-table .table td{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.form-control{padding:3px 6px 4px;height:30px;}.icheckbox-blue{top:0px;left:6px;}.form-control.select2-hidden-accessible{position:static!important;}.select-table table label.error{position: inherit;}select + label.error{z-index:1;right:40px;}
+	</style>
+</head>
+<body class="gray-bg" style="font: 14px Helvetica Neue, Helvetica, PingFang SC, 微软雅黑, Tahoma, Arial, sans-serif !important;">
+    <section class="section-content">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content" style="border-style:none;">
+                    <div class="nav-tabs-custom">
+                        <ul class="nav nav-tabs">
+                            <li><a href="#tab-basic" data-toggle="tab" aria-expanded="false">基本信息</a></li>
+                            <li class="active"><a href="#tab-field" data-toggle="tab" aria-expanded="true">字段信息</a></li>
+                            <li><a href="#tab-gen" data-toggle="tab" aria-expanded="false">生成信息</a></li>
+                            <li class="pull-right header">
+								<i class="fa fa-code"></i> 生成配置
+							</li>
+                        </ul>
+                        <form id="form-gen-edit" class="form-horizontal" th:object="${table}">
+                        <input name="tableId" type="hidden" th:field="*{tableId}" />
+                        <div class="tab-content">
+                            <!-- 基本信息 -->
+                            <div class="tab-pane" id="tab-basic">
+				            <div class="row mt20">
+				            	<div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">表名称：</label>
+				                        <div class="col-sm-8">
+				                            <input name="tableName" class="form-control" type="text" placeholder="请输入表名称" maxlength="200" th:field="*{tableName}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">表描述：</label>
+				                        <div class="col-sm-8">
+				                            <input name="tableComment" class="form-control" type="text" placeholder="请输入表描述" maxlength="500" th:field="*{tableComment}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+				            <div class="row">
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">实体类名称：</label>
+				                        <div class="col-sm-8">
+				                            <input name="className" class="form-control" type="text" placeholder="请输入实体类名称" maxlength="100" th:field="*{className}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				                <div class="col-sm-6">
+				                    <div class="form-group">
+				                        <label class="col-sm-4 control-label is-required">作者：</label>
+				                        <div class="col-sm-8">
+				                            <input name="functionAuthor" class="form-control" type="text" placeholder="请输入作者" maxlength="50" th:field="*{functionAuthor}" required>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+				            <div class="row">
+				                <div class="col-sm-12">
+				                    <div class="form-group">
+				                        <label class="col-xs-2 control-label">备注：</label>
+				                        <div class="col-xs-10">
+				                            <textarea name="remark" maxlength="500" class="form-control" rows="3"></textarea>
+				                        </div>
+				                    </div>
+				                </div>
+				            </div>
+                            </div>
+                            
+                            <!-- 字段信息 -->
+                            <div class="tab-pane active" id="tab-field">
+                                <div class="select-table table-striped" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;">
+								    <table id="bootstrap-table" data-use-row-attr-func="true" data-reorderable-rows="true"></table>
+								</div>
+                            </div>
+                            
+                            <!-- 生成信息 -->
+                            <div class="tab-pane" id="tab-gen">
+					            <div class="row mt20">
+					            	<div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required">生成模板：</label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="tplCategory" name='tplCategory' style="width: 100%">
+												    <option value="crud" th:field="*{tplCategory}">单表（增删改查）</option>
+												    <option value="tree" th:field="*{tplCategory}">树表（增删改查）</option>
+												    <option value="sub" th:field="*{tplCategory}">主子表（增删改查）</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="生成在哪个java包下，例如 com.ruoyi.project.system">生成包路径：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="packageName" class="form-control" type="text" placeholder="请输入生成包路径" maxlength="100" th:field="*{packageName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="可理解为子系统名，例如 system">生成模块名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="moduleName" class="form-control" type="text" placeholder="请输入生成模块名" maxlength="30" th:field="*{moduleName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="可理解为功能英文名，例如 user">生成业务名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="businessName" class="form-control" type="text" placeholder="请输入生成业务名" maxlength="50" th:field="*{businessName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="用作类描述，例如 用户">生成功能名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input name="functionName" class="form-control" type="text" placeholder="请输入生成功能名" maxlength="50" th:field="*{functionName}" required>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="分配到指定菜单下，例如 系统管理">上级菜单：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <input id="parentMenuId" name="params[parentMenuId]" type="hidden" th:value="*{parentMenuId}"/>
+					                            <div class="input-group">
+												    <input id="parentMenuName" name="params[parentMenuName]" class="form-control" type="text" onclick="selectMenuTree()" placeholder="请选择上级菜单" maxlength="50" th:value="*{parentMenuName}" required>
+											        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+											    </div>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label" title="默认为zip压缩包下载，也可以自定义生成路径">生成代码方式：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+                                                <label class="radio-box"> <input type="radio" name="genType" value="0" th:field="*{genType}" /> zip压缩包 </label> 
+                                                <label class="radio-box"> <input type="radio" name="genType" value="1" th:field="*{genType}" /> 自定义路径</label> 
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="hidden row" id="pathinfo">
+					                <div class="col-sm-12">
+					                    <div class="form-group">
+					                        <label class="col-xs-2 control-label" title="填写磁盘绝对路径，若不填写，则生成到当前Web项目下">生成基础路径：<i class="fa fa-question-circle-o"></i></label>
+						                    <div class="col-xs-10">
+						                        <div class="input-group input-group-sm">
+						                            <input id="genPath" name="genPath" class="form-control" type="text" th:field="*{genPath}" placeholder="请输入项目路径" maxlength="200">
+						                            <div class="input-group-btn">
+						                               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">最近路径快速选择 <span class="caret"></span></button>
+															<ul class="dropdown-menu dropdown-menu-right" role="menu">
+																<li><a href="javascript:$('#genPath').val('/')"><i class="fa fa-refresh"></i>恢复默认的生成基础路径</a></li>
+															</ul>
+														</div>
+													</div>
+						                    </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="hidden" id="subInfo">
+					            <h4 class="form-header h4">关联信息</h4>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="关联子表的表名， 如：sys_user">关联子表的表名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='type form-control' id="subTableName" name='subTableName' th:attr='data-value=*{subTableName}' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="子表关联的外键名， 如：user_id">子表关联的外键名：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='router form-control' id="subTableFkName" name='subTableFkName' th:attr='data-value=*{subTableFkName}' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            </div>
+					            <div class="hidden" id="otherInfo">
+					            <h4 class="form-header h4">其他信息</h4>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树显示的编码字段名， 如：dept_id">树编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeCode" name='params[treeCode]' style="width: 100%">
+					                                <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeCode}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树显示的父编码字段名， 如：parent_Id">树父编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeParentCode" name='params[treeParentCode]' style="width: 100%">
+												    <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeParentCode}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            <div class="row">
+					                <div class="col-sm-6">
+					                    <div class="form-group">
+					                        <label class="col-sm-4 control-label is-required" title="树节点的显示名称字段名， 如：dept_name">树名称字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <div class="col-sm-8">
+					                            <select class='form-control' id="treeName" name='params[treeName]' style="width: 100%">
+												    <option value="">---请选择---</option>
+												    <option th:each="column : ${table.columns}" th:text="${column.columnName + '：' + column.columnComment}" th:value="${column.columnName}" th:field="*{treeName}"></option>
+												</select>
+					                        </div>
+					                    </div>
+					                </div>
+					            </div>
+					            </div>
+                            </div>
+                        </div>
+                        </form>
+                    </div>
+                </div>
+               <div class="box-footer">
+			       <div class="col-sm-offset-5 col-sm-6">
+			           <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+			           <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+			       </div>
+           	   </div>
+            </div>
+        </div>
+    </div>
+	</section>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: select2-js" />
+    <th:block th:include="include :: bootstrap-table-reorder-rows-js" />
+    <script th:src="@{/js/jquery.tmpl.js}"></script>
+    <th:block th:include="include :: jquery-cxselect-js" />
+    <script th:inline="javascript">
+	    /* 用户信息-修改 */
+	    $("#form-table-edit").validate({
+	    	rules: {
+	    	    tableName: {
+	    	        required: true,
+	    	    },
+	    	},
+			focusCleanup: true
+		});
+	    
+	    /* 表级联信息 */
+   		var data = [[${data}]];
+    	$('#subInfo').cxSelect({
+    	  selects: ['type', 'router'],
+    	  jsonValue: 'v',
+    	  data: data
+    	});
+	    
+	    function submitHandler() {
+	        if ($.validate.form()) {
+	        	$.operate.saveTab(prefix + "/edit", $("#form-gen-edit").serializeArray());
+	        }
+	    }
+	    
+	    var prefix = ctx + "tool/gen";
+		$(function() {
+		    var options = {
+		        url: prefix + "/column/list",
+		        sortName: "sort",
+		        sortOrder: "desc",
+		        height: $(window).height() - 166,
+		        pagination: false,
+		        showSearch: false,
+		        showRefresh: false,
+		        showToggle: false,
+		        showColumns: false,
+		        onLoadSuccess: onLoadSuccess,
+		        onReorderRow: onReorderRow,
+		        columns: [{
+                    title: "序号",
+                    width: "5%",
+                    formatter: function (value, row, index) {
+                    	// 编号隐藏域
+                    	var columnIdHtml = $.common.sprintf("<input type='hidden' name='columns[%s].columnId' value='%s'>", index, row.columnId);
+                    	// 排序隐藏域
+                    	var sortHtml = $.common.sprintf("<input type='hidden' name='columns[%s].sort' value='%s' id='columns_sort_%s'>", index, row.sort, row.columnId);
+                    	return columnIdHtml + sortHtml + $.table.serialNumber(index);
+                    },
+                    cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "move" } };
+                    }
+                },
+		        {
+		            field: 'columnName',
+		            title: '字段列名',
+		            width: "10%",
+		            class: "nodrag",
+		            cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        },
+		        {
+		            field: 'columnComment',
+		            title: '字段描述',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		            	var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, value);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'columnType',
+		            title: '物理类型',
+		            width: "10%",
+		            class: "nodrag",
+		            cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        },
+		        {
+		            field: 'javaType',
+		            title: 'Java类型',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		        		var data = [{ index: index, javaType: value }];
+		                return $("#javaTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'javaField',
+		            title: 'Java属性',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		        		var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].javaField' value='%s' required>", index, value);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isInsert',
+		            title: '插入',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isEdit',
+		            title: '编辑',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isEdit' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isList',
+		            title: '列表',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isList' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'isQuery',
+		            title: '查询',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isQuery' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'queryType',
+		            title: '查询方式',
+		            width: "10%",
+		            formatter: function (value, row, index) {
+		            	var data = [{ index: index, queryType: value }];
+		                return $("#queryTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'isRequired',
+		            title: '必填',
+		            width: "5%",
+		            formatter: function (value, row, index) {
+		            	var isCheck = value == 1 ? 'checked' : '';
+		            	var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isRequired' value='1' %s></label>", index, isCheck);
+		        		return html;
+		        	}
+		        },
+		        {
+		            field: 'htmlType',
+		            title: '显示类型',
+		            width: "12%",
+		            formatter: function (value, row, index) {
+		            	var data = [{ index: index, htmlType: value }];
+		                return $("#htmlTypeTpl").tmpl(data).html();
+		        	}
+		        },
+		        {
+		            field: 'dictType',
+		            title: '字典类型',
+		            width: "13%",
+		            formatter: function (value, row, index) {
+		        		var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].dictType' value='%s' id='columns_dict_%s'>", index, (value === undefined ? '' : value), row.columnId);
+		        		return "<div class='input-group'>" + html + "<span class='input-group-addon input-sm' onclick='selectDictTree(" + row.columnId + ", this)'><i class='fa fa-search'></i></span></div>";
+		        	},
+		        	cellStyle: function(value, row, index) {
+                        return { css: { "cursor": "default" } };
+                    }
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		// 当所有数据被加载时触发处理函数
+		function onLoadSuccess(data){
+			$.fn.select2.defaults.set( "theme", "bootstrap" );
+			$("select.form-control").each(function () {
+				$(this).select2().on("change", function () {
+					$(this).valid();
+				})
+			})
+			$(".check-box").each(function() {
+	            $(this).iCheck({
+	                checkboxClass: 'icheckbox-blue'
+            	})
+        	})
+        }
+		
+		// 当拖拽结束后处理函数
+		function onReorderRow(data) {
+	        for (var i = 0; i < data.length; i++) {
+			    $("#columns_sort_" + data[i].columnId).val(i+1);
+			}
+       }
+		
+		$(function() {
+            var tplCategory = $("#tplCategory option:selected").val();
+            tplCategoryVisible(tplCategory);
+            var genType = $('input[name="genType"]:checked').val();
+            pathInfoVisible(genType);
+        });
+		
+		$('#tplCategory').on('select2:select', function (event) {
+			var tplCategory = $(event.target).val();
+			tplCategoryVisible(tplCategory);
+		});
+		
+		function tplCategoryVisible(tplCategory) {
+			if("crud" == tplCategory){
+				$("#treeCode").select2("val", [""]);
+				$("#treeParentCode").select2("val", [""]);
+				$("#treeName").select2("val", [""]);
+				$("#otherInfo").addClass("hidden");
+				$("#subInfo").addClass("hidden");
+			} else if("tree" == tplCategory){
+				$("#otherInfo").removeClass("hidden");
+				$("#treeCode").attr("required", "true");
+				$("#treeParentCode").attr("required", "true");
+				$("#treeName").attr("required", "true");
+				$("#subInfo").addClass("hidden");
+			} else if("sub" == tplCategory){
+				$("#subInfo").removeClass("hidden");
+				$("#treeCode").select2("val", [""]);
+				$("#treeParentCode").select2("val", [""]);
+				$("#treeName").select2("val", [""]);
+				$("#subTableName").attr("required", "true");
+				$("#subTableFkName").attr("required", "true");
+				$("#otherInfo").addClass("hidden");
+			}
+        }
+		
+		$('input').on('ifChecked', function(event){
+			var genType = $(event.target).val();
+			pathInfoVisible(genType);
+		});
+		
+		function pathInfoVisible(genType) {
+			if("0" == genType){
+				$("#genPath").val("/");
+				$("#pathinfo").addClass("hidden");
+			} else if("1" == genType){
+				$("#pathinfo").removeClass("hidden");
+			}
+		}
+		
+		// 选择字典处理函数
+		function selectDictTree(columnId, obj) {
+			var dictType = $.common.nullToStr($(obj).parent().find("input").val());
+        	var url = ctx + "system/dict/selectDictTree/" + columnId + "/" + dictType;
+			var options = {
+				title: '选择字典类型',
+				width: "380",
+				url: url,
+				callBack: doDictSubmit
+			};
+			$.modal.openOptions(options);
+		}
+		
+		// 选择菜单处理函数
+        function selectMenuTree() {
+        	var parentMenuId = $("#parentMenuId").val();
+        	var menuId = parentMenuId > 0 ? parentMenuId : 1;
+        	var url = ctx + "system/menu/selectMenuTree/" + menuId;
+			var options = {
+				title: '菜单选择',
+				width: "380",
+				url: url,
+				callBack: doMenuSubmit
+			};
+			$.modal.openOptions(options);
+		}
+		
+		function doDictSubmit(index, layero){
+			var body = $.modal.getChildFrame(index);
+   			var columnId = body.find('#columnId').val();
+   			var dictType = body.find('#dictType').val();
+   			$.modal.close(index);
+   			$("#columns_dict_" + columnId).val(dictType);
+		}
+		
+		function doMenuSubmit(index, layero){
+			var body = $.modal.getChildFrame(index);
+   			$("#parentMenuId").val(body.find('#treeId').val());
+   			$("#parentMenuName").val(body.find('#treeName').val());
+   			$.modal.close(index);
+		}
+    </script>
+</body>
+</html>
+
+
+<!-- java类型 -->
+<script id="javaTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].javaType'>
+    <option value="Long" {{if javaType==="Long"}}selected{{/if}}>Long</option>
+    <option value="String" {{if javaType==="String"}}selected{{/if}}>String</option>
+    <option value="Integer" {{if javaType==="Integer"}}selected{{/if}}>Integer</option>
+    <option value="Double" {{if javaType==="Double"}}selected{{/if}}>Double</option>
+    <option value="BigDecimal" {{if javaType==="BigDecimal"}}selected{{/if}}>BigDecimal</option>
+    <option value="Date" {{if javaType==="Date"}}selected{{/if}}>Date</option>
+</select>
+</div>
+</script>
+
+<!-- 查询方式 -->
+<script id="queryTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].queryType'>
+    <option value="EQ" {{if queryType==="EQ"}}selected{{/if}}>=</option>
+    <option value="NE" {{if queryType==="NE"}}selected{{/if}}>!=</option>
+    <option value="GT" {{if queryType==="GT"}}selected{{/if}}>></option>
+    <option value="GTE" {{if queryType==="GTE"}}selected{{/if}}>>=</option>
+    <option value="LT" {{if queryType==="LT"}}selected{{/if}}><</option>
+    <option value="LTE" {{if queryType==="LTE"}}selected{{/if}}><=</option>
+    <option value="LIKE" {{if queryType==="LIKE"}}selected{{/if}}>Like</option>
+    <option value="BETWEEN" {{if queryType==="BETWEEN"}}selected{{/if}}>Between</option>
+</select>
+</div>
+</script>
+
+<!-- 显示类型 -->
+<script id="htmlTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='columns[${index}].htmlType'>
+    <option value="input" {{if htmlType==="input"}}selected{{/if}}>文本框</option>
+    <option value="textarea" {{if htmlType==="textarea"}}selected{{/if}}>文本域</option>
+    <option value="select" {{if htmlType==="select"}}selected{{/if}}>下拉框</option>
+    <option value="radio" {{if htmlType==="radio"}}selected{{/if}}>单选框</option>
+    <option value="checkbox" {{if htmlType==="checkbox"}}selected{{/if}}>复选框</option>
+    <option value="summernote" {{if htmlType==="summernote"}}selected{{/if}}>富文本</option>
+    <option value="datetime" {{if htmlType==="datetime"}}selected{{/if}}>日期控件</option>
+    <option value="upload" {{if htmlType==="upload"}}selected{{/if}}>上传控件</option>
+</select>
+</div>
+</script>
diff --git a/common-generator-starter/target/classes/templates/tool/gen/gen.html b/common-generator-starter/target/classes/templates/tool/gen/gen.html
new file mode 100644
index 0000000..a0150f1
--- /dev/null
+++ b/common-generator-starter/target/classes/templates/tool/gen/gen.html
@@ -0,0 +1,218 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('代码生成列表')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="gen-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								表名称：<input type="text" name="tableName"/>
+							</li>
+							<li>
+								表描述：<input type="text" name="tableComment"/>
+							</li>
+							<li class="select-time">
+								<label>表时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			
+			<div class="btn-group-sm" id="toolbar" role="group">
+			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
+			        <i class="fa fa-download"></i> 生成
+			    </a>
+				<a class="btn btn-success" onclick="createTable()" shiro:hasRole="admin">
+					<i class="fa fa-plus"></i> 创建
+				</a>
+				<a class="btn btn-info" onclick="importTable()">
+			        <i class="fa fa-upload"></i> 导入
+			    </a>
+			    <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="tool:gen:edit">
+		            <i class="fa fa-edit"></i> 修改
+		        </a>
+			    <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="tool:gen:remove">
+		            <i class="fa fa-remove"></i> 删除
+		        </a>
+		    </div>
+		
+		    <div class="col-sm-12 select-table table-striped">
+			    <table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: bootstrap-table-export-js" />
+	<script th:src="@{/ajax/libs/highlight/highlight.min.js}"></script>
+	<script th:inline="javascript">
+		var prefix = ctx + "tool/gen";
+		var editFlag = [[${@permission.hasPermi('tool:gen:edit')}]];
+		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
+		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
+		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
+	
+		$(function() {
+		    var options = {
+		        url: prefix + "/list",
+		        updateUrl: prefix + "/edit/{id}",
+		        removeUrl: prefix + "/remove",
+		        sortName: "createTime",
+		        sortOrder: "desc",
+		        showExport: true,
+		        modalName: "生成配置",
+		        rememberSelected: true,
+		        uniqueId: "tableId",
+		        columns: [{
+		        	field: 'state',
+		            checkbox: true
+		        },
+		        {
+		            field: 'tableId',
+		            title: '编号',
+		            visible: false
+		        },
+		        {
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                 	    return $.table.serialNumber(index);
+                    }
+                },
+		        {
+		            field: 'tableName',
+		            title: '表名称',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'tableComment',
+		            title: '表描述',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value, 15);
+                    }
+		        },
+		        {
+		            field: 'className',
+		            title: '实体类名称',
+		            sortable: true
+		        },
+		        {
+		            field: 'createTime',
+		            title: '创建时间',
+		            sortable: true
+		        },
+		        {
+		            field: 'updateTime',
+		            title: '更新时间',
+		            sortable: true
+		        },
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		                var actions = [];
+		                actions.push('<a class="btn btn-info btn-xs ' + previewFlag + '" href="javascript:void(0)" onclick="preview(\'' + row.tableId + '\')"><i class="fa fa-search"></i>预览</a> ');
+		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.tableId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tableId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+		                actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="synchDb(\'' + row.tableName + '\')"><i class="fa fa-refresh"></i>同步</a> ');
+		                actions.push('<a class="btn btn-primary btn-xs ' + codeFlag + '" href="javascript:void(0)" onclick="genCode(\'' + row.tableName + '\',\'' + row.genType + '\')"><i class="fa fa-bug"></i>生成代码</a> ');
+		                return actions.join('');
+		            }
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		// 预览代码
+		function preview(tableId) {
+			var preViewUrl = prefix + "/preview/" + tableId;
+			$.modal.loading("正在加载数据，请稍候...");
+			$.get(preViewUrl, function(result) {
+				if (result.code == web_status.SUCCESS) {
+					 var items = [];
+		                $.each(result.data, function(index, value) {
+		                    var templateName = index.substring(index.lastIndexOf("/") + 1, index.length).replace(/\.vm/g, "");
+		                    if(!$.common.equals("sql", templateName) && !$.common.equals("tree.html", templateName) && !$.common.equals("sub-domain.java", templateName)){
+		                    	var language = templateName.substring(templateName.lastIndexOf(".") + 1);
+			                    var highCode = hljs.highlight(language, value).value;
+		                    	items.push({
+			                        title: templateName , content: "<pre class=\"layui-code\"><code>" + highCode + "</code></pre>"
+			                    })
+		                    }
+		                });
+		                top.layer.tab({
+                            area: ['90%', '90%'],
+                            shadeClose: true,
+                            success: function(layero, index){
+                                parent.loadCss(ctx + "ajax/libs/highlight/default.min.css");
+                            },
+	                        tab: items
+		                });
+				} else {
+					$.modal.alertError(result.msg);
+				}
+				$.modal.closeLoading();
+			});
+		}
+	
+		// 生成代码
+		function genCode(tableName, genType) {
+		    $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() {
+		    	if(genType === "0") {
+			    	location.href = prefix + "/download/" + tableName;
+			        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
+				} else if(genType === "1") {
+					$.operate.get(prefix + "/genCode/" + tableName);
+				}
+		    })
+		}
+		
+		// 同步数据库
+		function synchDb(tableName){
+			$.modal.confirm("确认要强制同步" + tableName + "表结构吗？", function() {
+			    $.operate.get(prefix + "/synchDb/" + tableName);
+			})
+		}
+	
+		// 批量生成代码
+		function batchGenCode() {
+		    var rows = $.table.selectColumns("tableName");
+		    if (rows.length == 0) {
+		        $.modal.alertWarning("请选择要生成的数据");
+		        return;
+		    }
+		    $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
+		    	location.href = prefix + "/batchGenCode?tables=" + rows;
+		        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
+		    });
+		}
+
+		// 导入表结构
+		function importTable() {
+			var importTableUrl = prefix + "/importTable";
+			$.modal.open("导入表结构", importTableUrl);
+		}
+
+		// 创建表结构
+		function createTable() {
+			var creatTableUrl = prefix + "/createTable";
+			$.modal.open("创建表结构", creatTableUrl);
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/templates/tool/gen/importTable.html b/common-generator-starter/target/classes/templates/tool/gen/importTable.html
new file mode 100644
index 0000000..91562e7
--- /dev/null
+++ b/common-generator-starter/target/classes/templates/tool/gen/importTable.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('导入表结构')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="gen-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								表名称：<input type="text" name="tableName"/>
+							</li>
+							<li>
+								表描述：<input type="text" name="tableComment"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			
+		    <div class="col-sm-12 select-table table-striped">
+			    <table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<script type="text/javascript">
+		var prefix = ctx + "tool/gen";
+	
+		$(function() {
+		    var options = {
+		        url: prefix + "/db/list",
+		        showSearch: false,
+		        showRefresh: false,
+		        showToggle: false,
+		        showColumns: false,
+		        clickToSelect: true,
+		        rememberSelected: true,
+		        uniqueId: "tableName",
+		        columns: [{
+		        	field: 'state',
+		            checkbox: true
+		        },
+		        {
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                 	    return $.table.serialNumber(index);
+                    }
+                },
+		        {
+		            field: 'tableName',
+		            title: '表名称',
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'tableComment',
+		            title: '表描述',
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
+		        },
+		        {
+		            field: 'createTime',
+		            title: '创建时间'
+		        },
+		        {
+		            field: 'updateTime',
+		            title: '更新时间'
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		/* 导入表结构-选择表结构-提交 */
+		function submitHandler() {
+			var rows = $.table.selectColumns("tableName");
+			if (rows.length == 0) {
+       			$.modal.alertWarning("请至少选择一条记录");
+       			return;
+       		}
+			var data = {"tables": rows.join()};
+			$.operate.save(prefix + "/importTable", data);
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/html/add.html.vm b/common-generator-starter/target/classes/vm/html/add.html.vm
new file mode 100644
index 0000000..b7f1781
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/html/add.html.vm
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增${functionName}')" />
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-css" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-css" />
+#break
+#end
+#end
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-${businessName}-add">
+#if($table.sub)
+            <h4 class="form-header h4">${functionName}信息</h4>
+#end
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group">
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+#set($treeId = "${className}?.${treeCode}")
+                        <input id="treeId" name="${treeParentCode}" type="hidden" th:value="${${treeId}}"/>
+                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:value="${${treeName}}"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "input")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input name="${field}" class="form-control" type="text"#if($column.required) required#end>
+                </div>
+            </div>
+#elseif($column.htmlType == "upload")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="${field}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="${field}" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "summernote")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" name="${field}">
+                    <div class="summernote" id="${field}"></div>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b"#if($column.required) required#end>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
+                    <label th:each="dict : ${type}" class="check-box">
+                        <input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"#if($column.required) required#end>
+                    </label>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <label class="check-box">
+                        <input name="${field}" type="checkbox"#if($column.required) required#end> 无
+                    </label>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
+                        <input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:checked="${dict.default}"#if($column.required) required#end>
+                        <label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="${field}" value=""#if($column.required) required#end>
+                        <label th:for="${field}" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "datetime")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="${field}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "textarea")
+            <div class="form-group">
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end></textarea>
+                </div>
+            </div>
+#end
+#end
+#end
+#end
+#if($table.sub)
+            <h4 class="form-header h4">${subTable.functionName}信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+#end
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-js" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-js" />
+#break
+#end
+#end
+    <script th:inline="javascript">
+        var prefix = ctx + "${moduleName}/${businessName}"
+#if($table.sub)
+#foreach($column in $subTable.columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+#end
+        $("#form-${businessName}-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-${businessName}-add').serialize());
+            }
+        }
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+
+        $("input[name='$column.javaField']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+
+        $(".file-upload").fileinput({
+            uploadUrl: ctx + 'common/upload',
+            maxFileCount: 1,
+            autoReplace: true
+        }).on('fileuploaded', function (event, data, previewId, index) {
+            $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+        }).on('fileremoved', function (event, id, index) {
+            $("input[name='" + event.currentTarget.id + "']").val('')
+        })
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+
+        $(function() {
+            $('.summernote').summernote({
+                lang: 'zh-CN',
+                dialogsInBody: true,
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function(files) {
+                        var obj = this;
+                    	var data = new FormData();
+                    	data.append("file", files[0]);
+                    	$.ajax({
+                            type: "post",
+                            url: ctx + "common/upload",
+                    		data: data,
+                    		cache: false,
+                    		contentType: false,
+                    		processData: false,
+                    		dataType: 'json',
+                    		success: function(result) {
+                    		    if (result.code == web_status.SUCCESS) {
+                    		        $('#' + obj.id).summernote('insertImage', result.url);
+                    		    } else {
+                    		        $.modal.alertError(result.msg);
+                    		    }
+                    		},
+                    		error: function(error) {
+                    		    $.modal.alertWarning("图片上传失败。");
+                    		}
+                    	});
+                    }
+                }
+            });
+        });
+#break
+#end
+#end
+#if($table.tree)
+
+        /*${functionName}-新增-选择父${functionName}树*/
+        function select${BusinessName}Tree() {
+            var options = {
+                title: '${functionName}选择',
+                width: "380",
+                url: prefix + "/select${BusinessName}Tree/" + $("#treeId").val(),
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
+#end
+#if($table.sub)
+
+        $(function() {
+            var options = {
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+#foreach($column in $subTable.columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
+                        return $.common.dictToSelect(${javaField}Datas, value, name);
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#else
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
+                        return html;
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#end
+#end
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#if($column.pk || $javaField == ${subTableFkclassName})
+#else
+                    ${javaField}: ""#if($foreach.count != $subTable.columns.size()),#end
+
+#end
+#end
+                }
+            });
+        }
+#end
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/html/edit.html.vm b/common-generator-starter/target/classes/vm/html/edit.html.vm
new file mode 100644
index 0000000..53e0451
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/html/edit.html.vm
@@ -0,0 +1,392 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改${functionName}')" />
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-css" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-css" />
+#break
+#end
+#end
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-${businessName}-edit" th:object="${${className}}">
+#if($table.sub)
+            <h4 class="form-header h4">${functionName}信息</h4>
+#end
+            <input name="${pkColumn.javaField}" th:field="*{${pkColumn.javaField}}" type="hidden">
+#foreach($column in $columns)
+#if($column.edit && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($field=$column.javaField)
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group">
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+                        <input id="treeId" name="${treeParentCode}" type="hidden" th:field="*{${treeParentCode}}" />
+                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:field="*{parentName}"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "input")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end>
+                </div>
+            </div>
+#elseif($column.htmlType == "upload")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="${field}" th:field="*{${field}}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="${field}" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "summernote")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" th:field="*{${field}}">
+                    <div class="summernote" id="${field}"></div>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b" th:with="type=${@dict.getType('${dictType}')}"#if($column.required) required#end>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{${field}}"></option>
+                    </select>
+                </div>
+            </div>
+#elseif($column.htmlType == "select" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <select name="${field}" class="form-control m-b"#if($column.required) required#end>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8" th:with="type=${@dict.getType('${dictType}')}">
+                    <label th:each="dict : ${type}" class="check-box">
+                        <input name="${field}" type="checkbox" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" th:attr="checked=${${className}.${field}.contains(dict.dictValue)?true:false}"#if($column.required) required#end>
+                    </label>
+                </div>
+            </div>
+#elseif($column.htmlType == "checkbox" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <label class="check-box">
+                        <input name="${field}" type="checkbox"#if($column.required) required#end> 无
+                    </label>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('${dictType}')}">
+                        <input type="radio" th:id="${'${field}_' + dict.dictCode}" name="${field}" th:value="${dict.dictValue}" th:field="*{${field}}"#if($column.required) required#end>
+                        <label th:for="${'${field}_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "radio" && $dictType)
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="${field}" value=""#if($column.required) required#end>
+                        <label th:for="${field}" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+#elseif($column.htmlType == "datetime")
+            <div class="form-group">    
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="${field}" th:value="${#dates.format(${className}.${field}, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"#if($column.required) required#end>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+#elseif($column.htmlType == "textarea")
+            <div class="form-group">
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
+                <div class="col-sm-8">
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end>[[*{${field}}]]</textarea>
+                </div>
+            </div>
+#end
+#end
+#end
+#end
+#if($table.sub)
+            <h4 class="form-header h4">${subTable.functionName}信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+#end
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+    <th:block th:include="include :: datetimepicker-js" />
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+    <th:block th:include="include :: summernote-js" />
+#break
+#end
+#end
+    <script th:inline="javascript">
+        var prefix = ctx + "${moduleName}/${businessName}";
+#if($table.sub)
+#foreach($column in $subTable.columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+#end
+        $("#form-${businessName}-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-${businessName}-edit').serialize());
+            }
+        }
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime")
+
+        $("input[name='$column.javaField']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "upload")
+
+        $(".file-upload").each(function (i) {
+            var val = $("input[name='" + this.id + "']").val()
+            $(this).fileinput({
+                'uploadUrl': ctx + 'common/upload',
+                initialPreviewAsData: true,
+                initialPreview: [val],
+                maxFileCount: 1,
+                autoReplace: true
+            }).on('fileuploaded', function (event, data, previewId, index) {
+                $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+            }).on('fileremoved', function (event, id, index) {
+                $("input[name='" + event.currentTarget.id + "']").val('')
+            })
+            $(this).fileinput('_initFileActions');
+        });
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "summernote")
+
+        $(function() {
+            $('.summernote').each(function(i) {
+                $('#' + this.id).summernote({
+                    lang: 'zh-CN',
+                    dialogsInBody: true,
+                    callbacks: {
+                        onChange: function(contents, $edittable) {
+                            $("input[name='" + this.id + "']").val(contents);
+                        },
+                        onImageUpload: function(files) {
+                            var obj = this;
+                            var data = new FormData();
+                            data.append("file", files[0]);
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: data,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function(result) {
+                                    if (result.code == web_status.SUCCESS) {
+                                        $('#' + obj.id).summernote('insertImage', result.url);
+                                    } else {
+                                        $.modal.alertError(result.msg);
+                                    }
+                                },
+                                error: function(error) {
+                                    $.modal.alertWarning("图片上传失败。");
+                                }
+                            });
+                        }
+                    }
+                });
+                var content = $("input[name='" + this.id + "']").val();
+                $('#' + this.id).summernote('code', content);
+            })
+        });
+#break
+#end
+#end
+#if($table.tree)
+
+        /*${functionName}-编辑-选择父${functionName}树*/
+        function select${BusinessName}Tree() {
+            var options = {
+                title: '${functionName}选择',
+                width: "380",
+                url: prefix + "/select${BusinessName}Tree/" + $("#treeId").val(),
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
+#end
+#if($table.sub)
+
+        $(function() {
+            var options = {
+                data: [[${${className}.${subclassName}List}]],
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+#foreach($column in $subTable.columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("${subclassName}List[%s].${javaField}", index);
+                        return $.common.dictToSelect(${javaField}Datas, value, name);
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#else
+                {
+                    field: '${javaField}',
+                    align: 'center',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='${subclassName}List[%s].${javaField}' value='%s'>", index, value);
+                        return html;
+                    }
+#if($foreach.count != $subTable.columns.size())
+                },
+#end
+#end
+#end
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#if($column.pk || $javaField == ${subTableFkclassName})
+#else
+                    ${javaField}: ""#if($foreach.count != $subTable.columns.size()),#end
+
+#end
+#end
+        	    }
+            });
+        }
+#end
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/html/list-tree.html.vm b/common-generator-starter/target/classes/vm/html/list-tree.html.vm
new file mode 100644
index 0000000..f7f797d
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/html/list-tree.html.vm
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('${functionName}列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else  
+#set($comment=$column.columnComment)
+#end  
+#if($column.htmlType == "input")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" name="${column.javaField}"/>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" placeholder="请选择${comment}" name="${column.javaField}"/>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
+                            </li>                
+#end
+#end
+#end
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="${permissionPrefix}:add">
+                    <i class="fa fa-plus"></i> 新增
+                </a>
+                <a class="btn btn-primary" onclick="$.operate.edit()" shiro:hasPermission="${permissionPrefix}:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-info" id="expandAllBtn">
+                    <i class="fa fa-exchange"></i> 展开/折叠
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-tree-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var addFlag = [[${@permission.hasPermi('${permissionPrefix}:add')}]];
+        var editFlag = [[${@permission.hasPermi('${permissionPrefix}:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('${permissionPrefix}:remove')}]];
+#foreach($column in $columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+        var prefix = ctx + "${moduleName}/${businessName}";
+
+        $(function() {
+            var options = {
+                code: "${treeCode}",
+                parentCode: "${treeParentCode}",
+                expandColumn: "${expandColumn}",
+                uniqueId: "${pkColumn.javaField}",
+                url: prefix + "/list",
+                createUrl: prefix + "/add/{id}",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "${functionName}",
+                columns: [{
+                    field: 'selectItem',
+                    radio: true
+                },
+#foreach($column in $columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    align: 'left',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
+                    }
+                },
+#elseif($column.list && "" != $javaField)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    align: 'left'
+                },
+#end                
+#end
+                {
+                    title: '操作',
+                    align: 'center',
+                    align: 'left',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info  btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-plus"></i>新增</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.treeTable.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/html/list.html.vm b/common-generator-starter/target/classes/vm/html/list.html.vm
new file mode 100644
index 0000000..f2e9c5a
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/html/list.html.vm
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('${functionName}列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else  
+#set($comment=$column.columnComment)
+#end  
+#if($column.htmlType == "input")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" name="${column.javaField}"/>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                            <li>
+                                <label>${comment}：</label>
+                                <select name="${column.javaField}">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                            <li>
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" placeholder="请选择${comment}" name="${column.javaField}"/>
+                            </li>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
+                            </li>
+#end
+#end
+#end
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="${permissionPrefix}:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="${permissionPrefix}:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="${permissionPrefix}:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="${permissionPrefix}:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('${permissionPrefix}:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('${permissionPrefix}:remove')}]];
+#foreach($column in $columns)
+#if(${column.dictType} != '')
+        var ${column.javaField}Datas = [[${@dict.getType('${column.dictType}')}]];
+#end
+#end
+        var prefix = ctx + "${moduleName}/${businessName}";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "${functionName}",
+                columns: [{
+                    checkbox: true
+                },
+#foreach($column in $columns)
+#set($dictType=$column.dictType)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    visible: false
+                },
+#elseif($column.list && "" != $dictType)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
+                    }
+                },
+#elseif($column.list && "" != $javaField)
+                {
+                    field: '${javaField}',
+                    title: '${comment}'
+                },
+#end                
+#end
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.${pkColumn.javaField} + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/html/tree.html.vm b/common-generator-starter/target/classes/vm/html/tree.html.vm
new file mode 100644
index 0000000..80364ad
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/html/tree.html.vm
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('${functionName}树选择')" />
+    <th:block th:include="include :: ztree-css" />
+</head>
+<style>
+    body{height:auto;font-family: "Microsoft YaHei";}
+    button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
+</style>
+<body class="hold-transition box box-main">
+#set($treeId = "${className}?." + $treeCode)
+#set($treeName = "${className}?." + $treeName)
+    <input id="treeId"   name="treeId"    type="hidden" th:value="${${treeId}}"/>
+    <input id="treeName" name="treeName"  type="hidden" th:value="${${treeName}}"/>
+    <div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
+        <label id="btnShow" title="显示搜索" style="display:none;">︾</label>
+        <label id="btnHide" title="隐藏搜索">︽</label>
+    </div>
+    <div class="treeSearchInput" id="search">
+        <label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
+        <button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
+    </div>
+    <div class="treeExpandCollapse">
+        <a href="#" onclick="$.tree.expand()">展开</a> /
+        <a href="#" onclick="$.tree.collapse()">折叠</a>
+    </div>
+    <div id="tree" class="ztree treeselect"></div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: ztree-js" />
+    <script th:inline="javascript">
+        $(function() {
+            var url = ctx + "${moduleName}/${businessName}/treeData";
+            var options = {
+                url: url,
+                expandLevel: 2,
+                onClick : zOnClick
+            };
+            $.tree.init(options);
+        });
+
+        function zOnClick(event, treeId, treeNode) {
+            var treeId = treeNode.id;
+            var treeName = treeNode.name;
+            $("#treeId").val(treeId);
+            $("#treeName").val(treeName);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/java/controller.java.vm b/common-generator-starter/target/classes/vm/java/controller.java.vm
new file mode 100644
index 0000000..e826fd4
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/controller.java.vm
@@ -0,0 +1,202 @@
+package ${packageName}.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+#elseif($table.tree)
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.domain.Ztree;
+#end
+
+/**
+ * ${functionName}Controller
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Controller
+@RequestMapping("/${moduleName}/${businessName}")
+public class ${ClassName}Controller extends BaseController
+{
+    private String prefix = "${moduleName}/${businessName}";
+
+    @Autowired
+    private I${ClassName}Service ${className}Service;
+
+    @RequiresPermissions("${permissionPrefix}:view")
+    @GetMapping()
+    public String ${businessName}()
+    {
+        return prefix + "/${businessName}";
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 查询${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(${ClassName} ${className})
+    {
+        startPage();
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return getDataTable(list);
+    }
+#elseif($table.tree)
+    /**
+     * 查询${functionName}树列表
+     */
+    @RequiresPermissions("${permissionPrefix}:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public List<${ClassName}> list(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return list;
+    }
+#end
+
+    /**
+     * 导出${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:export")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        return util.exportExcel(list, "${functionName}数据");
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 新增${functionName}
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+#elseif($table.tree)
+    /**
+     * 新增${functionName}
+     */
+    @GetMapping(value = { "/add/{${pkColumn.javaField}}", "/add/" })
+    public String add(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(${pkColumn.javaField}))
+        {
+            mmap.put("${className}", ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        }
+        return prefix + "/add";
+    }
+#end
+
+    /**
+     * 新增保存${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:add")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(${ClassName} ${className})
+    {
+        return toAjax(${className}Service.insert${ClassName}(${className}));
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:edit")
+    @GetMapping("/edit/{${pkColumn.javaField}}")
+    public String edit(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap)
+    {
+        ${ClassName} ${className} = ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        mmap.put("${className}", ${className});
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:edit")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(${ClassName} ${className})
+    {
+        return toAjax(${className}Service.update${ClassName}(${className}));
+    }
+
+#if($table.crud || $table.sub)
+    /**
+     * 删除${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(ids));
+    }
+#elseif($table.tree)
+    /**
+     * 删除
+     */
+    @RequiresPermissions("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{${pkColumn.javaField}}")
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+    }
+#end
+#if($table.tree)
+
+    /**
+     * 选择${functionName}树
+     */
+#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
+    @GetMapping(value = { "/select${BusinessName}Tree/{${pkColumn.javaField}}", "/select${BusinessName}Tree/" })
+    public String select${BusinessName}Tree(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(${pkColumn.javaField}))
+        {
+            mmap.put("${className}", ${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        }
+        return prefix + "/tree";
+    }
+
+    /**
+     * 加载${functionName}树列表
+     */
+    @GetMapping("/treeData")
+    @ResponseBody
+    public List<Ztree> treeData()
+    {
+        List<Ztree> ztrees = ${className}Service.select${ClassName}Tree();
+        return ztrees;
+    }
+#end
+}
diff --git a/common-generator-starter/target/classes/vm/java/domain.java.vm b/common-generator-starter/target/classes/vm/java/domain.java.vm
new file mode 100644
index 0000000..bd51c17
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/domain.java.vm
@@ -0,0 +1,105 @@
+package ${packageName}.domain;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud || $table.sub)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
+public class ${ClassName} extends ${Entity}
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#if($table.sub)
+    /** $table.subTable.functionName信息 */
+    private List<${subClassName}> ${subclassName}List;
+
+#end
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+#if($table.sub)
+    public List<${subClassName}> get${subClassName}List()
+    {
+        return ${subclassName}List;
+    }
+
+    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+    {
+        this.${subclassName}List = ${subclassName}List;
+    }
+
+#end
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+#if($table.sub)
+            .append("${subclassName}List", get${subClassName}List())
+#end
+            .toString();
+    }
+}
diff --git a/common-generator-starter/target/classes/vm/java/mapper.java.vm b/common-generator-starter/target/classes/vm/java/mapper.java.vm
new file mode 100644
index 0000000..ebee538
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/mapper.java.vm
@@ -0,0 +1,91 @@
+package ${packageName}.mapper;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+#if($table.sub)
+import ${packageName}.domain.${subClassName};
+#end
+
+/**
+ * ${functionName}Mapper接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface ${ClassName}Mapper 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 删除${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String[] ${pkColumn.javaField}s);
+#if($table.sub)
+
+    /**
+     * 批量删除${subTable.functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}s(String[] ${pkColumn.javaField}s);
+    
+    /**
+     * 批量新增${subTable.functionName}
+     * 
+     * @param ${subclassName}List ${subTable.functionName}列表
+     * @return 结果
+     */
+    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    
+
+    /**
+     * 通过${functionName}主键删除${subTable.functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}ID
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+#end
+}
diff --git a/common-generator-starter/target/classes/vm/java/service.java.vm b/common-generator-starter/target/classes/vm/java/service.java.vm
new file mode 100644
index 0000000..765c9d6
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/service.java.vm
@@ -0,0 +1,73 @@
+package ${packageName}.service;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+#if($table.tree)
+import com.ruoyi.common.core.domain.Ztree;
+#end
+
+/**
+ * ${functionName}Service接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface I${ClassName}Service 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s);
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+#if($table.tree)
+
+    /**
+     * 查询${functionName}树列表
+     * 
+     * @return 所有${functionName}信息
+     */
+    public List<Ztree> select${ClassName}Tree();
+#end
+}
diff --git a/common-generator-starter/target/classes/vm/java/serviceImpl.java.vm b/common-generator-starter/target/classes/vm/java/serviceImpl.java.vm
new file mode 100644
index 0000000..242b1c7
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/serviceImpl.java.vm
@@ -0,0 +1,213 @@
+package ${packageName}.service.impl;
+
+import java.util.List;
+#if($table.tree)
+import java.util.ArrayList;
+import com.ruoyi.common.core.domain.Ztree;
+#end
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
+import com.ruoyi.common.utils.DateUtils;
+#break
+#end
+#end
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+#if($table.sub)
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import ${packageName}.domain.${subClassName};
+#end
+import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * ${functionName}Service业务层处理
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+{
+    @Autowired
+    private ${ClassName}Mapper ${className}Mapper;
+
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
+    @Override
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
+    {
+        return ${className}Mapper.select${ClassName}List(${className});
+    }
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int insert${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime')
+        ${className}.setCreateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        int rows = ${className}Mapper.insert${ClassName}(${className});
+        insert${subClassName}(${className});
+        return rows;
+#else
+        return ${className}Mapper.insert${ClassName}(${className});
+#end
+    }
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int update${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'updateTime')
+        ${className}.setUpdateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+#end
+        return ${className}Mapper.update${ClassName}(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s)
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(Convert.toStrArray(${pkColumn.javaField}s));
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(Convert.toStrArray(${pkColumn.javaField}s));
+    }
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+#if($table.tree)
+
+    /**
+     * 查询${functionName}树列表
+     * 
+     * @return 所有${functionName}信息
+     */
+    @Override
+    public List<Ztree> select${ClassName}Tree()
+    {
+        List<${ClassName}> ${className}List = ${className}Mapper.select${ClassName}List(new ${ClassName}());
+        List<Ztree> ztrees = new ArrayList<Ztree>();
+        for (${ClassName} ${className} : ${className}List)
+        {
+            Ztree ztree = new Ztree();
+#if($treeCode.length() > 2 && $treeCode.substring(1,2).matches("[A-Z]"))
+#set($TreeCode=$treeCode)
+#else
+#set($TreeCode=$treeCode.substring(0,1).toUpperCase() + ${treeCode.substring(1)})
+#end
+#if($treeParentCode.length() > 2 && $treeParentCode.substring(1,2).matches("[A-Z]"))
+#set($TreeParentCode=$treeParentCode)
+#else
+#set($TreeParentCode=$treeParentCode.substring(0,1).toUpperCase() + ${treeParentCode.substring(1)})
+#end
+#if($treeName.length() > 2 && $treeName.substring(1,2).matches("[A-Z]"))
+#set($TreeName=$treeName)
+#else
+#set($TreeName=$treeName.substring(0,1).toUpperCase() + ${treeName.substring(1)})
+#end
+            ztree.setId(${className}.get${TreeCode}());
+            ztree.setpId(${className}.get${TreeParentCode}());
+            ztree.setName(${className}.get${TreeName}());
+            ztree.setTitle(${className}.get${TreeName}());
+            ztrees.add(ztree);
+        }
+        return ztrees;
+    }
+#end
+#if($table.sub)
+
+    /**
+     * 新增${subTable.functionName}信息
+     * 
+     * @param ${className} ${functionName}对象
+     */
+    public void insert${subClassName}(${ClassName} ${className})
+    {
+        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        if (StringUtils.isNotNull(${subclassName}List))
+        {
+            List<${subClassName}> list = new ArrayList<${subClassName}>();
+            for (${subClassName} ${subclassName} : ${subclassName}List)
+            {
+                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+                list.add(${subclassName});
+            }
+            if (list.size() > 0)
+            {
+                ${className}Mapper.batch${subClassName}(list);
+            }
+        }
+    }
+#end
+}
diff --git a/common-generator-starter/target/classes/vm/java/sub-domain.java.vm b/common-generator-starter/target/classes/vm/java/sub-domain.java.vm
new file mode 100644
index 0000000..a3f53eb
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/java/sub-domain.java.vm
@@ -0,0 +1,76 @@
+package ${packageName}.domain;
+
+#foreach ($import in $subImportList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * ${subTable.functionName}对象 ${subTableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public class ${subClassName} extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $subTable.columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+            .toString();
+    }
+}
diff --git a/common-generator-starter/target/classes/vm/js/api.js.vm b/common-generator-starter/target/classes/vm/js/api.js.vm
new file mode 100644
index 0000000..9295524
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/js/api.js.vm
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询${functionName}列表
+export function list${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询${functionName}详细
+export function get${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'get'
+  })
+}
+
+// 新增${functionName}
+export function add${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改${functionName}
+export function update${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除${functionName}
+export function del${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'delete'
+  })
+}
diff --git a/common-generator-starter/target/classes/vm/sql/sql.vm b/common-generator-starter/target/classes/vm/sql/sql.vm
new file mode 100644
index 0000000..d5121af
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/sql/sql.vm
@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}查询', @parentId, '1',  '#',  'F', '0', '${permissionPrefix}:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}新增', @parentId, '2',  '#',  'F', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}修改', @parentId, '3',  '#',  'F', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}删除', @parentId, '4',  '#',  'F', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}导出', @parentId, '5',  '#',  'F', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');
diff --git a/common-generator-starter/target/classes/vm/vue/index-tree.vue.vm b/common-generator-starter/target/classes/vm/vue/index-tree.vue.vm
new file mode 100644
index 0000000..bfb61b5
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/vue/index-tree.vue.vm
@@ -0,0 +1,482 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    size="small"
+                                    @keyup.enter.native="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+                                <el-option
+                                        v-for="dict in dict.type.${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+                                <el-option label="请选择字典生成" value="" />
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable size="small"
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="yyyy-MM-dd"
+                                            placeholder="选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    size="small"
+                                    style="width: 240px"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+                v-loading="loading"
+                :data="${businessName}List"
+                row-key="${treeCode}"
+                default-expand-all
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        >
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template slot-scope="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template slot-scope="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    #if(${foreach.index} == 1)
+                        <el-table-column label="${comment}" prop="${javaField}" />
+                    #else
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" />
+                    #end
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改</el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-plus"
+                            @click="handleAdd(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:add']"
+                    >新增</el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if("" != $treeParentCode && $column.javaField == $treeParentCode)
+                                <el-form-item label="${comment}" prop="${treeParentCode}">
+                                    <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option label="请选择字典生成" value="" />
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+                                        >{{dict.label}}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable size="small"
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+    import Treeselect from "@riophae/vue-treeselect";
+    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+    export default {
+        name: "${BusinessName}",
+        #if(${dicts} != '')
+            dicts: [${dicts}],
+        #end
+        components: {
+            Treeselect
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 显示搜索条件
+                showSearch: true,
+                // ${functionName}表格数据
+                    ${businessName}List: [],
+                // ${functionName}树选项
+                    ${businessName}Options: [],
+                // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        // $comment时间范围
+                        daterange${AttrName}: [],
+                    #end
+                #end
+                // 查询参数
+                queryParams: {
+            #foreach ($column in $columns)
+                #if($column.query)
+                    $column.javaField: null#if($foreach.count != $columns.size()),#end
+                #end
+            #end
+        },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                #foreach ($column in $columns)
+                    #if($column.required)
+                        #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                        #if($parentheseIndex != -1)
+                            #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                        #else
+                            #set($comment=$column.columnComment)
+                        #end
+                        $column.javaField: [
+                        { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+                    ]#if($foreach.count != $columns.size()),#end
+                    #end
+                #end
+            }
+        };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+            /** 查询${functionName}列表 */
+            getList() {
+                this.loading = true;
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        this.queryParams.params = {};
+                        #break
+                    #end
+                #end
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+                            this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+                            this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+                        }
+                    #end
+                #end
+                list${BusinessName}(this.queryParams).then(response => {
+                    this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                    this.loading = false;
+                });
+            },
+            /** 转换${functionName}数据结构 */
+            normalizer(node) {
+                if (node.children && !node.children.length) {
+                    delete node.children;
+                }
+                return {
+                    id: node.${treeCode},
+                    label: node.${treeName},
+                    children: node.children
+                };
+            },
+            /** 查询${functionName}下拉树结构 */
+            getTreeselect() {
+                list${BusinessName}().then(response => {
+                    this.${businessName}Options = [];
+                    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+                    data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                    this.${businessName}Options.push(data);
+                });
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "radio")
+                        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+                    #elseif($column.htmlType == "checkbox")
+                        $column.javaField: []#if($foreach.count != $columns.size()),#end
+                    #else
+                        $column.javaField: null#if($foreach.count != $columns.size()),#end
+                    #end
+                #end
+            };
+                this.resetForm("form");
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        this.daterange${AttrName} = [];
+                    #end
+                #end
+                this.resetForm("queryForm");
+                this.handleQuery();
+            },
+            /** 新增按钮操作 */
+            handleAdd(row) {
+                this.reset();
+                this.getTreeselect();
+                if (row != null && row.${treeCode}) {
+                    this.form.${treeParentCode} = row.${treeCode};
+                } else {
+                    this.form.${treeParentCode} = 0;
+                }
+                this.open = true;
+                this.title = "添加${functionName}";
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset();
+                this.getTreeselect();
+                if (row != null) {
+                    this.form.${treeParentCode} = row.${treeCode};
+                }
+                get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+                    this.form = response.data;
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                            this.form.$column.javaField = this.form.${column.javaField}.split(",");
+                        #end
+                    #end
+                    this.open = true;
+                    this.title = "修改${functionName}";
+                });
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.#[[$]]#refs["form"].validate(valid => {
+                    if (valid) {
+                        #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                        this.form.$column.javaField = this.form.${column.javaField}.join(",");
+                        #end
+                        #end
+                        if (this.form.${pkColumn.javaField} != null) {
+                            update${BusinessName}(this.form).then(response => {
+                                this.#[[$modal]]#.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        } else {
+                            add${BusinessName}(this.form).then(response => {
+                                this.#[[$modal]]#.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    }
+                });
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+                    return del${BusinessName}(row.${pkColumn.javaField});
+                }).then(() => {
+                    this.getList();
+                    this.#[[$modal]]#.msgSuccess("删除成功");
+                }).catch(() => {});
+            }
+        }
+    };
+</script>
diff --git a/common-generator-starter/target/classes/vm/vue/index.vue.vm b/common-generator-starter/target/classes/vm/vue/index.vue.vm
new file mode 100644
index 0000000..65620b4
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/vue/index.vue.vm
@@ -0,0 +1,573 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable size="small"
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+          <el-table-column label="$comment" prop="${javaField}">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+export default {
+  name: "${BusinessName}",
+#if(${dicts} != '')
+  dicts: [${dicts}],
+#end
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+#if($table.sub)
+      // 子表选中数据
+      checked${subClassName}: [],
+#end
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+#if($table.sub)
+      // ${subTable.functionName}表格数据
+      ${subclassName}List: [],
+#end
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      };
+#if($table.sub)
+      this.${subclassName}List = [];
+#end
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.${pkColumn.javaField})
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+      get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+        this.${subclassName}List = response.data.${subclassName}List;
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+          this.form.${subclassName}List = this.${subclassName}List;
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
+      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+        return del${BusinessName}(${pkColumn.javaField}s);
+      }).then(() => {
+        this.getList();
+        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+#if($table.sub)
+	/** ${subTable.functionName}序号 */
+    row${subClassName}Index({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** ${subTable.functionName}添加按钮操作 */
+    handleAdd${subClassName}() {
+      let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+      obj.$column.javaField = "";
+#end
+#end
+      this.${subclassName}List.push(obj);
+    },
+    /** ${subTable.functionName}删除按钮操作 */
+    handleDelete${subClassName}() {
+      if (this.checked${subClassName}.length == 0) {
+        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+      } else {
+        const ${subclassName}List = this.${subclassName}List;
+        const checked${subClassName} = this.checked${subClassName};
+        this.${subclassName}List = ${subclassName}List.filter(function(item) {
+          return checked${subClassName}.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handle${subClassName}SelectionChange(selection) {
+      this.checked${subClassName} = selection.map(item => item.index)
+    },
+#end
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('${moduleName}/${businessName}/export', {
+        ...this.queryParams
+      }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/common-generator-starter/target/classes/vm/vue/v3/index-tree.vue.vm b/common-generator-starter/target/classes/vm/vue/v3/index-tree.vue.vm
new file mode 100644
index 0000000..5342e91
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/vue/v3/index-tree.vue.vm
@@ -0,0 +1,464 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    @keyup.enter="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option
+                                        v-for="dict in ${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option label="请选择字典生成" value="" />
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="YYYY-MM-DD"
+                                            placeholder="选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}" style="width: 308px">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    value-format="YYYY-MM-DD"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="Plus"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+                v-loading="loading"
+                :data="${businessName}List"
+                row-key="${treeCode}"
+                default-expand-all
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        >
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template #default="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template #default="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template #default="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    #if(${foreach.index} == 1)
+                        <el-table-column label="${comment}" prop="${javaField}" />
+                    #else
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" />
+                    #end
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template #default="scope">
+                    <el-button
+                            type="text"
+                            icon="Edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改</el-button>
+                    <el-button
+                            type="text"
+                            icon="Plus"
+                            @click="handleAdd(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:add']"
+                    >新增</el-button>
+                    <el-button
+                            type="text"
+                            icon="Delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if("" != $treeParentCode && $column.javaField == $treeParentCode)
+                                <el-form-item label="${comment}" prop="${treeParentCode}">
+                                    <tree-select
+                                            v-model:value="form.${treeParentCode}"
+                                            :options="${businessName}Options"
+                                            :objMap="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+                                            placeholder="请选择${comment}"
+                                    />
+                                </el-form-item>
+                            #elseif($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option label="请选择字典生成" value="" />
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in ${dictType}"
+                                                :key="dict.value"
+                                                #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+                                        >{{dict.label}}</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="YYYY-MM-DD"
+                                                    placeholder="选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="${BusinessName}">
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+    const { proxy } = getCurrentInstance();
+        #if(${dicts} != '')
+            #set($dictsNoSymbol=$dicts.replace("'", ""))
+        const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+        #end
+
+    const ${businessName}List = ref([]);
+    const ${businessName}Options = ref([]);
+    const open = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const title = ref("");
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            const daterange${AttrName} = ref([]);
+            #end
+        #end
+
+    const data = reactive({
+        form: {},
+        queryParams: {
+        #foreach ($column in $columns)
+            #if($column.query)
+                $column.javaField: null#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    },
+    rules: {
+        #foreach ($column in $columns)
+            #if($column.required)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                $column.javaField: [
+                { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+            ]#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询${functionName}列表 */
+    function getList() {
+        loading.value = true;
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                queryParams.value.params = {};
+                #break
+            #end
+        #end
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+                    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+                    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+                }
+            #end
+        #end
+        list${BusinessName}(queryParams.value).then(response => {
+                ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+            loading.value = false;
+        });
+    }
+
+    /** 查询${functionName}下拉树结构 */
+    async function getTreeselect() {
+        await list${BusinessName}().then(response => {
+                ${businessName}Options.value = [];
+            const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+            data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+                ${businessName}Options.value.push(data);
+        });
+    }
+
+    // 取消按钮
+    function cancel() {
+        open.value = false;
+        reset();
+    }
+
+    // 表单重置
+    function reset() {
+        form.value = {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "radio")
+                $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+            #elseif($column.htmlType == "checkbox")
+                $column.javaField: []#if($foreach.count != $columns.size()),#end
+            #else
+                $column.javaField: null#if($foreach.count != $columns.size()),#end
+            #end
+        #end
+    };
+        proxy.resetForm("${businessName}Ref");
+    }
+
+    /** 搜索按钮操作 */
+    function handleQuery() {
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    function resetQuery() {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                daterange${AttrName}.value = [];
+            #end
+        #end
+        proxy.resetForm("queryRef");
+        handleQuery();
+    }
+
+    /** 新增按钮操作 */
+    async function handleAdd(row) {
+        reset();
+        await getTreeselect();
+        if (row != null && row.${treeCode}) {
+            form.value.${treeParentCode} = row.${treeCode};
+        } else {
+            form.value.${treeParentCode} = 0;
+        }
+        open.value = true;
+        title.value = "添加${functionName}";
+    }
+
+    /** 修改按钮操作 */
+    async function handleUpdate(row) {
+        reset();
+        await getTreeselect();
+        if (row != null) {
+            form.value.${treeParentCode} = row.${treeCode};
+        }
+        get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+            form.value = response.data;
+            #foreach ($column in $columns)
+                #if($column.htmlType == "checkbox")
+                    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+                #end
+            #end
+            open.value = true;
+            title.value = "修改${functionName}";
+        });
+    }
+
+    /** 提交按钮 */
+    function submitForm() {
+        proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+            if (valid) {
+                #foreach ($column in $columns)
+                #if($column.htmlType == "checkbox")
+                form.value.$column.javaField = form.value.${column.javaField}.join(",");
+                #end
+                #end
+                if (form.value.${pkColumn.javaField} != null) {
+                    update${BusinessName}(form.value).then(response => {
+                        proxy.#[[$modal]]#.msgSuccess("修改成功");
+                        open.value = false;
+                        getList();
+                    });
+                } else {
+                    add${BusinessName}(form.value).then(response => {
+                        proxy.#[[$modal]]#.msgSuccess("新增成功");
+                        open.value = false;
+                        getList();
+                    });
+                }
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    function handleDelete(row) {
+        proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+            return del${BusinessName}(row.${pkColumn.javaField});
+        }).then(() => {
+            getList();
+            proxy.#[[$modal]]#.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+
+    getList();
+</script>
diff --git a/common-generator-starter/target/classes/vm/vue/v3/index.vue.vm b/common-generator-starter/target/classes/vm/vue/v3/index.vue.vm
new file mode 100644
index 0000000..08bb071
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/vue/v3/index.vue.vm
@@ -0,0 +1,564 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in ${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}" style="width: 308px">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template #default="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+          <el-table-column label="$comment" prop="${javaField}">
+            <template #default="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}">
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+const { proxy } = getCurrentInstance();
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+#end
+
+const ${businessName}List = ref([]);
+#if($table.sub)
+const ${subclassName}List = ref([]);
+#end
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+#if($table.sub)
+const checked${subClassName} = ref([]);
+#end
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+const daterange${AttrName} = ref([]);
+#end
+#end
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    #foreach ($column in $columns)
+#if($column.query)
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  },
+  rules: {
+    #foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    $column.javaField: [
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+    ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询${functionName}列表 */
+function getList() {
+  loading.value = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+  queryParams.value.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+  }
+#end
+#end
+  list${BusinessName}(queryParams.value).then(response => {
+    ${businessName}List.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  };
+#if($table.sub)
+  ${subclassName}List.value = [];
+#end
+  proxy.resetForm("${businessName}Ref");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  daterange${AttrName}.value = [];
+#end
+#end
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.${pkColumn.javaField});
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加${functionName}";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
+  get${BusinessName}(${pkColumn.javaField}).then(response => {
+    form.value = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+    ${subclassName}List.value = response.data.${subclassName}List;
+#end
+    open.value = true;
+    title.value = "修改${functionName}";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+    if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+      form.value.${subclassName}List = ${subclassName}List.value;
+#end
+      if (form.value.${pkColumn.javaField} != null) {
+        update${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        add${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+    return del${BusinessName}(${pkColumn.javaField}s);
+  }).then(() => {
+    getList();
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+#if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1;
+}
+
+/** ${subTable.functionName}添加按钮操作 */
+function handleAdd${subClassName}() {
+  let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+  obj.$column.javaField = "";
+#end
+#end
+  ${subclassName}List.value.push(obj);
+}
+
+/** ${subTable.functionName}删除按钮操作 */
+function handleDelete${subClassName}() {
+  if (checked${subClassName}.value.length == 0) {
+    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+  } else {
+    const ${subclassName}s = ${subclassName}List.value;
+    const checked${subClassName}s = checked${subClassName}.value;
+    ${subclassName}List.value = ${subclassName}s.filter(function(item) {
+      return checked${subClassName}s.indexOf(item.index) == -1
+    });
+  }
+}
+
+/** 复选框选中数据 */
+function handle${subClassName}SelectionChange(selection) {
+  checked${subClassName}.value = selection.map(item => item.index)
+}
+
+#end
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('${moduleName}/${businessName}/export', {
+    ...queryParams.value
+  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+}
+
+getList();
+</script>
diff --git a/common-generator-starter/target/classes/vm/vue/v3/readme.txt b/common-generator-starter/target/classes/vm/vue/v3/readme.txt
new file mode 100644
index 0000000..10362d6
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/vue/v3/readme.txt
@@ -0,0 +1 @@
+���ʹ�õ���RuoYi-Cloud-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼��
\ No newline at end of file
diff --git a/common-generator-starter/target/classes/vm/xml/mapper.xml.vm b/common-generator-starter/target/classes/vm/xml/mapper.xml.vm
new file mode 100644
index 0000000..9de59b5
--- /dev/null
+++ b/common-generator-starter/target/classes/vm/xml/mapper.xml.vm
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
+    
+    <resultMap type="${ClassName}" id="${ClassName}Result">
+#foreach ($column in $columns)
+        <result property="${column.javaField}"    column="${column.columnName}"    />
+#end
+#if($table.tree)
+        <result property="parentName" column="parent_name" />
+#end
+    </resultMap>
+#if($table.sub)
+
+    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+    </resultMap>
+
+    <resultMap type="${subClassName}" id="${subClassName}Result">
+#foreach ($column in $subTable.columns)
+        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
+#end
+    </resultMap>
+#end
+
+    <sql id="select${ClassName}Vo">
+        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+    </sql>
+
+    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+        <include refid="select${ClassName}Vo"/>
+        <where>  
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+#if($column.queryType == "EQ")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
+#elseif($queryType == "NE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
+#elseif($queryType == "GT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
+#elseif($queryType == "GTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
+#elseif($queryType == "LT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
+#elseif($queryType == "LTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
+#elseif($queryType == "LIKE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
+#elseif($queryType == "BETWEEN")
+            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
+#end
+#end
+#end
+        </where>
+#if($table.tree)
+        order by ${tree_parent_code}
+#end
+    </select>
+    
+    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+#if($table.crud)
+        <include refid="select${ClassName}Vo"/>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+#elseif($table.tree)
+        select#foreach($column in $columns) t.$column.columnName,#end p.${tree_name} as parent_name
+        from ${tableName} t
+        left join ${tableName} p on p.${pkColumn.columnName} = t.${tree_parent_code}
+        where t.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#elseif($table.sub)
+        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
+           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
+
+        from ${tableName} a
+        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
+        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#end
+    </select>
+        
+    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+        insert into ${tableName}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
+#end
+#end
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
+#end
+#end
+         </trim>
+    </insert>
+
+    <update id="update${ClassName}" parameterType="${ClassName}">
+        update ${tableName}
+        <trim prefix="SET" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
+#end
+#end
+        </trim>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </update>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </delete>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+        delete from ${tableName} where ${pkColumn.columnName} in 
+        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
+            #{${pkColumn.javaField}}
+        </foreach>
+    </delete>
+#if($table.sub)
+    
+    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
+        delete from ${subTableName} where ${subTableFkName} in 
+        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+            #{${subTableFkclassName}}
+        </foreach>
+    </delete>
+
+    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
+        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+    </delete>
+
+    <insert id="batch${subClassName}">
+        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
+        </foreach>
+    </insert>
+#end
+
+</mapper>
\ No newline at end of file
diff --git a/common-generator-starter/target/common-generator-starter-1.0.0-SNAPSHOT.jar b/common-generator-starter/target/common-generator-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..405e9de
Binary files /dev/null and b/common-generator-starter/target/common-generator-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-generator-starter/target/maven-archiver/pom.properties b/common-generator-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..068ee1f
--- /dev/null
+++ b/common-generator-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:16 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-generator-starter
diff --git a/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..e1384dd
--- /dev/null
+++ b/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,19 @@
+com\mosty\common\generator\controller\GenController.class
+com\mosty\common\generator\config\GenConstants.class
+com\mosty\common\generator\util\CharsetKit.class
+com\mosty\common\generator\domain\GenTableColumn.class
+com\mosty\common\generator\service\IGenTableColumnService.class
+com\mosty\common\generator\mapper\GenTableColumnMapper.class
+com\mosty\common\generator\service\IGenTableService.class
+com\mosty\common\generator\util\VelocityUtils.class
+com\mosty\common\generator\config\GenConfig.class
+com\mosty\common\generator\config\BaseEntity.class
+com\mosty\common\generator\mapper\GenTableMapper.class
+com\mosty\common\generator\util\VelocityInitializer.class
+com\mosty\common\generator\util\Convert.class
+com\mosty\common\generator\domain\GenTable.class
+com\mosty\common\generator\util\GenUtils.class
+com\mosty\common\generator\GeneratorAutoConfiguration.class
+com\mosty\common\generator\service\GenTableServiceImpl.class
+com\mosty\common\generator\service\GenTableColumnServiceImpl.class
+com\mosty\common\generator\util\StringUtils.class
diff --git a/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..96cba03
--- /dev/null
+++ b/common-generator-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,30 @@
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\GenTableServiceImpl.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\controller\GenController.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\config\GenConstants.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\VelocityUtils.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\GenTableService_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\GeneratorAutoConfiguration.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\Convert.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\IGenTableService.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\VelocityInitializer_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\mapper\GenTableMapper.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\domain\GenTableColumn_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\mapper\GenTableColumnMapper_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\VelocityInitializer.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\StringUtils.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\mapper\GenTableColumnMapper.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\config\GenConfig.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\mapper\GenTableMapper_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\domain\GenTable.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\GenTableColumnServiceImpl.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\CharsetKit.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\GenTableColumnService_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\GenUtils_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\config\GenConfig_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\domain\GenTableColumn.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\service\IGenTableColumnService.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\controller\GenController_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\domain\GenTable_bak.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\GenUtils.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\config\BaseEntity.java
+E:\project\zgga\mosty-common\common-generator-starter\src\main\java\com\mosty\common\generator\util\VelocityUtils_bak.java
diff --git a/common-log-base-starter/common-log-base-starter.iml b/common-log-base-starter/common-log-base-starter.iml
new file mode 100644
index 0000000..315d4b5
--- /dev/null
+++ b/common-log-base-starter/common-log-base-starter.iml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-log-base-starter/pom.xml b/common-log-base-starter/pom.xml
new file mode 100644
index 0000000..17188d2
--- /dev/null
+++ b/common-log-base-starter/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mosty</groupId>
+        <artifactId>mosty-common</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-log-base-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.kafka</groupId>-->
+<!--            <artifactId>kafka-clients</artifactId>-->
+<!--            <version>2.6.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.kafka</groupId>-->
+<!--            <artifactId>spring-kafka</artifactId>-->
+<!--            <version>2.6.6</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/BaseController.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/BaseController.java
new file mode 100644
index 0000000..322799a
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/BaseController.java
@@ -0,0 +1,219 @@
+package com.mosty.operation.log;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.text.ParseException;
+import java.util.Date;
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.common.core.domain.AjaxResult.Type;
+//import com.ruoyi.common.core.domain.entity.SysUser;
+//import com.ruoyi.common.core.page.PageDomain;
+//import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.common.core.page.TableSupport;
+//import com.ruoyi.common.utils.DateUtils;
+//import com.ruoyi.common.utils.PageUtils;
+//import com.ruoyi.common.utils.ServletUtils;
+//import com.ruoyi.common.utils.ShiroUtils;
+//import com.ruoyi.common.utils.StringUtils;
+//import com.ruoyi.common.utils.sql.SqlUtil;
+
+/**
+ * web层通用数据处理
+ *
+ * @author ruoyi
+ */
+@Slf4j
+public class BaseController {
+
+    /**
+     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder) {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
+            @Override
+            public void setAsText(String text) {
+                try {
+                    setValue(DateUtils.parseDate(text));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据
+     */
+//    protected void startPage()
+//    {
+//        PageUtils.startPage();
+//    }
+//
+//    /**
+//     * 设置请求排序数据
+//     */
+//    protected void startOrderBy()
+//    {
+//        PageDomain pageDomain = TableSupport.buildPageRequest();
+//        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+//        {
+//            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+//            PageHelper.orderBy(orderBy);
+//        }
+//    }
+//
+//    /**
+//     * 获取request
+//     */
+//    public HttpServletRequest getRequest()
+//    {
+//        return ServletUtils.getRequest();
+//    }
+//
+//    /**
+//     * 获取response
+//     */
+//    public HttpServletResponse getResponse()
+//    {
+//        return ServletUtils.getResponse();
+//    }
+//
+//    /**
+//     * 获取session
+//     */
+//    public HttpSession getSession()
+//    {
+//        return getRequest().getSession();
+//    }
+//
+//    /**
+//     * 响应请求分页数据
+//     */
+//    @SuppressWarnings({ "rawtypes", "unchecked" })
+//    protected TableDataInfo getDataTable(List<?> list)
+//    {
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(0);
+//        rspData.setRows(list);
+//        rspData.setTotal(new PageInfo(list).getTotal());
+//        return rspData;
+//    }
+//
+//    /**
+//     * 响应返回结果
+//     *
+//     * @param rows 影响行数
+//     * @return 操作结果
+//     */
+//    protected AjaxResult toAjax(int rows)
+//    {
+//        return rows > 0 ? success() : error();
+//    }
+//
+//    /**
+//     * 响应返回结果
+//     *
+//     * @param result 结果
+//     * @return 操作结果
+//     */
+//    protected AjaxResult toAjax(boolean result)
+//    {
+//        return result ? success() : error();
+//    }
+//
+//    /**
+//     * 返回成功
+//     */
+//    public AjaxResult success()
+//    {
+//        return AjaxResult.success();
+//    }
+//
+//    /**
+//     * 返回失败消息
+//     */
+//    public AjaxResult error()
+//    {
+//        return AjaxResult.error();
+//    }
+//
+//    /**
+//     * 返回成功消息
+//     */
+//    public AjaxResult success(String message)
+//    {
+//        return AjaxResult.success(message);
+//    }
+//
+//    /**
+//     * 返回成功数据
+//     */
+//    public static AjaxResult success(Object data)
+//    {
+//        return AjaxResult.success("操作成功", data);
+//    }
+//
+//    /**
+//     * 返回失败消息
+//     */
+//    public AjaxResult error(String message)
+//    {
+//        return AjaxResult.error(message);
+//    }
+//
+//    /**
+//     * 返回错误码消息
+//     */
+//    public AjaxResult error(Type type, String message)
+//    {
+//        return new AjaxResult(type, message);
+//    }
+//
+//    /**
+//     * 页面跳转
+//     */
+//    public String redirect(String url)
+//    {
+//        return StringUtils.format("redirect:{}", url);
+//    }
+//
+//    /**
+//     * 获取用户缓存信息
+//     */
+//    public SysUser getSysUser()
+//    {
+//        return ShiroUtils.getSysUser();
+//    }
+//
+//    /**
+//     * 设置用户缓存信息
+//     */
+//    public void setSysUser(SysUser user)
+//    {
+//        ShiroUtils.setSysUser(user);
+//    }
+//
+//    /**
+//     * 获取登录用户id
+//     */
+//    public Long getUserId()
+//    {
+//        return getSysUser().getUserId();
+//    }
+//
+//    /**
+//     * 获取登录用户名
+//     */
+//    public String getLoginName()
+//    {
+//        return getSysUser().getLoginName();
+//    }
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/BusinessStatus.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/BusinessStatus.java
new file mode 100644
index 0000000..3eca628
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/BusinessStatus.java
@@ -0,0 +1,18 @@
+package com.mosty.operation.log;
+
+/**
+ * 操作状态
+ *
+ * @author ruoyi
+ */
+public enum BusinessStatus {
+    /**
+     * 成功
+     */
+    SUCCESS,
+
+    /**
+     * 失败
+     */
+    FAIL,
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/LogAspect.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/LogAspect.java
new file mode 100644
index 0000000..1d35c30
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/LogAspect.java
@@ -0,0 +1,216 @@
+package com.mosty.operation.log;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.support.spring.PropertyPreFilters;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.base.threadpool.SimpleThreadPool;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.base.util.ServletUtils;
+import com.mosty.common.base.util.SpringIocContext;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.JWTUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.operation.log.service.SysOperLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.Map;
+
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_HEADER;
+import static com.mosty.common.base.entity.log.LogConst.LOG_THREAD_POOL;
+
+
+/**
+ * 操作日志记录处理
+ *
+ * @author ruoyi
+ */
+@Slf4j
+@Aspect
+@Component
+public class LogAspect extends LogSaveStrategy {
+
+    // 排除敏感属性字段
+    public static final String[] EXCLUDE_PROPERTIES = {"password", "oldPassword", "newPassword", "confirmPassword"};
+
+    // 配置织入点
+    @Pointcut("@annotation(com.mosty.common.base.entity.log.Log)")
+    public void logPointCut() {
+    }
+
+    // 处理完请求后执行
+    @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) {
+        handleLog(joinPoint, controllerLog, null, jsonResult);
+    }
+
+    // 拦截异常操作
+    @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) {
+        handleLog(joinPoint, controllerLog, e, null);
+    }
+
+    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
+        try {
+            String token = ServletUtils.getRequest().getHeader(TOKEN_HEADER);
+            // 获取当前的用户 从header中获取
+            UserInfo userInfo = JWTUtil.getUserInfo(token);
+            String ipAddress = IpUtil.getIpAddress(ServletUtils.getRequest());
+            // *========数据库日志=========*//
+            SysOperLog operLog = new SysOperLog();
+            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+            // 请求的地址
+            operLog.setOperIp(ipAddress);
+            String url = ServletUtils.getRequest().getRequestURI();
+            operLog.setOperUrl(url);
+            //  添加服务名称
+            if (url != null && url.length() >= 11) {
+                String[] s = url.split("/");
+                if (s.length >= 2 && s[1].contains("mosty-")) {
+                    operLog.setMkmc(s[1]);
+                }
+            }
+            if (userInfo != null) {
+                operLog.setOperName(userInfo.getUserLoginName());
+                operLog.setOperUserId(String.valueOf(userInfo.getUserId()));
+                operLog.setOperSfzh(userInfo.getIdEntityCard());
+                if (StringUtils.isNotNull(userInfo.getDeptId())
+                        && StringUtils.isNotEmpty(userInfo.getDeptName())) {
+                    operLog.setSsbm(userInfo.getDeptName());
+                    operLog.setSsbmid(String.valueOf(userInfo.getDeptId()));
+                    operLog.setSsbmdm(userInfo.getDeptCode());
+                }
+            }
+            if (e != null) {
+                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+            }
+            // 设置方法名称
+            String className = joinPoint.getTarget().getClass().getName();
+            String methodName = joinPoint.getSignature().getName();
+            operLog.setMethod(className + "." + methodName + "()");
+            // 设置请求方式
+            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+            // 处理设置注解上的参数
+            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+            // 保存数据库
+            SimpleThreadPool.execute(LOG_THREAD_POOL, () ->
+                    SpringIocContext.getBean(SysOperLogService.class).insertOperlog(operLog));
+        } catch (Exception exp) {
+            // 记录本地异常日志
+            log.error("==前置通知异常==");
+            log.error("异常信息:{}", exp.getMessage());
+            exp.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取注解中对方法的描述信息 用于Controller层注解
+     *
+     * @param log     日志
+     * @param operLog 操作日志
+     * @throws Exception
+     */
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception {
+        // 设置action动作
+        operLog.setBusinessType(log.businessType().ordinal());
+        // 设置标题
+        operLog.setTitle(log.title());
+        // 设置操作人类别
+        operLog.setOperatorType(log.operatorType().ordinal());
+        // 是否需要保存request，参数和值
+        if (log.isSaveRequestData()) {
+            // 获取参数的信息，传入到数据库中。
+            setRequestValue(joinPoint, operLog);
+        }
+        // 是否需要保存response，参数和值
+        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) {
+            operLog.setJsonResult(StringUtils.substring(JSONObject.toJSONString(jsonResult), 0, 2000));
+        }
+    }
+
+    /**
+     * 获取请求的参数，放到log中
+     *
+     * @param operLog 操作日志
+     * @throws Exception 异常
+     */
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception {
+        Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
+        if (StringUtils.isNotEmpty(map)) {
+            String params = JSONObject.toJSONString(map, excludePropertyPreFilter());
+            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+        } else {
+            Object args = joinPoint.getArgs();
+            if (StringUtils.isNotNull(args)) {
+                String params = argsArrayToString(joinPoint.getArgs());
+                operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+            }
+        }
+    }
+
+    /**
+     * 忽略敏感属性
+     */
+    public PropertyPreFilters.MySimplePropertyPreFilter excludePropertyPreFilter() {
+        return new PropertyPreFilters().addFilter().addExcludes(EXCLUDE_PROPERTIES);
+    }
+
+    /**
+     * 参数拼装
+     */
+    private String argsArrayToString(Object[] paramsArray) {
+        StringBuilder params = new StringBuilder();
+        if (paramsArray != null && paramsArray.length > 0) {
+            for (Object o : paramsArray) {
+                if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
+                    try {
+                        Object jsonObj = JSONObject.toJSONString(o, excludePropertyPreFilter());
+                        params.append(jsonObj.toString()).append(" ");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return params.toString().trim();
+    }
+
+    /**
+     * 判断是否需要过滤的对象。
+     *
+     * @param o 对象信息。
+     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+     */
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o) {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray()) {
+            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            Collection collection = (Collection) o;
+            for (Object value : collection) {
+                return value instanceof MultipartFile;
+            }
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            Map map = (Map) o;
+            for (Object value : map.entrySet()) {
+                Map.Entry entry = (Map.Entry) value;
+                return entry.getValue() instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+                || o instanceof BindingResult;
+    }
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/LogSaveStrategy.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/LogSaveStrategy.java
new file mode 100644
index 0000000..2127597
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/LogSaveStrategy.java
@@ -0,0 +1,42 @@
+package com.mosty.operation.log;
+
+import com.google.common.collect.Sets;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.lang.NonNull;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class LogSaveStrategy implements ApplicationContextAware {
+
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    /** ioc 容器 */
+    private static ApplicationContext applicationContext;
+
+    private static final Set<String> NATIVE_APP_NAME = Collections.unmodifiableSet(Sets.newHashSet("mosty", "mosty-base"));
+
+//    private final FeignClient;
+
+
+    private Boolean nativeInvoke() {
+        return NATIVE_APP_NAME.contains(applicationName);
+    }
+
+    @Override
+    public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
+        LogSaveStrategy.applicationContext = applicationContext;
+    }
+
+    protected void saveOperationLog() {
+        if (nativeInvoke()) {
+
+        }
+//        remoteFeign();
+    }
+
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/OperationLogBaseAutoConfiguration.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/OperationLogBaseAutoConfiguration.java
new file mode 100644
index 0000000..5778d62
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/OperationLogBaseAutoConfiguration.java
@@ -0,0 +1,18 @@
+package com.mosty.operation.log;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  代码生成自动装配
+ * @author kevin
+ * @date 2022/2/3 3:34 PM
+ * @since 1.0.0
+ */
+@Configuration
+@ComponentScan(basePackages = "com.mosty.operation")
+@MapperScan("com.mosty.operation.log.mapper")
+public class OperationLogBaseAutoConfiguration {
+
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/SysOperlogController.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/SysOperlogController.java
new file mode 100644
index 0000000..f731296
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/SysOperlogController.java
@@ -0,0 +1,118 @@
+package com.mosty.operation.log.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.operation.log.BaseController;
+import com.mosty.operation.log.entity.DeleteListVO;
+import com.mosty.operation.log.entity.VO.OperlogPage;
+import com.mosty.operation.log.service.SysOperLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志记录
+ *
+ * @author ruoyi
+ */
+@RestController
+@AllArgsConstructor
+@Api(tags = "操作日志")
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController {
+
+
+    private final SysOperLogService operLogService;
+
+
+    @PostMapping("/list")
+    @ApiOperation("查询操作日志列表")
+    @Log(title = "查询操作日志详情", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<SysOperLog>> list(@RequestBody OperlogPage operLog) {
+        IPage<SysOperLog> sysOperLogPage = operLogService.selectByPage(operLog);
+        return ResponseResult.success(sysOperLogPage);
+    }
+
+
+    @Log(title = "删除操作日志", businessType = BusinessType.DELETE)
+    @ApiOperation("查询操作日志详情")
+    @PostMapping("/remove")
+    public ResponseResult<Boolean> remove(@RequestBody DeleteListVO deleteListVO) {
+        operLogService.deleteOperLogByIds(deleteListVO.getIds());
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @ApiOperation("查询操作日志详情")
+    @Log(title = "查询操作日志详情", businessType = BusinessType.OTHER)
+    @GetMapping("/detail/{id}")
+    public ResponseResult<SysOperLog> detail(@PathVariable("id") Long id) {
+        SysOperLog log = operLogService.getOne(new LambdaQueryWrapper<SysOperLog>()
+                .eq(SysOperLog::getOperId, id));
+        return ResponseResult.success(log);
+    }
+
+    @Log(title = "清空操作日志", businessType = BusinessType.CLEAN)
+    @ApiOperation("清空操作日志")
+    @PostMapping("/clean")
+    public ResponseResult<Boolean> clean() {
+        operLogService.cleanOperLog();
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @Log(title = "系统使用情况统计数字", businessType = BusinessType.OTHER)
+    @ApiOperation("系统使用情况统计数字")
+    @JwtSysUser
+    @PostMapping("/statistics")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天 4.90天", required = true, dataType = "String"),
+    })
+    public ResponseResult<Map<String,Object>> statistics(String type) {
+        return ResponseResult.success(operLogService.statistics(type));
+    }
+
+    @Log(title = "部门排名统计TOP10", businessType = BusinessType.OTHER)
+    @ApiOperation("部门排名统计TOP10")
+    @JwtSysUser
+    @PostMapping("/bmStatistics")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天 4.90天", required = true, dataType = "String"),
+    })
+    public ResponseResult<List<Map<String,Object>>> bmStatistics(String type) {
+        return ResponseResult.success(operLogService.bmStatistics(type));
+    }
+
+    @Log(title = "人员排名统计TOP10", businessType = BusinessType.OTHER)
+    @ApiOperation("人员排名统计TOP10")
+    @JwtSysUser
+    @PostMapping("/ryStatistics")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天 4.90天", required = true, dataType = "String"),
+    })
+    public ResponseResult<List<Map<String,Object>>> ryStatistics(String type) {
+        return ResponseResult.success(operLogService.ryStatistics(type));
+    }
+
+    @Log(title = "模块排名统计", businessType = BusinessType.OTHER)
+    @ApiOperation("模块排名统计")
+    @JwtSysUser
+    @PostMapping("/mkStatistics")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天 4.90天", required = true, dataType = "String"),
+    })
+    public ResponseResult<List<Map<String,Object>>> mkStatistics(String type) {
+        return ResponseResult.success(operLogService.mkStatistics(type));
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/provider/SysOperlogProviderController.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/provider/SysOperlogProviderController.java
new file mode 100644
index 0000000..2ed997f
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/controller/provider/SysOperlogProviderController.java
@@ -0,0 +1,38 @@
+package com.mosty.operation.log.controller.provider;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.operation.log.BaseController;
+import com.mosty.operation.log.service.SysOperLogService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 操作日志记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@Api(tags = "操作日志 for Feign调用")
+@RequestMapping("/provider/monitor/operateLog")
+public class SysOperlogProviderController extends BaseController {
+
+    private String prefix = "monitor/operlog";
+
+    @Autowired
+    private SysOperLogService operLogService;
+
+    // 添加操作日志
+    @PostMapping("/save")
+    public ResponseResult<Boolean> save(@RequestBody SysOperLog sysOperLog) {
+        operLogService.insertOperlog(sysOperLog);
+        return ResponseResult.success();
+    }
+
+    @GetMapping()
+    public String operlog(){
+        return prefix + "/operlog";
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/BaseEntity.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/BaseEntity.java
new file mode 100644
index 0000000..3e46bfb
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/BaseEntity.java
@@ -0,0 +1,115 @@
+package com.mosty.operation.log.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ * 
+ * @author ruoyi
+ */
+public class BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 搜索值 */
+    private String searchValue;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    private Map<String, Object> params;
+
+    public String getSearchValue()
+    {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue)
+    {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateBy()
+    {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy()
+    {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime)
+    {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/DeleteListVO.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/DeleteListVO.java
new file mode 100644
index 0000000..c52d549
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/DeleteListVO.java
@@ -0,0 +1,20 @@
+package com.mosty.operation.log.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DeleteListVO", description="DeleteList批量")
+public class DeleteListVO {
+    /**
+     * ID集合
+     */
+   private List<Long> ids;
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excel.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excel.java
new file mode 100644
index 0000000..0666716
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excel.java
@@ -0,0 +1,175 @@
+package com.mosty.operation.log.entity;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.math.BigDecimal;
+
+/**
+ * 自定义导出Excel数据注解
+ * 
+ * @author ruoyi
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Excel
+{
+    /**
+     * 导出时在excel中排序
+     */
+    public int sort() default Integer.MAX_VALUE;
+
+    /**
+     * 导出到Excel中的名字.
+     */
+    public String name() default "";
+
+    /**
+     * 日期格式, 如: yyyy-MM-dd
+     */
+    public String dateFormat() default "";
+
+    /**
+     * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
+     */
+    public String dictType() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    public String readConverterExp() default "";
+
+    /**
+     * 分隔符，读取字符串组内容
+     */
+    public String separator() default ",";
+
+    /**
+     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+     */
+    public int scale() default -1;
+
+    /**
+     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+     */
+    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
+    /**
+     * 导出类型（0数字 1字符串）
+     */
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出时在excel中每个列的高度 单位为字符
+     */
+    public double height() default 14;
+
+    /**
+     * 导出时在excel中每个列的宽 单位为字符
+     */
+    public double width() default 16;
+
+    /**
+     * 文字后缀,如% 90 变成90%
+     */
+    public String suffix() default "";
+
+    /**
+     * 当值为空时,字段的默认值
+     */
+    public String defaultValue() default "";
+
+    /**
+     * 提示信息
+     */
+    public String prompt() default "";
+
+    /**
+     * 设置只能选择不能输入的列内容.
+     */
+    public String[] combo() default {};
+
+    /**
+     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
+     */
+    public boolean isExport() default true;
+
+    /**
+     * 另一个类中的属性名称,支持多级获取,以小数点隔开
+     */
+    public String targetAttr() default "";
+
+    /**
+     * 是否自动统计数据,在最后追加一行统计数据总和
+     */
+    public boolean isStatistics() default false;
+
+    /**
+     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+     */
+    public Align align() default Align.AUTO;
+
+    /**
+     * 自定义数据处理器
+     */
+    public Class<?> handler() default ExcelHandlerAdapter.class;
+
+    /**
+     * 自定义数据处理器参数
+     */
+    public String[] args() default {};
+
+    public enum Align
+    {
+        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
+        private final int value;
+
+        Align(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    /**
+     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
+     */
+    Type type() default Type.ALL;
+
+    public enum Type
+    {
+        ALL(0), EXPORT(1), IMPORT(2);
+        private final int value;
+
+        Type(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    public enum ColumnType
+    {
+        NUMERIC(0), STRING(1), IMAGE(2);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/ExcelHandlerAdapter.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/ExcelHandlerAdapter.java
new file mode 100644
index 0000000..3e868e0
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/ExcelHandlerAdapter.java
@@ -0,0 +1,19 @@
+package com.mosty.operation.log.entity;
+
+/**
+ * Excel数据格式处理适配器
+ * 
+ * @author ruoyi
+ */
+public interface ExcelHandlerAdapter
+{
+    /**
+     * 格式化
+     * 
+     * @param value 单元格数据值
+     * @param args excel注解args参数组
+     *
+     * @return 处理后的值
+     */
+    Object format(Object value, String[] args);
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excels.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excels.java
new file mode 100644
index 0000000..a91694b
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/Excels.java
@@ -0,0 +1,18 @@
+package com.mosty.operation.log.entity;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ * 
+ * @author ruoyi
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels
+{
+    Excel[] value();
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/SysUser.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/SysUser.java
new file mode 100644
index 0000000..197b694
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/SysUser.java
@@ -0,0 +1,377 @@
+package com.mosty.operation.log.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author ruoyi
+ */
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = Excel.ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Excel.Type.IMPORT)
+    private Long deptId;
+
+    /** 部门父ID */
+    private Long parentId;
+
+    /** 角色ID */
+    private Long roleId;
+
+    /** 登录名称 */
+    @Excel(name = "登录名称")
+    private String loginName;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 用户类型 */
+    private String userType;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 盐加密 */
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Excel.Type.EXPORT)
+    private String loginIp;
+
+    /** 最后登录时间 */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
+    private Date loginDate;
+
+    /** 密码最后更新时间 */
+    private Date pwdUpdateDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
+    })
+//    private SysDept dept;
+//
+//    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    public SysUser()
+    {
+
+    }
+
+    public SysUser(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+//    @Xss(message = "登录账号不能包含脚本字符")
+//    @NotBlank(message = "登录账号不能为空")
+//    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
+    public String getLoginName()
+    {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName)
+    {
+        this.loginName = loginName;
+    }
+
+//    @Xss(message = "用户昵称不能包含脚本字符")
+//    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserType()
+    {
+        return userType;
+    }
+
+    public void setUserType(String userType)
+    {
+        this.userType = userType;
+    }
+
+//    @Email(message = "邮箱格式不正确")
+//    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+//    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    @JsonIgnore
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getSalt()
+    {
+        return salt;
+    }
+
+    public void setSalt(String salt)
+    {
+        this.salt = salt;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    public Date getPwdUpdateDate()
+    {
+        return pwdUpdateDate;
+    }
+
+    public void setPwdUpdateDate(Date pwdUpdateDate)
+    {
+        this.pwdUpdateDate = pwdUpdateDate;
+    }
+
+//    public SysDept getDept()
+//    {
+//        if (dept == null)
+//        {
+//            dept = new SysDept();
+//        }
+//        return dept;
+//    }
+//
+//    public void setDept(SysDept dept)
+//    {
+//        this.dept = dept;
+//    }
+//
+//    public List<SysRole> getRoles()
+//    {
+//        return roles;
+//    }
+//
+//    public void setRoles(List<SysRole> roles)
+//    {
+//        this.roles = roles;
+//    }
+
+    public Long[] getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(Long[] roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public Long[] getPostIds()
+    {
+        return postIds;
+    }
+
+    public void setPostIds(Long[] postIds)
+    {
+        this.postIds = postIds;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("loginName", getLoginName())
+            .append("userName", getUserName())
+            .append("userType", getUserType())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("salt", getSalt())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+//            .append("dept", getDept())
+//			.append("roles", getRoles())
+            .toString();
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/VO/OperlogPage.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/VO/OperlogPage.java
new file mode 100644
index 0000000..4f92d5c
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/entity/VO/OperlogPage.java
@@ -0,0 +1,42 @@
+package com.mosty.operation.log.entity.VO;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class OperlogPage extends Page {
+
+    /**
+     * 操作模块
+     */
+    @ApiModelProperty(value = "操作模块")
+    private String title;
+
+    /**
+     * 操作人员
+     */
+    @ApiModelProperty(value = "操作人员")
+    private String operName;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    @ApiModelProperty(value = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+    private Integer businessType;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    @ApiModelProperty(value = "状态 0=正常,1=异常")
+    private Integer status;
+
+
+
+}
+
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/mapper/SysOperLogMapper.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/mapper/SysOperLogMapper.java
new file mode 100644
index 0000000..708e79a
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/mapper/SysOperLogMapper.java
@@ -0,0 +1,61 @@
+package com.mosty.operation.log.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.base.entity.log.SysOperLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 操作日志 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
+
+    // 新增操作日志
+    void insertOperlog(SysOperLog operLog);
+
+    // 查询系统操作日志集合
+    List<SysOperLog> selectOperLogList(SysOperLog operLog);
+
+    // 批量删除系统操作日志
+    int deleteOperLogByIds(String[] ids);
+
+    // 查询操作日志详细
+    SysOperLog selectOperLogById(Long operId);
+
+    // 清空操作日志
+    void cleanOperLog();
+
+    // 查询使用次数
+    int getSycs(@Param("kssj") String kssj,
+                @Param("jssj") String jssj,
+                @Param("useSql") String useSql,
+                @Param("status") String status);
+
+    // 查询访问人数
+    int getFwrs(@Param("kssj") String kssj,
+                @Param("jssj") String jssj,
+                @Param("useSql") String useSql);
+
+    // 部门排名统计
+    List<Map<String, Object>> bmStatistics(@Param("kssj") String kssj,
+                                           @Param("jssj") String jssj,
+                                           @Param("aUseSql") String aUseSql,
+                                           @Param("bUseSql") String bUseSql);
+
+    // 人员排名统计
+    List<Map<String, Object>> ryStatistics(@Param("kssj") String kssj,
+                                           @Param("jssj") String jssj,
+                                           @Param("aUseSql") String aUseSql,
+                                           @Param("bUseSql") String bUseSql);
+
+    // 模块排名统计
+    List<Map<String, Object>> mkStatistics(@Param("kssj") String kssj,
+                                           @Param("jssj") String jssj,
+                                           @Param("aUseSql") String aUseSql,
+                                           @Param("bUseSql") String bUseSql);
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/service/SysOperLogService.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/service/SysOperLogService.java
new file mode 100644
index 0000000..69be0f7
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/service/SysOperLogService.java
@@ -0,0 +1,53 @@
+package com.mosty.operation.log.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.operation.log.entity.VO.OperlogPage;
+import com.mosty.operation.log.mapper.SysOperLogMapper;
+import com.mosty.operation.log.util.Convert;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志 服务层处理
+ *
+ * @author ruoyi
+ */
+@Service
+public interface SysOperLogService extends IService<SysOperLog> {
+
+    // 新增操作日志
+    void insertOperlog(SysOperLog operLog);
+
+    // 查询系统操作日志集合
+    List<SysOperLog> selectOperLogList(SysOperLog operLog);
+
+    // 批量删除系统操作日志
+    void deleteOperLogByIds(List<Long> ids);
+
+    // 查询操作日志详细
+    SysOperLog selectOperLogById(Long operId);
+
+    // 清空操作日志
+    void cleanOperLog();
+
+    //分页查询
+    IPage<SysOperLog> selectByPage(OperlogPage operLog);
+
+    // 系统使用情况统计数字
+    Map<String, Object> statistics(String type);
+
+    // 部门排名统计TOP10
+    List<Map<String, Object>> bmStatistics(String type);
+
+    // 人员排名统计TOP10
+    List<Map<String, Object>> ryStatistics(String type);
+
+    // 模块排名统计
+    List<Map<String, Object>> mkStatistics(String type);
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.java
new file mode 100644
index 0000000..229eb6d
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.java
@@ -0,0 +1,173 @@
+package com.mosty.operation.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.operation.log.entity.VO.OperlogPage;
+import com.mosty.operation.log.mapper.SysOperLogMapper;
+import com.mosty.operation.log.service.SysOperLogService;
+import com.mosty.operation.log.util.Convert;
+import org.apache.catalina.User;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+
+/**
+ * 操作日志 服务层处理
+ */
+
+@Service
+public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog>
+        implements SysOperLogService {
+
+    @Resource
+    private SysOperLogMapper operLogMapper;
+
+    // 新增操作日志
+    @Override
+    public void insertOperlog(SysOperLog operLog) {
+        if (operLog.getOperTime() == null) {
+            operLog.setOperTime(new Date());
+        }
+        operLogMapper.insertOperlog(operLog);
+    }
+
+    // 查询系统操作日志集合
+    @Override
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
+        return operLogMapper.selectOperLogList(operLog);
+    }
+
+    // 批量删除系统操作日志
+    @Override
+    public void deleteOperLogByIds(List<Long> ids) {
+        operLogMapper.delete(new LambdaQueryWrapper<SysOperLog>()
+                .in(SysOperLog::getOperId, ids));
+    }
+
+    // 查询操作日志详细
+    @Override
+    public SysOperLog selectOperLogById(Long operId) {
+        return operLogMapper.selectOperLogById(operId);
+    }
+
+    // 清空操作日志
+    @Override
+    public void cleanOperLog() {
+        operLogMapper.cleanOperLog();
+    }
+
+    @Override
+    public IPage<SysOperLog> selectByPage(OperlogPage dto) {
+        LambdaQueryWrapper<SysOperLog> qw = new LambdaQueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(dto.getTitle()), SysOperLog::getTitle, dto.getTitle())
+                .like(StringUtils.isNotBlank(dto.getOperName()), SysOperLog::getOperName, dto.getOperName())
+                .eq(Objects.nonNull(dto.getBusinessType()), SysOperLog::getBusinessType, dto.getBusinessType())
+                .eq(Objects.nonNull(dto.getStatus()), SysOperLog::getStatus, dto.getStatus())
+                .orderByDesc(SysOperLog::getOperId);
+        return operLogMapper.selectPage(dto, qw);
+    }
+
+    @Override
+    public Map<String, Object> statistics(String type) {
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("", user);
+        String kssj = null, jssj;
+        jssj = DateUtils.getTime();
+        if ("1".equals(type)) {
+            kssj = DateUtils.getDate() + " 00:00:00";
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -8));
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -31));
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -90));
+        }
+        Map<String, Object> map = new HashMap<>();
+        //  请求成功次数
+        map.put("qqcgcs", this.operLogMapper.getSycs(kssj, jssj, useSql, "0"));
+        //  请求失败次数
+        map.put("qqsbcs", this.operLogMapper.getSycs(kssj, jssj, useSql, "1"));
+        //  访问人数
+        map.put("fwrs", this.operLogMapper.getFwrs(kssj, jssj, useSql));
+        return map;
+    }
+
+    @Override
+    public List<Map<String, Object>> bmStatistics(String type) {
+        UserInfo user = UserInfoManager.get();
+        String aUseSql = PermissionsUtil.createSql("a", user);
+        String bUseSql = PermissionsUtil.createSql("b", user);
+        String kssj = null, jssj;
+        jssj = DateUtils.getTime();
+        if ("1".equals(type)) {
+            kssj = DateUtils.getDate() + " 00:00:00";
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -8));
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -31));
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -90));
+        }
+        return this.baseMapper.bmStatistics(kssj, jssj, aUseSql, bUseSql);
+    }
+
+    @Override
+    public List<Map<String, Object>> ryStatistics(String type) {
+        UserInfo user = UserInfoManager.get();
+        String aUseSql = PermissionsUtil.createSql("a", user);
+        String bUseSql = PermissionsUtil.createSql("b", user);
+        String kssj = null, jssj;
+        jssj = DateUtils.getTime();
+        if ("1".equals(type)) {
+            kssj = DateUtils.getDate() + " 00:00:00";
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -8));
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -31));
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -90));
+        }
+        return this.baseMapper.ryStatistics(kssj, jssj, aUseSql, bUseSql);
+    }
+
+    @Override
+    public List<Map<String, Object>> mkStatistics(String type) {
+        UserInfo user = UserInfoManager.get();
+        String aUseSql = PermissionsUtil.createSql("a", user);
+        String bUseSql = PermissionsUtil.createSql("b", user);
+        String kssj = null, jssj;
+        jssj = DateUtils.getTime();
+        if ("1".equals(type)) {
+            kssj = DateUtils.getDate() + " 00:00:00";
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -8));
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -31));
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",
+                    DateUtils.getNextDate(new Date(), "D", -90));
+        }
+        return this.baseMapper.mkStatistics(kssj, jssj, aUseSql, bUseSql);
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/util/Convert.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/Convert.java
new file mode 100644
index 0000000..a01e521
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/Convert.java
@@ -0,0 +1,854 @@
+package com.mosty.operation.log.util;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+
+/**
+ * 类型转换器
+ *
+ * @author ruoyi
+ */
+public class Convert {
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static String toStr(Object value, String defaultValue) {
+        if (null == value) {
+            return defaultValue;
+        }
+        if (value instanceof String) {
+            return (String) value;
+        }
+        return value.toString();
+    }
+
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static String toStr(Object value) {
+        return toStr(value, null);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Character toChar(Object value, Character defaultValue) {
+        if (null == value) {
+            return defaultValue;
+        }
+        if (value instanceof Character) {
+            return (Character) value;
+        }
+
+        final String valueStr = toStr(value, null);
+        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Character toChar(Object value) {
+        return toChar(value, null);
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Byte toByte(Object value, Byte defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Byte) {
+            return (Byte) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).byteValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Byte.parseByte(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Byte toByte(Object value) {
+        return toByte(value, null);
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Short toShort(Object value, Short defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Short) {
+            return (Short) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).shortValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Short.parseShort(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Short toShort(Object value) {
+        return toShort(value, null);
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Number toNumber(Object value, Number defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Number) {
+            return (Number) value;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return NumberFormat.getInstance().parse(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Number toNumber(Object value) {
+        return toNumber(value, null);
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Integer toInt(Object value, Integer defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Integer) {
+            return (Integer) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).intValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Integer.parseInt(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Integer toInt(Object value) {
+        return toInt(value, null);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String str) {
+        return toIntArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str) {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String split, String str) {
+        if (StringUtils.isEmpty(str)) {
+            return new Integer[]{};
+        }
+        String[] arr = str.split(split);
+        final Integer[] ints = new Integer[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            final Integer v = toInt(arr[i], 0);
+            ints[i] = v;
+        }
+        return ints;
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str   被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str) {
+        if (StringUtils.isEmpty(str)) {
+            return new Long[]{};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            final Long v = toLong(arr[i], null);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str) {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str) {
+        return str.split(split);
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Long toLong(Object value, Long defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Long) {
+            return (Long) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).longValue();
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Long toLong(Object value) {
+        return toLong(value, null);
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Double toDouble(Object value, Double defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Double) {
+            return (Double) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).doubleValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).doubleValue();
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Double toDouble(Object value) {
+        return toDouble(value, null);
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Float toFloat(Object value, Float defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Float) {
+            return (Float) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).floatValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Float.parseFloat(valueStr.trim());
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Float toFloat(Object value) {
+        return toFloat(value, null);
+    }
+
+    /**
+     * 转换为boolean<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value, Boolean defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Boolean) {
+            return (Boolean) value;
+        }
+        String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        valueStr = valueStr.trim().toLowerCase();
+        switch (valueStr) {
+            case "true":
+                return true;
+            case "false":
+                return false;
+            case "yes":
+                return true;
+            case "ok":
+                return true;
+            case "no":
+                return false;
+            case "1":
+                return true;
+            case "0":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为boolean<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value) {
+        return toBool(value, null);
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     *
+     * @param clazz        Enum的Class
+     * @param value        值
+     * @param defaultValue 默认值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (clazz.isAssignableFrom(value.getClass())) {
+            @SuppressWarnings("unchecked")
+            E myE = (E) value;
+            return myE;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return Enum.valueOf(clazz, valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
+        return toEnum(clazz, value, null);
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof BigInteger) {
+            return (BigInteger) value;
+        }
+        if (value instanceof Long) {
+            return BigInteger.valueOf((Long) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return new BigInteger(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value) {
+        return toBigInteger(value, null);
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value        被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof BigDecimal) {
+            return (BigDecimal) value;
+        }
+        if (value instanceof Long) {
+            return new BigDecimal((Long) value);
+        }
+        if (value instanceof Double) {
+            return new BigDecimal((Double) value);
+        }
+        if (value instanceof Integer) {
+            return new BigDecimal((Integer) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr)) {
+            return defaultValue;
+        }
+        try {
+            return new BigDecimal(valueStr);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value) {
+        return toBigDecimal(value, null);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @return 字符串
+     */
+//    public static String utf8Str(Object obj)
+//    {
+//        return str(obj, CharsetKit.CHARSET_UTF_8);
+//    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj         对象
+     * @param charsetName 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, String charsetName) {
+        return str(obj, Charset.forName(charsetName));
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj     对象
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, Charset charset) {
+        if (null == obj) {
+            return null;
+        }
+
+        if (obj instanceof String) {
+            return (String) obj;
+        } else if (obj instanceof byte[]) {
+            return str((byte[]) obj, charset);
+        } else if (obj instanceof Byte[]) {
+            byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
+            return str(bytes, charset);
+        } else if (obj instanceof ByteBuffer) {
+            return str((ByteBuffer) obj, charset);
+        }
+        return obj.toString();
+    }
+
+    /**
+     * 将byte数组转为字符串
+     *
+     * @param bytes   byte数组
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(byte[] bytes, String charset) {
+        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+    }
+
+    /**
+     * 解码字节码
+     *
+     * @param data    字符串
+     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
+     * @return 解码后的字符串
+     */
+    public static String str(byte[] data, Charset charset) {
+        if (data == null) {
+            return null;
+        }
+
+        if (null == charset) {
+            return new String(data);
+        }
+        return new String(data, charset);
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data    数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, String charset) {
+        if (data == null) {
+            return null;
+        }
+
+        return str(data, Charset.forName(charset));
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data    数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, Charset charset) {
+        if (null == charset) {
+            charset = Charset.defaultCharset();
+        }
+        return charset.decode(data).toString();
+    }
+
+    // ----------------------------------------------------------------------- 全角半角转换
+
+    /**
+     * 半角转全角
+     *
+     * @param input String.
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input) {
+        return toSBC(input, null);
+    }
+
+    /**
+     * 半角转全角
+     *
+     * @param input         String
+     * @param notConvertSet 不替换的字符集合
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input, Set<Character> notConvertSet) {
+        char c[] = input.toCharArray();
+        for (int i = 0; i < c.length; i++) {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == ' ') {
+                c[i] = '\u3000';
+            } else if (c[i] < '\177') {
+                c[i] = (char) (c[i] + 65248);
+
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 全角转半角
+     *
+     * @param input String.
+     * @return 半角字符串
+     */
+    public static String toDBC(String input) {
+        return toDBC(input, null);
+    }
+
+    /**
+     * 替换全角为半角
+     *
+     * @param text          文本
+     * @param notConvertSet 不替换的字符集合
+     * @return 替换后的字符
+     */
+    public static String toDBC(String text, Set<Character> notConvertSet) {
+        char c[] = text.toCharArray();
+        for (int i = 0; i < c.length; i++) {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == '\u3000') {
+                c[i] = ' ';
+            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
+                c[i] = (char) (c[i] - 65248);
+            }
+        }
+        String returnString = new String(c);
+
+        return returnString;
+    }
+
+    /**
+     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+     *
+     * @param n 数字
+     * @return 中文大写数字
+     */
+    public static String digitUppercase(double n) {
+        String[] fraction = {"角", "分"};
+        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
+
+        String head = n < 0 ? "负" : "";
+        n = Math.abs(n);
+
+        String s = "";
+        for (int i = 0; i < fraction.length; i++) {
+            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+        }
+        if (s.length() < 1) {
+            s = "整";
+        }
+        int integerPart = (int) Math.floor(n);
+
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
+            String p = "";
+            for (int j = 0; j < unit[1].length && n > 0; j++) {
+                p = digit[integerPart % 10] + unit[1][j] + p;
+                integerPart = integerPart / 10;
+            }
+            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+        }
+        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+    }
+}
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/util/ServletUtils.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/ServletUtils.java
new file mode 100644
index 0000000..e83e0b4
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/ServletUtils.java
@@ -0,0 +1,155 @@
+package com.mosty.operation.log.util;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+/**
+ * 客户端工具类
+ *
+ * @author ruoyi
+ */
+public class ServletUtils {
+    /**
+     * 定义移动端请求的所有可能类型
+     */
+    private final static String[] agent = {"Android", "iPhone", "iPod", "iPad", "Windows Phone", "MQQBrowser"};
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name) {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name, String defaultValue) {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name) {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name) {
+        return Convert.toBool(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
+        return Convert.toBool(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取request
+     */
+    public static HttpServletRequest getRequest() {
+        return getRequestAttributes().getRequest();
+    }
+
+    /**
+     * 获取response
+     */
+    public static HttpServletResponse getResponse() {
+        return getRequestAttributes().getResponse();
+    }
+
+    /**
+     * 获取session
+     */
+    public static HttpSession getSession() {
+        return getRequest().getSession();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes() {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        return (ServletRequestAttributes) attributes;
+    }
+
+    /**
+     * 将字符串渲染到客户端
+     *
+     * @param response 渲染对象
+     * @param string   待渲染的字符串
+     * @return null
+     */
+    public static String renderString(HttpServletResponse response, String string) {
+        try {
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            response.getWriter().print(string);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 是否是Ajax异步请求
+     *
+     * @param request
+     */
+    public static boolean isAjaxRequest(HttpServletRequest request) {
+        String accept = request.getHeader("accept");
+        if (accept != null && accept.indexOf("application/json") != -1) {
+            return true;
+        }
+
+        String xRequestedWith = request.getHeader("X-Requested-With");
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+            return true;
+        }
+
+        String uri = request.getRequestURI();
+        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
+            return true;
+        }
+
+        String ajax = request.getParameter("__ajax");
+        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断User-Agent 是不是来自于手机
+     */
+    public static boolean checkAgentIsMobile(String ua) {
+        boolean flag = false;
+        if (!ua.contains("Windows NT") || (ua.contains("Windows NT") && ua.contains("compatible; MSIE 9.0;"))) {
+            // 排除 苹果桌面系统
+            if (!ua.contains("Windows NT") && !ua.contains("Macintosh")) {
+                for (String item : agent) {
+                    if (ua.contains(item)) {
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return flag;
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/java/com/mosty/operation/log/util/StringUtils.java b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/StringUtils.java
new file mode 100644
index 0000000..392b808
--- /dev/null
+++ b/common-log-base-starter/src/main/java/com/mosty/operation/log/util/StringUtils.java
@@ -0,0 +1,478 @@
+package com.mosty.operation.log.util;
+
+import org.springframework.util.AntPathMatcher;
+
+import java.util.*;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    /**
+     * 空字符串
+     */
+    private static final String NULLSTR = "";
+
+    /**
+     * 下划线
+     */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue) {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll) {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll) {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     *                * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects) {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects) {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map) {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str) {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object) {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object) {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     *
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object) {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str) {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (start > str.length()) {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @param end   结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end) {
+        if (str == null) {
+            return NULLSTR;
+        }
+
+        if (end < 0) {
+            end = str.length() + end;
+        }
+        if (start < 0) {
+            start = str.length() + start;
+        }
+
+        if (end > str.length()) {
+            end = str.length();
+        }
+
+        if (start > end) {
+            return NULLSTR;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        if (end < 0) {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+//    public static String format(String template, Object... params)
+//    {
+//        if (isEmpty(params) || isEmpty(template))
+//        {
+//            return template;
+//        }
+//        return StrFormatter.format(template, params);
+//    }
+
+    /**
+     * 是否为http(s)://开头
+     *
+     * @param link 链接
+     * @return 结果
+     */
+//    public static boolean ishttp(String link)
+//    {
+//        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+//    }
+
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep) {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     *
+     * @param str         字符串
+     * @param sep         分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim        去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str)) {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str)) {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split) {
+            if (filterBlank && StringUtils.isBlank(string)) {
+                continue;
+            }
+            if (trim) {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs                  指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+        if (isEmpty(cs) || isEmpty(searchCharSequences)) {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences) {
+            if (containsIgnoreCase(cs, testStr)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str) {
+        if (str == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (i > 0) {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            } else {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1)) {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str  验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        if (str != null && strs != null) {
+            for (String s : strs) {
+                if (str.equalsIgnoreCase(trim(s))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 删除最后一个字符串
+     *
+     * @param str  输入字符串
+     * @param spit 以什么类型结尾的
+     * @return 截取后的字符串
+     */
+    public static String lastStringDel(String str, String spit) {
+        if (!StringUtils.isEmpty(str) && str.endsWith(spit)) {
+            return str.subSequence(0, str.length() - 1).toString();
+        }
+        return str;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name) {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty()) {
+            // 没必要转换
+            return "";
+        } else if (!name.contains("_")) {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels) {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty()) {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如：user_name->userName
+     */
+    public static String toCamelCase(String s) {
+        if (s == null) {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1) {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR) {
+                upperCase = true;
+            } else if (upperCase) {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str  指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs) {
+        if (isEmpty(str) || isEmpty(strs)) {
+            return false;
+        }
+        for (String pattern : strs) {
+            if (isMatch(pattern, str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url     需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url) {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj) {
+        return (T) obj;
+    }
+}
\ No newline at end of file
diff --git a/common-log-base-starter/src/main/resources/META-INF/spring.factories b/common-log-base-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..9a1327a
--- /dev/null
+++ b/common-log-base-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.operation.log.OperationLogBaseAutoConfiguration
\ No newline at end of file
diff --git a/common-log-base-starter/target/classes/META-INF/spring.factories b/common-log-base-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..9a1327a
--- /dev/null
+++ b/common-log-base-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.operation.log.OperationLogBaseAutoConfiguration
\ No newline at end of file
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController$1.class b/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController$1.class
new file mode 100644
index 0000000..d104fa1
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController$1.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController.class b/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController.class
new file mode 100644
index 0000000..bb35f19
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/BaseController.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/BusinessStatus.class b/common-log-base-starter/target/classes/com/mosty/operation/log/BusinessStatus.class
new file mode 100644
index 0000000..a15c068
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/BusinessStatus.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/LogAspect.class b/common-log-base-starter/target/classes/com/mosty/operation/log/LogAspect.class
new file mode 100644
index 0000000..c7d9152
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/LogAspect.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/LogSaveStrategy.class b/common-log-base-starter/target/classes/com/mosty/operation/log/LogSaveStrategy.class
new file mode 100644
index 0000000..5294d89
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/LogSaveStrategy.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/OperationLogBaseAutoConfiguration.class b/common-log-base-starter/target/classes/com/mosty/operation/log/OperationLogBaseAutoConfiguration.class
new file mode 100644
index 0000000..5961859
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/OperationLogBaseAutoConfiguration.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/controller/SysOperlogController.class b/common-log-base-starter/target/classes/com/mosty/operation/log/controller/SysOperlogController.class
new file mode 100644
index 0000000..8f4b26e
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/controller/SysOperlogController.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/controller/provider/SysOperlogProviderController.class b/common-log-base-starter/target/classes/com/mosty/operation/log/controller/provider/SysOperlogProviderController.class
new file mode 100644
index 0000000..9909215
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/controller/provider/SysOperlogProviderController.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/BaseEntity.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/BaseEntity.class
new file mode 100644
index 0000000..29d1854
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/BaseEntity.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/DeleteListVO.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/DeleteListVO.class
new file mode 100644
index 0000000..065b208
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/DeleteListVO.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Align.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Align.class
new file mode 100644
index 0000000..76bbaee
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Align.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$ColumnType.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$ColumnType.class
new file mode 100644
index 0000000..49e0e3b
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$ColumnType.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Type.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Type.class
new file mode 100644
index 0000000..e203723
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel$Type.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel.class
new file mode 100644
index 0000000..8724aef
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excel.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/ExcelHandlerAdapter.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/ExcelHandlerAdapter.class
new file mode 100644
index 0000000..48af806
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/ExcelHandlerAdapter.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excels.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excels.class
new file mode 100644
index 0000000..8cbf813
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/Excels.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/SysUser.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/SysUser.class
new file mode 100644
index 0000000..f6ca663
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/SysUser.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/entity/VO/OperlogPage.class b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/VO/OperlogPage.class
new file mode 100644
index 0000000..31d894e
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/entity/VO/OperlogPage.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/mapper/SysOperLogMapper.class b/common-log-base-starter/target/classes/com/mosty/operation/log/mapper/SysOperLogMapper.class
new file mode 100644
index 0000000..8291d49
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/mapper/SysOperLogMapper.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/service/SysOperLogService.class b/common-log-base-starter/target/classes/com/mosty/operation/log/service/SysOperLogService.class
new file mode 100644
index 0000000..d3a0ad3
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/service/SysOperLogService.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.class b/common-log-base-starter/target/classes/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.class
new file mode 100644
index 0000000..cff9ec3
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/service/impl/SysOperLogServiceImpl.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/util/Convert.class b/common-log-base-starter/target/classes/com/mosty/operation/log/util/Convert.class
new file mode 100644
index 0000000..5f7de31
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/util/Convert.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/util/ServletUtils.class b/common-log-base-starter/target/classes/com/mosty/operation/log/util/ServletUtils.class
new file mode 100644
index 0000000..68aebf3
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/util/ServletUtils.class differ
diff --git a/common-log-base-starter/target/classes/com/mosty/operation/log/util/StringUtils.class b/common-log-base-starter/target/classes/com/mosty/operation/log/util/StringUtils.class
new file mode 100644
index 0000000..a08b7e1
Binary files /dev/null and b/common-log-base-starter/target/classes/com/mosty/operation/log/util/StringUtils.class differ
diff --git a/common-log-base-starter/target/common-log-base-starter-1.0.0-SNAPSHOT.jar b/common-log-base-starter/target/common-log-base-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..ae5efd8
Binary files /dev/null and b/common-log-base-starter/target/common-log-base-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-log-base-starter/target/maven-archiver/pom.properties b/common-log-base-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..c8ed89d
--- /dev/null
+++ b/common-log-base-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:11 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-log-base-starter
diff --git a/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..0cd5280
--- /dev/null
+++ b/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,24 @@
+com\mosty\operation\log\BusinessStatus.class
+com\mosty\operation\log\mapper\SysOperLogMapper.class
+com\mosty\operation\log\util\StringUtils.class
+com\mosty\operation\log\entity\DeleteListVO.class
+com\mosty\operation\log\util\ServletUtils.class
+com\mosty\operation\log\entity\Excels.class
+com\mosty\operation\log\entity\VO\OperlogPage.class
+com\mosty\operation\log\entity\SysUser.class
+com\mosty\operation\log\entity\Excel$Type.class
+com\mosty\operation\log\entity\Excel$ColumnType.class
+com\mosty\operation\log\entity\BaseEntity.class
+com\mosty\operation\log\controller\SysOperlogController.class
+com\mosty\operation\log\entity\ExcelHandlerAdapter.class
+com\mosty\operation\log\entity\Excel$Align.class
+com\mosty\operation\log\controller\provider\SysOperlogProviderController.class
+com\mosty\operation\log\OperationLogBaseAutoConfiguration.class
+com\mosty\operation\log\BaseController.class
+com\mosty\operation\log\service\impl\SysOperLogServiceImpl.class
+com\mosty\operation\log\BaseController$1.class
+com\mosty\operation\log\service\SysOperLogService.class
+com\mosty\operation\log\LogAspect.class
+com\mosty\operation\log\util\Convert.class
+com\mosty\operation\log\entity\Excel.class
+com\mosty\operation\log\LogSaveStrategy.class
diff --git a/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..a31c541
--- /dev/null
+++ b/common-log-base-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,20 @@
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\service\impl\SysOperLogServiceImpl.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\LogSaveStrategy.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\util\ServletUtils.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\util\StringUtils.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\LogAspect.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\OperationLogBaseAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\BaseEntity.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\SysUser.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\DeleteListVO.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\Excel.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\Excels.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\VO\OperlogPage.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\BusinessStatus.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\util\Convert.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\entity\ExcelHandlerAdapter.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\mapper\SysOperLogMapper.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\controller\SysOperlogController.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\service\SysOperLogService.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\BaseController.java
+C:\tools\dy外网\mosty-common\common-log-base-starter\src\main\java\com\mosty\operation\log\controller\provider\SysOperlogProviderController.java
diff --git a/common-magic-api-starter/common-magic-api-starter.iml b/common-magic-api-starter/common-magic-api-starter.iml
new file mode 100644
index 0000000..4a33f39
--- /dev/null
+++ b/common-magic-api-starter/common-magic-api-starter.iml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.7" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-magic-api-starter/pom.xml b/common-magic-api-starter/pom.xml
new file mode 100644
index 0000000..091070c
--- /dev/null
+++ b/common-magic-api-starter/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-magic-api-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ssssssss</groupId>
+            <artifactId>magic-api-spring-boot-starter</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ssssssss</groupId>
+            <artifactId>magic-api-plugin-swagger</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/MagicApiAutoConfiguration.java b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/MagicApiAutoConfiguration.java
new file mode 100644
index 0000000..bf73fb7
--- /dev/null
+++ b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/MagicApiAutoConfiguration.java
@@ -0,0 +1,15 @@
+package com.mosty.common.magic.api;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  自动装配启动类型
+ * @author kevin
+ * @date 2022/2/3 7:28 PM
+ * @since 1.0.0
+ */
+@Configuration
+@SuppressWarnings("unused")
+public class MagicApiAutoConfiguration {
+
+}
diff --git a/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/CustomJsonValueProvider.java b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/CustomJsonValueProvider.java
new file mode 100644
index 0000000..6af9c0d
--- /dev/null
+++ b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/CustomJsonValueProvider.java
@@ -0,0 +1,60 @@
+package com.mosty.common.magic.api.config;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.ssssssss.magicapi.core.context.RequestEntity;
+import org.ssssssss.magicapi.core.interceptor.ResultProvider;
+
+/**
+ *	magic 全局结果包装
+ * @author kevin
+ * @date 2022/5/29 6:06 下午
+ * @since 1.0.0
+ * @see ResponseResult
+ * @see com.mosty.common.base.exception.MostyExceptionHandler
+ */
+@Slf4j
+@Component
+@Qualifier("globalResultHandler")
+public class CustomJsonValueProvider implements ResultProvider {
+    /**
+    *   定义返回结果，默认返回JsonBean
+    */
+	@Override
+	public Object buildResult(RequestEntity requestEntity, int code, String message, Object data) {
+        // 如果对分页格式有要求的话，可以对data的类型进行判断，进而返回不同的格式
+		return new ResponseResult(code, message, data);
+	}
+
+	@Override
+	public Object buildException(RequestEntity requestEntity, Throwable throwable) {
+		throwable.printStackTrace();
+		log.warn("业务异常：message={}", throwable.getMessage());
+		Throwable cause = throwable.getCause();
+		if (cause instanceof BusinessException) {
+			BusinessException businessException = (BusinessException) cause;
+			return businessException.getCode() != null ?
+					ResponseResult.fail(businessException.getCode(), businessException.getMessage()) :
+					ResponseResult.fail(businessException.getMessage());
+		}
+
+		return ResponseResult.fail(500, "系统异常，请稍后重试");
+	}
+
+	/**
+	 *   定义分页返回结果，该项会被封装在Json结果内，
+	 *   此方法可以不覆盖，默认返回PageResult
+	 */
+//	@Override
+//	public Object buildPageResult(RequestEntity requestEntity, Page page, long total, List<Map<String, Object>> data) {
+//		return new HashMap<String,Object>(){
+//			{
+//				put("total", total);
+//				put("list", data);
+//			}
+//		};
+//	}
+}
\ No newline at end of file
diff --git a/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/TokenParseInterceptor.java b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/TokenParseInterceptor.java
new file mode 100644
index 0000000..712d077
--- /dev/null
+++ b/common-magic-api-starter/src/main/java/com/mosty/common/magic/api/config/TokenParseInterceptor.java
@@ -0,0 +1,46 @@
+package com.mosty.common.magic.api.config;
+
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.ssssssss.magicapi.core.interceptor.RequestInterceptor;
+import org.ssssssss.magicapi.core.model.ApiInfo;
+import org.ssssssss.script.MagicScriptContext;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 泛解析jwt 信息，实现类似 {@code JwtSysUser} 的效果
+ */
+@Component
+@Order(1) //拦截器顺序，可选
+public class TokenParseInterceptor implements RequestInterceptor {
+
+   /*
+   * 当返回对象时，直接将此对象返回到页面，返回null时，继续执行后续操作
+   */
+   @Override
+   public Object preHandle(ApiInfo info, MagicScriptContext context, HttpServletRequest request, HttpServletResponse response) {
+       System.out.println("请求前：" + info.getPath());
+       // 拦截请求并直接返回结果，不继续后续代码
+       // 需要注意的是，拦截器返回的结果不会被包裹一层json值，也不会走ResultProvider
+       // return new JsonBean<>(100,"拦截器返回");
+       // 放开请求，执行后续代码
+       return null;
+   }
+    /**
+     * 执行完毕之后执行
+     * @param value 即将要返回到页面的值
+     * @return 返回到页面的对象,当返回null时执行后续拦截器，否则直接返回该值，不执行后续拦截器
+     */
+   @Override
+   public Object postHandle(ApiInfo info, MagicScriptContext context, Object value, HttpServletRequest request, HttpServletResponse response) {
+       System.out.println("请求后：" + info.getPath());
+       System.out.println("返回结果：" + value);
+       // 拦截请求并直接返回结果，不继续后续代码
+       // 需要注意的是，拦截器返回的结果不会被包裹一层json值，也不会走ResultProvider
+       // return new JsonBean<>(100,"拦截器返回");
+       // 放开请求，执行后续代码
+       return null;
+   }
+}
\ No newline at end of file
diff --git a/common-magic-api-starter/src/main/resources/META-INF/spring.factories b/common-magic-api-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..541f2f5
--- /dev/null
+++ b/common-magic-api-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.magic.api.MagicApiAutoConfiguration,\
+com.mosty.common.magic.api.config.CustomJsonValueProvider,\
+com.mosty.common.magic.api.config.TokenParseInterceptor
\ No newline at end of file
diff --git a/common-magic-api-starter/target/classes/META-INF/spring.factories b/common-magic-api-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..541f2f5
--- /dev/null
+++ b/common-magic-api-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.magic.api.MagicApiAutoConfiguration,\
+com.mosty.common.magic.api.config.CustomJsonValueProvider,\
+com.mosty.common.magic.api.config.TokenParseInterceptor
\ No newline at end of file
diff --git a/common-magic-api-starter/target/classes/com/mosty/common/magic/api/MagicApiAutoConfiguration.class b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/MagicApiAutoConfiguration.class
new file mode 100644
index 0000000..19cff8c
Binary files /dev/null and b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/MagicApiAutoConfiguration.class differ
diff --git a/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/CustomJsonValueProvider.class b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/CustomJsonValueProvider.class
new file mode 100644
index 0000000..8163e46
Binary files /dev/null and b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/CustomJsonValueProvider.class differ
diff --git a/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/TokenParseInterceptor.class b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/TokenParseInterceptor.class
new file mode 100644
index 0000000..888138e
Binary files /dev/null and b/common-magic-api-starter/target/classes/com/mosty/common/magic/api/config/TokenParseInterceptor.class differ
diff --git a/common-magic-api-starter/target/common-magic-api-starter-1.0.0-SNAPSHOT.jar b/common-magic-api-starter/target/common-magic-api-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..973a2c7
Binary files /dev/null and b/common-magic-api-starter/target/common-magic-api-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-magic-api-starter/target/maven-archiver/pom.properties b/common-magic-api-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..ad27fa6
--- /dev/null
+++ b/common-magic-api-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:24 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-magic-api-starter
diff --git a/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..61d01e3
--- /dev/null
+++ b/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,3 @@
+com\mosty\common\magic\api\config\CustomJsonValueProvider.class
+com\mosty\common\magic\api\config\TokenParseInterceptor.class
+com\mosty\common\magic\api\MagicApiAutoConfiguration.class
diff --git a/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..492ffe4
--- /dev/null
+++ b/common-magic-api-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,3 @@
+C:\tools\dy外网\mosty-common\common-magic-api-starter\src\main\java\com\mosty\common\magic\api\config\TokenParseInterceptor.java
+C:\tools\dy外网\mosty-common\common-magic-api-starter\src\main\java\com\mosty\common\magic\api\MagicApiAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-magic-api-starter\src\main\java\com\mosty\common\magic\api\config\CustomJsonValueProvider.java
diff --git a/common-redis-starter/common-redis-starter.iml b/common-redis-starter/common-redis-starter.iml
new file mode 100644
index 0000000..367c443
--- /dev/null
+++ b/common-redis-starter/common-redis-starter.iml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-redis-starter/pom.xml b/common-redis-starter/pom.xml
new file mode 100644
index 0000000..a582c6e
--- /dev/null
+++ b/common-redis-starter/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mosty</groupId>
+        <artifactId>mosty-common</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-redis-starter</artifactId>
+	
+    <description>
+        common-redis-starter缓存服务
+    </description>
+
+    <dependencies>
+		
+        <!-- SpringBoot Boot Redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+             <version>${starter-data-redis.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>6</source>
+                    <target>6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-redis-starter/src/main/java/com/mosty/common/redis/RedisAutoConfiguration.java b/common-redis-starter/src/main/java/com/mosty/common/redis/RedisAutoConfiguration.java
new file mode 100644
index 0000000..0da5998
--- /dev/null
+++ b/common-redis-starter/src/main/java/com/mosty/common/redis/RedisAutoConfiguration.java
@@ -0,0 +1,17 @@
+package com.mosty.common.redis;
+
+import com.mosty.common.redis.configure.RedisConfig;
+import com.mosty.common.redis.service.RedisService;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ *  代码生成自动装配
+ * @author kevin
+ * @date 2022/2/3 3:34 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Import({RedisService.class, RedisConfig.class})
+public class RedisAutoConfiguration {
+}
diff --git a/common-redis-starter/src/main/java/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.java b/common-redis-starter/src/main/java/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.java
new file mode 100644
index 0000000..e2ba7e7
--- /dev/null
+++ b/common-redis-starter/src/main/java/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.java
@@ -0,0 +1,64 @@
+package com.mosty.common.redis.configure;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+import org.springframework.util.Assert;
+
+import java.nio.charset.Charset;
+
+/**
+ * Redis使用FastJson序列化
+ *
+ * @author ruoyi
+ */
+public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
+
+    @SuppressWarnings("unused")
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+
+    private Class<T> clazz;
+
+    static {
+        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
+    }
+
+    public FastJson2JsonRedisSerializer(Class<T> clazz) {
+        super();
+        this.clazz = clazz;
+    }
+
+    @Override
+    public byte[] serialize(T t) throws SerializationException {
+        if (t == null) {
+            return new byte[0];
+        }
+        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
+    }
+
+    @Override
+    public T deserialize(byte[] bytes) throws SerializationException {
+        if (bytes == null || bytes.length <= 0) {
+            return null;
+        }
+        String str = new String(bytes, DEFAULT_CHARSET);
+
+        return JSON.parseObject(str, clazz);
+    }
+
+    public void setObjectMapper(ObjectMapper objectMapper) {
+        Assert.notNull(objectMapper, "'objectMapper' must not be null");
+        this.objectMapper = objectMapper;
+    }
+
+    protected JavaType getJavaType(Class<?> clazz) {
+        return TypeFactory.defaultInstance().constructType(clazz);
+    }
+}
diff --git a/common-redis-starter/src/main/java/com/mosty/common/redis/configure/RedisConfig.java b/common-redis-starter/src/main/java/com/mosty/common/redis/configure/RedisConfig.java
new file mode 100644
index 0000000..450d6a5
--- /dev/null
+++ b/common-redis-starter/src/main/java/com/mosty/common/redis/configure/RedisConfig.java
@@ -0,0 +1,48 @@
+package com.mosty.common.redis.configure;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * redis配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport {
+    @Bean
+    @SuppressWarnings(value = {"unchecked", "rawtypes"})
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<Object, Object> template = new RedisTemplate();
+        template.setConnectionFactory(connectionFactory);
+
+        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+        serializer.setObjectMapper(mapper);
+
+        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash的key也采用StringRedisSerializer的序列化方式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+}
diff --git a/common-redis-starter/src/main/java/com/mosty/common/redis/service/RedisService.java b/common-redis-starter/src/main/java/com/mosty/common/redis/service/RedisService.java
new file mode 100644
index 0000000..4cb24fa
--- /dev/null
+++ b/common-redis-starter/src/main/java/com/mosty/common/redis/service/RedisService.java
@@ -0,0 +1,232 @@
+package com.mosty.common.redis.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * spring redis 工具类
+ *
+ * @author ruoyi
+ **/
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+@Component
+public class RedisService {
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key   缓存的键值
+     * @param value 缓存的值
+     */
+    public <T> void setCacheObject(final String key, final T value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key      缓存的键值
+     * @param value    缓存的值
+     * @param timeout  时间
+     * @param timeUnit 时间颗粒度
+     */
+    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout) {
+        return expire(key, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @param unit    时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 获取有效时间
+     *
+     * @param key Redis键
+     * @return 有效时间
+     */
+    public long getExpire(final String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 判断 key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> T getCacheObject(final String key) {
+        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+        return operation.get(key);
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean deleteObject(final String key) {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     * @return
+     */
+    public long deleteObject(final Collection collection) {
+        return redisTemplate.delete(collection);
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key      缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public <T> long setCacheList(final String key, final List<T> dataList) {
+        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+        return count == null ? 0 : count;
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> List<T> getCacheList(final String key) {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key     缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
+        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+        Iterator<T> it = dataSet.iterator();
+        while (it.hasNext()) {
+            setOperation.add(it.next());
+        }
+        return setOperation;
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key
+     * @param dataMap
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key
+     * @return
+     */
+    public <T> Map<String, T> getCacheMap(final String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key   Redis键
+     * @param hKey  Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
+        redisTemplate.opsForHash().put(key, hKey, value);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key  Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public <T> T getCacheMapValue(final String key, final String hKey) {
+        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+        return opsForHash.get(key, hKey);
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key   Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
+        return redisTemplate.opsForHash().multiGet(key, hKeys);
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public Collection<String> keys(final String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+}
diff --git a/common-redis-starter/src/main/resources/META-INF/spring.factories b/common-redis-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..f90f55a
--- /dev/null
+++ b/common-redis-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.redis.RedisAutoConfiguration
+
+  
diff --git a/common-redis-starter/target/classes/META-INF/spring.factories b/common-redis-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..f90f55a
--- /dev/null
+++ b/common-redis-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.redis.RedisAutoConfiguration
+
+  
diff --git a/common-redis-starter/target/classes/com/mosty/common/redis/RedisAutoConfiguration.class b/common-redis-starter/target/classes/com/mosty/common/redis/RedisAutoConfiguration.class
new file mode 100644
index 0000000..06c6a8c
Binary files /dev/null and b/common-redis-starter/target/classes/com/mosty/common/redis/RedisAutoConfiguration.class differ
diff --git a/common-redis-starter/target/classes/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.class b/common-redis-starter/target/classes/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.class
new file mode 100644
index 0000000..916ebd8
Binary files /dev/null and b/common-redis-starter/target/classes/com/mosty/common/redis/configure/FastJson2JsonRedisSerializer.class differ
diff --git a/common-redis-starter/target/classes/com/mosty/common/redis/configure/RedisConfig.class b/common-redis-starter/target/classes/com/mosty/common/redis/configure/RedisConfig.class
new file mode 100644
index 0000000..f4787c3
Binary files /dev/null and b/common-redis-starter/target/classes/com/mosty/common/redis/configure/RedisConfig.class differ
diff --git a/common-redis-starter/target/classes/com/mosty/common/redis/service/RedisService.class b/common-redis-starter/target/classes/com/mosty/common/redis/service/RedisService.class
new file mode 100644
index 0000000..77be5d9
Binary files /dev/null and b/common-redis-starter/target/classes/com/mosty/common/redis/service/RedisService.class differ
diff --git a/common-redis-starter/target/common-redis-starter-1.0.0-SNAPSHOT.jar b/common-redis-starter/target/common-redis-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..1615cc9
Binary files /dev/null and b/common-redis-starter/target/common-redis-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-redis-starter/target/maven-archiver/pom.properties b/common-redis-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..36408be
--- /dev/null
+++ b/common-redis-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:03 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-redis-starter
diff --git a/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..0ad910d
--- /dev/null
+++ b/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,4 @@
+com\mosty\common\redis\configure\FastJson2JsonRedisSerializer.class
+com\mosty\common\redis\service\RedisService.class
+com\mosty\common\redis\RedisAutoConfiguration.class
+com\mosty\common\redis\configure\RedisConfig.class
diff --git a/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..72f17f1
--- /dev/null
+++ b/common-redis-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,4 @@
+C:\tools\dy外网\mosty-common\common-redis-starter\src\main\java\com\mosty\common\redis\RedisAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-redis-starter\src\main\java\com\mosty\common\redis\service\RedisService.java
+C:\tools\dy外网\mosty-common\common-redis-starter\src\main\java\com\mosty\common\redis\configure\RedisConfig.java
+C:\tools\dy外网\mosty-common\common-redis-starter\src\main\java\com\mosty\common\redis\configure\FastJson2JsonRedisSerializer.java
diff --git a/common-task-starter/common-task-starter.iml b/common-task-starter/common-task-starter.iml
new file mode 100644
index 0000000..645e8cf
--- /dev/null
+++ b/common-task-starter/common-task-starter.iml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-core-starter" />
+    <orderEntry type="module" module-name="common-config-starter" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-task-starter/pom.xml b/common-task-starter/pom.xml
new file mode 100644
index 0000000..34e0196
--- /dev/null
+++ b/common-task-starter/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-task-starter</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-core-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>${shiro.version}</version>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/TaskAutoConfiguration.java b/common-task-starter/src/main/java/com/mosty/common/task/TaskAutoConfiguration.java
new file mode 100644
index 0000000..31c068f
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/TaskAutoConfiguration.java
@@ -0,0 +1,16 @@
+package com.mosty.common.task;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *
+ * @author kevin
+ * @date 2022/2/3 7:28 PM
+ * @since 1.0.0
+ */
+@Configuration
+@MapperScan("com.mosty.common.task.mapper")
+public class TaskAutoConfiguration {
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteStatusEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteStatusEnum.java
new file mode 100644
index 0000000..c8ebc88
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteStatusEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行状态
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum ExecuteStatusEnum {
+
+    /** 1。未完成 */
+    UNFINISH(1, "未完成"),
+
+    /** 2。已执行 */
+    FINISH(2, "已完成");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteTypeEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteTypeEnum.java
new file mode 100644
index 0000000..ab1a4bc
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/ExecuteTypeEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行类型
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum ExecuteTypeEnum {
+
+    /** 1用户 */
+    USER(1, "用户"),
+
+    /** 2。部门 */
+    DEPT(2, "部门");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/GroupCountTypeEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/GroupCountTypeEnum.java
new file mode 100644
index 0000000..2a4b73d
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/GroupCountTypeEnum.java
@@ -0,0 +1,32 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行类型
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum GroupCountTypeEnum {
+
+    /** 1。今天 */
+    TODAY(1, "今天"),
+
+    /** 2。七天 */
+    WEEK(2, "七天"),
+
+
+    /** 3。30天  */
+    MONTH(3, "30天"),
+    /** 4。全部 */
+    ALL(4, "全部");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/LineChartTypeEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/LineChartTypeEnum.java
new file mode 100644
index 0000000..20aa39b
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/LineChartTypeEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  折线图类型
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum LineChartTypeEnum {
+
+    /** 1 日 */
+    DAY(1, "日"),
+
+    /** 2 月 */
+    MONTH(2, "月");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/RuleTypeEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/RuleTypeEnum.java
new file mode 100644
index 0000000..925f953
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/RuleTypeEnum.java
@@ -0,0 +1,26 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行类型
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum RuleTypeEnum {
+
+    /** 1 单人 */
+    ONE(1, "单人"),
+
+    /** 2 多人 */
+    MORE(2, "多人");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskItemStatusEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskItemStatusEnum.java
new file mode 100644
index 0000000..547990f
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskItemStatusEnum.java
@@ -0,0 +1,28 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行类型
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum TaskItemStatusEnum {
+
+    /** 0未查看 */
+    NOTVIEWED(0, "未查看"),
+
+    /** 1。已查看 */
+    VIEWED(1, "已查看"),
+    /** 2。完成 */
+    FINISH(2, "完成");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskLogStatusEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskLogStatusEnum.java
new file mode 100644
index 0000000..86b980a
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskLogStatusEnum.java
@@ -0,0 +1,43 @@
+package com.mosty.common.task.constant.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  执行状态
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum TaskLogStatusEnum {
+
+    /** 0未查看 */
+    NOTVIEWED(0, "下发"),
+
+    /** 1。已查看 */
+    VIEWED(1, "查看"),
+    /** 2。完成 */
+    FINISH(2, "完成");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+    /**
+     * 根据编码匹配菜单类型
+     * @param code 编码
+     * @return 菜单类型枚举
+     */
+    public static TaskLogStatusEnum valueOf(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (TaskLogStatusEnum taskTypeEnum : TaskLogStatusEnum.values()) {
+            if (taskTypeEnum.code.equals(code)) {
+                return taskTypeEnum;
+            }
+        }
+        return null;
+    }
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskTypeEnum.java b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskTypeEnum.java
new file mode 100644
index 0000000..3769b74
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/constant/enums/TaskTypeEnum.java
@@ -0,0 +1,42 @@
+package com.mosty.common.task.constant.enums;
+
+import com.mosty.common.base.constant.enums.MenuTypeEnum;
+import lombok.AllArgsConstructor;
+import org.jetbrains.annotations.Contract;
+
+/**
+ *  执行状态
+ * @author liyan
+ * @date 2022/2/16 11:06 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum TaskTypeEnum {
+
+    /** 1。核实任务 */
+    VERIFY("1", "核实任务"),
+
+    /** 2。预警指令 */
+    EARLY("2", "预警指令"),
+    OTHER("3", "其他")
+    ;
+
+    /** 编码 */
+    public final String code;
+
+    /** 描述 */
+    public final String desc;
+    /**
+     * 根据编码匹配菜单类型
+     * @param code 编码
+     * @return 菜单类型枚举
+     */
+    public static TaskTypeEnum getEnum(String code) {
+        for (TaskTypeEnum taskTypeEnum : TaskTypeEnum.values()) {
+            if (taskTypeEnum.code.equals(code)) {
+                return taskTypeEnum;
+            }
+        }
+        return TaskTypeEnum.OTHER;
+    }
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskController.java b/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskController.java
new file mode 100644
index 0000000..992f3be
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskController.java
@@ -0,0 +1,110 @@
+package com.mosty.common.task.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.task.entity.SysTask;
+import com.mosty.common.task.entity.vo.*;
+import com.mosty.common.task.service.SysTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@SuppressWarnings("unused")
+@RestController
+@CrossOrigin
+@AllArgsConstructor
+@RequestMapping("/sysTask")
+@Api(tags = "任务接口")
+public class SysTaskController {
+    @Resource
+    private SysTaskService sysTaskService;
+
+    /**
+     * 添加任务并下发
+     * @param addSysTaskVO 添加任务并下发
+     * @return 添加结果
+     */
+    @PostMapping("addSysTask")
+    @ApiOperation(value = "添加任务并下发", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "添加任务并下发",businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> addSysTask(@RequestBody @Valid AddSysTaskVO addSysTaskVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysTaskService.saveInfo(addSysTaskVO,ipAddress);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    /**
+     * 查看回调
+     * @return 添加结果
+     */
+    @PostMapping("detail")
+    @ApiOperation(value = "查看回调", httpMethod = "POST", response = SysTask.class)
+    @Log(title = "查看回调",businessType = BusinessType.UPDATE)
+    public ResponseResult<SysTask> detail(@RequestBody  DetailSysTaskVO detailSysTaskVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        SysTask task= sysTaskService.detail(detailSysTaskVO,ipAddress);
+        return ResponseResult.success(task);
+    }
+
+    /**
+     * 完成回调
+     * @return 添加结果
+     */
+    @PostMapping("finish")
+    @ApiOperation(value = "完成回调", httpMethod = "POST", response = Boolean.class)
+    @Log(title = "完成回调",businessType = BusinessType.UPDATE)
+    public ResponseResult<Boolean> finish(@RequestBody  FinishSysTaskVO finishSysTaskVO, HttpServletRequest servletRequest) {
+        String ipAddress = IpUtil.getIpAddress(servletRequest);
+        sysTaskService.finish(finishSysTaskVO,ipAddress);
+        return ResponseResult.success(true);
+    }
+
+    /**
+     * 查询当前登陆用户的任务
+     * @return 当前登陆用户的任务
+     */
+    @PostMapping("findByList")
+    @ApiOperation(value = "查询当前登陆用户的任务", httpMethod = "POST", response = SysTaskItemVO.class)
+    public ResponseResult<IPage<SysTaskItemVO>> findByList(@RequestBody QueryTaskVO queryTaskVO, HttpServletRequest servletRequest) {
+        IPage<SysTaskItemVO>  page = sysTaskService.findByList(queryTaskVO);
+        return ResponseResult.success(page);
+    }
+
+
+
+    /**
+     * 查询当前登陆用户的任务日志
+     * @return 当前登陆用户的任务
+     */
+    @PostMapping("findLogByList")
+    @ApiOperation(value = "查询当前登陆用户的任务日志", httpMethod = "POST", response = SysTaskLogVO.class)
+    public ResponseResult<List<SysTaskLogVO>> findLogByList(@RequestBody QueryTaskLogVO queryTaskLogVO, HttpServletRequest servletRequest) {
+        List<SysTaskLogVO>  page = sysTaskService.findLogByList(queryTaskLogVO);
+        return ResponseResult.success(page);
+    }
+    /**
+     * 查询任务数量
+     * @return 查询任务数量
+     */
+    @PostMapping("countByQuery")
+    @ApiOperation(value = "查询任务数量", httpMethod = "POST", response = Long.class)
+    public ResponseResult<Long> countByQuery(@RequestBody QueryTaskVO queryTaskVO, HttpServletRequest servletRequest) {
+        Long count = sysTaskService.countByQuery(queryTaskVO);
+        return ResponseResult.success(count);
+    }
+
+
+
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskReportController.java b/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskReportController.java
new file mode 100644
index 0000000..f4a2d54
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/controller/SysTaskReportController.java
@@ -0,0 +1,84 @@
+package com.mosty.common.task.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.task.entity.SysTask;
+import com.mosty.common.task.entity.vo.*;
+import com.mosty.common.task.service.SysTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@SuppressWarnings("unused")
+@RestController
+@AllArgsConstructor
+@CrossOrigin
+@RequestMapping("/sysTaskReport")
+@Api(tags = "任务数量报表接口")
+public class SysTaskReportController {
+    @Resource
+    private SysTaskService sysTaskService;
+
+    /**
+     * 查询今日数据
+     * @param
+     * @return 添加结果
+     */
+    @PostMapping("todayCount")
+    @ApiOperation(value = "查询今日统计数据", httpMethod = "POST", response = SysTaskCountToday.class)
+    public ResponseResult<SysTaskCountToday> todayCount() {
+        SysTaskCountToday today= sysTaskService.todayCount();
+        return ResponseResult.success(today);
+    }
+
+    /**
+     * 查询全部统计数据
+     * @param
+     * @return 添加结果
+     */
+    @PostMapping("allCount")
+    @ApiOperation(value = "查询全部统计数据", httpMethod = "POST", response = SysTaskCountToday.class)
+    public ResponseResult<SysTaskCountToday> allCount() {
+        SysTaskCountToday today= sysTaskService.allCount();
+        return ResponseResult.success(today);
+    }
+
+    /**
+     * 查询分类条数
+     * @param
+     * @return 添加结果
+     */
+    @PostMapping("groupCount/{countType}")
+    @ApiOperation(value = "查询全部统计数据 1.今日 2.七日 3。 30天 4。 全部。", httpMethod = "POST", response = SysTaskCountGroup.class)
+    public ResponseResult<List<SysTaskCountGroup>> groupCount(@PathVariable("countType") Integer countType) {
+        List<SysTaskCountGroup> groups = sysTaskService.groupCount(countType);
+        return ResponseResult.success(groups);
+    }
+
+    /**
+     * 查询折线图数据
+     * @param
+     * @return 添加结果
+     */
+    @PostMapping("lineChart/{lineChartType}")
+    @ApiOperation(value = "查询折线图数据 1 按日统计 2 按月统计", httpMethod = "POST", response = SysTaskLineChartVO.class)
+    public ResponseResult<List<SysTaskLineChartVO>> lineChart(@PathVariable("lineChartType") Integer lineChartType) {
+        List<SysTaskLineChartVO>  lineCharts= sysTaskService.lineChart(lineChartType);
+        return ResponseResult.success(lineCharts);
+    }
+
+
+
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTask.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTask.java
new file mode 100644
index 0000000..f52747e
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTask.java
@@ -0,0 +1,261 @@
+package com.mosty.common.task.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 任务表
+ * @TableName sys_task
+ */
+@TableName(value ="sys_task")
+@Data
+public class SysTask implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 任务类型
+     */
+    @TableField(value = "rwlx")
+    private String rwlx;
+
+    /**
+     * 执行类型
+     */
+    @TableField(value = "zxlx")
+    private Integer zxlx;
+
+    /**
+     * 任务紧急程度
+     */
+    @TableField(value = "rwjjcd")
+    private String rwjjcd;
+
+    /**
+     * 任务名称
+     */
+    @TableField(value = "rwmc")
+    private String rwmc;
+
+    /**
+     * 任务内容
+     */
+    @TableField(value = "rwnr")
+    private String rwnr;
+
+    /**
+     * 任务制定时间
+     */
+    @TableField(value = "rwzdsj")
+    private LocalDateTime rwzdsj;
+
+    /**
+     * 任务完成时间
+     */
+    @TableField(value = "rwwcsj")
+    private LocalDateTime rwwcsj;
+
+    /**
+     * 任务要求完成时间
+     */
+    @TableField(value = "rwyqwcsj")
+    private LocalDateTime rwyqwcsj;
+
+    /**
+     * 任务创建人身份证号
+     */
+    @TableField(value = "rwcjrsfzh")
+    private String rwcjrsfzh;
+
+    /**
+     * 任务创建人姓名
+     */
+    @TableField(value = "rwcjrxm")
+    private String rwcjrxm;
+
+    /**
+     * 任务创建人单位
+     */
+    @TableField(value = "rwcjrdw")
+    private String rwcjrdw;
+
+    /**
+     * 任务创建人部门id
+     */
+    @TableField(value = "rwcjrbm_id")
+    private Long rwcjrbmId;
+
+    /**
+     * 任务创建人部门名称
+     */
+    @TableField(value = "rwcjrbmmc")
+    private String rwcjrbmmc;
+
+    /**
+     * 任务创建人单位id
+     */
+    @TableField(value = "rwcjrdw_id")
+    private Long rwcjrdwId;
+
+
+    /**
+     * 任务创建人电话
+     */
+    @TableField(value = "rwcjrdh")
+    private String rwcjrdh;
+
+    /**
+     * 任务创建规则 1.单人任务 2.多人任务
+     */
+    @TableField(value = "rwcjrgz")
+    private Integer rwcjrgz;
+
+    /**
+     * 任务执行状态 1，未完成 2.已完成
+     */
+    @TableField(value = "rwzxzt")
+    private Integer rwzxzt;
+
+    /**
+     * 任务来源系统
+     */
+    @TableField(value = "rwlyxt")
+    private String rwlyxt;
+
+    /**
+     * 任务来源id
+     */
+    @TableField(value = "rwly_id")
+    private String rwlyId;
+
+    /**
+     * 任务url
+     */
+    @TableField(value = "rw_url")
+    private String rwUrl;
+
+    /**
+     * 任务终端
+     */
+    @TableField(value = "rwzd")
+    private String rwzd;
+
+
+    /**
+     * 应用id
+     */
+    @TableField(value = "yy_id")
+    private Long yyId;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "bz")
+    private String bz;
+
+    /**
+     * 注销标志0正常 1.注销
+     */
+    @TableField(value = "xt_zxbz")
+    private Integer xtZxbz;
+
+    /**
+     * 注销原因
+     */
+    @TableField(value = "xt_zxyy")
+    private String xtZxyy;
+
+    /**
+     * 采集时间
+     */
+    @TableField(value = "xt_cjsj")
+    private LocalDateTime xtCjsj;
+
+    /**
+     * 录入时间
+     */
+    @TableField(value = "xt_lrsj")
+    private LocalDateTime xtLrsj;
+
+    /**
+     * 录入人姓名
+     */
+    @TableField(value = "xt_lrrxm")
+    private String xtLrrxm;
+
+    /**
+     * 录入人id
+     */
+    @TableField(value = "xt_lrrid")
+    private Long xtLrrid;
+
+    /**
+     * 录入人部门
+     */
+    @TableField(value = "xt_lrrbm")
+    private String xtLrrbm;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrrbmid")
+    private Long xtLrrbmid;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrip")
+    private String xtLrip;
+
+    /**
+     * 最后修改时间
+     */
+    @TableField(value = "xt_zhxgsj")
+    private LocalDateTime xtZhxgsj;
+
+    /**
+     * 最后修改人姓名
+     */
+    @TableField(value = "xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    /**
+     * 最后修改人id
+     */
+    @TableField(value = "xt_zhxgid")
+    private Long xtZhxgid;
+
+    /**
+     * 最后修改人部门
+     */
+    @TableField(value = "xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    /**
+     * 最后修改人部门id
+     */
+    @TableField(value = "xt_zhxgrbmid")
+    private Long xtZhxgrbmid;
+
+    /**
+     * 最后修改人ip
+     */
+    @TableField(value = "xt_zhxgrip")
+    private String xtZhxgrip;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskItem.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskItem.java
new file mode 100644
index 0000000..9196758
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskItem.java
@@ -0,0 +1,200 @@
+package com.mosty.common.task.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * 任务下发表
+ * @TableName sys_task_item
+ */
+@TableName(value ="sys_task_item")
+@Data
+public class SysTaskItem implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 任务id
+     */
+    @TableField(value = "rw_id")
+    private Long rwId;
+
+    /**
+     * 任务接受人id
+     */
+    @TableField(value = "rwjsr_id")
+    private Long rwjsrId;
+
+    /**
+     * 任务接受人身份证号
+     */
+    @TableField(value = "rwjsrsfzh")
+    private String rwjsrsfzh;
+
+    /**
+     * 任务接受人姓名
+     */
+    @TableField(value = "rwjsrxm")
+    private String rwjsrxm;
+
+    /**
+     * 任务接受人单位id
+     */
+    @TableField(value = "rwjsrdw_id")
+    private Long rwjsrdwId;
+
+    /**
+     * 任务接受人单位
+     */
+    @TableField(value = "rwjsrdw")
+    private String rwjsrdw;
+
+    /**
+     * 任务接受人部门id
+     */
+    @TableField(value = "rwjsrbm_id")
+    private Long rwjsrbmId;
+
+    /**
+     * 任务接受人部门名称
+     */
+    @TableField(value = "rwjsrbmmc")
+    private String rwjsrbmmc;
+
+    /**
+     * 任务状态 0.未查看 1.已查看 2.已完成
+     */
+    @TableField(value = "rwzt")
+    private Integer rwzt;
+
+    /**
+     * 任务制定时间
+     */
+    @TableField(value = "rwzdsj")
+    private LocalDateTime rwzdsj;
+
+    /**
+     * 任务查看时间
+     */
+    @TableField(value = "rwcksj")
+    private LocalDateTime rwcksj;
+
+    /**
+     * 任务完成时间
+     */
+    @TableField(value = "rwwcsj")
+    private LocalDateTime rwwcsj;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "bz")
+    private String bz;
+
+    /**
+     * 注销标志0正常 1.注销
+     */
+    @TableField(value = "xt_zxbz")
+    private Integer xtZxbz;
+
+    /**
+     * 注销原因
+     */
+    @TableField(value = "xt_zxyy")
+    private String xtZxyy;
+
+    /**
+     * 采集时间
+     */
+    @TableField(value = "xt_cjsj")
+    private LocalDateTime xtCjsj;
+
+    /**
+     * 录入时间
+     */
+    @TableField(value = "xt_lrsj")
+    private LocalDateTime xtLrsj;
+
+    /**
+     * 录入人姓名
+     */
+    @TableField(value = "xt_lrrxm")
+    private String xtLrrxm;
+
+    /**
+     * 录入人id
+     */
+    @TableField(value = "xt_lrrid")
+    private Long xt_lrrid;
+
+    /**
+     * 录入人部门
+     */
+    @TableField(value = "xt_lrrbm")
+    private String xtLrrbm;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrrbmid")
+    private String xtLrrbmid;
+
+    /**
+     * 录入人部门id
+     */
+    @TableField(value = "xt_lrip")
+    private String xtLrip;
+
+    /**
+     * 最后修改时间
+     */
+    @TableField(value = "xt_zhxgsj")
+    private LocalDateTime xtZhxgsj;
+
+    /**
+     * 最后修改人姓名
+     */
+    @TableField(value = "xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    /**
+     * 最后修改人id
+     */
+    @TableField(value = "xt_zhxgid")
+    private Long xtZhxgid;
+
+    /**
+     * 最后修改人部门
+     */
+    @TableField(value = "xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    /**
+     * 最后修改人部门id
+     */
+    @TableField(value = "xt_zhxgrbmid")
+    private Long xtZhxgrbmid;
+
+    /**
+     * 最后修改人ip
+     */
+    @TableField(value = "xt_zhxgrip")
+    private String xtZhxgrip;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskLog.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskLog.java
new file mode 100644
index 0000000..b45567b
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/SysTaskLog.java
@@ -0,0 +1,58 @@
+package com.mosty.common.task.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * 任务日志表
+ * @TableName sys_task_log
+ */
+@TableName(value ="sys_task_log")
+@Data
+public class SysTaskLog implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 任务下发处置表id
+     */
+    @TableField(value = "task_item_id")
+    private Long taskItemId;
+
+    /**
+     * 任务id
+     */
+    @TableField(value = "rw_id")
+    private Long rwId;
+
+    /**
+     * 任务接受人id
+     */
+    @TableField(value = "rwjsr_id")
+    private Long rwjsrId;
+
+    /**
+     * 任务处置时间
+     */
+    @TableField(value = "rwczsj")
+    private LocalDateTime rwczsj;
+
+    /**
+     * 任务处置状态
+     */
+    @TableField(value = "rwczzt")
+    private Integer rwczzt;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.java
new file mode 100644
index 0000000..700b444
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.java
@@ -0,0 +1,30 @@
+package com.mosty.common.task.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class AddSysTaskDeptVO implements Serializable {
+
+    @ApiModelProperty("任务接受部门编码， 执行类型为部门时 必传" )
+    private Long deptCode;
+
+    /**
+     * 任务接受部门单位id
+     */
+    @ApiModelProperty("任务接受人单位id 执行类型为部门时 必传")
+    private Long companyId;
+
+    /**
+     * 任务接受部门单位名称
+     */
+    @ApiModelProperty("任务接受人单位名称 执行类型为部门时 必传")
+    private String companyName;
+
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.java
new file mode 100644
index 0000000..35293a0
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.java
@@ -0,0 +1,41 @@
+package com.mosty.common.task.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+public class AddSysTaskUserInfoVO implements Serializable {
+
+
+
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    @NotNull(message = "身份证号")
+    private String idCardNo;
+
+
+    /**
+     * 任务接受人单位id
+     */
+    @ApiModelProperty("任务接受人单位id")
+    @NotNull(message = "任务接受人单位id")
+    private Long companyId;
+
+    /**
+     * 任务接受人单位名称
+     */
+    @ApiModelProperty("任务接受人单位名称")
+    private String companyName;
+
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskVO.java
new file mode 100644
index 0000000..685a5ea
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/AddSysTaskVO.java
@@ -0,0 +1,166 @@
+package com.mosty.common.task.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class AddSysTaskVO implements Serializable {
+    /**
+     * 应用id
+     */
+    @ApiModelProperty("应用id")
+    @NotNull(message = "应用id不能为空")
+    private Long appId;
+
+    /**
+     * 任务类型
+     */
+    @ApiModelProperty("任务类型 1， 核实任务 2。预警指令")
+    @NotNull(message = "任务类型不能为空")
+    private String rwlx;
+
+    /**
+     * 执行类型
+     */
+    @ApiModelProperty("执行类型 1用户 2部门")
+    @NotNull(message = "执行类型不能为空")
+    private Integer zxlx;
+
+    /**
+     * 任务紧急程度
+     */
+    @ApiModelProperty("任务紧急程度")
+    @NotNull(message = "任务紧急程度不能为空")
+    private String rwjjcd;
+
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty("任务名称")
+    @NotBlank(message = "任务名称不能为空")
+    private String rwmc;
+
+    /**
+     * 任务内容
+     */
+    @ApiModelProperty("任务内容")
+    @NotBlank(message = "任务内容不能为空")
+    private String rwnr;
+
+    /**
+     * 任务制定时间
+     */
+    @ApiModelProperty("任务制定时间")
+    private LocalDateTime rwzdsj;
+
+    /**
+     * 任务要求完成时间
+     */
+    @ApiModelProperty("任务要求完成时间")
+    private LocalDateTime rwyqwcsj;
+    /**
+     * 任务创建人ID
+     */
+    @ApiModelProperty("任务创建人ID")
+    private Long rwcjrId;
+    /**
+     * 任务创建人身份证号
+     */
+    @ApiModelProperty("任务创建人身份证号")
+    private String rwcjrsfzh;
+
+    /**
+     * 任务创建人姓名
+     */
+    @ApiModelProperty("任务创建人姓名")
+    private String rwcjrxm;
+
+    /**
+     * 任务创建人单位
+     */
+    @ApiModelProperty("任务创建人单位")
+    private String rwcjrdw;
+
+    /**
+     * 任务创建人部门id
+     */
+    @ApiModelProperty("任务创建人部门id")
+    private Long rwcjrbmId;
+
+    /**
+     * 任务创建人部门名称
+     */
+    @ApiModelProperty("任务创建人部门名称")
+    private String rwcjrbmmc;
+
+    /**
+     * 任务创建人单位id
+     */
+    @ApiModelProperty("任务创建人单位id")
+    private Long rwcjrdwId;
+
+
+    /**
+     * 任务创建人电话
+     */
+    @ApiModelProperty("任务创建人电话")
+    private String rwcjrdh;
+
+    /**
+     * 任务创建规则 1.单人任务 2.多人任务
+     */
+    @ApiModelProperty("任务创建规则 1.单人任务 2.多人任务")
+    private Integer rwcjrgz;
+
+    /**
+     * 任务来源系统
+     */
+    @ApiModelProperty("任务来源系统  1 智能安防，2。公共安全监管 3。三级指挥")
+    @NotNull(message = "任务来源系统不能为空 1 智能安防，2。公共安全监管 3。三级指挥" )
+    private String rwlyxt;
+
+    /**
+     * 任务来源id
+     */
+    @ApiModelProperty("任务来源id  ")
+    private String rwlyId;
+
+
+    /**
+     * 任务url
+     */
+    @ApiModelProperty("任务url")
+    private String rwUrl;
+
+    /**
+     * 任务终端
+     */
+    @ApiModelProperty("任务终端 1,安卓 2 H5 ")
+    @NotNull(message = "任务终端不能为空 1")
+    private String rwzd;
+
+    /**
+     * 备注
+     */
+    private String bz;
+    /**
+     * 执行类型为用户时 必穿
+     */
+    @ApiModelProperty("执行类型为用户时 必传  任务接受人信息")
+    private List<AddSysTaskUserInfoVO> UserInfos;
+
+    /**
+     * 执行类型为用户时 必穿
+     */
+    @ApiModelProperty("执行类型为部门时 必传  任务接受部门信息")
+    private List<AddSysTaskDeptVO> deptVOS;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/DetailSysTaskVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/DetailSysTaskVO.java
new file mode 100644
index 0000000..d7b95ed
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/DetailSysTaskVO.java
@@ -0,0 +1,15 @@
+package com.mosty.common.task.entity.vo;
+
+import com.mosty.common.token.UserInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+@Data
+public class DetailSysTaskVO implements Serializable {
+    @ApiModelProperty(value = "下发任务id",required = true)
+    private Long taskItemId;
+    @ApiModelProperty(value ="操作人身份证",required = true)
+    private String idCardNo;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/FinishSysTaskVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/FinishSysTaskVO.java
new file mode 100644
index 0000000..9c37543
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/FinishSysTaskVO.java
@@ -0,0 +1,25 @@
+package com.mosty.common.task.entity.vo;
+
+import com.mosty.common.token.UserInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class FinishSysTaskVO implements Serializable {
+    @ApiModelProperty(value = "下发任务id")
+    private Long taskItemId;
+    @ApiModelProperty(value ="操作人身份证",required = true)
+    @NotBlank(message="操作人身份证不能为空")
+    private String  idCardNo;
+    @ApiModelProperty(value = "来源任务id",required = true)
+    @NotBlank(message = "来源系统id不能为空")
+    private String lyxtId;
+    @ApiModelProperty(value ="部门编码")
+    private String  deptCode;
+
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskLogVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskLogVO.java
new file mode 100644
index 0000000..fa27525
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskLogVO.java
@@ -0,0 +1,28 @@
+package com.mosty.common.task.entity.vo;
+
+import cn.hutool.db.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class QueryTaskLogVO implements Serializable {
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "用户id",required = true)
+    private Long userId;
+    /**
+     * 任务id
+     */
+    @ApiModelProperty("任务id")
+    private Long rwId;
+    /**
+     * 下发任务id
+     */
+    @ApiModelProperty("下发任务id")
+    private Long taskItemId;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskVO.java
new file mode 100644
index 0000000..d547dc9
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/QueryTaskVO.java
@@ -0,0 +1,69 @@
+package com.mosty.common.task.entity.vo;
+
+import cn.hutool.db.Page;
+import com.mosty.common.token.UserInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+public class QueryTaskVO extends Page implements Serializable {
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号",required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String idCardNo;
+    /**
+     * 部门编码
+     */
+    @ApiModelProperty(value = "部门编码（获取不到部门id传编码）",required = true)
+    private Long deptCode;
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(value = "部门编码",required = true)
+    private Long deptId;
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty("任务名称")
+    private String taskName;
+    /**
+     * 任务状态 0 未查看 1已查看 2已完成
+     */
+    @ApiModelProperty("任务状态 0 未查看 1已查看 2已完成")
+    private Integer taskStatus;
+
+    /**
+     * 任务来源
+     */
+    @ApiModelProperty("任务来源 01_智能安防社区 02_公共安全监管 03_三级指挥")
+    private Integer source;
+
+    /**
+     * 任务类型
+     */
+    @ApiModelProperty("任务类型 01 核实任务 02 预警指令")
+    private Integer taskType;
+
+    /**
+     * 任务开始时间
+     */
+    @ApiModelProperty("任务开始时间")
+    private LocalDateTime startTime;
+
+    /**
+     * 任务结束时间
+     */
+    @ApiModelProperty("任务结束时间")
+    private LocalDateTime endTime;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountGroup.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountGroup.java
new file mode 100644
index 0000000..61478ec
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountGroup.java
@@ -0,0 +1,14 @@
+package com.mosty.common.task.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SysTaskCountGroup implements Serializable {
+    @ApiModelProperty("任务类型")
+    private  String rwlx;
+    @ApiModelProperty("数量")
+    private  Long count;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountToday.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountToday.java
new file mode 100644
index 0000000..80702b6
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskCountToday.java
@@ -0,0 +1,14 @@
+package com.mosty.common.task.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SysTaskCountToday implements Serializable {
+    @ApiModelProperty("完成数量")
+    private  Long finishCount;
+    @ApiModelProperty("未完成数量")
+    private  Long unFinishCount;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskItemVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskItemVO.java
new file mode 100644
index 0000000..f1762a4
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskItemVO.java
@@ -0,0 +1,78 @@
+package com.mosty.common.task.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Transient;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class SysTaskItemVO implements Serializable {
+    private Long id;
+
+    /**
+     * 任务来源id
+     */
+    @ApiModelProperty("任务来源id")
+    private String rwlyId;
+
+
+    /**
+     * 任务类型
+     */
+    @ApiModelProperty("任务类型")
+    private String rwlx;
+    /**
+     * 任务类型描述
+     */
+    @ApiModelProperty("任务类型描述")
+    private String rwlxDesc;
+
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty("任务名称")
+    private String rwmc;
+
+    /**
+     * 任务内容
+     */
+    @ApiModelProperty("任务内容")
+    private String rwnr;
+    /**
+     * 任务Url
+     */
+    @ApiModelProperty("任务Url")
+    private String rwurl;
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String idCardNo;
+
+    /**
+     * 任务内容
+     */
+    @ApiModelProperty("任务来源系统")
+    private String rwlyxt;
+
+
+    /**
+     * 任务要求完成时间
+     */
+    @ApiModelProperty(value = "任务要求完成时间")
+    private LocalDateTime rwyqwcsj;
+    /**
+     * 任务日志
+     */
+    @ApiModelProperty("任务日志")
+    private List<SysTaskLogVO> logs;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLineChartVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLineChartVO.java
new file mode 100644
index 0000000..7d44d0f
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLineChartVO.java
@@ -0,0 +1,16 @@
+package com.mosty.common.task.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SysTaskLineChartVO implements Serializable {
+    @ApiModelProperty("序号：月 1 -12   日期 近七天 例子：4-11")
+    private  String  no;
+
+    @ApiModelProperty("数量")
+    private  Long count;
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLogVO.java b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLogVO.java
new file mode 100644
index 0000000..a59bfb1
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/entity/vo/SysTaskLogVO.java
@@ -0,0 +1,29 @@
+package com.mosty.common.task.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class SysTaskLogVO implements Serializable {
+    /**
+     * 任务处置时间
+     */
+    @ApiModelProperty(value = "任务处置时间")
+    private LocalDateTime rwczsj;
+
+    /**
+     * 任务处置状态
+     */
+    @ApiModelProperty(value = "rwczzt")
+    private Integer rwczzt;
+
+    /**
+     * 任务处置状态
+     */
+    @ApiModelProperty(value = "任务处置状态")
+    private String rwczztDesc;
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskItemMapper.java b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskItemMapper.java
new file mode 100644
index 0000000..b283df1
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskItemMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.common.task.mapper;
+
+import com.mosty.common.task.entity.SysTaskItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_item(任务下发表)】的数据库操作Mapper
+* @createDate 2022-04-21 21:34:04
+*/
+public interface SysTaskItemMapper extends BaseMapper<SysTaskItem> {
+
+}
+
+
+
+
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskLogMapper.java b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskLogMapper.java
new file mode 100644
index 0000000..99a340c
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskLogMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.common.task.mapper;
+
+import com.mosty.common.task.entity.SysTaskLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_log(任务日志表)】的数据库操作Mapper
+* @createDate 2022-04-21 21:34:09
+*/
+public interface SysTaskLogMapper extends BaseMapper<SysTaskLog> {
+
+}
+
+
+
+
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskMapper.java b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskMapper.java
new file mode 100644
index 0000000..2773761
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/mapper/SysTaskMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.common.task.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.task.entity.SysTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.task.entity.vo.QueryTaskVO;
+import com.mosty.common.task.entity.vo.SysTaskItemVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @author liyan
+* @description 针对表【sys_task(任务表)】的数据库操作Mapper
+* @createDate 2022-04-21 21:31:14
+*/
+public interface SysTaskMapper extends BaseMapper<SysTask> {
+    /**
+     * 分页查询
+     * @param queryTaskVO
+     * @return
+     */
+    IPage<SysTaskItemVO> findByList(IPage<SysTaskItemVO> page,@Param("param") QueryTaskVO queryTaskVO);
+
+    /**
+     * 根据条件查询  执行类型为用户的任务数量
+     * @param queryTaskVO
+     * @return
+     */
+    Long countByUser(@Param("param") QueryTaskVO queryTaskVO);
+
+    /**
+     * 执行类型为部门  查询对应条件的数量
+     * @param queryTaskVO
+     * @return
+     */
+    Long countByDept(@Param("param") QueryTaskVO queryTaskVO);
+}
+
+
+
+
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskItemService.java b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskItemService.java
new file mode 100644
index 0000000..846abe8
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskItemService.java
@@ -0,0 +1,13 @@
+package com.mosty.common.task.service;
+
+import com.mosty.common.task.entity.SysTaskItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_item(任务下发表)】的数据库操作Service
+* @createDate 2022-04-21 21:34:04
+*/
+public interface SysTaskItemService extends IService<SysTaskItem> {
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskLogService.java b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskLogService.java
new file mode 100644
index 0000000..b59446c
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskLogService.java
@@ -0,0 +1,13 @@
+package com.mosty.common.task.service;
+
+import com.mosty.common.task.entity.SysTaskLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_log(任务日志表)】的数据库操作Service
+* @createDate 2022-04-21 21:34:09
+*/
+public interface SysTaskLogService extends IService<SysTaskLog> {
+
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskService.java b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskService.java
new file mode 100644
index 0000000..d0b92e1
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/SysTaskService.java
@@ -0,0 +1,84 @@
+package com.mosty.common.task.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.task.entity.SysTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.common.task.entity.vo.*;
+
+import java.util.List;
+
+/**
+* @author liyan
+* @description 针对表【sys_task(任务表)】的数据库操作Service
+* @createDate 2022-04-21 21:31:14
+*/
+public interface SysTaskService extends IService<SysTask> {
+    /**
+     * 保存下发任务
+     * @param addSysTaskVO
+     * @param ipAddress
+     */
+    void saveInfo(AddSysTaskVO addSysTaskVO, String ipAddress);
+
+    /**
+     * 查看任务详情
+     * @param detailSysTaskVO
+     * @param ipAddress
+     * @return
+     */
+    SysTask detail(DetailSysTaskVO detailSysTaskVO, String ipAddress);
+
+    /**
+     * 完成回调
+     * @param finishSysTaskVO
+     * @param ipAddress
+     */
+    void finish(FinishSysTaskVO finishSysTaskVO, String ipAddress);
+
+    /**
+     * 分页查询
+     * @param queryTaskVO
+     * @return
+     */
+    IPage<SysTaskItemVO> findByList(QueryTaskVO queryTaskVO);
+
+    /**
+     * 查询对应的日志
+     * @param queryTaskLogVO
+     * @return
+     */
+    List<SysTaskLogVO> findLogByList(QueryTaskLogVO queryTaskLogVO);
+
+    /**
+     * 查询任务数量根据条件
+     * @param queryTaskVO
+     * @return
+     */
+    Long countByQuery(QueryTaskVO queryTaskVO);
+
+    /**
+     * 查询当天的任务数据
+     * @return
+     */
+    SysTaskCountToday todayCount();
+
+    /**
+     * 查询全部统计数据
+     * @return
+     */
+    SysTaskCountToday allCount();
+
+    /**
+     * 根据类型统计数据
+     * @param countType
+     * @return
+     */
+    List<SysTaskCountGroup> groupCount(Integer countType);
+
+    /**
+     * 获取折线图数据
+     * @param lineChartType
+     * @return
+     */
+    List<SysTaskLineChartVO> lineChart(Integer lineChartType);
+}
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.java b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.java
new file mode 100644
index 0000000..aeb9359
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.java
@@ -0,0 +1,22 @@
+package com.mosty.common.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.task.entity.SysTaskItem;
+import com.mosty.common.task.service.SysTaskItemService;
+import com.mosty.common.task.mapper.SysTaskItemMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_item(任务下发表)】的数据库操作Service实现
+* @createDate 2022-04-21 21:34:04
+*/
+@Service
+public class SysTaskItemServiceImpl extends ServiceImpl<SysTaskItemMapper, SysTaskItem>
+    implements SysTaskItemService{
+
+}
+
+
+
+
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.java b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.java
new file mode 100644
index 0000000..9a82633
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.java
@@ -0,0 +1,22 @@
+package com.mosty.common.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.task.entity.SysTaskLog;
+import com.mosty.common.task.service.SysTaskLogService;
+import com.mosty.common.task.mapper.SysTaskLogMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author liyan
+* @description 针对表【sys_task_log(任务日志表)】的数据库操作Service实现
+* @createDate 2022-04-21 21:34:09
+*/
+@Service
+public class SysTaskLogServiceImpl extends ServiceImpl<SysTaskLogMapper, SysTaskLog>
+    implements SysTaskLogService{
+
+}
+
+
+
+
diff --git a/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskServiceImpl.java b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskServiceImpl.java
new file mode 100644
index 0000000..5a5d6df
--- /dev/null
+++ b/common-task-starter/src/main/java/com/mosty/common/task/service/impl/SysTaskServiceImpl.java
@@ -0,0 +1,515 @@
+package com.mosty.common.task.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.base.util.LocalDateTimeUtils;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.service.SysDeptService;
+import com.mosty.common.core.business.service.SysUserService;
+import com.mosty.common.core.login.dto.DeptDTO;
+import com.mosty.common.task.constant.enums.*;
+import com.mosty.common.task.entity.SysTask;
+import com.mosty.common.task.entity.SysTaskItem;
+import com.mosty.common.task.entity.SysTaskLog;
+import com.mosty.common.task.entity.vo.*;
+import com.mosty.common.task.service.SysTaskItemService;
+import com.mosty.common.task.service.SysTaskLogService;
+import com.mosty.common.task.service.SysTaskService;
+import com.mosty.common.task.mapper.SysTaskMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author liyan
+ * @description 针对表【sys_task(任务表)】的数据库操作Service实现
+ * @createDate 2022-04-21 21:31:14
+ */
+@Service
+public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask>
+        implements SysTaskService {
+    @Resource
+    private SysTaskMapper sysTaskMapper;
+    @Resource
+    private SysTaskItemService sysTaskItemService;
+    @Resource
+    private SysTaskLogService sysTaskLogService;
+    @Resource
+    private SysUserService userService;
+    @Resource
+    private SysDeptService sysDeptService;
+
+    @Override
+    public IPage<SysTaskItemVO> findByList(QueryTaskVO queryTaskVO) {
+        String idCardNo = queryTaskVO.getIdCardNo();
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_entity_card", idCardNo);
+        SysUser sysUser = userService.getBaseMapper().selectOne(queryWrapper);
+        Asserts.check(sysUser == null, "身份证 %s 对应的用户不存在！", idCardNo);
+        List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+        Asserts.check(CollectionUtils.isEmpty(deptList), "身份证 %s 没有绑定部门！", idCardNo);
+        DeptDTO deptDTO = deptList.get(0);
+        if (Objects.nonNull(deptDTO)) {
+            queryTaskVO.setDeptId(deptDTO.getDeptId());
+        }
+        IPage<SysTaskItemVO> page = new Page<>(queryTaskVO.getPageNumber(), queryTaskVO.getPageSize());
+        IPage<SysTaskItemVO> result = sysTaskMapper.findByList(page, queryTaskVO);
+        if (CollectionUtils.isNotEmpty(result.getRecords())) {
+            List<SysTaskItemVO> records = result.getRecords();
+            records.forEach(sysTaskItemVO -> {
+                sysTaskItemVO.setRwlxDesc(TaskTypeEnum.getEnum(sysTaskItemVO.getRwlx()).desc);
+            });
+            getLogs(records);
+            result.setRecords(records);
+        }
+        return result;
+    }
+
+    @Override
+    public List<SysTaskLogVO> findLogByList(QueryTaskLogVO queryTaskLogVO) {
+        LambdaQueryWrapper<SysTaskLog> logQueryWrapper = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(queryTaskLogVO.getTaskItemId())) {
+            logQueryWrapper.eq(SysTaskLog::getTaskItemId, queryTaskLogVO.getTaskItemId());
+        }
+        if (Objects.nonNull(queryTaskLogVO.getRwId())) {
+            logQueryWrapper.eq(SysTaskLog::getRwId, queryTaskLogVO.getRwId());
+        }
+        if (Objects.nonNull(queryTaskLogVO.getUserId())) {
+            logQueryWrapper.eq(SysTaskLog::getRwjsrId, queryTaskLogVO.getUserId());
+        }
+        List<SysTaskLog> list = sysTaskLogService.list(logQueryWrapper);
+        List<SysTaskLogVO> sysTaskLogVOS = BeanUtil.copyToList(list, SysTaskLogVO.class);
+        return sysTaskLogVOS;
+    }
+
+    @Override
+    public Long countByQuery(QueryTaskVO queryTaskVO) {
+        String idCardNo = queryTaskVO.getIdCardNo();
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_entity_card", idCardNo);
+        queryWrapper.eq("xt_zxbz",DeletedEnum.NATURE.code);
+        SysUser sysUser = userService.getBaseMapper().selectOne(queryWrapper);
+        Asserts.check(sysUser == null, "身份证 %s 对应的用户不存在！", idCardNo);
+        List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+        Asserts.check(CollectionUtils.isEmpty(deptList), "身份证 %s 没有绑定部门！", idCardNo);
+        DeptDTO deptDTO = deptList.get(0);
+        if (Objects.nonNull(deptDTO)) {
+            queryTaskVO.setDeptId(deptDTO.getDeptId());
+        }
+        //查询
+        Long count = sysTaskMapper.countByUser(queryTaskVO);
+        Long deptCount = sysTaskMapper.countByDept(queryTaskVO);
+        return deptCount + count;
+    }
+
+    @Override
+    public SysTaskCountToday todayCount() {
+        long unFinish = this.count(new LambdaQueryWrapper<SysTask>()
+                .eq(SysTask::getRwzxzt, ExecuteStatusEnum.UNFINISH.code).between(SysTask::getRwzdsj,
+                        LocalDateTimeUtils.todayStart(), LocalDateTimeUtils.todayEnd()));
+        long finish = this.count(new LambdaQueryWrapper<SysTask>()
+                .eq(SysTask::getRwzxzt, ExecuteStatusEnum.FINISH.code).between(SysTask::getRwzdsj,
+                        LocalDateTimeUtils.todayStart(), LocalDateTimeUtils.todayEnd()));
+        SysTaskCountToday today = new SysTaskCountToday();
+        today.setFinishCount(finish);
+        today.setUnFinishCount(unFinish);
+        return today;
+    }
+
+    @Override
+    public SysTaskCountToday allCount() {
+        long unFinish = this.count(new LambdaQueryWrapper<SysTask>()
+                .eq(SysTask::getRwzxzt, ExecuteStatusEnum.UNFINISH.code));
+        long finish = this.count(new LambdaQueryWrapper<SysTask>()
+                .eq(SysTask::getRwzxzt, ExecuteStatusEnum.FINISH.code));
+        SysTaskCountToday today = new SysTaskCountToday();
+        today.setFinishCount(finish);
+        today.setUnFinishCount(unFinish);
+        return today;
+    }
+
+    @Override
+    public List<SysTaskCountGroup> groupCount(Integer countType) {
+        List<SysTaskCountGroup> groupList = new ArrayList<>();
+        initGroupList(groupList);
+        if (GroupCountTypeEnum.ALL.code.equals(countType)) {
+            List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>());
+            Map<String, List<SysTask>> typeMap = list.stream().collect(Collectors.groupingBy(SysTask::getRwlx));
+            groupList.forEach(item -> {
+                if (typeMap.containsKey(item.getRwlx())){
+                    item.setCount( Long.valueOf(typeMap.get(item.getRwlx()).size()));
+                }
+            });
+        }
+        if (GroupCountTypeEnum.TODAY.code.equals(countType)) {
+            List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().between(SysTask::getRwzdsj,
+                    LocalDateTimeUtils.todayStart(), LocalDateTimeUtils.todayEnd()));
+            Map<String, List<SysTask>> typeMap = list.stream().collect(Collectors.groupingBy(SysTask::getRwlx));
+            groupList.forEach(item -> {
+                if (typeMap.containsKey(item.getRwlx())){
+                    item.setCount( Long.valueOf(typeMap.get(item.getRwlx()).size()));
+                }
+
+            });
+        }
+        if (GroupCountTypeEnum.WEEK.code.equals(countType)) {
+            List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().between(SysTask::getRwzdsj,
+                    LocalDateTimeUtils.daysStart(7), LocalDateTime.now()));
+            Map<String, List<SysTask>> typeMap = list.stream().collect(Collectors.groupingBy(SysTask::getRwlx));
+            groupList.forEach(item -> {
+                if (typeMap.containsKey(item.getRwlx())){
+                    item.setCount( Long.valueOf(typeMap.get(item.getRwlx()).size()));
+                }
+
+            });
+        }
+        if (GroupCountTypeEnum.MONTH.code.equals(countType)) {
+            List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().between(SysTask::getRwzdsj,
+                    LocalDateTimeUtils.daysStart(30), LocalDateTime.now()));
+            Map<String, List<SysTask>> typeMap = list.stream().collect(Collectors.groupingBy(SysTask::getRwlx));
+            groupList.forEach(item -> {
+                if (typeMap.containsKey(item.getRwlx())){
+                    item.setCount( Long.valueOf(typeMap.get(item.getRwlx()).size()));
+                }
+
+            });
+        }
+        return groupList;
+    }
+
+    private void initGroupList(List<SysTaskCountGroup> groupList) {
+        TaskTypeEnum[] values = TaskTypeEnum.values();
+        for (TaskTypeEnum value : values) {
+            SysTaskCountGroup group = new SysTaskCountGroup();
+            group.setCount(0L);
+            group.setRwlx(value.code);
+            groupList.add(group);
+        }
+
+    }
+
+    @Override
+    public List<SysTaskLineChartVO> lineChart(Integer lineChartType) {
+        if (LineChartTypeEnum.DAY.code.equals(lineChartType)) {
+            List<SysTaskLineChartVO> sysTaskLineChartVOS = getDay();
+            sysTaskLineChartVOS.sort(Comparator.comparing(SysTaskLineChartVO::getNo));
+            return sysTaskLineChartVOS;
+        } else {
+            List<SysTaskLineChartVO> sysTaskLineChartVOS = getMonth();
+            sysTaskLineChartVOS.sort(Comparator.comparing(SysTaskLineChartVO::getNo));
+            return sysTaskLineChartVOS;
+        }
+    }
+
+    private List<SysTaskLineChartVO> getMonth() {
+        List<SysTaskLineChartVO> sysTaskLineChartVOS = new ArrayList<>();
+        Map<String, Long> monthGroup = getMonthGroup(12);
+        //获取最近七天的数据
+        LocalDateTime begin = LocalDateTimeUtils.todayStart().minusYears(1);
+        LocalDateTime after = LocalDateTimeUtils.todayEnd();
+        List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().between(SysTask::getRwzdsj, begin, after));
+        Map<String, List<SysTask>> taskMap = list.stream().collect(Collectors.groupingBy(item -> DateUtils.parseDateToStr(DateUtils.YY_MM, DateUtils.LocalDateTimeToDate(item.getRwzdsj()))));
+        monthGroup.entrySet().forEach(item -> {
+            SysTaskLineChartVO chartVO = new SysTaskLineChartVO();
+            if (taskMap.containsKey(item.getKey())) {
+                List<SysTask> sysTasks = taskMap.get(item.getKey());
+                chartVO.setNo(item.getKey());
+                chartVO.setCount(Long.valueOf(sysTasks.size()));
+            } else {
+                chartVO.setNo(item.getKey());
+                chartVO.setCount(0L);
+            }
+            sysTaskLineChartVOS.add(chartVO);
+        });
+        return sysTaskLineChartVOS;
+    }
+
+    private List<SysTaskLineChartVO> getDay() {
+        List<SysTaskLineChartVO> sysTaskLineChartVOS = new ArrayList<>();
+        //获取最近七天的数据
+        Map<String, Long> dayMap = getDayGroup(7);
+        LocalDateTime begin = LocalDateTimeUtils.todayStart().minusDays(7);
+        LocalDateTime after = LocalDateTimeUtils.todayEnd();
+        List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().between(SysTask::getRwzdsj, begin, after));
+        Map<String, List<SysTask>> taskMap = list.stream().collect(Collectors.groupingBy(item -> DateUtils.parseDateToStr(DateUtils.MM_DD, DateUtils.LocalDateTimeToDate(item.getRwzdsj()))));
+        dayMap.entrySet().forEach(item -> {
+            SysTaskLineChartVO chartVO = new SysTaskLineChartVO();
+            if (taskMap.containsKey(item.getKey())) {
+                List<SysTask> sysTasks = taskMap.get(item.getKey());
+                chartVO.setNo(item.getKey());
+                chartVO.setCount(Long.valueOf(sysTasks.size()));
+            } else {
+                chartVO.setNo(item.getKey());
+                chartVO.setCount(0L);
+            }
+            sysTaskLineChartVOS.add(chartVO);
+        });
+        return sysTaskLineChartVOS;
+
+    }
+
+    private Map<String, Long> getDayGroup(Integer dayNum) {
+        Map<String, Long> map = new HashMap<>();
+        for (int i = 1; i <= dayNum; i++) {
+            map.put(DateUtils.parseDateToStr(DateUtils.MM_DD, DateUtils.LocalDateTimeToDate(LocalDateTime.now().minusDays(i))), 0L);
+        }
+        return map;
+    }
+
+    private Map<String, Long> getMonthGroup(Integer monthNum) {
+        Map<String, Long> map = new HashMap<>();
+        for (int i = 1; i <= monthNum; i++) {
+            map.put(DateUtils.parseDateToStr(DateUtils.YY_MM, DateUtils.LocalDateTimeToDate(LocalDateTime.now().minusMonths(i))), 0L);
+        }
+        return map;
+
+    }
+
+
+    /**
+     * 获取对应任务的日志
+     *
+     * @param records
+     */
+    private void getLogs(List<SysTaskItemVO> records) {
+        List<Long> taskItemIds = records.stream().map(SysTaskItemVO::getId).collect(Collectors.toList());
+        List<SysTaskLog> list = sysTaskLogService.list(new LambdaQueryWrapper<SysTaskLog>()
+                .in(SysTaskLog::getTaskItemId, taskItemIds).orderByDesc(SysTaskLog::getRwczsj));
+        if (CollectionUtils.isNotEmpty(list)) {
+            Map<Long, List<SysTaskLog>> itemMap =
+                    list.stream().collect(Collectors.groupingBy(SysTaskLog::getTaskItemId));
+            records.forEach(item -> {
+                List<SysTaskLog> sysTaskLogs = itemMap.get(item.getId());
+                List<SysTaskLogVO> sysTaskLogVOS = BeanUtil.copyToList(sysTaskLogs, SysTaskLogVO.class);
+                sysTaskLogVOS.forEach(log -> {
+                    log.setRwczztDesc(TaskLogStatusEnum.valueOf(log.getRwczzt()).desc);
+                });
+                item.setLogs(sysTaskLogVOS);
+            });
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveInfo(AddSysTaskVO addSysTaskVO, String ipAddress) {
+        //1.记录任务    如果是执行类型部门，
+        // 判断规则为单人且下发部门id 不能为空
+        //如果是执行类型为 人  那么下发用户List不能为空
+        validInfo(addSysTaskVO);
+        SysTask sysTask = BeanUtil.copyProperties(addSysTaskVO, SysTask.class);
+        sysTask.setXtZhxgsj(LocalDateTime.now());
+        sysTask.setXtCjsj(LocalDateTime.now());
+        sysTask.setXtLrip(ipAddress);
+        sysTask.setXtZhxgid(addSysTaskVO.getRwcjrId());
+        sysTask.setXtZhxgrxm(addSysTaskVO.getRwcjrxm());
+        sysTask.setXtZhxgrbmid(addSysTaskVO.getRwcjrbmId());
+        sysTask.setXtZhxgrbm(addSysTaskVO.getRwcjrbmmc());
+
+        sysTask.setXtLrsj(LocalDateTime.now());
+        sysTask.setXtLrrid(addSysTaskVO.getRwcjrId());
+        sysTask.setXtLrrxm(addSysTaskVO.getRwcjrxm());
+        sysTask.setXtLrrbmid(addSysTaskVO.getRwcjrbmId());
+        sysTask.setXtLrrbm(addSysTaskVO.getRwcjrbmmc());
+        sysTask.setYyId(addSysTaskVO.getAppId());
+        this.save(sysTask);
+        //2。下发相关任务
+        saveItems(addSysTaskVO, sysTask);
+    }
+
+    @Override
+    @Transactional
+    public SysTask detail(DetailSysTaskVO detailSysTaskVO, String ipAddress) {
+        String idCardNo = detailSysTaskVO.getIdCardNo();
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_entity_card", idCardNo);
+        SysUser sysUser = userService.getBaseMapper().selectOne(queryWrapper);
+        Asserts.check(sysUser == null, "身份证 %s 对应的用户不存在！", idCardNo);
+        List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+        DeptDTO deptDTO = deptList.get(0);
+        //1。更新对应任务下发表为已查看
+        SysTaskItem taskItem = sysTaskItemService.getById(detailSysTaskVO.getTaskItemId());
+        if (TaskItemStatusEnum.NOTVIEWED.code.equals(taskItem.getRwzt())) {
+            taskItem.setRwcksj(LocalDateTime.now());
+            taskItem.setRwzt(TaskItemStatusEnum.VIEWED.code);
+            taskItem.setXtZxbz(DeletedEnum.NATURE.code);
+            taskItem.setXtZhxgsj(LocalDateTime.now());
+            taskItem.setXtLrip(ipAddress);
+            taskItem.setXtZhxgid(sysUser.getId());
+            taskItem.setXtZhxgrxm(sysUser.getUserName());
+            taskItem.setXtZhxgrbmid(deptDTO.getDeptId());
+            taskItem.setXtZhxgrbm(deptDTO.getDeptName());
+            sysTaskItemService.updateById(taskItem);
+        }
+        //2。插入日志
+        SysTaskLog log = new SysTaskLog();
+        log.setRwId(taskItem.getRwId());
+        log.setRwjsrId(sysUser.getId());
+        log.setTaskItemId(taskItem.getId());
+        log.setRwczsj(LocalDateTime.now());
+        log.setRwczzt(TaskItemStatusEnum.VIEWED.code);
+        sysTaskLogService.save(log);
+        //返回任务详情
+        SysTask task = this.getById(taskItem.getRwId());
+        task.setId(detailSysTaskVO.getTaskItemId());
+        return task;
+    }
+
+    @Override
+    @Transactional
+    public void finish(FinishSysTaskVO finishSysTaskVO, String ipAddress) {
+        List<SysTask> list = this.list(new LambdaQueryWrapper<SysTask>().eq(SysTask::getRwlyId, finishSysTaskVO.getLyxtId()));
+        if (CollectionUtils.isEmpty(list)){
+            Asserts.check(true, "没有查到对应任务", finishSysTaskVO.getLyxtId());
+        }
+        SysTask sourceTask = list.get(0);
+        //1。更新对应任务下发表为完成
+        String idCardNo = finishSysTaskVO.getIdCardNo();
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_entity_card", idCardNo);
+        SysUser sysUser = userService.getBaseMapper().selectOne(queryWrapper);
+        Asserts.check(sysUser == null, "身份证 %s 对应的用户不存在！", idCardNo);
+        List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+        DeptDTO deptDTO = deptList.get(0);
+        SysTaskItem taskItem =null;
+        if (ExecuteTypeEnum.USER.code.equals(sourceTask.getZxlx())){
+             taskItem = sysTaskItemService.getOne(new LambdaQueryWrapper<SysTaskItem>()
+                    .eq(SysTaskItem::getRwId, sourceTask.getId()).eq(SysTaskItem::getRwjsrsfzh, idCardNo));
+        }else{
+            Asserts.check(StringUtils.isBlank(finishSysTaskVO.getDeptCode()), "任务类型为部门时部门编码不能为空", finishSysTaskVO.getDeptCode());
+            SysDept sysDept = sysDeptService.getOne(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getOrgCode, finishSysTaskVO.getDeptCode())
+                    .eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code));
+            Asserts.check(sysDept == null, "部门编码 %s 对应的部门不存在！", finishSysTaskVO.getDeptCode());
+            taskItem = sysTaskItemService.getOne(new LambdaQueryWrapper<SysTaskItem>()
+                    .eq(SysTaskItem::getRwId, sourceTask.getId()).eq(SysTaskItem::getRwjsrbmId,sysDept.getId()));
+        }
+        Asserts.check(TaskItemStatusEnum.FINISH.code.equals(taskItem.getRwzt()), "该任务已经完成，请勿重复完成");
+        taskItem.setRwwcsj(LocalDateTime.now());
+        taskItem.setRwzt(TaskItemStatusEnum.FINISH.code);
+        taskItem.setXtZhxgsj(LocalDateTime.now());
+        taskItem.setXtLrip(ipAddress);
+        taskItem.setXtZhxgid(sysUser.getId());
+        taskItem.setXtZhxgrxm(sysUser.getUserName());
+        taskItem.setXtZhxgrbmid(deptDTO.getDeptId());
+        taskItem.setXtZhxgrbm(deptDTO.getDeptName());
+        sysTaskItemService.updateById(taskItem);
+        //2。插入日志
+        SysTaskLog log = new SysTaskLog();
+        log.setRwId(taskItem.getRwId());
+        log.setRwjsrId(sysUser.getId());
+        log.setTaskItemId(taskItem.getId());
+        log.setRwczsj(LocalDateTime.now());
+        log.setRwczzt(TaskItemStatusEnum.FINISH.code);
+        sysTaskLogService.save(log);
+        //3 判断任务是否执行完成
+        SysTask task = this.getById(taskItem.getRwId());
+        if (ExecuteTypeEnum.DEPT.code.equals(task.getZxlx()) || RuleTypeEnum.ONE.code.equals(task.getRwcjrgz())) {
+            task.setRwzxzt(2);
+            task.setXtZhxgsj(LocalDateTime.now());
+            task.setXtLrip(ipAddress);
+            task.setXtZhxgid(sysUser.getId());
+            task.setXtZhxgrxm(sysUser.getUserName());
+            task.setXtZhxgrbmid(deptDTO.getDeptId());
+            task.setXtZhxgrbm(deptDTO.getDeptName());
+            this.updateById(task);
+        } else {
+            int count = sysTaskItemService.count(new LambdaQueryWrapper<SysTaskItem>()
+                    .ne(SysTaskItem::getId, finishSysTaskVO.getTaskItemId()).ne(SysTaskItem::getRwzt, TaskItemStatusEnum.FINISH.code));
+            if (count == 0) {
+                task.setRwzxzt(2);
+                task.setXtZhxgsj(LocalDateTime.now());
+                task.setXtLrip(ipAddress);
+                task.setXtZhxgid(sysUser.getId());
+                task.setXtZhxgrxm(sysUser.getUserName());
+                task.setXtZhxgrbmid(deptDTO.getDeptId());
+                task.setXtZhxgrbm(deptDTO.getDeptName());
+                this.updateById(task);
+            }
+        }
+
+    }
+
+
+    private void saveItems(AddSysTaskVO addSysTaskVO, SysTask sysTask) {
+        List<SysTaskLog> logs = new ArrayList<>();
+        if (ExecuteTypeEnum.USER.code.equals(addSysTaskVO.getZxlx())) {
+            List<AddSysTaskUserInfoVO> userInfos = addSysTaskVO.getUserInfos();
+            userInfos.forEach(item -> {
+                SysTaskItem taskItem = new SysTaskItem();
+                taskItem.setRwId(sysTask.getId());
+                QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("id_entity_card", item.getIdCardNo());
+                SysUser sysUser = userService.getBaseMapper().selectOne(queryWrapper);
+                Asserts.check(sysUser == null, "身份证 %s 对应的用户不存在！", item.getIdCardNo());
+                taskItem.setRwjsrId(sysUser.getId());
+                List<DeptDTO> deptList = sysDeptService.selectUserDeptList(sysUser.getId());
+                DeptDTO deptDTO = deptList.get(0);
+                taskItem.setRwjsrbmId(deptDTO.getDeptId());
+                taskItem.setRwjsrbmmc(deptDTO.getDeptName());
+                taskItem.setRwjsrdw(item.getCompanyName());
+                taskItem.setRwjsrdwId(item.getCompanyId());
+                taskItem.setRwjsrxm(sysUser.getUserName());
+                taskItem.setRwjsrsfzh(sysUser.getIdEntityCard());
+                sysTaskItemService.save(taskItem);
+                SysTaskLog log = new SysTaskLog();
+                log.setRwId(sysTask.getId());
+                log.setRwjsrId(sysUser.getId());
+                log.setTaskItemId(taskItem.getId());
+                log.setRwczsj(LocalDateTime.now());
+                log.setRwczzt(TaskItemStatusEnum.NOTVIEWED.code);
+                logs.add(log);
+            });
+        } else {
+            List<AddSysTaskDeptVO> deptVOS = addSysTaskVO.getDeptVOS();
+            deptVOS.forEach(item -> {
+                SysTaskItem taskItem = new SysTaskItem();
+                taskItem.setRwId(sysTask.getId());
+                SysDept one = sysDeptService.getOne(new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getOrgCode, item.getDeptCode())
+                        .eq(SysDept::getXtZxbz, DeletedEnum.NATURE.code));
+                taskItem.setRwjsrbmId(one.getId());
+                taskItem.setRwjsrdw(item.getCompanyName());
+                taskItem.setRwjsrdwId(item.getCompanyId());
+                sysTaskItemService.save(taskItem);
+                SysTaskLog log = new SysTaskLog();
+                log.setRwId(sysTask.getId());
+                log.setTaskItemId(taskItem.getId());
+                log.setRwczsj(LocalDateTime.now());
+                log.setRwczzt(TaskItemStatusEnum.NOTVIEWED.code);
+                logs.add(log);
+            });
+
+        }
+        sysTaskLogService.saveBatch(logs);
+
+
+    }
+
+    private void validInfo(AddSysTaskVO addSysTaskVO) {
+        Asserts.check(ExecuteTypeEnum.USER.code.equals(addSysTaskVO.getZxlx())
+                && CollectionUtil.isEmpty(addSysTaskVO.getUserInfos()), "执行类型为用户用户信息为不能为空");
+
+        Asserts.check(ExecuteTypeEnum.DEPT.code.equals(addSysTaskVO.getZxlx())
+                && CollectionUtil.isEmpty(addSysTaskVO.getDeptVOS()), "执行类型为部门，部门信息为不能为空");
+    }
+}
+
+
+
+
diff --git a/common-task-starter/src/main/resources/META-INF/spring.factories b/common-task-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..dd70f63
--- /dev/null
+++ b/common-task-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.task.TaskAutoConfiguration
\ No newline at end of file
diff --git a/common-task-starter/src/main/resources/mapper/SysTaskItemMapper.xml b/common-task-starter/src/main/resources/mapper/SysTaskItemMapper.xml
new file mode 100644
index 0000000..63e8f2d
--- /dev/null
+++ b/common-task-starter/src/main/resources/mapper/SysTaskItemMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskItemMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTaskItem">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="rw_id" column="rw_id" jdbcType="BIGINT"/>
+            <result property="rwjsr_id" column="rwjsr_id" jdbcType="BIGINT"/>
+            <result property="rwjsrsfzh" column="rwjsrsfzh" jdbcType="VARCHAR"/>
+            <result property="rwjsrxm" column="rwjsrxm" jdbcType="VARCHAR"/>
+            <result property="rwjsrdw_id" column="rwjsrdw_id" jdbcType="BIGINT"/>
+            <result property="rwjsrdw" column="rwjsrdw" jdbcType="VARCHAR"/>
+            <result property="rwjsrbm_id" column="rwjsrbm_id" jdbcType="BIGINT"/>
+            <result property="rwjsrbmmc" column="rwjsrbmmc" jdbcType="VARCHAR"/>
+            <result property="rwzt" column="rwzt" jdbcType="INTEGER"/>
+            <result property="rwzdsj" column="rwzdsj" jdbcType="TIMESTAMP"/>
+            <result property="rwcksj" column="rwcksj" jdbcType="TIMESTAMP"/>
+            <result property="rwwcsj" column="rwwcsj" jdbcType="TIMESTAMP"/>
+            <result property="bz" column="bz" jdbcType="VARCHAR"/>
+            <result property="xt_zxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+            <result property="xt_zxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+            <result property="xt_cjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_lrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_lrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+            <result property="xt_lrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+            <result property="xt_lrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+            <result property="xt_lrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+            <result property="xt_lrip" column="xt_lrip" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_zhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+            <result property="xt_zhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+            <result property="xt_zhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,rw_id,rwjsr_id,
+        rwjsrsfzh,rwjsrxm,rwjsrdw_id,
+        rwjsrdw,rwjsrbm_id,rwjsrbmmc,
+        rwzt,rwzdsj,rwcksj,
+        rwwcsj,bz,xt_zxbz,
+        xt_zxyy,xt_cjsj,xt_lrsj,
+        xt_lrrxm,xt_lrrid,xt_lrrbm,
+        xt_lrrbmid,xt_lrip,xt_zhxgsj,
+        xt_zhxgrxm,xt_zhxgid,xt_zhxgrbm,
+        xt_zhxgrbmid,xt_zhxgrip
+    </sql>
+</mapper>
diff --git a/common-task-starter/src/main/resources/mapper/SysTaskLogMapper.xml b/common-task-starter/src/main/resources/mapper/SysTaskLogMapper.xml
new file mode 100644
index 0000000..b8158c5
--- /dev/null
+++ b/common-task-starter/src/main/resources/mapper/SysTaskLogMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskLogMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTaskLog">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="rw_xfczb_id" column="rw_xfczb_id" jdbcType="BIGINT"/>
+            <result property="rw_id" column="rw_id" jdbcType="BIGINT"/>
+            <result property="rwjsr_id" column="rwjsr_id" jdbcType="BIGINT"/>
+            <result property="rwczsj" column="rwczsj" jdbcType="TIMESTAMP"/>
+            <result property="rwczzt" column="rwczzt" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,rw_xfczb_id,rw_id,
+        rwjsr_id,rwczsj,rwczzt
+    </sql>
+</mapper>
diff --git a/common-task-starter/src/main/resources/mapper/SysTaskMapper.xml b/common-task-starter/src/main/resources/mapper/SysTaskMapper.xml
new file mode 100644
index 0000000..c0caa02
--- /dev/null
+++ b/common-task-starter/src/main/resources/mapper/SysTaskMapper.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTask">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="rwlx" column="rwlx" jdbcType="INTEGER"/>
+        <result property="rwjjcd" column="rwjjcd" jdbcType="INTEGER"/>
+        <result property="rwmc" column="rwmc" jdbcType="VARCHAR"/>
+        <result property="rwnr" column="rwnr" jdbcType="VARCHAR"/>
+        <result property="rwzdsj" column="rwzdsj" jdbcType="TIMESTAMP"/>
+        <result property="rwwcsj" column="rwwcsj" jdbcType="TIMESTAMP"/>
+        <result property="rwyqwcsj" column="rwyqwcsj" jdbcType="TIMESTAMP"/>
+        <result property="rwcjrsfzh" column="rwcjrsfzh" jdbcType="VARCHAR"/>
+        <result property="rwcjrxm" column="rwcjrxm" jdbcType="VARCHAR"/>
+        <result property="rwcjrdw" column="rwcjrdw" jdbcType="VARCHAR"/>
+        <result property="rwcjrdwId" column="rwcjrdw_id" jdbcType="BIGINT"/>
+        <result property="rwcjrdh" column="rwcjrdh" jdbcType="VARCHAR"/>
+        <result property="rwcjrgz" column="rwcjrgz" jdbcType="INTEGER"/>
+        <result property="rwzxzt" column="rwzxzt" jdbcType="INTEGER"/>
+        <result property="rwlyxt" column="rwlyxt" jdbcType="VARCHAR"/>
+        <result property="rwUrl" column="rw_url" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtZxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,rwlx,rwjjcd,
+        rwmc,rwnr,rwzdsj,
+        rwwcsj,rwyqwcsj,rwcjrsfzh,
+        rwcjrxm,rwcjrdw,rwcjrdw_id,
+        rwcjrdh,rwcjrgz,rwzxzt,
+        rwlyxt,rw_url,bz,
+        xt_zxbz,xt_zxyy,xt_cjsj,
+        xt_lrsj,xt_lrrxm,xt_lrrid,
+        xt_lrrbm,xt_lrrbmid,xt_lrip,
+        xt_zhxgsj,xt_zhxgrxm,xt_zhxgid,
+        xt_zhxgrbm,xt_zhxgrbmid,xt_zhxgrip
+    </sql>
+    <select id="countByUser" resultType="java.lang.Long">
+        select
+        count(1)
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrsfzh=#{param.idCardNo}
+        AND st.zxlx =1
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+    </select>
+
+    <select id="countByDept" resultType="java.lang.Long">
+        select
+        count(1)
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrbm_id=#{param.deptId}
+        AND st.zxlx =2
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+
+    </select>
+    <!--分页查询-->
+    <select id="findByList" resultType="com.mosty.common.task.entity.vo.SysTaskItemVO">
+        select
+        sti.id,
+        st.rwlx ,
+        st.rw_url AS rwUrl,
+        st.rwmc,
+        st.rwnr,
+        st.rwyqwcsj,
+        st.rwlyxt,
+        st.rwly_id,
+        sti.rwjsrsfzh AS idCardNo
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrsfzh=#{param.idCardNo}
+        AND st.zxlx =1
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+        UNION
+        select
+        sti.id,
+        st.rwlx ,
+        st.rwly_id,
+        st.rw_url AS rwUrl,
+        st.rwmc,
+        st.rwnr,
+        st.rwyqwcsj,
+        st.rwlyxt,
+        sti.rwjsrsfzh AS idCardNo
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrbm_id=#{param.deptId}
+        AND st.zxlx =2
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+        ORDER BY id DESC
+    </select>
+</mapper>
diff --git a/common-task-starter/target/classes/META-INF/spring.factories b/common-task-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..dd70f63
--- /dev/null
+++ b/common-task-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.common.task.TaskAutoConfiguration
\ No newline at end of file
diff --git a/common-task-starter/target/classes/com/mosty/common/task/TaskAutoConfiguration.class b/common-task-starter/target/classes/com/mosty/common/task/TaskAutoConfiguration.class
new file mode 100644
index 0000000..34bf2f4
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/TaskAutoConfiguration.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteStatusEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteStatusEnum.class
new file mode 100644
index 0000000..7c4bb12
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteStatusEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteTypeEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteTypeEnum.class
new file mode 100644
index 0000000..b29a036
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/ExecuteTypeEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/GroupCountTypeEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/GroupCountTypeEnum.class
new file mode 100644
index 0000000..557924c
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/GroupCountTypeEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/LineChartTypeEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/LineChartTypeEnum.class
new file mode 100644
index 0000000..83a8a57
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/LineChartTypeEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/RuleTypeEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/RuleTypeEnum.class
new file mode 100644
index 0000000..516c11b
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/RuleTypeEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskItemStatusEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskItemStatusEnum.class
new file mode 100644
index 0000000..54f77d3
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskItemStatusEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskLogStatusEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskLogStatusEnum.class
new file mode 100644
index 0000000..f68a5a2
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskLogStatusEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskTypeEnum.class b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskTypeEnum.class
new file mode 100644
index 0000000..9e4b786
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/constant/enums/TaskTypeEnum.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskController.class b/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskController.class
new file mode 100644
index 0000000..d58b31f
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskController.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskReportController.class b/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskReportController.class
new file mode 100644
index 0000000..c31d7ed
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/controller/SysTaskReportController.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/SysTask.class b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTask.class
new file mode 100644
index 0000000..5c62629
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTask.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskItem.class b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskItem.class
new file mode 100644
index 0000000..84d39ec
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskItem.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskLog.class b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskLog.class
new file mode 100644
index 0000000..b92830e
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/SysTaskLog.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.class
new file mode 100644
index 0000000..287ace0
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskDeptVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.class
new file mode 100644
index 0000000..501baaa
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskUserInfoVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskVO.class
new file mode 100644
index 0000000..0898006
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/AddSysTaskVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/DetailSysTaskVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/DetailSysTaskVO.class
new file mode 100644
index 0000000..06322b6
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/DetailSysTaskVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/FinishSysTaskVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/FinishSysTaskVO.class
new file mode 100644
index 0000000..ebcf320
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/FinishSysTaskVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskLogVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskLogVO.class
new file mode 100644
index 0000000..fc90d04
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskLogVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskVO.class
new file mode 100644
index 0000000..0973290
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/QueryTaskVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountGroup.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountGroup.class
new file mode 100644
index 0000000..25a71f3
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountGroup.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountToday.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountToday.class
new file mode 100644
index 0000000..23c6198
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskCountToday.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskItemVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskItemVO.class
new file mode 100644
index 0000000..0f99ec6
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskItemVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLineChartVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLineChartVO.class
new file mode 100644
index 0000000..e47d1d7
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLineChartVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLogVO.class b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLogVO.class
new file mode 100644
index 0000000..6984c8d
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/entity/vo/SysTaskLogVO.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskItemMapper.class b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskItemMapper.class
new file mode 100644
index 0000000..a204b1f
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskItemMapper.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskLogMapper.class b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskLogMapper.class
new file mode 100644
index 0000000..5eca394
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskLogMapper.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskMapper.class b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskMapper.class
new file mode 100644
index 0000000..31a8a7b
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/mapper/SysTaskMapper.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskItemService.class b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskItemService.class
new file mode 100644
index 0000000..80c7de6
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskItemService.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskLogService.class b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskLogService.class
new file mode 100644
index 0000000..de18375
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskLogService.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskService.class b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskService.class
new file mode 100644
index 0000000..45578aa
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/SysTaskService.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.class b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.class
new file mode 100644
index 0000000..fb07dbe
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskItemServiceImpl.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.class b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.class
new file mode 100644
index 0000000..d19cc65
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskLogServiceImpl.class differ
diff --git a/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskServiceImpl.class b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskServiceImpl.class
new file mode 100644
index 0000000..9e41132
Binary files /dev/null and b/common-task-starter/target/classes/com/mosty/common/task/service/impl/SysTaskServiceImpl.class differ
diff --git a/common-task-starter/target/classes/mapper/SysTaskItemMapper.xml b/common-task-starter/target/classes/mapper/SysTaskItemMapper.xml
new file mode 100644
index 0000000..63e8f2d
--- /dev/null
+++ b/common-task-starter/target/classes/mapper/SysTaskItemMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskItemMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTaskItem">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="rw_id" column="rw_id" jdbcType="BIGINT"/>
+            <result property="rwjsr_id" column="rwjsr_id" jdbcType="BIGINT"/>
+            <result property="rwjsrsfzh" column="rwjsrsfzh" jdbcType="VARCHAR"/>
+            <result property="rwjsrxm" column="rwjsrxm" jdbcType="VARCHAR"/>
+            <result property="rwjsrdw_id" column="rwjsrdw_id" jdbcType="BIGINT"/>
+            <result property="rwjsrdw" column="rwjsrdw" jdbcType="VARCHAR"/>
+            <result property="rwjsrbm_id" column="rwjsrbm_id" jdbcType="BIGINT"/>
+            <result property="rwjsrbmmc" column="rwjsrbmmc" jdbcType="VARCHAR"/>
+            <result property="rwzt" column="rwzt" jdbcType="INTEGER"/>
+            <result property="rwzdsj" column="rwzdsj" jdbcType="TIMESTAMP"/>
+            <result property="rwcksj" column="rwcksj" jdbcType="TIMESTAMP"/>
+            <result property="rwwcsj" column="rwwcsj" jdbcType="TIMESTAMP"/>
+            <result property="bz" column="bz" jdbcType="VARCHAR"/>
+            <result property="xt_zxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+            <result property="xt_zxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+            <result property="xt_cjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_lrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_lrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+            <result property="xt_lrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+            <result property="xt_lrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+            <result property="xt_lrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+            <result property="xt_lrip" column="xt_lrip" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+            <result property="xt_zhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+            <result property="xt_zhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+            <result property="xt_zhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+            <result property="xt_zhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,rw_id,rwjsr_id,
+        rwjsrsfzh,rwjsrxm,rwjsrdw_id,
+        rwjsrdw,rwjsrbm_id,rwjsrbmmc,
+        rwzt,rwzdsj,rwcksj,
+        rwwcsj,bz,xt_zxbz,
+        xt_zxyy,xt_cjsj,xt_lrsj,
+        xt_lrrxm,xt_lrrid,xt_lrrbm,
+        xt_lrrbmid,xt_lrip,xt_zhxgsj,
+        xt_zhxgrxm,xt_zhxgid,xt_zhxgrbm,
+        xt_zhxgrbmid,xt_zhxgrip
+    </sql>
+</mapper>
diff --git a/common-task-starter/target/classes/mapper/SysTaskLogMapper.xml b/common-task-starter/target/classes/mapper/SysTaskLogMapper.xml
new file mode 100644
index 0000000..b8158c5
--- /dev/null
+++ b/common-task-starter/target/classes/mapper/SysTaskLogMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskLogMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTaskLog">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="rw_xfczb_id" column="rw_xfczb_id" jdbcType="BIGINT"/>
+            <result property="rw_id" column="rw_id" jdbcType="BIGINT"/>
+            <result property="rwjsr_id" column="rwjsr_id" jdbcType="BIGINT"/>
+            <result property="rwczsj" column="rwczsj" jdbcType="TIMESTAMP"/>
+            <result property="rwczzt" column="rwczzt" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,rw_xfczb_id,rw_id,
+        rwjsr_id,rwczsj,rwczzt
+    </sql>
+</mapper>
diff --git a/common-task-starter/target/classes/mapper/SysTaskMapper.xml b/common-task-starter/target/classes/mapper/SysTaskMapper.xml
new file mode 100644
index 0000000..c0caa02
--- /dev/null
+++ b/common-task-starter/target/classes/mapper/SysTaskMapper.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.common.task.mapper.SysTaskMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.task.entity.SysTask">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="rwlx" column="rwlx" jdbcType="INTEGER"/>
+        <result property="rwjjcd" column="rwjjcd" jdbcType="INTEGER"/>
+        <result property="rwmc" column="rwmc" jdbcType="VARCHAR"/>
+        <result property="rwnr" column="rwnr" jdbcType="VARCHAR"/>
+        <result property="rwzdsj" column="rwzdsj" jdbcType="TIMESTAMP"/>
+        <result property="rwwcsj" column="rwwcsj" jdbcType="TIMESTAMP"/>
+        <result property="rwyqwcsj" column="rwyqwcsj" jdbcType="TIMESTAMP"/>
+        <result property="rwcjrsfzh" column="rwcjrsfzh" jdbcType="VARCHAR"/>
+        <result property="rwcjrxm" column="rwcjrxm" jdbcType="VARCHAR"/>
+        <result property="rwcjrdw" column="rwcjrdw" jdbcType="VARCHAR"/>
+        <result property="rwcjrdwId" column="rwcjrdw_id" jdbcType="BIGINT"/>
+        <result property="rwcjrdh" column="rwcjrdh" jdbcType="VARCHAR"/>
+        <result property="rwcjrgz" column="rwcjrgz" jdbcType="INTEGER"/>
+        <result property="rwzxzt" column="rwzxzt" jdbcType="INTEGER"/>
+        <result property="rwlyxt" column="rwlyxt" jdbcType="VARCHAR"/>
+        <result property="rwUrl" column="rw_url" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="xtZxbz" column="xt_zxbz" jdbcType="INTEGER"/>
+        <result property="xtZxyy" column="xt_zxyy" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+        <result property="xtLrrxm" column="xt_lrrxm" jdbcType="VARCHAR"/>
+        <result property="xtLrrid" column="xt_lrrid" jdbcType="BIGINT"/>
+        <result property="xtLrrbm" column="xt_lrrbm" jdbcType="VARCHAR"/>
+        <result property="xtLrrbmid" column="xt_lrrbmid" jdbcType="VARCHAR"/>
+        <result property="xtLrip" column="xt_lrip" jdbcType="VARCHAR"/>
+        <result property="xtZhxgsj" column="xt_zhxgsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhxgrxm" column="xt_zhxgrxm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgid" column="xt_zhxgid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrbm" column="xt_zhxgrbm" jdbcType="VARCHAR"/>
+        <result property="xtZhxgrbmid" column="xt_zhxgrbmid" jdbcType="BIGINT"/>
+        <result property="xtZhxgrip" column="xt_zhxgrip" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,rwlx,rwjjcd,
+        rwmc,rwnr,rwzdsj,
+        rwwcsj,rwyqwcsj,rwcjrsfzh,
+        rwcjrxm,rwcjrdw,rwcjrdw_id,
+        rwcjrdh,rwcjrgz,rwzxzt,
+        rwlyxt,rw_url,bz,
+        xt_zxbz,xt_zxyy,xt_cjsj,
+        xt_lrsj,xt_lrrxm,xt_lrrid,
+        xt_lrrbm,xt_lrrbmid,xt_lrip,
+        xt_zhxgsj,xt_zhxgrxm,xt_zhxgid,
+        xt_zhxgrbm,xt_zhxgrbmid,xt_zhxgrip
+    </sql>
+    <select id="countByUser" resultType="java.lang.Long">
+        select
+        count(1)
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrsfzh=#{param.idCardNo}
+        AND st.zxlx =1
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+    </select>
+
+    <select id="countByDept" resultType="java.lang.Long">
+        select
+        count(1)
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrbm_id=#{param.deptId}
+        AND st.zxlx =2
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+
+    </select>
+    <!--分页查询-->
+    <select id="findByList" resultType="com.mosty.common.task.entity.vo.SysTaskItemVO">
+        select
+        sti.id,
+        st.rwlx ,
+        st.rw_url AS rwUrl,
+        st.rwmc,
+        st.rwnr,
+        st.rwyqwcsj,
+        st.rwlyxt,
+        st.rwly_id,
+        sti.rwjsrsfzh AS idCardNo
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrsfzh=#{param.idCardNo}
+        AND st.zxlx =1
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+        UNION
+        select
+        sti.id,
+        st.rwlx ,
+        st.rwly_id,
+        st.rw_url AS rwUrl,
+        st.rwmc,
+        st.rwnr,
+        st.rwyqwcsj,
+        st.rwlyxt,
+        sti.rwjsrsfzh AS idCardNo
+        FROM
+        sys_task st
+        LEFT JOIN
+        sys_task_item sti ON sti.rw_id = st.id
+        WHERE
+        sti.rwjsrbm_id=#{param.deptId}
+        AND st.zxlx =2
+        <if test="param.startTime !=null and param.startTime!=''">
+            and
+            <![CDATA[st.rwzdsj >= #{param.startTime}]]>
+        </if>
+        <if test="param.endTime !=null and param.endTime!=''">
+            and
+            <![CDATA[st.rwzdsj <= #{param.endTime}]]>
+        </if>
+        <if test="param.source!=null and param.source!=''">
+            AND st.rwlyxt =#{param.source}
+        </if>
+        <if test="param.taskType!=null and param.taskType!=''">
+            AND st.rwlx =#{param.taskType}
+        </if>
+        <if test="param.taskName!=null and param.taskName!=''">
+            AND st.rwmc like concat('%', #{param.taskName}, '%')
+        </if>
+        <if test="param.taskStatus!=null and param.taskStatus!=''">
+            AND sti.rwzt = #{param.taskStatus}
+        </if>
+        ORDER BY id DESC
+    </select>
+</mapper>
diff --git a/common-task-starter/target/common-task-starter-1.0.0-SNAPSHOT.jar b/common-task-starter/target/common-task-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..1fdd18f
Binary files /dev/null and b/common-task-starter/target/common-task-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-task-starter/target/maven-archiver/pom.properties b/common-task-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..f880639
--- /dev/null
+++ b/common-task-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:23 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-task-starter
diff --git a/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..7243174
--- /dev/null
+++ b/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,35 @@
+com\mosty\common\task\constant\enums\GroupCountTypeEnum.class
+com\mosty\common\task\entity\vo\SysTaskLineChartVO.class
+com\mosty\common\task\mapper\SysTaskMapper.class
+com\mosty\common\task\entity\vo\SysTaskCountToday.class
+com\mosty\common\task\service\impl\SysTaskLogServiceImpl.class
+com\mosty\common\task\constant\enums\ExecuteStatusEnum.class
+com\mosty\common\task\constant\enums\LineChartTypeEnum.class
+com\mosty\common\task\entity\SysTask.class
+com\mosty\common\task\service\impl\SysTaskItemServiceImpl.class
+com\mosty\common\task\constant\enums\RuleTypeEnum.class
+com\mosty\common\task\constant\enums\TaskItemStatusEnum.class
+com\mosty\common\task\controller\SysTaskController.class
+com\mosty\common\task\mapper\SysTaskLogMapper.class
+com\mosty\common\task\entity\vo\DetailSysTaskVO.class
+com\mosty\common\task\entity\vo\AddSysTaskDeptVO.class
+com\mosty\common\task\entity\vo\QueryTaskVO.class
+com\mosty\common\task\service\SysTaskLogService.class
+com\mosty\common\task\controller\SysTaskReportController.class
+com\mosty\common\task\entity\vo\AddSysTaskUserInfoVO.class
+com\mosty\common\task\entity\vo\QueryTaskLogVO.class
+com\mosty\common\task\entity\vo\SysTaskCountGroup.class
+com\mosty\common\task\constant\enums\ExecuteTypeEnum.class
+com\mosty\common\task\entity\vo\SysTaskLogVO.class
+com\mosty\common\task\service\SysTaskService.class
+com\mosty\common\task\service\SysTaskItemService.class
+com\mosty\common\task\entity\SysTaskLog.class
+com\mosty\common\task\entity\vo\AddSysTaskVO.class
+com\mosty\common\task\entity\vo\FinishSysTaskVO.class
+com\mosty\common\task\TaskAutoConfiguration.class
+com\mosty\common\task\service\impl\SysTaskServiceImpl.class
+com\mosty\common\task\constant\enums\TaskLogStatusEnum.class
+com\mosty\common\task\constant\enums\TaskTypeEnum.class
+com\mosty\common\task\entity\SysTaskItem.class
+com\mosty\common\task\mapper\SysTaskItemMapper.class
+com\mosty\common\task\entity\vo\SysTaskItemVO.class
diff --git a/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..9e89179
--- /dev/null
+++ b/common-task-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,35 @@
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\ExecuteTypeEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\SysTaskItemVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\LineChartTypeEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\mapper\SysTaskItemMapper.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\SysTaskLogVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\ExecuteStatusEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\SysTaskLineChartVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\SysTask.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\SysTaskItem.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\impl\SysTaskServiceImpl.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\FinishSysTaskVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\impl\SysTaskLogServiceImpl.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\SysTaskCountToday.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\controller\SysTaskReportController.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\SysTaskItemService.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\SysTaskLog.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\controller\SysTaskController.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\SysTaskService.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\RuleTypeEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\AddSysTaskVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\QueryTaskLogVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\DetailSysTaskVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\AddSysTaskDeptVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\TaskTypeEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\TaskAutoConfiguration.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\GroupCountTypeEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\TaskLogStatusEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\AddSysTaskUserInfoVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\QueryTaskVO.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\constant\enums\TaskItemStatusEnum.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\mapper\SysTaskMapper.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\SysTaskLogService.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\entity\vo\SysTaskCountGroup.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\service\impl\SysTaskItemServiceImpl.java
+C:\tools\dy外网\mosty-common\common-task-starter\src\main\java\com\mosty\common\task\mapper\SysTaskLogMapper.java
diff --git a/common-token-starter/common-token-starter.iml b/common-token-starter/common-token-starter.iml
new file mode 100644
index 0000000..1f9f2a6
--- /dev/null
+++ b/common-token-starter/common-token-starter.iml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.12" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/common-token-starter/pom.xml b/common-token-starter/pom.xml
new file mode 100644
index 0000000..bb7f2cb
--- /dev/null
+++ b/common-token-starter/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-common</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-token-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+            <version>${transmittable-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://10.64.201.126:8081/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://10.64.201.126:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/DeptInfo.java b/common-token-starter/src/main/java/com/mosty/common/token/DeptInfo.java
new file mode 100644
index 0000000..5bdc8bb
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/DeptInfo.java
@@ -0,0 +1,60 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.mosty.common.token;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 部门信息
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeptInfo implements Serializable {
+
+    private static final long serialVersionUID = -2608276244908343842L;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private Long ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private Long ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private Long sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty("权限等级（D_ZDY_SJQX）")
+    private String permissionsLevel;
+
+    @ApiModelProperty("权限过滤条件ids")
+    private String ids;
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java b/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java
new file mode 100644
index 0000000..e2f1ab2
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java
@@ -0,0 +1,102 @@
+package com.mosty.common.token;
+
+import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.TokenExpiredException;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.interfaces.JWTVerifier;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+
+import java.util.Date;
+
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_ISSUER;
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_KEY;
+
+/**
+ * token工具类
+ *
+ * @author kevin
+ * @date 2022/3/21 11:03 PM
+ * @since 1.0.0
+ */
+@Slf4j
+public class JWTUtil {
+    public JWTUtil() {
+    }
+
+    public static DecodedJWT verify(String token) {
+        try {
+            // 这里不判断token过期状态
+//            Algorithm algorithm = Algorithm.HMAC256(TOKEN_KEY);
+//            JWTVerifier verifier = JWT.require(algorithm).withIssuer(new String[]{TOKEN_ISSUER}).build();
+//            DecodedJWT decodedJWT = verifier.verify(token);
+//
+//            Date expiresAt = decodedJWT.getExpiresAt();
+//            if (expiresAt.before(new Date())) {
+//                log.info("token已过期");
+//            }
+//
+//            return expiresAt.after(new Date()) ? decodedJWT : null;
+            if(StringUtils.isNotEmpty(token)){
+                Algorithm algorithm = Algorithm.HMAC256(TOKEN_KEY);
+                JWTVerifier verifier = JWT.require(algorithm).withIssuer(new String[]{TOKEN_ISSUER}).build();
+                return verifier.verify(token);
+            }
+            return null;
+        } catch (TokenExpiredException expiredException) {
+            log.warn("token过期：{}", expiredException.getMessage());
+            throw new BusinessException(HttpStatus.UNAUTHORIZED.value(), "token过期，请重新登陆", null);
+        } catch (Exception var11) {
+            var11.printStackTrace();
+            log.error("解签失败: {}", var11.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * token 泛解析用户信息
+     *
+     * @param token jwt token
+     * @return 用户信息
+     */
+    public static UserInfo getUserInfo(String token) {
+        DecodedJWT jwt = verify(token);
+        if (jwt == null) {
+            return null;
+        }
+        return new UserInfo(
+                jwt.getClaim("userId").asLong(),
+                jwt.getClaim("userName").asString(),
+                jwt.getClaim("phone").asString(),
+                jwt.getClaim("userLoginName").asString(),
+                jwt.getClaim("inDustRialId").asString(),
+                jwt.getClaim("idEntityCard").asString(),
+                jwt.getClaim("isVirtualUser").asString(),
+                jwt.getClaim("level").asString(),
+                jwt.getClaim("deptId").asLong(),
+                jwt.getClaim("deptName").asString(),
+                jwt.getClaim("deptCode").asString(),
+                jwt.getClaim("fxjDeptId").asLong(),
+                jwt.getClaim("fxjDeptName").asString(),
+                jwt.getClaim("fxjDeptCode").asString(),
+                jwt.getClaim("dszDeptId").asLong(),
+                jwt.getClaim("dszDeptName").asString(),
+                jwt.getClaim("dszDeptCode").asString(),
+                jwt.getClaim("deptLevel").asString(),
+                jwt.getClaim("deptBizType").asString(),
+                JSONObject.parseObject(jwt.getClaim("permissions").asString(), UserPermissionsInfo.class)
+        );
+    }
+
+    public static void main(String[] args) {
+        UserInfo res = getUserInfo("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImlzcyI6Inprai1mcG0tc3RvcmVhZG1pbiIsImV4cCI6MTYyODMzMTE1NCwiaWF0IjoxNjI3ODk5MTU0LCJ1c2VySWQiOjUzfQ.hJ25t46zntTUknwjsB0UJzOIFcM5n7IG0DDA6RVP8jM");
+        System.out.println(res);
+    }
+
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/JwtSysUser.java b/common-token-starter/src/main/java/com/mosty/common/token/JwtSysUser.java
new file mode 100644
index 0000000..6993965
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/JwtSysUser.java
@@ -0,0 +1,25 @@
+package com.mosty.common.token;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *  用户信息泛解析标识
+ * @author kevin
+ * @date 2022/2/16 1:17 PM
+ * @since 1.0.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface JwtSysUser {
+
+    /**
+     * 用户realm，方便后续扩展
+     * @return 用户
+     */
+    String value() default "";
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/SysUserInterceptor.java b/common-token-starter/src/main/java/com/mosty/common/token/SysUserInterceptor.java
new file mode 100644
index 0000000..6440e24
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/SysUserInterceptor.java
@@ -0,0 +1,129 @@
+package com.mosty.common.token;
+
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+
+/**
+ *  token解析器
+ * @author kevin
+ * @date 2022/3/21 11:12 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@SuppressWarnings("unused")
+public class SysUserInterceptor implements HandlerInterceptor {
+    public SysUserInterceptor() {
+    }
+
+    @PostConstruct
+    public void init() {
+    }
+
+    public boolean preHandle(@Nullable HttpServletRequest request, @Nullable HttpServletResponse response, @Nullable Object handler){
+        if (!(handler instanceof HandlerMethod)) {
+            return true;
+        }else{
+            HandlerMethod handlerMethod =(HandlerMethod)handler;
+            Method method = handlerMethod.getMethod();
+            JwtSysUser sysUser =(JwtSysUser)method.getAnnotation(JwtSysUser.class);
+
+            if(sysUser == null) {
+                sysUser = (JwtSysUser) method.getDeclaringClass().getAnnotation(JwtSysUser.class);
+            }
+            if (sysUser == null) {
+                return true;
+            }else {
+                UserInfo info = this.getUserInfoFromJwtToken(request, sysUser);
+                if(info == null){
+                    throw new BusinessException(401,"登录过期，请重新登录!!",(Object)null);
+                } else {
+                    UserInfoManager.set(info);
+                    return true;
+                }
+            }
+
+        }
+
+    }
+
+    public void afterCompletion(@Nullable HttpServletRequest request, @Nullable HttpServletResponse response, @Nullable Object handler, Exception ex) {
+        UserInfoManager.clear();
+    }
+
+    private boolean setUserInfo(UserInfo info, JwtSysUser sysUser) {
+//        if (this.mockUserInfo) {
+//            return true;
+//        }
+
+//        UserInfoResp resp = this.userInfoCache.getUserInfo(info.getUserId(), sysUser.value());
+//        if (resp == null) {
+//            return false;
+//        } else {
+//            info.setMerchantId(resp.getMerchantId());
+//            info.setMobile(resp.getMobile());
+//            info.setUsername(resp.getUsername());
+//            info.setAccount(resp.getAccount());
+//            info.setStatus(resp.getStatus());
+//            info.setEmail(resp.getEmail());
+//            info.setSystemType(SystemTypeEnum.toEnum(resp.getSystem()));
+//            info.setUserInfoType(UserInfoTypeEnum.toEnum(resp.getType()));
+//            return true;
+//        }
+        return true;
+    }
+
+    private UserInfo getUserInfoFromJwtToken(HttpServletRequest request, JwtSysUser sysUser) {
+        try {
+            String token = request.getHeader("token");
+            if (token == null) {
+                token = request.getHeader("Authorization");
+            }
+
+            if (!StringUtils.isEmpty(token)) {
+                return JWTUtil.getUserInfo(token);
+            }
+        } catch (Exception e) {
+            log.error("解析token异常", e);
+        }
+        return null;
+    }
+
+    private void writeNeedLogin(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        this.assemblyResponse(request, response, "用户未登录!", HttpStatus.UNAUTHORIZED, "BIZ.USER_NOT_LOGIN");
+    }
+
+    private void writeException(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        this.assemblyResponse(request, response, "网络异常,请稍后再试", HttpStatus.OK, "BIZ.BUSSINESS_EXCEPTION");
+    }
+
+    private void assemblyResponse(HttpServletRequest request, HttpServletResponse response, String errorMsg, HttpStatus unauthorized, String userNotLogin) throws IOException {
+        response.setContentType("application/json;charset=UTF-8");
+        response.setStatus(unauthorized.value());
+        String origin = request.getHeader("Origin");
+        if (origin == null) {
+            response.addHeader("Access-Control-Allow-Origin", "*");
+        } else {
+            response.addHeader("Access-Control-Allow-Origin", origin);
+        }
+
+        response.addHeader("Access-Control-Allow-Headers", "*");
+        response.addHeader("Access-Control-Allow-Credentials", "true");
+        response.addHeader("Access-Control-Allow-Methods", "GET,POST,PUT,OPTIONS,DELETE");
+        PrintWriter writer = response.getWriter();
+//        writer.write(JSON.toJSONString(new ResponseResult(userNotLogin, errorMsg)));
+        writer.flush();
+        writer.close();
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java b/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java
new file mode 100644
index 0000000..0dd335a
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java
@@ -0,0 +1,91 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.mosty.common.token;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户信息
+ *
+ * @author kevin
+ * @date 2022/2/16 1:24 PM
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+public class UserInfo implements Serializable {
+
+    private static final long serialVersionUID = -2608276244908343842L;
+
+    @ApiModelProperty(value = "用户id")
+    public final Long userId;
+
+    @ApiModelProperty(value = "用户名")
+    public final String userName;
+
+    @ApiModelProperty(value = "用户电话")
+    public final String phone;
+
+    @ApiModelProperty(value = "用户账号")
+    public final String userLoginName;
+
+    @ApiModelProperty(value = "用户行业号码")
+    public final String inDustRialId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    public final String idEntityCard;
+
+    @ApiModelProperty(value = "是否虚拟用户")
+    public final String isVirtualUser;
+
+    @ApiModelProperty(value = "数据权限范围")
+    public final String level;
+
+    @ApiModelProperty(value = "部门id")
+    public final Long deptId;
+
+    @ApiModelProperty(value = "部门名称")
+    public final String deptName;
+
+    @ApiModelProperty(value = "部门编码")
+    public final String deptCode;
+
+    @ApiModelProperty(value = "分县局部门id")
+    public final Long fxjDeptId;
+
+    @ApiModelProperty(value = "分县局部门名称")
+    public final String fxjDeptName;
+
+    @ApiModelProperty(value = "分县局部门编码")
+    public final String fxjDeptCode;
+
+    @ApiModelProperty(value = "地市州部门id")
+    public final Long dszDeptId;
+
+    @ApiModelProperty(value = "地市州部门名称")
+    public final String dszDeptName;
+
+    @ApiModelProperty(value = "地市州部门编码")
+    public final String dszDeptCode;
+
+    @ApiModelProperty(value = "部门等级")
+    public final String deptLevel;
+
+    @ApiModelProperty(value = "所在部门业务类型代码")
+    public final String deptBizType;
+
+    @ApiModelProperty(value = "用户数据权限SQL")
+    public final UserPermissionsInfo userPermissionsInfo;
+
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserInfoCache.java b/common-token-starter/src/main/java/com/mosty/common/token/UserInfoCache.java
new file mode 100644
index 0000000..4122dc8
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserInfoCache.java
@@ -0,0 +1,69 @@
+//package com.mosty.common.token;
+//
+//import com.google.common.base.Function;
+//import com.google.common.cache.CacheBuilder;
+//import com.google.common.cache.CacheLoader;
+//import com.google.common.cache.LoadingCache;
+//import java.util.HashMap;
+//import java.util.Map;
+//import java.util.concurrent.TimeUnit;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.StringUtils;
+//
+//@Component
+//public class UserInfoCache {
+//    private static final Logger log = LoggerFactory.getLogger(UserInfoCache.class);
+//    private static final String KEY_MID = "_";
+//    private final Map<Integer, Function<Integer, ResponseResult<UserInfoResp>>> func = new HashMap();
+//    private final LoadingCache<String, UserInfoResp> cache;
+//
+//    public UserInfoCache(StoreUserInfoClient storeUserInfoClient, PlatformUserInfoClient platformUserInfoClient) {
+//        this.cache = CacheBuilder.newBuilder().maximumSize(10000L).expireAfterWrite(3L, TimeUnit.MINUTES).build(new CacheLoader<String, UserInfoResp>() {
+//            public UserInfoResp load(String key) {
+//                if (StringUtils.isEmpty(key)) {
+//                    return null;
+//                } else {
+//                    String[] vs = key.split("_");
+//                    Integer type = Integer.valueOf(vs[0]);
+//                    Integer userId = Integer.valueOf(vs[1]);
+//                    UserType userType = UserType.toEnum(type);
+//                    if (userType == null) {
+//                        UserInfoCache.log.error("用户类型正确,type:{},userId:{}", type, userId);
+//                        return null;
+//                    } else {
+//                        ResponseResult<UserInfoResp> result = (ResponseResult)((Function)UserInfoCache.this.func.get(type)).apply(userId);
+//                        if (result != null) {
+//                            if (result.isSuccess()) {
+//                                return (UserInfoResp)result.getData();
+//                            }
+//
+//                            UserInfoCache.log.error("调用{}后台用户失败:{},{}", new Object[]{userType.getName(), userId, result.getMessage()});
+//                        }
+//
+//                        return null;
+//                    }
+//                }
+//            }
+//        });
+//        if (storeUserInfoClient != null && platformUserInfoClient != null) {
+//            this.func.put(UserType.store.getValue(), storeUserInfoClient::getUserInfo);
+//            this.func.put(UserType.platform.getValue(), platformUserInfoClient::getUserInfo);
+//        }
+//
+//    }
+//
+//    public UserInfoResp getUserInfo(Integer userId, UserType userType) {
+//        if (userId != null && userType != null) {
+//            try {
+//                return (UserInfoResp)this.cache.getUnchecked(userType.value + "_" + userId);
+//            } catch (Exception var4) {
+//                log.error("key:{}/{} err", new Object[]{userId, userType, var4});
+//                return null;
+//            }
+//        } else {
+//            return null;
+//        }
+//    }
+//}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserInfoManager.java b/common-token-starter/src/main/java/com/mosty/common/token/UserInfoManager.java
new file mode 100644
index 0000000..36ac8c7
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserInfoManager.java
@@ -0,0 +1,34 @@
+package com.mosty.common.token;
+
+import com.alibaba.ttl.TransmittableThreadLocal;
+import com.mosty.common.base.exception.BusinessException;
+
+public class UserInfoManager {
+
+    /**
+     * 用户信息
+     */
+    private static final ThreadLocal<UserInfo> USER_CONTEXT = TransmittableThreadLocal.withInitial(() -> null);
+
+    public UserInfoManager() {}
+
+    public static void set(UserInfo userInfo) {
+        USER_CONTEXT.set(userInfo);
+    }
+
+    public static void clear() {
+        USER_CONTEXT.remove();
+    }
+
+    public static UserInfo get() {
+        UserInfo user = USER_CONTEXT.get();
+        if (user == null) {
+            throw new BusinessException("登录信息获取异常，请重新登录！！");
+        }
+        return user;
+    }
+
+    public static UserInfo getUser() {
+        return USER_CONTEXT.get();
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserPermissionsInfo.java b/common-token-starter/src/main/java/com/mosty/common/token/UserPermissionsInfo.java
new file mode 100644
index 0000000..a19312d
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserPermissionsInfo.java
@@ -0,0 +1,36 @@
+package com.mosty.common.token;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ *  用户权限信息
+ * @author Lhh
+ * @date 2022/06/27 17:24
+ * @since 1.0.0
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserPermissionsInfo {
+
+    @ApiModelProperty("权限过滤条件ids")
+    private String ids;
+
+    @ApiModelProperty("权限过滤条件orgcodes")
+    private String orgcodes;
+
+    @ApiModelProperty("权限等级（D_ZDY_SJQX）")
+    private String permissionsLevel;
+
+    @ApiModelProperty("权限SQL(ssbmid)")
+    private String permissionsSql;
+
+    @ApiModelProperty("权限SQL(ssbmdm)")
+    private String permissionsSqlCode;
+
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserType.java b/common-token-starter/src/main/java/com/mosty/common/token/UserType.java
new file mode 100644
index 0000000..190eb97
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserType.java
@@ -0,0 +1,28 @@
+//package com.mosty.common.token;
+//
+//import com.aimart.common.base.BaseEnum;
+//
+//public enum UserType implements BaseEnum {
+//    store(1, "商家/门店后台"),
+//    platform(2, "平台后台");
+//
+//    public final int value;
+//    public final String name;
+//
+//    public int getValue() {
+//        return this.value;
+//    }
+//
+//    public String getName() {
+//        return this.name;
+//    }
+//
+//    public static UserType toEnum(Integer value) {
+//        return (UserType)BaseEnum.toEnum(value, UserType.class);
+//    }
+//
+//    private UserType(int value, String name) {
+//        this.value = value;
+//        this.name = name;
+//    }
+//}
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/VirtualUserEnum.java b/common-token-starter/src/main/java/com/mosty/common/token/VirtualUserEnum.java
new file mode 100644
index 0000000..bb5625f
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/token/VirtualUserEnum.java
@@ -0,0 +1,43 @@
+package com.mosty.common.token;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  虚拟用户标识
+ * @author kevin
+ * @date 2022/2/25 9:52 AM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public enum VirtualUserEnum {
+
+    /** 正常用户 */
+    NATURE(1, "正常用户"),
+
+    /** 虚拟用户 */
+    VIRTUAL(2, "虚拟状态");
+
+    /** 编码 */
+    public final Integer code;
+
+    /** 描述 */
+    public final String desc;
+
+    /**
+     * 编码匹配 用户类型
+     * @param code 编码
+     * @return 虚拟用户枚举
+     */
+    public static VirtualUserEnum valueOf(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (VirtualUserEnum virtualUserEnum : VirtualUserEnum.values()) {
+            if (virtualUserEnum.code.equals(code)) {
+                return virtualUserEnum;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/DataPermissionConstant.java b/common-token-starter/src/main/java/com/mosty/common/util/DataPermissionConstant.java
new file mode 100644
index 0000000..b16fa82
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/DataPermissionConstant.java
@@ -0,0 +1,27 @@
+package com.mosty.common.util;
+
+import lombok.AllArgsConstructor;
+
+/**
+ *  菜单类型枚举
+ * @author kevin
+ * @date 2022/2/22 12:53 PM
+ * @since 1.0.0
+ */
+@AllArgsConstructor
+public class DataPermissionConstant {
+
+    // 全部数据权限
+    public static final String DATA_SCOPE_ALL = "1";
+    // 市级数据权限
+    public static final String DATA_SCOPE_CITY = "2";
+    // 县级数据权限
+    public static final String DATA_SCOPE_COUNTY = "3";
+    // 部门及以下数据权限
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+    // 部门数据权限
+    public static final String DATA_SCOPE_DEPT = "5";
+    // 仅本人数据权限
+    public static final String DATA_SCOPE_SELF = "99";
+
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/GeoHashKit.java b/common-token-starter/src/main/java/com/mosty/common/util/GeoHashKit.java
new file mode 100644
index 0000000..c69fe1f
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/GeoHashKit.java
@@ -0,0 +1,139 @@
+package com.mosty.common.util;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 经纬度相关工具
+ **/
+public class GeoHashKit {
+    private static final char[] _base32 = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
+
+    private final static Map<Character, Integer> _decodemap = new HashMap<>();
+
+    private static final int[] bits = {16, 8, 4, 2, 1};
+
+    static {
+        int sz = _base32.length;
+        for (int i = 0; i < sz; i++) {
+            _decodemap.put(_base32[i], i);
+        }
+    }
+
+
+    public static void main(String[] args) {
+        String gc1 = encode(new BigDecimal("39.916527"), new BigDecimal("116.397128"));
+        System.out.println(gc1);
+        BigDecimal[] gd1 = decode(gc1);
+        System.out.println(gd1[0] + ", " + gd1[1]);
+    }
+
+
+    /**
+     * 经纬度换算geoHash
+     *
+     * @param lat
+     * @param lon
+     * @return
+     */
+    public static String encode(BigDecimal lat, BigDecimal lon) {
+        double latitude = lat.doubleValue();
+        double longitude = lon.doubleValue();
+        double[] lat_interval = {-90.0, 90.0};
+        double[] lon_interval = {-180.0, 180.0};
+        StringBuilder geohash = new StringBuilder();
+        boolean is_even = true;
+        int bit = 0, ch = 0;
+        int precision = 12;
+        while (geohash.length() < precision) {
+            double mid;
+            if (is_even) {
+                mid = (lon_interval[0] + lon_interval[1]) / 2;
+                if (longitude > mid) {
+                    ch |= bits[bit];
+                    lon_interval[0] = mid;
+                } else {
+                    lon_interval[1] = mid;
+                }
+            } else {
+                mid = (lat_interval[0] + lat_interval[1]) / 2;
+                if (latitude > mid) {
+                    ch |= bits[bit];
+                    lat_interval[0] = mid;
+                } else {
+                    lat_interval[1] = mid;
+                }
+            }
+            is_even = !is_even;
+            if (bit < 4) {
+                bit++;
+            } else {
+                geohash.append(_base32[ch]);
+                bit = 0;
+                ch = 0;
+            }
+        }
+        return geohash.toString();
+    }
+
+
+    public static BigDecimal[] decode(String geohash) {
+        double[] ge = decode_exactly(geohash);
+        double lat, lon, lat_err, lon_err;
+        lat = ge[0];
+        lon = ge[1];
+        lat_err = ge[2];
+        lon_err = ge[3];
+        double lat_precision = Math.max(1, Math.round(-Math.log10(lat_err))) - 1;
+        double lon_precision = Math.max(1, Math.round(-Math.log10(lon_err))) - 1;
+        lat = getPrecision(lat, lat_precision);
+        lon = getPrecision(lon, lon_precision);
+        return new BigDecimal[]{new BigDecimal(lat), new BigDecimal(lon)};
+    }
+
+
+    public static double[] decode_exactly(String geohash) {
+        double[] lat_interval = {-90.0, 90.0};
+        double[] lon_interval = {-180.0, 180.0};
+        double lat_err = 90.0;
+        double lon_err = 180.0;
+        boolean is_even = true;
+        int sz = geohash.length();
+        int bsz = bits.length;
+        double latitude, longitude;
+        for (int i = 0; i < sz; i++) {
+            int cd = _decodemap.get(geohash.charAt(i));
+            for (int mask : bits) {
+                if (is_even) {
+                    lon_err /= 2;
+                    if ((cd & mask) != 0) {
+                        lon_interval[0] = (lon_interval[0] + lon_interval[1]) / 2;
+                    } else {
+                        lon_interval[1] = (lon_interval[0] + lon_interval[1]) / 2;
+                    }
+                } else {
+                    lat_err /= 2;
+                    if ((cd & mask) != 0) {
+                        lat_interval[0] = (lat_interval[0] + lat_interval[1]) / 2;
+                    } else {
+                        lat_interval[1] = (lat_interval[0] + lat_interval[1]) / 2;
+                    }
+                }
+                is_even = !is_even;
+            }
+        }
+        latitude = (lat_interval[0] + lat_interval[1]) / 2;
+        longitude = (lon_interval[0] + lon_interval[1]) / 2;
+        return new double[]{latitude, longitude, lat_err, lon_err};
+    }
+
+
+    static double getPrecision(double x, double precision) {
+        double base = Math.pow(10, -precision);
+        double diff = x % base;
+        return x - diff;
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/ImageUtils.java b/common-token-starter/src/main/java/com/mosty/common/util/ImageUtils.java
new file mode 100644
index 0000000..ce4f249
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/ImageUtils.java
@@ -0,0 +1,547 @@
+package com.mosty.common.util;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sun.misc.BASE64Encoder;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import javax.net.ssl.*;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.geom.AffineTransform;
+import java.awt.image.*;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/**
+ * 图片处理类<br>
+ *
+ * @author Esacpe
+ * @version 2014-8-22
+ */
+
+public class ImageUtils {
+
+    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
+
+
+
+    public static byte[] getImage(String imagePath)
+    {
+        InputStream is = getFile(imagePath);
+        try
+        {
+            return IOUtils.toByteArray(is);
+        }
+        catch (Exception e)
+        {
+            log.error("图片加载异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
+    public static InputStream getFile(String imagePath)
+    {
+        try
+        {
+            byte[] result = readFile(imagePath);
+            result = Arrays.copyOf(result, result.length);
+            return new ByteArrayInputStream(result);
+        }
+        catch (Exception e)
+        {
+            log.error("获取图片异常 {}", e);
+        }
+        return null;
+    }
+
+    /**
+     * 读取文件为字节数据
+     *
+     * @param url 地址
+     * @return 字节数据
+     */
+    public static byte[] readFile(String url)
+    {
+        InputStream in = null;
+        try
+        {
+            // 网络地址
+            URL urlObj = new URL(url);
+            URLConnection urlConnection = urlObj.openConnection();
+            urlConnection.setConnectTimeout(30 * 1000);
+            urlConnection.setReadTimeout(60 * 1000);
+            urlConnection.setDoInput(true);
+            in = urlConnection.getInputStream();
+            return IOUtils.toByteArray(in);
+        }
+        catch (Exception e)
+        {
+            log.error("访问文件异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(in);
+        }
+    }
+
+
+    /**
+     * 将图片缩放处理方法<br>
+     *
+     * @param source    源图片对象
+     * @param targetW   转换后的宽度
+     * @param targetH   转换后的高度
+     * @param sameScale 是否等比例缩放
+     * @return BufferedImage
+     */
+    public static BufferedImage resize(BufferedImage source, int targetW,
+                                       int targetH, boolean sameScale) { // targetW，targetH分别表示目标长和宽
+        int type = source.getType();
+        BufferedImage target = null;
+        double sx = (double) targetW / source.getWidth();
+        double sy = (double) targetH / source.getHeight();
+        if (sameScale) { // 需要等比例缩放
+            if (sx > sy) {
+                sx = sy;
+                targetW = (int) (sx * source.getWidth());
+            } else {
+                sy = sx;
+                targetH = (int) (sy * source.getHeight());
+            }
+        }
+        if (type == BufferedImage.TYPE_CUSTOM) { // handmade
+            ColorModel cm = source.getColorModel();
+            WritableRaster raster = cm.createCompatibleWritableRaster(targetW,
+                    targetH);
+            boolean alphaPremultiplied = cm.isAlphaPremultiplied();
+            target = new BufferedImage(cm, raster, alphaPremultiplied, null);
+        } else {
+            target = new BufferedImage(targetW, targetH, type);
+        }
+        Graphics2D g = target.createGraphics();
+        // smoother than exlax:
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+        g.drawRenderedImage(source, AffineTransform.getScaleInstance(sx, sy));
+        g.dispose();
+        return target;
+    }
+
+    /**
+     * 将图片放大与缩小<br>
+     *
+     * @param sourceByte 源图片的字节数组
+     * @param width      转换后的宽度
+     * @param height     转换后的高度
+     * @param sameScale  是否等比例缩放
+     * @return byte[]
+     */
+    public static byte[] convertImageSize(byte[] sourceByte, int width,
+                                          int height, boolean sameScale) throws Exception {
+        byte[] returnValue = null;
+        if (sourceByte != null && sourceByte.length > 0) {
+            ByteArrayInputStream in = new ByteArrayInputStream(sourceByte);
+            // BufferedImage srcImage = getReadImage(in);
+            BufferedImage srcImage = null;
+            try {
+                srcImage = ImageIO.read(in); // RGB
+            } catch (Exception e) {
+            }
+            if (srcImage != null) {
+                BufferedImage srcImageTarget = resize(srcImage, width, height,
+                        sameScale);
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                boolean flag = ImageIO.write(srcImageTarget, "JPEG", out);
+                returnValue = out.toByteArray();
+            }
+        }
+        return returnValue;
+    }
+
+    /**
+     * 将图片放大与缩小后另存<br>
+     *
+     * @param fromFileStr   来源文件名
+     * @param saveToFileStr 目标文件名
+     * @param width         转换后的宽度
+     * @param height        转换后的高度
+     * @param sameScale     是否等比例缩放
+     */
+    public static void saveImageAsJpg(String fromFileStr, String saveToFileStr,
+                                      int width, int height, boolean sameScale) throws Exception {
+        String imgType = "JPEG";
+        if (fromFileStr.toLowerCase().endsWith(".png")) {
+            imgType = "PNG";
+        }
+        File saveFile = new File(saveToFileStr);
+        File fromFile = new File(fromFileStr);
+        BufferedImage srcImage = getReadImage(fromFile);
+        if (srcImage != null) {
+            if (width > 0 || height > 0) {
+                srcImage = resize(srcImage, width, height, sameScale);
+            }
+            ImageIO.write(srcImage, imgType, saveFile);
+        }
+    }
+
+    /**
+     * 根据文件取得bufferedImage对象（自动识别RGB与CMYK）<br>
+     *
+     * @param file 来源文件名
+     * @return BufferedImage
+     */
+    private static BufferedImage getReadImage(File file) throws Exception {
+        BufferedImage srcImage = null;
+        ImageInputStream input = ImageIO.createImageInputStream(file); // 只能接收File或FileInputStream，ByteArrayInputStream无效
+        Iterator readers = ImageIO.getImageReaders(input);
+        if (readers == null || !readers.hasNext()) {
+            throw new RuntimeException("1 No ImageReaders found");
+        }
+        ImageReader reader = (ImageReader) readers.next();
+        reader.setInput(input);
+        String format = reader.getFormatName();
+        if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format)) {
+            try {
+                srcImage = ImageIO.read(file); // RGB
+            } catch (Exception e) {
+                Raster raster = reader.readRaster(0, null);// CMYK
+                srcImage = createJPEG4(raster);
+            }
+            input.close();
+        }
+        return srcImage;
+    }
+
+    /**
+     * RGB彩色空间转换为CMYK<br>
+     *
+     * @param raster
+     * @return BufferedImage
+     */
+    private static BufferedImage createJPEG4(Raster raster) {
+        int w = raster.getWidth();
+        int h = raster.getHeight();
+        byte[] rgb = new byte[w * h * 3]; // 彩色空间转换
+        float[] Y = raster.getSamples(0, 0, w, h, 0, (float[]) null);
+        float[] Cb = raster.getSamples(0, 0, w, h, 1, (float[]) null);
+        float[] Cr = raster.getSamples(0, 0, w, h, 2, (float[]) null);
+        float[] K = raster.getSamples(0, 0, w, h, 3, (float[]) null);
+        for (int i = 0, imax = Y.length, base = 0; i < imax; i++, base += 3) {
+            float k = 220 - K[i], y = 255 - Y[i], cb = 255 - Cb[i], cr = 255 - Cr[i];
+            double val = y + 1.402 * (cr - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+            val = y - 0.34414 * (cb - 128) - 0.71414 * (cr - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base + 1] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+            val = y + 1.772 * (cb - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base + 2] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+        }
+        raster = Raster.createInterleavedRaster(new DataBufferByte(rgb,
+                rgb.length), w, h, w * 3, 3, new int[]{0, 1, 2}, null);
+        ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        ColorModel cm = new ComponentColorModel(cs, false, true,
+                Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+        return new BufferedImage(cm, (WritableRaster) raster, true, null);
+    }
+
+    public static byte[] encodeImageTobyte(String url) {
+        //打开链接
+        try {
+            URL urls = new URL(url);
+            HttpURLConnection conn = null;
+
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+            //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            //关闭输入流
+            inStream.close();
+            byte[] data = outStream.toByteArray();
+            return data;//返回Base64编码过的字节数组字符串
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 网络图片转成base64 https
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encodeImageToByteHttps(String url) {
+        byte[] data = null;
+        try {
+            SSLContext sslcontext = SSLContext.getInstance("SSL", "SunJSSE");
+            sslcontext.init(null, new TrustManager[]{new MyX509TrustManager()}, new java.security.SecureRandom());
+            URL urls = new URL(url);
+            HostnameVerifier ignoreHostnameVerifier = new HostnameVerifier() {
+                public boolean verify(String s, SSLSession sslsession) {
+                    System.out.println("WARNING: Hostname is not matched for cert.");
+                    return true;
+                }
+            };
+            HttpsURLConnection.setDefaultHostnameVerifier(ignoreHostnameVerifier);
+            HttpsURLConnection.setDefaultSSLSocketFactory(sslcontext.getSocketFactory());
+            //之后任何Https协议网站皆能正常访问，同第一种情况
+            HttpURLConnection conn = null;
+
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_MOVED_PERM) {
+                String location = conn.getHeaderField("Location");
+                byte[] data1 = encodeImageToByteHttps(location.trim());
+                if (null != data && data1.length > 0) {
+                    return data1;
+                }
+
+            } else {
+                //通过输入流获取图片数据
+                InputStream inStream = conn.getInputStream();
+                //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+                ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+                //创建一个Buffer字符串
+                byte[] buffer = new byte[1024];
+                //每次读取的字符串长度，如果为-1，代表全部读取完毕
+                int len = 0;
+                //使用一个输入流从buffer里把数据读取出来
+                while ((len = inStream.read(buffer)) != -1) {
+                    //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                    outStream.write(buffer, 0, len);
+                }
+                //关闭输入流
+                inStream.close();
+                data = outStream.toByteArray();
+
+            }
+        } catch (Exception e) {
+            System.out.println("解析失败！------》" + e.getMessage());
+        }
+        return data;
+    }
+
+
+    /**
+     * 网络图片转成base64 https
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static String encodeImageToBase64Https(String url) {
+        String base64 = null;
+        try {
+            SSLContext sslcontext = SSLContext.getInstance("SSL", "SunJSSE");
+            sslcontext.init(null, new TrustManager[]{new MyX509TrustManager()}, new java.security.SecureRandom());
+            URL urls = new URL(url);
+            HostnameVerifier ignoreHostnameVerifier = new HostnameVerifier() {
+                public boolean verify(String s, SSLSession sslsession) {
+                    System.out.println("WARNING: Hostname is not matched for cert.");
+                    return true;
+                }
+            };
+            HttpsURLConnection.setDefaultHostnameVerifier(ignoreHostnameVerifier);
+            HttpsURLConnection.setDefaultSSLSocketFactory(sslcontext.getSocketFactory());
+            //之后任何Https协议网站皆能正常访问，同第一种情况
+            HttpURLConnection conn = null;
+
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_MOVED_PERM) {
+                String location = conn.getHeaderField("Location");
+                String s = encodeImageToBase64Https(location.trim());
+                if (StringUtils.isNotBlank(s)) {
+                    return s;
+                }
+
+            } else {
+                //通过输入流获取图片数据
+                InputStream inStream = conn.getInputStream();
+                //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+                ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+                //创建一个Buffer字符串
+                byte[] buffer = new byte[1024];
+                //每次读取的字符串长度，如果为-1，代表全部读取完毕
+                int len = 0;
+                //使用一个输入流从buffer里把数据读取出来
+                while ((len = inStream.read(buffer)) != -1) {
+                    //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                    outStream.write(buffer, 0, len);
+                }
+                //关闭输入流
+                inStream.close();
+                byte[] data = outStream.toByteArray();
+                //对字节数组Base64编码
+                BASE64Encoder encoder = new BASE64Encoder();
+                base64 = encoder.encode(data).replaceAll("[\\s*\t\n\r]", "");
+            }
+        } catch (Exception e) {
+            System.out.println("解析失败！------》" + e.getMessage());
+        }
+        return base64;
+    }
+
+    /**
+     * 网络图片转成base64
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static String encodeImageToBase64(String url) throws Exception {
+        //打开链接
+        URL urls = new URL(url);
+        HttpURLConnection conn;
+        try {
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+            //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            //关闭输入流
+            inStream.close();
+            byte[] data = outStream.toByteArray();
+            //对字节数组Base64编码
+            BASE64Encoder encoder = new BASE64Encoder();
+            return encoder.encode(data).replaceAll("[\\s*\t\n\r]", "");
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("解析失败!");
+        }
+    }
+
+    public static String ImageToBase64(String imgPath) {
+        byte[] data = null;
+        try {
+            InputStream in = new FileInputStream(imgPath);
+            data = new byte[in.available()];
+            in.read(data);
+            in.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+//        return StringUtils.replaceBlank(StringUtils.getByteToBase64(data));
+        return "";
+    }
+
+    /**
+     * 网络图片转成base64
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encodeImageToByte(String url) throws Exception {
+        //打开链接
+        URL urls = new URL(url);
+        HttpURLConnection conn = null;
+        try {
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+            //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            //关闭输入流
+            inStream.close();
+            byte[] data = outStream.toByteArray();
+            return data;
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("解析失败!");
+        }
+    }
+
+
+
+
+    public static void main(String argv[]) throws Exception{
+//            ImageUtils.saveImageAsJpg("C:/test.jpg", "c:/test2.jpg", 179, 220,
+//                    true);
+
+            //		String s = ImageUtils.ImageToBase64("C:\\Users\\admin\\Desktop\\ryxp.jpg");
+//		System.out.println(s);
+//            String str = "normal://repository-builder/20190628/ehlZxEcjZp09UubZQugxug==@11";
+//            //编码加密
+//            String encodeStr = Base64.getEncoder().encodeToString(str.getBytes("UTF-8"));
+//            System.out.println("加密后的字符串为:" + encodeStr);
+//            //解码解密
+//            String decoderStr = new String(Base64.getDecoder().decode(encodeStr), StandardCharsets.UTF_8); //
+//            // 推荐使用StandardCharsets类指定
+//            System.out.println("解密后的字符串为" + decoderStr);
+
+
+
+            String tp="http://10.64.201.128:7266/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=510502195403065021";
+        String s = ImageUtils.encodeImageToBase64(tp);
+        System.out.println(s);
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/JtsUtils.java b/common-token-starter/src/main/java/com/mosty/common/util/JtsUtils.java
new file mode 100644
index 0000000..b20bfce
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/JtsUtils.java
@@ -0,0 +1,206 @@
+package com.mosty.common.util;
+
+import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.linearref.LengthIndexedLine;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JtsUtils {
+    private static final double EARTH_RADIUS = 6378137;
+    public static GeometryFactory factory = new GeometryFactory(new PrecisionModel(100000000000d));
+    private static final DecimalFormat df = new DecimalFormat("0.00000000000");
+    private static final DecimalFormat format = new DecimalFormat("0.0000");
+
+    public static String toEwkt(Geometry geom) {
+        if (geom == null) {
+            return null;
+        }
+        String type = geom.getGeometryType().toUpperCase();
+        switch (type) {
+            case "POINT": {
+                Coordinate coor = geom.getCoordinate();
+                return "POINT(" + formatCoordinate(coor) + ")";
+            }
+            case "MULTIPOINT": {
+                return coordinateToEwkt("MULTIPOINT(", geom.getCoordinates(), ")");
+            }
+            case "LINESTRING": {
+                return coordinateToEwkt("LINESTRING(", geom.getCoordinates(), ")");
+            }
+            case "POLYGON": {
+                return coordinateToEwkt("POLYGON((", geom.getCoordinates(), "))");
+            }
+            case "MULTILINESTRING": {
+                StringBuffer sb = new StringBuffer();
+                sb.append("MULTILINESTRING(");
+                sb.append(multiGeometryFormat(geom));
+                sb.append(")");
+                return sb.toString();
+            }
+            case "MULTIPOLYGON": {
+                StringBuffer sb = new StringBuffer();
+                sb.append("MULTIPOLYGON(");
+                sb.append(multiGeometryFormat(geom));
+                sb.append(")");
+                return sb.toString();
+            }
+            case "GEOMETRYCOLLECTION": {
+                StringBuffer sb = new StringBuffer();
+                int num = geom.getNumGeometries();
+                sb.append("GEOMETRYCOLLECTION(");
+                for (int j = 0; j < num; j++) {
+                    Geometry element = geom.getGeometryN(j);
+                    String subType = element.getGeometryType().toUpperCase();
+                    if ("POINT".equals(subType)) {
+                        sb.append("POINT(" + formatCoordinate(element.getCoordinate()) + ")");
+                    } else if ("LINESTRING".equals(subType)) {
+                        sb.append(coordinateToEwkt("LINESTRING(", element.getCoordinates(), ")"));
+                    } else if ("POLYGON".equals(subType)) {
+                        sb.append(coordinateToEwkt("POLYGON((", element.getCoordinates(), "))"));
+                    }
+                    if (j < num - 1) {
+                        sb.append(",");
+                    }
+                }
+                sb.append(")");
+                return sb.toString();
+            }
+        }
+        return null;
+    }
+
+    private static String formatCoordinate(Coordinate coordinate) {
+        return df.format(coordinate.x) + " " + df.format(coordinate.y);
+    }
+
+    public static String coordinateToEwkt(String prefix, Coordinate[] coordinates, String suffix) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(prefix);
+        boolean append = false;
+        for (Coordinate coordinate : coordinates) {
+            if (append) {
+                sb.append(",");
+            }
+            sb.append(formatCoordinate(coordinate));
+            append = true;
+        }
+        sb.append(suffix);
+        return sb.toString();
+    }
+
+    public static String multiGeometryFormat(Geometry geom) {
+        StringBuffer sb = new StringBuffer();
+        int num = geom.getNumGeometries();
+        for (int i = 0; i < num; i++) {
+            Geometry g = geom.getGeometryN(i);
+            sb.append(coordinateToEwkt("((", g.getCoordinates(), "))"));
+            if (i < num - 1) {
+                sb.append(",");
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取两组成的线的几何中心
+     *
+     * @param s 起始点
+     * @param e 结束点
+     * @return
+     */
+    public static Coordinate getCentroid(Coordinate s, Coordinate e) {// 获取两点组成的线的图心
+        if (s.x == e.x && s.y == e.y) {
+            return s;
+        }
+        LineString ls = factory.createLineString(new Coordinate[]{s, e});
+        Point cp = ls.getCentroid();
+        return cp.getCoordinate();
+    }
+
+    /**
+     * 获取多个离散几何点的几何中心
+     *
+     * @param coors
+     * @return
+     */
+    public static Coordinate getCentroid(Coordinate[] coors) {// 获取多个离散点的图心
+        MultiPoint mp = factory.createMultiPoint(coors);
+        return mp.getCentroid().getCoordinate();
+    }
+
+    /**
+     * 获取面
+     *
+     * @param list
+     * @return
+     */
+    public static Polygon getPolygon(List<BigDecimal[]> list) {
+        Coordinate[] coors = new Coordinate[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            BigDecimal[] item = list.get(i);
+            Coordinate coor = new Coordinate();
+            coor.x = item[0].doubleValue();
+            coor.y = item[1].doubleValue();
+            coors[i] = coor;
+        }
+        return factory.createPolygon(coors);
+    }
+
+    /**
+     * 获取线
+     *
+     * @param list [[x,y],[x1,y1],[x2,y2]....]
+     * @return
+     */
+    public static LineString createLine(List<BigDecimal[]> list) {
+        Coordinate[] coors = new Coordinate[list.size() - 1];
+        for (int i = 0; i < list.size(); i++) {
+            BigDecimal[] item = list.get(i);
+            Coordinate coor = new Coordinate();
+            coor.x = item[0].doubleValue();
+            coor.y = item[1].doubleValue();
+            coors[i] = coor;
+        }
+        return factory.createLineString(coors);
+    }
+
+    /**
+     * 获取点
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    public static Point getPoint(BigDecimal x, BigDecimal y) {
+        Coordinate coor = new Coordinate(x.doubleValue(), y.doubleValue());
+        return factory.createPoint(coor);
+    }
+
+    // 解析面类型为经纬度数组
+    public static List<BigDecimal[]> decodePolygon(Polygon pl) {
+        if (pl != null) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            Coordinate[] coors = pl.getCoordinates();
+            if (coors.length > 0) {
+                for (Coordinate coor : coors) {
+                    BigDecimal[] temp = new BigDecimal[2];
+                    temp[0] = new BigDecimal(coor.x);
+                    temp[1] = new BigDecimal(coor.y);
+                    list.add(temp);
+                }
+            }
+            return list;
+        }
+        return null;
+    }
+
+    public static Coordinate getCenter(LineString line) {
+        LengthIndexedLine indexedLine = new LengthIndexedLine(line);
+        double[] index = indexedLine.indicesOf(line);
+        Coordinate mid = indexedLine.extractPoint((index[0] + index[1]) / 2);
+        return mid;
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/MyX509TrustManager.java b/common-token-starter/src/main/java/com/mosty/common/util/MyX509TrustManager.java
new file mode 100644
index 0000000..7e6c36f
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/MyX509TrustManager.java
@@ -0,0 +1,22 @@
+package com.mosty.common.util;
+
+
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class MyX509TrustManager implements X509TrustManager {
+
+    // 检查客户端证书
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }
+
+    // 检查服务器端证书
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }
+
+    // 返回受信任的X509证书数组
+    public X509Certificate[] getAcceptedIssuers() {
+        return null;
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/PermissionsUtil.java b/common-token-starter/src/main/java/com/mosty/common/util/PermissionsUtil.java
new file mode 100644
index 0000000..d94a6d0
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/PermissionsUtil.java
@@ -0,0 +1,106 @@
+package com.mosty.common.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+
+import java.util.Arrays;
+
+/**
+ * 数据权限获取工具
+ */
+public class PermissionsUtil {
+
+    // 根据组织机构ID获取查询权限
+    public static void queryWrapperUtilByDeptInfo(QueryWrapper queryWrapper, DeptInfo deptInfo) {
+        if (deptInfo != null && deptInfo.getPermissionsLevel() != null) {
+            String level = deptInfo.getPermissionsLevel();
+            if ("1".equals(level) || "2".equals(level)) {
+                // do nothing
+            } else if ("3".equals(level)) {
+                queryWrapper.eq("sssgajid", deptInfo.getSssgajid());
+            } else if ("4".equals(level)) {
+                queryWrapper.eq("ssxgajid", deptInfo.getSsxgajid());
+            } else if ("5".equals(level)) {
+                if (StringUtils.isNotEmpty(deptInfo.getIds())) {
+                    String[] ids = deptInfo.getIds().split(",");
+                    queryWrapper.in("ssbmid", Arrays.asList(ids));
+                }
+            } else if ("6".equals(level)) {
+                queryWrapper.eq("ssbmid", deptInfo.getSsbmid());
+            }
+        }
+    }
+
+    // 根据组织机构ID获取查询权限
+    public static void queryWrapperUtil(QueryWrapper queryWrapper, UserInfo userInfo) {
+        if (userInfo != null && userInfo.getUserPermissionsInfo() != null) {
+            String level = userInfo.getUserPermissionsInfo().getPermissionsLevel();
+            if ("1".equals(level) || "2".equals(level)) {
+                // do nothing
+            } else if ("3".equals(level)) {
+                queryWrapper.eq("sssgajid", userInfo.getDszDeptId());
+            } else if ("4".equals(level)) {
+                queryWrapper.eq("ssxgajid", userInfo.getFxjDeptId());
+            } else if ("5".equals(level)) {
+                if (userInfo.getUserPermissionsInfo() != null
+                        && StringUtils.isNotEmpty(userInfo.getUserPermissionsInfo().getIds())) {
+                    String[] ids = userInfo.getUserPermissionsInfo().getIds().split(",");
+                    queryWrapper.in("ssbmid", Arrays.asList(ids));
+                }
+            } else if ("6".equals(level)) {
+                queryWrapper.eq("ssbmid", userInfo.getDeptId());
+            }
+        }
+    }
+
+    // 根据组织机构编码获取查询权限
+    public static void queryWrapperUtilByCode(QueryWrapper queryWrapper, UserInfo userInfo) {
+        if (userInfo != null && userInfo.getUserPermissionsInfo() != null) {
+            String level = userInfo.getUserPermissionsInfo().getPermissionsLevel();
+            if ("1".equals(level) || "2".equals(level)) {
+                // do nothing
+            } else if ("3".equals(level)) {
+                queryWrapper.eq("sssgajdm", userInfo.getDszDeptCode());
+            } else if ("4".equals(level)) {
+                queryWrapper.eq("ssxgajdm", userInfo.getFxjDeptCode());
+            } else if ("5".equals(level)) {
+                String[] orgcodes = userInfo.getUserPermissionsInfo().getOrgcodes().split(",");
+                queryWrapper.in("ssbmdm", Arrays.asList(orgcodes));
+            } else if ("6".equals(level)) {
+                queryWrapper.eq("ssbmdm", userInfo.getDeptId());
+            }
+        }
+    }
+
+    // 表别名(使用ssbmid)
+    public static String createSql(String tableAlias, UserInfo userInfo) {
+        String dataPermissionSql = "";
+        if (userInfo != null && userInfo.userPermissionsInfo != null && !StringUtils.isEmpty(userInfo.userPermissionsInfo.getPermissionsSql())) {
+            String sql = userInfo.userPermissionsInfo.getPermissionsSql().replaceAll("&apos;", "'");
+            if (StringUtils.isEmpty(tableAlias)) {
+                dataPermissionSql = sql.replaceAll("alias.", "");
+            } else {
+                dataPermissionSql = sql.replaceAll("alias", tableAlias);
+            }
+        }
+        return dataPermissionSql;
+    }
+
+    // 表别名(使用ssbmdm)
+    public static String createSqlOfCode(String tableAlias, UserInfo userInfo) {
+        String dataPermissionSql = "";
+        if (userInfo != null && userInfo.userPermissionsInfo != null &&
+                !StringUtils.isEmpty(userInfo.userPermissionsInfo.getPermissionsSqlCode())) {
+            String sql = userInfo.userPermissionsInfo.getPermissionsSqlCode().replaceAll("&apos;", "'");
+            if (StringUtils.isEmpty(tableAlias)) {
+                dataPermissionSql = sql.replaceAll("alias.", "");
+            } else {
+                dataPermissionSql = sql.replaceAll("alias", tableAlias);
+            }
+        }
+        return dataPermissionSql;
+    }
+}
diff --git a/common-token-starter/src/main/java/com/mosty/common/util/UUIDGenerator.java b/common-token-starter/src/main/java/com/mosty/common/util/UUIDGenerator.java
new file mode 100644
index 0000000..c24cc39
--- /dev/null
+++ b/common-token-starter/src/main/java/com/mosty/common/util/UUIDGenerator.java
@@ -0,0 +1,41 @@
+package com.mosty.common.util;
+
+import java.util.UUID;
+
+public class UUIDGenerator {
+
+	/**
+	 * 获取UUID
+	 * @return
+	 */
+	public static String getUUID() {
+		UUID uuid = UUID.randomUUID();
+		String str = uuid.toString();
+		// 去掉"-"符号
+		str = str.replace("-", "");
+		return str;
+	}
+
+	/**
+	 * 获得指定数量的UUID
+	 * @param number 指定数量
+	 * @return
+	 */
+	public static String[] getUUID(int number) {
+		if (number < 1) {
+			return null;
+		}
+		String[] ss = new String[number];
+		for (int i = 0; i < number; i++) {
+			ss[i] = getUUID();
+		}
+		return ss;
+	}
+
+	public static void main(String[] args) {
+		String[] ss = getUUID(10);
+		for (int i = 0; i < ss.length; i++) {
+			System.out.println("ss[" + i + "]=====" + getUUID());
+		}
+	}
+}
diff --git a/common-token-starter/target/classes/com/mosty/common/token/DeptInfo.class b/common-token-starter/target/classes/com/mosty/common/token/DeptInfo.class
new file mode 100644
index 0000000..7f68288
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/DeptInfo.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/JWTUtil.class b/common-token-starter/target/classes/com/mosty/common/token/JWTUtil.class
new file mode 100644
index 0000000..7ca2df7
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/JWTUtil.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/JwtSysUser.class b/common-token-starter/target/classes/com/mosty/common/token/JwtSysUser.class
new file mode 100644
index 0000000..accc10e
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/JwtSysUser.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/SysUserInterceptor.class b/common-token-starter/target/classes/com/mosty/common/token/SysUserInterceptor.class
new file mode 100644
index 0000000..6a891a3
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/SysUserInterceptor.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/UserInfo.class b/common-token-starter/target/classes/com/mosty/common/token/UserInfo.class
new file mode 100644
index 0000000..7482796
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/UserInfo.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/UserInfoManager.class b/common-token-starter/target/classes/com/mosty/common/token/UserInfoManager.class
new file mode 100644
index 0000000..474a4f6
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/UserInfoManager.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/UserPermissionsInfo.class b/common-token-starter/target/classes/com/mosty/common/token/UserPermissionsInfo.class
new file mode 100644
index 0000000..ac80a02
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/UserPermissionsInfo.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/token/VirtualUserEnum.class b/common-token-starter/target/classes/com/mosty/common/token/VirtualUserEnum.class
new file mode 100644
index 0000000..09c73c5
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/token/VirtualUserEnum.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/DataPermissionConstant.class b/common-token-starter/target/classes/com/mosty/common/util/DataPermissionConstant.class
new file mode 100644
index 0000000..f24a8a7
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/DataPermissionConstant.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/GeoHashKit.class b/common-token-starter/target/classes/com/mosty/common/util/GeoHashKit.class
new file mode 100644
index 0000000..168e9a3
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/GeoHashKit.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$1.class b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$1.class
new file mode 100644
index 0000000..91123ee
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$1.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$2.class b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$2.class
new file mode 100644
index 0000000..e232934
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils$2.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/ImageUtils.class b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils.class
new file mode 100644
index 0000000..7113b4d
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/ImageUtils.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/JtsUtils.class b/common-token-starter/target/classes/com/mosty/common/util/JtsUtils.class
new file mode 100644
index 0000000..6909896
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/JtsUtils.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/MyX509TrustManager.class b/common-token-starter/target/classes/com/mosty/common/util/MyX509TrustManager.class
new file mode 100644
index 0000000..709a407
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/MyX509TrustManager.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/PermissionsUtil.class b/common-token-starter/target/classes/com/mosty/common/util/PermissionsUtil.class
new file mode 100644
index 0000000..02c5577
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/PermissionsUtil.class differ
diff --git a/common-token-starter/target/classes/com/mosty/common/util/UUIDGenerator.class b/common-token-starter/target/classes/com/mosty/common/util/UUIDGenerator.class
new file mode 100644
index 0000000..2557319
Binary files /dev/null and b/common-token-starter/target/classes/com/mosty/common/util/UUIDGenerator.class differ
diff --git a/common-token-starter/target/common-token-starter-1.0.0-SNAPSHOT.jar b/common-token-starter/target/common-token-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..6aa1563
Binary files /dev/null and b/common-token-starter/target/common-token-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/common-token-starter/target/maven-archiver/pom.properties b/common-token-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..85f1062
--- /dev/null
+++ b/common-token-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:09 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=common-token-starter
diff --git a/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..9e1310b
--- /dev/null
+++ b/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,17 @@
+com\mosty\common\token\DeptInfo.class
+com\mosty\common\token\JwtSysUser.class
+com\mosty\common\token\VirtualUserEnum.class
+com\mosty\common\token\UserPermissionsInfo.class
+com\mosty\common\util\JtsUtils.class
+com\mosty\common\util\ImageUtils$1.class
+com\mosty\common\util\DataPermissionConstant.class
+com\mosty\common\util\PermissionsUtil.class
+com\mosty\common\token\UserInfoManager.class
+com\mosty\common\util\MyX509TrustManager.class
+com\mosty\common\token\SysUserInterceptor.class
+com\mosty\common\util\ImageUtils.class
+com\mosty\common\token\JWTUtil.class
+com\mosty\common\util\ImageUtils$2.class
+com\mosty\common\token\UserInfo.class
+com\mosty\common\util\GeoHashKit.class
+com\mosty\common\util\UUIDGenerator.class
diff --git a/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..b6daa01
--- /dev/null
+++ b/common-token-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,17 @@
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\UserType.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\DeptInfo.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\MyX509TrustManager.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\DataPermissionConstant.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\UserInfo.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\UUIDGenerator.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\PermissionsUtil.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\UserPermissionsInfo.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\JtsUtils.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\ImageUtils.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\util\GeoHashKit.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\UserInfoManager.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\VirtualUserEnum.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\JwtSysUser.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\SysUserInterceptor.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\JWTUtil.java
+E:\project\zgga\mosty-common\common-token-starter\src\main\java\com\mosty\common\token\UserInfoCache.java
diff --git a/h5player.min.js b/h5player.min.js
new file mode 100644
index 0000000..57ed4b0
--- /dev/null
+++ b/h5player.min.js
@@ -0,0 +1,26495 @@
+!function (e, t) {
+    if ("object" == typeof exports && "object" == typeof module) module.exports = t(); else if ("function" == typeof define && define.amd) define([], t); else {
+        var n, i = t();
+        for (n in i) ("object" == typeof exports ? exports : e)[n] = i[n]
+    }
+}(window, function () {
+    return n = [function (e, t, hs) {
+        !function (ds) {
+            var ls;//! moment.js
+//! version : 2.29.4
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+            ds.exports = function () {
+                "use strict";
+                var I, W;
+
+                function h() {
+                    return I.apply(null, arguments)
+                }
+
+                function H(e) {
+                    I = e
+                }
+
+                function s(e) {
+                    return e instanceof Array || Object.prototype.toString.call(e) === "[object Array]"
+                }
+
+                function j(e) {
+                    return e != null && Object.prototype.toString.call(e) === "[object Object]"
+                }
+
+                function u(e, t) {
+                    return Object.prototype.hasOwnProperty.call(e, t)
+                }
+
+                function F(e) {
+                    if (Object.getOwnPropertyNames) return Object.getOwnPropertyNames(e).length === 0; else {
+                        var t;
+                        for (t in e) if (u(e, t)) return false;
+                        return true
+                    }
+                }
+
+                function o(e) {
+                    return e === void 0
+                }
+
+                function d(e) {
+                    return typeof e === "number" || Object.prototype.toString.call(e) === "[object Number]"
+                }
+
+                function B(e) {
+                    return e instanceof Date || Object.prototype.toString.call(e) === "[object Date]"
+                }
+
+                function N(e, t) {
+                    var n = [], i, r = e.length;
+                    for (i = 0; i < r; ++i) n.push(t(e[i], i));
+                    return n
+                }
+
+                function z(e, t) {
+                    for (var n in t) if (u(t, n)) e[n] = t[n];
+                    if (u(t, "toString")) e.toString = t.toString;
+                    if (u(t, "valueOf")) e.valueOf = t.valueOf;
+                    return e
+                }
+
+                function l(e, t, n, i) {
+                    return $n(e, t, n, i, true).utc()
+                }
+
+                function U() {
+                    return {
+                        empty: false,
+                        unusedTokens: [],
+                        unusedInput: [],
+                        overflow: -2,
+                        charsLeftOver: 0,
+                        nullInput: false,
+                        invalidEra: null,
+                        invalidMonth: null,
+                        invalidFormat: false,
+                        userInvalidated: false,
+                        iso: false,
+                        parsedDateParts: [],
+                        era: null,
+                        meridiem: null,
+                        rfc2822: false,
+                        weekdayMismatch: false
+                    }
+                }
+
+                function c(e) {
+                    if (e._pf == null) e._pf = U();
+                    return e._pf
+                }
+
+                if (Array.prototype.some) W = Array.prototype.some; else W = function (e) {
+                    var t = Object(this), n = t.length >>> 0, i;
+                    for (i = 0; i < n; i++) if (i in t && e.call(this, t[i], i, t)) return true;
+                    return false
+                };
+
+                function V(e) {
+                    if (e._isValid == null) {
+                        var t = c(e), n = W.call(t.parsedDateParts, function (e) {
+                                return e != null
+                            }),
+                            i = !isNaN(e._d.getTime()) && t.overflow < 0 && !t.empty && !t.invalidEra && !t.invalidMonth && !t.invalidWeekday && !t.weekdayMismatch && !t.nullInput && !t.invalidFormat && !t.userInvalidated && (!t.meridiem || t.meridiem && n);
+                        if (e._strict) i = i && t.charsLeftOver === 0 && t.unusedTokens.length === 0 && t.bigHour === undefined;
+                        if (Object.isFrozen == null || !Object.isFrozen(e)) e._isValid = i; else return i
+                    }
+                    return e._isValid
+                }
+
+                function G(e) {
+                    var t = l(NaN);
+                    if (e != null) z(c(t), e); else c(t).userInvalidated = true;
+                    return t
+                }
+
+                var J = h.momentProperties = [], q = false;
+
+                function K(e, t) {
+                    var n, i, r, a = J.length;
+                    if (!o(t._isAMomentObject)) e._isAMomentObject = t._isAMomentObject;
+                    if (!o(t._i)) e._i = t._i;
+                    if (!o(t._f)) e._f = t._f;
+                    if (!o(t._l)) e._l = t._l;
+                    if (!o(t._strict)) e._strict = t._strict;
+                    if (!o(t._tzm)) e._tzm = t._tzm;
+                    if (!o(t._isUTC)) e._isUTC = t._isUTC;
+                    if (!o(t._offset)) e._offset = t._offset;
+                    if (!o(t._pf)) e._pf = c(t);
+                    if (!o(t._locale)) e._locale = t._locale;
+                    if (a > 0) for (n = 0; n < a; n++) {
+                        i = J[n];
+                        r = t[i];
+                        if (!o(r)) e[i] = r
+                    }
+                    return e
+                }
+
+                function X(e) {
+                    K(this, e);
+                    this._d = new Date(e._d != null ? e._d.getTime() : NaN);
+                    if (!this.isValid()) this._d = new Date(NaN);
+                    if (q === false) {
+                        q = true;
+                        h.updateOffset(this);
+                        q = false
+                    }
+                }
+
+                function _(e) {
+                    return e instanceof X || e != null && e._isAMomentObject != null
+                }
+
+                function Z(e) {
+                    if (h.suppressDeprecationWarnings === false && typeof console !== "undefined" && console.warn) console.warn("Deprecation warning: " + e)
+                }
+
+                function e(a, s) {
+                    var o = true;
+                    return z(function () {
+                        if (h.deprecationHandler != null) h.deprecationHandler(null, a);
+                        if (o) {
+                            var e = [], t, n, i, r = arguments.length;
+                            for (n = 0; n < r; n++) {
+                                t = "";
+                                if (typeof arguments[n] === "object") {
+                                    t += "\n[" + n + "] ";
+                                    for (i in arguments[0]) if (u(arguments[0], i)) t += i + ": " + arguments[0][i] + ", ";
+                                    t = t.slice(0, -2)
+                                } else t = arguments[n];
+                                e.push(t)
+                            }
+                            Z(a + "\nArguments: " + Array.prototype.slice.call(e).join("") + "\n" + (new Error).stack);
+                            o = false
+                        }
+                        return s.apply(this, arguments)
+                    }, s)
+                }
+
+                var $ = {}, Q;
+
+                function ee(e, t) {
+                    if (h.deprecationHandler != null) h.deprecationHandler(e, t);
+                    if (!$[e]) {
+                        Z(t);
+                        $[e] = true
+                    }
+                }
+
+                function f(e) {
+                    return typeof Function !== "undefined" && e instanceof Function || Object.prototype.toString.call(e) === "[object Function]"
+                }
+
+                function te(e) {
+                    var t, n;
+                    for (n in e) if (u(e, n)) {
+                        t = e[n];
+                        if (f(t)) this[n] = t; else this["_" + n] = t
+                    }
+                    this._config = e;
+                    this._dayOfMonthOrdinalParseLenient = new RegExp((this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) + "|" + /\d{1,2}/.source)
+                }
+
+                function ne(e, t) {
+                    var n = z({}, e), i;
+                    for (i in t) if (u(t, i)) if (j(e[i]) && j(t[i])) {
+                        n[i] = {};
+                        z(n[i], e[i]);
+                        z(n[i], t[i])
+                    } else if (t[i] != null) n[i] = t[i]; else delete n[i];
+                    for (i in e) if (u(e, i) && !u(t, i) && j(e[i])) n[i] = z({}, n[i]);
+                    return n
+                }
+
+                function ie(e) {
+                    if (e != null) this.set(e)
+                }
+
+                if (h.suppressDeprecationWarnings = false, h.deprecationHandler = null, Object.keys) Q = Object.keys; else Q = function (e) {
+                    var t, n = [];
+                    for (t in e) if (u(e, t)) n.push(t);
+                    return n
+                };
+                var re = {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                };
+
+                function ae(e, t, n) {
+                    var i = this._calendar[e] || this._calendar["sameElse"];
+                    return f(i) ? i.call(t, n) : i
+                }
+
+                function a(e, t, n) {
+                    var i = "" + Math.abs(e), r = t - i.length, a = e >= 0;
+                    return (a ? n ? "+" : "" : "-") + Math.pow(10, Math.max(0, r)).toString().substr(1) + i
+                }
+
+                var se = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,
+                    oe = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g, ue = {}, de = {};
+
+                function i(e, t, n, i) {
+                    var r = i;
+                    if (typeof i === "string") r = function () {
+                        return this[i]()
+                    };
+                    if (e) de[e] = r;
+                    if (t) de[t[0]] = function () {
+                        return a(r.apply(this, arguments), t[1], t[2])
+                    };
+                    if (n) de[n] = function () {
+                        return this.localeData().ordinal(r.apply(this, arguments), e)
+                    }
+                }
+
+                function le(e) {
+                    if (e.match(/\[[\s\S]/)) return e.replace(/^\[|\]$/g, "");
+                    return e.replace(/\\/g, "")
+                }
+
+                function he(i) {
+                    var r = i.match(se), e, a;
+                    for (e = 0, a = r.length; e < a; e++) if (de[r[e]]) r[e] = de[r[e]]; else r[e] = le(r[e]);
+                    return function (e) {
+                        var t = "", n;
+                        for (n = 0; n < a; n++) t += f(r[n]) ? r[n].call(e, i) : r[n];
+                        return t
+                    }
+                }
+
+                function ce(e, t) {
+                    if (!e.isValid()) return e.localeData().invalidDate();
+                    t = _e(t, e.localeData());
+                    ue[t] = ue[t] || he(t);
+                    return ue[t](e)
+                }
+
+                function _e(e, t) {
+                    var n = 5;
+
+                    function i(e) {
+                        return t.longDateFormat(e) || e
+                    }
+
+                    oe.lastIndex = 0;
+                    while (n >= 0 && oe.test(e)) {
+                        e = e.replace(oe, i);
+                        oe.lastIndex = 0;
+                        n -= 1
+                    }
+                    return e
+                }
+
+                var fe = {
+                    LTS: "h:mm:ss A",
+                    LT: "h:mm A",
+                    L: "MM/DD/YYYY",
+                    LL: "MMMM D, YYYY",
+                    LLL: "MMMM D, YYYY h:mm A",
+                    LLLL: "dddd, MMMM D, YYYY h:mm A"
+                };
+
+                function me(e) {
+                    var t = this._longDateFormat[e], n = this._longDateFormat[e.toUpperCase()];
+                    if (t || !n) return t;
+                    this._longDateFormat[e] = n.match(se).map(function (e) {
+                        if (e === "MMMM" || e === "MM" || e === "DD" || e === "dddd") return e.slice(1);
+                        return e
+                    }).join("");
+                    return this._longDateFormat[e]
+                }
+
+                var pe = "Invalid date";
+
+                function ye() {
+                    return this._invalidDate
+                }
+
+                var ve = "%d", ge = /\d{1,2}/;
+
+                function Me(e) {
+                    return this._ordinal.replace("%d", e)
+                }
+
+                var Le = {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    w: "a week",
+                    ww: "%d weeks",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                };
+
+                function Se(e, t, n, i) {
+                    var r = this._relativeTime[n];
+                    return f(r) ? r(e, t, n, i) : r.replace(/%d/i, e)
+                }
+
+                function ke(e, t) {
+                    var n = this._relativeTime[e > 0 ? "future" : "past"];
+                    return f(n) ? n(t) : n.replace(/%s/i, t)
+                }
+
+                var be = {};
+
+                function t(e, t) {
+                    var n = e.toLowerCase();
+                    be[n] = be[n + "s"] = be[t] = e
+                }
+
+                function m(e) {
+                    return typeof e === "string" ? be[e] || be[e.toLowerCase()] : undefined
+                }
+
+                function we(e) {
+                    var t = {}, n, i;
+                    for (i in e) if (u(e, i)) {
+                        n = m(i);
+                        if (n) t[n] = e[i]
+                    }
+                    return t
+                }
+
+                var De = {};
+
+                function n(e, t) {
+                    De[e] = t
+                }
+
+                function Te(e) {
+                    var t = [], n;
+                    for (n in e) if (u(e, n)) t.push({unit: n, priority: De[n]});
+                    t.sort(function (e, t) {
+                        return e.priority - t.priority
+                    });
+                    return t
+                }
+
+                function Ee(e) {
+                    return e % 4 === 0 && e % 100 !== 0 || e % 400 === 0
+                }
+
+                function p(e) {
+                    if (e < 0) return Math.ceil(e) || 0; else return Math.floor(e)
+                }
+
+                function y(e) {
+                    var t = +e, n = 0;
+                    if (t !== 0 && isFinite(t)) n = p(t);
+                    return n
+                }
+
+                function Ye(t, n) {
+                    return function (e) {
+                        if (e != null) {
+                            Ce(this, t, e);
+                            h.updateOffset(this, n);
+                            return this
+                        } else return Pe(this, t)
+                    }
+                }
+
+                function Pe(e, t) {
+                    return e.isValid() ? e._d["get" + (e._isUTC ? "UTC" : "") + t]() : NaN
+                }
+
+                function Ce(e, t, n) {
+                    if (e.isValid() && !isNaN(n)) if (t === "FullYear" && Ee(e.year()) && e.month() === 1 && e.date() === 29) {
+                        n = y(n);
+                        e._d["set" + (e._isUTC ? "UTC" : "") + t](n, e.month(), at(n, e.month()))
+                    } else e._d["set" + (e._isUTC ? "UTC" : "") + t](n)
+                }
+
+                function Re(e) {
+                    e = m(e);
+                    if (f(this[e])) return this[e]();
+                    return this
+                }
+
+                function Ae(e, t) {
+                    if (typeof e === "object") {
+                        e = we(e);
+                        var n = Te(e), i, r = n.length;
+                        for (i = 0; i < r; i++) this[n[i].unit](e[n[i].unit])
+                    } else {
+                        e = m(e);
+                        if (f(this[e])) return this[e](t)
+                    }
+                    return this
+                }
+
+                var xe = /\d/, r = /\d\d/, Oe = /\d{3}/, Ie = /\d{4}/, We = /[+-]?\d{6}/, v = /\d\d?/, He = /\d\d\d\d?/,
+                    je = /\d\d\d\d\d\d?/, Fe = /\d{1,3}/, Be = /\d{1,4}/, Ne = /[+-]?\d{1,6}/, ze = /\d+/,
+                    Ue = /[+-]?\d+/, Ve = /Z|[+-]\d\d:?\d\d/gi, Ge = /Z|[+-]\d\d(?::?\d\d)?/gi,
+                    Je = /[+-]?\d+(\.\d{1,3})?/,
+                    qe = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,
+                    Ke;
+
+                function g(e, n, i) {
+                    Ke[e] = f(n) ? n : function (e, t) {
+                        return e && i ? i : n
+                    }
+                }
+
+                function Xe(e, t) {
+                    if (!u(Ke, e)) return new RegExp(Ze(e));
+                    return Ke[e](t._strict, t._locale)
+                }
+
+                function Ze(e) {
+                    return M(e.replace("\\", "").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (e, t, n, i, r) {
+                        return t || n || i || r
+                    }))
+                }
+
+                function M(e) {
+                    return e.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&")
+                }
+
+                var Ke = {}, $e = {};
+
+                function L(e, n) {
+                    var t, i = n, r;
+                    if (typeof e === "string") e = [e];
+                    if (d(n)) i = function (e, t) {
+                        t[n] = y(e)
+                    };
+                    r = e.length;
+                    for (t = 0; t < r; t++) $e[e[t]] = i
+                }
+
+                function Qe(e, r) {
+                    L(e, function (e, t, n, i) {
+                        n._w = n._w || {};
+                        r(e, n._w, n, i)
+                    })
+                }
+
+                function et(e, t, n) {
+                    if (t != null && u($e, e)) $e[e](t, n._a, n, e)
+                }
+
+                var S = 0, k = 1, b = 2, w = 3, D = 4, T = 5, tt = 6, nt = 7, it = 8, E;
+
+                function rt(e, t) {
+                    return (e % t + t) % t
+                }
+
+                if (Array.prototype.indexOf) E = Array.prototype.indexOf; else E = function (e) {
+                    var t;
+                    for (t = 0; t < this.length; ++t) if (this[t] === e) return t;
+                    return -1
+                };
+
+                function at(e, t) {
+                    if (isNaN(e) || isNaN(t)) return NaN;
+                    var n = rt(t, 12);
+                    e += (t - n) / 12;
+                    return n === 1 ? Ee(e) ? 29 : 28 : 31 - n % 7 % 2
+                }
+
+                i("M", ["MM", 2], "Mo", function () {
+                    return this.month() + 1
+                }), i("MMM", 0, 0, function (e) {
+                    return this.localeData().monthsShort(this, e)
+                }), i("MMMM", 0, 0, function (e) {
+                    return this.localeData().months(this, e)
+                }), t("month", "M"), n("month", 8), g("M", v), g("MM", v, r), g("MMM", function (e, t) {
+                    return t.monthsShortRegex(e)
+                }), g("MMMM", function (e, t) {
+                    return t.monthsRegex(e)
+                }), L(["M", "MM"], function (e, t) {
+                    t[k] = y(e) - 1
+                }), L(["MMM", "MMMM"], function (e, t, n, i) {
+                    var r = n._locale.monthsParse(e, i, n._strict);
+                    if (r != null) t[k] = r; else c(n).invalidMonth = e
+                });
+                var st = "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                    ot = "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                    ut = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/, dt = qe, lt = qe;
+
+                function ht(e, t) {
+                    if (!e) return s(this._months) ? this._months : this._months["standalone"];
+                    return s(this._months) ? this._months[e.month()] : this._months[(this._months.isFormat || ut).test(t) ? "format" : "standalone"][e.month()]
+                }
+
+                function ct(e, t) {
+                    if (!e) return s(this._monthsShort) ? this._monthsShort : this._monthsShort["standalone"];
+                    return s(this._monthsShort) ? this._monthsShort[e.month()] : this._monthsShort[ut.test(t) ? "format" : "standalone"][e.month()]
+                }
+
+                function _t(e, t, n) {
+                    var i, r, a, s = e.toLocaleLowerCase();
+                    if (!this._monthsParse) {
+                        this._monthsParse = [];
+                        this._longMonthsParse = [];
+                        this._shortMonthsParse = [];
+                        for (i = 0; i < 12; ++i) {
+                            a = l([2e3, i]);
+                            this._shortMonthsParse[i] = this.monthsShort(a, "").toLocaleLowerCase();
+                            this._longMonthsParse[i] = this.months(a, "").toLocaleLowerCase()
+                        }
+                    }
+                    if (n) if (t === "MMM") {
+                        r = E.call(this._shortMonthsParse, s);
+                        return r !== -1 ? r : null
+                    } else {
+                        r = E.call(this._longMonthsParse, s);
+                        return r !== -1 ? r : null
+                    } else if (t === "MMM") {
+                        r = E.call(this._shortMonthsParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._longMonthsParse, s);
+                        return r !== -1 ? r : null
+                    } else {
+                        r = E.call(this._longMonthsParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._shortMonthsParse, s);
+                        return r !== -1 ? r : null
+                    }
+                }
+
+                function ft(e, t, n) {
+                    var i, r, a;
+                    if (this._monthsParseExact) return _t.call(this, e, t, n);
+                    if (!this._monthsParse) {
+                        this._monthsParse = [];
+                        this._longMonthsParse = [];
+                        this._shortMonthsParse = []
+                    }
+                    for (i = 0; i < 12; i++) {
+                        r = l([2e3, i]);
+                        if (n && !this._longMonthsParse[i]) {
+                            this._longMonthsParse[i] = new RegExp("^" + this.months(r, "").replace(".", "") + "$", "i");
+                            this._shortMonthsParse[i] = new RegExp("^" + this.monthsShort(r, "").replace(".", "") + "$", "i")
+                        }
+                        if (!n && !this._monthsParse[i]) {
+                            a = "^" + this.months(r, "") + "|^" + this.monthsShort(r, "");
+                            this._monthsParse[i] = new RegExp(a.replace(".", ""), "i")
+                        }
+                        if (n && t === "MMMM" && this._longMonthsParse[i].test(e)) return i; else if (n && t === "MMM" && this._shortMonthsParse[i].test(e)) return i; else if (!n && this._monthsParse[i].test(e)) return i
+                    }
+                }
+
+                function mt(e, t) {
+                    var n;
+                    if (!e.isValid()) return e;
+                    if (typeof t === "string") if (/^\d+$/.test(t)) t = y(t); else {
+                        t = e.localeData().monthsParse(t);
+                        if (!d(t)) return e
+                    }
+                    n = Math.min(e.date(), at(e.year(), t));
+                    e._d["set" + (e._isUTC ? "UTC" : "") + "Month"](t, n);
+                    return e
+                }
+
+                function pt(e) {
+                    if (e != null) {
+                        mt(this, e);
+                        h.updateOffset(this, true);
+                        return this
+                    } else return Pe(this, "Month")
+                }
+
+                function yt() {
+                    return at(this.year(), this.month())
+                }
+
+                function vt(e) {
+                    if (this._monthsParseExact) {
+                        if (!u(this, "_monthsRegex")) Mt.call(this);
+                        if (e) return this._monthsShortStrictRegex; else return this._monthsShortRegex
+                    } else {
+                        if (!u(this, "_monthsShortRegex")) this._monthsShortRegex = dt;
+                        return this._monthsShortStrictRegex && e ? this._monthsShortStrictRegex : this._monthsShortRegex
+                    }
+                }
+
+                function gt(e) {
+                    if (this._monthsParseExact) {
+                        if (!u(this, "_monthsRegex")) Mt.call(this);
+                        if (e) return this._monthsStrictRegex; else return this._monthsRegex
+                    } else {
+                        if (!u(this, "_monthsRegex")) this._monthsRegex = lt;
+                        return this._monthsStrictRegex && e ? this._monthsStrictRegex : this._monthsRegex
+                    }
+                }
+
+                function Mt() {
+                    function e(e, t) {
+                        return t.length - e.length
+                    }
+
+                    var t = [], n = [], i = [], r, a;
+                    for (r = 0; r < 12; r++) {
+                        a = l([2e3, r]);
+                        t.push(this.monthsShort(a, ""));
+                        n.push(this.months(a, ""));
+                        i.push(this.months(a, ""));
+                        i.push(this.monthsShort(a, ""))
+                    }
+                    t.sort(e);
+                    n.sort(e);
+                    i.sort(e);
+                    for (r = 0; r < 12; r++) {
+                        t[r] = M(t[r]);
+                        n[r] = M(n[r])
+                    }
+                    for (r = 0; r < 24; r++) i[r] = M(i[r]);
+                    this._monthsRegex = new RegExp("^(" + i.join("|") + ")", "i");
+                    this._monthsShortRegex = this._monthsRegex;
+                    this._monthsStrictRegex = new RegExp("^(" + n.join("|") + ")", "i");
+                    this._monthsShortStrictRegex = new RegExp("^(" + t.join("|") + ")", "i")
+                }
+
+                function Lt(e) {
+                    return Ee(e) ? 366 : 365
+                }
+
+                i("Y", 0, 0, function () {
+                    var e = this.year();
+                    return e <= 9999 ? a(e, 4) : "+" + e
+                }), i(0, ["YY", 2], 0, function () {
+                    return this.year() % 100
+                }), i(0, ["YYYY", 4], 0, "year"), i(0, ["YYYYY", 5], 0, "year"), i(0, ["YYYYYY", 6, true], 0, "year"), t("year", "y"), n("year", 1), g("Y", Ue), g("YY", v, r), g("YYYY", Be, Ie), g("YYYYY", Ne, We), g("YYYYYY", Ne, We), L(["YYYYY", "YYYYYY"], S), L("YYYY", function (e, t) {
+                    t[S] = e.length === 2 ? h.parseTwoDigitYear(e) : y(e)
+                }), L("YY", function (e, t) {
+                    t[S] = h.parseTwoDigitYear(e)
+                }), L("Y", function (e, t) {
+                    t[S] = parseInt(e, 10)
+                }), h.parseTwoDigitYear = function (e) {
+                    return y(e) + (y(e) > 68 ? 1900 : 2e3)
+                };
+                var St = Ye("FullYear", true);
+
+                function kt() {
+                    return Ee(this.year())
+                }
+
+                function bt(e, t, n, i, r, a, s) {
+                    var o;
+                    if (e < 100 && e >= 0) {
+                        o = new Date(e + 400, t, n, i, r, a, s);
+                        if (isFinite(o.getFullYear())) o.setFullYear(e)
+                    } else o = new Date(e, t, n, i, r, a, s);
+                    return o
+                }
+
+                function wt(e) {
+                    var t, n;
+                    if (e < 100 && e >= 0) {
+                        n = Array.prototype.slice.call(arguments);
+                        n[0] = e + 400;
+                        t = new Date(Date.UTC.apply(null, n));
+                        if (isFinite(t.getUTCFullYear())) t.setUTCFullYear(e)
+                    } else t = new Date(Date.UTC.apply(null, arguments));
+                    return t
+                }
+
+                function Dt(e, t, n) {
+                    var i = 7 + t - n, r = (7 + wt(e, 0, i).getUTCDay() - t) % 7;
+                    return -r + i - 1
+                }
+
+                function Tt(e, t, n, i, r) {
+                    var a = (7 + n - i) % 7, s = Dt(e, i, r), o = 1 + 7 * (t - 1) + a + s, u, d;
+                    if (o <= 0) {
+                        u = e - 1;
+                        d = Lt(u) + o
+                    } else if (o > Lt(e)) {
+                        u = e + 1;
+                        d = o - Lt(e)
+                    } else {
+                        u = e;
+                        d = o
+                    }
+                    return {year: u, dayOfYear: d}
+                }
+
+                function Et(e, t, n) {
+                    var i = Dt(e.year(), t, n), r = Math.floor((e.dayOfYear() - i - 1) / 7) + 1, a, s;
+                    if (r < 1) {
+                        s = e.year() - 1;
+                        a = r + Y(s, t, n)
+                    } else if (r > Y(e.year(), t, n)) {
+                        a = r - Y(e.year(), t, n);
+                        s = e.year() + 1
+                    } else {
+                        s = e.year();
+                        a = r
+                    }
+                    return {week: a, year: s}
+                }
+
+                function Y(e, t, n) {
+                    var i = Dt(e, t, n), r = Dt(e + 1, t, n);
+                    return (Lt(e) - i + r) / 7
+                }
+
+                function Yt(e) {
+                    return Et(e, this._week.dow, this._week.doy).week
+                }
+
+                i("w", ["ww", 2], "wo", "week"), i("W", ["WW", 2], "Wo", "isoWeek"), t("week", "w"), t("isoWeek", "W"), n("week", 5), n("isoWeek", 5), g("w", v), g("ww", v, r), g("W", v), g("WW", v, r), Qe(["w", "ww", "W", "WW"], function (e, t, n, i) {
+                    t[i.substr(0, 1)] = y(e)
+                });
+                var Pt = {dow: 0, doy: 6};
+
+                function Ct() {
+                    return this._week.dow
+                }
+
+                function Rt() {
+                    return this._week.doy
+                }
+
+                function At(e) {
+                    var t = this.localeData().week(this);
+                    return e == null ? t : this.add((e - t) * 7, "d")
+                }
+
+                function xt(e) {
+                    var t = Et(this, 1, 4).week;
+                    return e == null ? t : this.add((e - t) * 7, "d")
+                }
+
+                function Ot(e, t) {
+                    if (typeof e !== "string") return e;
+                    if (!isNaN(e)) return parseInt(e, 10);
+                    e = t.weekdaysParse(e);
+                    if (typeof e === "number") return e;
+                    return null
+                }
+
+                function It(e, t) {
+                    if (typeof e === "string") return t.weekdaysParse(e) % 7 || 7;
+                    return isNaN(e) ? null : e
+                }
+
+                function Wt(e, t) {
+                    return e.slice(t, 7).concat(e.slice(0, t))
+                }
+
+                i("d", 0, "do", "day"), i("dd", 0, 0, function (e) {
+                    return this.localeData().weekdaysMin(this, e)
+                }), i("ddd", 0, 0, function (e) {
+                    return this.localeData().weekdaysShort(this, e)
+                }), i("dddd", 0, 0, function (e) {
+                    return this.localeData().weekdays(this, e)
+                }), i("e", 0, 0, "weekday"), i("E", 0, 0, "isoWeekday"), t("day", "d"), t("weekday", "e"), t("isoWeekday", "E"), n("day", 11), n("weekday", 11), n("isoWeekday", 11), g("d", v), g("e", v), g("E", v), g("dd", function (e, t) {
+                    return t.weekdaysMinRegex(e)
+                }), g("ddd", function (e, t) {
+                    return t.weekdaysShortRegex(e)
+                }), g("dddd", function (e, t) {
+                    return t.weekdaysRegex(e)
+                }), Qe(["dd", "ddd", "dddd"], function (e, t, n, i) {
+                    var r = n._locale.weekdaysParse(e, i, n._strict);
+                    if (r != null) t.d = r; else c(n).invalidWeekday = e
+                }), Qe(["d", "e", "E"], function (e, t, n, i) {
+                    t[i] = y(e)
+                });
+                var Ht = "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                    jt = "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), Ft = "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), Bt = qe,
+                    Nt = qe, zt = qe;
+
+                function Ut(e, t) {
+                    var n = s(this._weekdays) ? this._weekdays : this._weekdays[e && e !== true && this._weekdays.isFormat.test(t) ? "format" : "standalone"];
+                    return e === true ? Wt(n, this._week.dow) : e ? n[e.day()] : n
+                }
+
+                function Vt(e) {
+                    return e === true ? Wt(this._weekdaysShort, this._week.dow) : e ? this._weekdaysShort[e.day()] : this._weekdaysShort
+                }
+
+                function Gt(e) {
+                    return e === true ? Wt(this._weekdaysMin, this._week.dow) : e ? this._weekdaysMin[e.day()] : this._weekdaysMin
+                }
+
+                function Jt(e, t, n) {
+                    var i, r, a, s = e.toLocaleLowerCase();
+                    if (!this._weekdaysParse) {
+                        this._weekdaysParse = [];
+                        this._shortWeekdaysParse = [];
+                        this._minWeekdaysParse = [];
+                        for (i = 0; i < 7; ++i) {
+                            a = l([2e3, 1]).day(i);
+                            this._minWeekdaysParse[i] = this.weekdaysMin(a, "").toLocaleLowerCase();
+                            this._shortWeekdaysParse[i] = this.weekdaysShort(a, "").toLocaleLowerCase();
+                            this._weekdaysParse[i] = this.weekdays(a, "").toLocaleLowerCase()
+                        }
+                    }
+                    if (n) if (t === "dddd") {
+                        r = E.call(this._weekdaysParse, s);
+                        return r !== -1 ? r : null
+                    } else if (t === "ddd") {
+                        r = E.call(this._shortWeekdaysParse, s);
+                        return r !== -1 ? r : null
+                    } else {
+                        r = E.call(this._minWeekdaysParse, s);
+                        return r !== -1 ? r : null
+                    } else if (t === "dddd") {
+                        r = E.call(this._weekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._shortWeekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._minWeekdaysParse, s);
+                        return r !== -1 ? r : null
+                    } else if (t === "ddd") {
+                        r = E.call(this._shortWeekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._weekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._minWeekdaysParse, s);
+                        return r !== -1 ? r : null
+                    } else {
+                        r = E.call(this._minWeekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._weekdaysParse, s);
+                        if (r !== -1) return r;
+                        r = E.call(this._shortWeekdaysParse, s);
+                        return r !== -1 ? r : null
+                    }
+                }
+
+                function qt(e, t, n) {
+                    var i, r, a;
+                    if (this._weekdaysParseExact) return Jt.call(this, e, t, n);
+                    if (!this._weekdaysParse) {
+                        this._weekdaysParse = [];
+                        this._minWeekdaysParse = [];
+                        this._shortWeekdaysParse = [];
+                        this._fullWeekdaysParse = []
+                    }
+                    for (i = 0; i < 7; i++) {
+                        r = l([2e3, 1]).day(i);
+                        if (n && !this._fullWeekdaysParse[i]) {
+                            this._fullWeekdaysParse[i] = new RegExp("^" + this.weekdays(r, "").replace(".", "\\.?") + "$", "i");
+                            this._shortWeekdaysParse[i] = new RegExp("^" + this.weekdaysShort(r, "").replace(".", "\\.?") + "$", "i");
+                            this._minWeekdaysParse[i] = new RegExp("^" + this.weekdaysMin(r, "").replace(".", "\\.?") + "$", "i")
+                        }
+                        if (!this._weekdaysParse[i]) {
+                            a = "^" + this.weekdays(r, "") + "|^" + this.weekdaysShort(r, "") + "|^" + this.weekdaysMin(r, "");
+                            this._weekdaysParse[i] = new RegExp(a.replace(".", ""), "i")
+                        }
+                        if (n && t === "dddd" && this._fullWeekdaysParse[i].test(e)) return i; else if (n && t === "ddd" && this._shortWeekdaysParse[i].test(e)) return i; else if (n && t === "dd" && this._minWeekdaysParse[i].test(e)) return i; else if (!n && this._weekdaysParse[i].test(e)) return i
+                    }
+                }
+
+                function Kt(e) {
+                    if (!this.isValid()) return e != null ? this : NaN;
+                    var t = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+                    if (e != null) {
+                        e = Ot(e, this.localeData());
+                        return this.add(e - t, "d")
+                    } else return t
+                }
+
+                function Xt(e) {
+                    if (!this.isValid()) return e != null ? this : NaN;
+                    var t = (this.day() + 7 - this.localeData()._week.dow) % 7;
+                    return e == null ? t : this.add(e - t, "d")
+                }
+
+                function Zt(e) {
+                    if (!this.isValid()) return e != null ? this : NaN;
+                    if (e != null) {
+                        var t = It(e, this.localeData());
+                        return this.day(this.day() % 7 ? t : t - 7)
+                    } else return this.day() || 7
+                }
+
+                function $t(e) {
+                    if (this._weekdaysParseExact) {
+                        if (!u(this, "_weekdaysRegex")) tn.call(this);
+                        if (e) return this._weekdaysStrictRegex; else return this._weekdaysRegex
+                    } else {
+                        if (!u(this, "_weekdaysRegex")) this._weekdaysRegex = Bt;
+                        return this._weekdaysStrictRegex && e ? this._weekdaysStrictRegex : this._weekdaysRegex
+                    }
+                }
+
+                function Qt(e) {
+                    if (this._weekdaysParseExact) {
+                        if (!u(this, "_weekdaysRegex")) tn.call(this);
+                        if (e) return this._weekdaysShortStrictRegex; else return this._weekdaysShortRegex
+                    } else {
+                        if (!u(this, "_weekdaysShortRegex")) this._weekdaysShortRegex = Nt;
+                        return this._weekdaysShortStrictRegex && e ? this._weekdaysShortStrictRegex : this._weekdaysShortRegex
+                    }
+                }
+
+                function en(e) {
+                    if (this._weekdaysParseExact) {
+                        if (!u(this, "_weekdaysRegex")) tn.call(this);
+                        if (e) return this._weekdaysMinStrictRegex; else return this._weekdaysMinRegex
+                    } else {
+                        if (!u(this, "_weekdaysMinRegex")) this._weekdaysMinRegex = zt;
+                        return this._weekdaysMinStrictRegex && e ? this._weekdaysMinStrictRegex : this._weekdaysMinRegex
+                    }
+                }
+
+                function tn() {
+                    function e(e, t) {
+                        return t.length - e.length
+                    }
+
+                    var t = [], n = [], i = [], r = [], a, s, o, u, d;
+                    for (a = 0; a < 7; a++) {
+                        s = l([2e3, 1]).day(a);
+                        o = M(this.weekdaysMin(s, ""));
+                        u = M(this.weekdaysShort(s, ""));
+                        d = M(this.weekdays(s, ""));
+                        t.push(o);
+                        n.push(u);
+                        i.push(d);
+                        r.push(o);
+                        r.push(u);
+                        r.push(d)
+                    }
+                    t.sort(e);
+                    n.sort(e);
+                    i.sort(e);
+                    r.sort(e);
+                    this._weekdaysRegex = new RegExp("^(" + r.join("|") + ")", "i");
+                    this._weekdaysShortRegex = this._weekdaysRegex;
+                    this._weekdaysMinRegex = this._weekdaysRegex;
+                    this._weekdaysStrictRegex = new RegExp("^(" + i.join("|") + ")", "i");
+                    this._weekdaysShortStrictRegex = new RegExp("^(" + n.join("|") + ")", "i");
+                    this._weekdaysMinStrictRegex = new RegExp("^(" + t.join("|") + ")", "i")
+                }
+
+                function nn() {
+                    return this.hours() % 12 || 12
+                }
+
+                function rn() {
+                    return this.hours() || 24
+                }
+
+                function an(e, t) {
+                    i(e, 0, 0, function () {
+                        return this.localeData().meridiem(this.hours(), this.minutes(), t)
+                    })
+                }
+
+                function sn(e, t) {
+                    return t._meridiemParse
+                }
+
+                function on(e) {
+                    return (e + "").toLowerCase().charAt(0) === "p"
+                }
+
+                i("H", ["HH", 2], 0, "hour"), i("h", ["hh", 2], 0, nn), i("k", ["kk", 2], 0, rn), i("hmm", 0, 0, function () {
+                    return "" + nn.apply(this) + a(this.minutes(), 2)
+                }), i("hmmss", 0, 0, function () {
+                    return "" + nn.apply(this) + a(this.minutes(), 2) + a(this.seconds(), 2)
+                }), i("Hmm", 0, 0, function () {
+                    return "" + this.hours() + a(this.minutes(), 2)
+                }), i("Hmmss", 0, 0, function () {
+                    return "" + this.hours() + a(this.minutes(), 2) + a(this.seconds(), 2)
+                }), an("a", true), an("A", false), t("hour", "h"), n("hour", 13), g("a", sn), g("A", sn), g("H", v), g("h", v), g("k", v), g("HH", v, r), g("hh", v, r), g("kk", v, r), g("hmm", He), g("hmmss", je), g("Hmm", He), g("Hmmss", je), L(["H", "HH"], w), L(["k", "kk"], function (e, t, n) {
+                    var i = y(e);
+                    t[w] = i === 24 ? 0 : i
+                }), L(["a", "A"], function (e, t, n) {
+                    n._isPm = n._locale.isPM(e);
+                    n._meridiem = e
+                }), L(["h", "hh"], function (e, t, n) {
+                    t[w] = y(e);
+                    c(n).bigHour = true
+                }), L("hmm", function (e, t, n) {
+                    var i = e.length - 2;
+                    t[w] = y(e.substr(0, i));
+                    t[D] = y(e.substr(i));
+                    c(n).bigHour = true
+                }), L("hmmss", function (e, t, n) {
+                    var i = e.length - 4, r = e.length - 2;
+                    t[w] = y(e.substr(0, i));
+                    t[D] = y(e.substr(i, 2));
+                    t[T] = y(e.substr(r));
+                    c(n).bigHour = true
+                }), L("Hmm", function (e, t, n) {
+                    var i = e.length - 2;
+                    t[w] = y(e.substr(0, i));
+                    t[D] = y(e.substr(i))
+                }), L("Hmmss", function (e, t, n) {
+                    var i = e.length - 4, r = e.length - 2;
+                    t[w] = y(e.substr(0, i));
+                    t[D] = y(e.substr(i, 2));
+                    t[T] = y(e.substr(r))
+                });
+                var un, dn = Ye("Hours", true);
+
+                function ln(e, t, n) {
+                    if (e > 11) return n ? "pm" : "PM"; else return n ? "am" : "AM"
+                }
+
+                var hn = {
+                    calendar: re,
+                    longDateFormat: fe,
+                    invalidDate: pe,
+                    ordinal: ve,
+                    dayOfMonthOrdinalParse: ge,
+                    relativeTime: Le,
+                    months: st,
+                    monthsShort: ot,
+                    week: Pt,
+                    weekdays: Ht,
+                    weekdaysMin: Ft,
+                    weekdaysShort: jt,
+                    meridiemParse: /[ap]\.?m?\.?/i
+                }, P = {}, cn = {}, _n;
+
+                function fn(e, t) {
+                    var n, i = Math.min(e.length, t.length);
+                    for (n = 0; n < i; n += 1) if (e[n] !== t[n]) return n;
+                    return i
+                }
+
+                function mn(e) {
+                    return e ? e.toLowerCase().replace("_", "-") : e
+                }
+
+                function pn(e) {
+                    var t = 0, n, i, r, a;
+                    while (t < e.length) {
+                        a = mn(e[t]).split("-");
+                        n = a.length;
+                        i = mn(e[t + 1]);
+                        i = i ? i.split("-") : null;
+                        while (n > 0) {
+                            r = vn(a.slice(0, n).join("-"));
+                            if (r) return r;
+                            if (i && i.length >= n && fn(a, i) >= n - 1) break;
+                            n--
+                        }
+                        t++
+                    }
+                    return _n
+                }
+
+                function yn(e) {
+                    return e.match("^[^/\\\\]*$") != null
+                }
+
+                function vn(t) {
+                    var e = null, n;
+                    if (P[t] === undefined && typeof ds !== "undefined" && ds && ds.exports && yn(t)) try {
+                        e = _n._abbr;
+                        n = ls;
+                        hs(284)("./" + t);
+                        gn(e)
+                    } catch (e) {
+                        P[t] = null
+                    }
+                    return P[t]
+                }
+
+                function gn(e, t) {
+                    var n;
+                    if (e) {
+                        if (o(t)) n = Sn(e); else n = Mn(e, t);
+                        if (n) _n = n; else if (typeof console !== "undefined" && console.warn) console.warn("Locale " + e + " not found. Did you forget to load it?")
+                    }
+                    return _n._abbr
+                }
+
+                function Mn(e, t) {
+                    if (t !== null) {
+                        var n, i = hn;
+                        t.abbr = e;
+                        if (P[e] != null) {
+                            ee("defineLocaleOverride", "use moment.updateLocale(localeName, config) to change " + "an existing locale. moment.defineLocale(localeName, " + "config) should only be used for creating a new locale " + "See http://momentjs.com/guides/#/warnings/define-locale/ for more info.");
+                            i = P[e]._config
+                        } else if (t.parentLocale != null) if (P[t.parentLocale] != null) i = P[t.parentLocale]._config; else {
+                            n = vn(t.parentLocale);
+                            if (n != null) i = n._config; else {
+                                if (!cn[t.parentLocale]) cn[t.parentLocale] = [];
+                                cn[t.parentLocale].push({name: e, config: t});
+                                return null
+                            }
+                        }
+                        P[e] = new ie(ne(i, t));
+                        if (cn[e]) cn[e].forEach(function (e) {
+                            Mn(e.name, e.config)
+                        });
+                        gn(e);
+                        return P[e]
+                    } else {
+                        delete P[e];
+                        return null
+                    }
+                }
+
+                function Ln(e, t) {
+                    if (t != null) {
+                        var n, i, r = hn;
+                        if (P[e] != null && P[e].parentLocale != null) P[e].set(ne(P[e]._config, t)); else {
+                            i = vn(e);
+                            if (i != null) r = i._config;
+                            t = ne(r, t);
+                            if (i == null) t.abbr = e;
+                            n = new ie(t);
+                            n.parentLocale = P[e];
+                            P[e] = n
+                        }
+                        gn(e)
+                    } else if (P[e] != null) if (P[e].parentLocale != null) {
+                        P[e] = P[e].parentLocale;
+                        if (e === gn()) gn(e)
+                    } else if (P[e] != null) delete P[e];
+                    return P[e]
+                }
+
+                function Sn(e) {
+                    var t;
+                    if (e && e._locale && e._locale._abbr) e = e._locale._abbr;
+                    if (!e) return _n;
+                    if (!s(e)) {
+                        t = vn(e);
+                        if (t) return t;
+                        e = [e]
+                    }
+                    return pn(e)
+                }
+
+                function kn() {
+                    return Q(P)
+                }
+
+                function bn(e) {
+                    var t, n = e._a;
+                    if (n && c(e).overflow === -2) {
+                        t = n[k] < 0 || n[k] > 11 ? k : n[b] < 1 || n[b] > at(n[S], n[k]) ? b : n[w] < 0 || n[w] > 24 || n[w] === 24 && (n[D] !== 0 || n[T] !== 0 || n[tt] !== 0) ? w : n[D] < 0 || n[D] > 59 ? D : n[T] < 0 || n[T] > 59 ? T : n[tt] < 0 || n[tt] > 999 ? tt : -1;
+                        if (c(e)._overflowDayOfYear && (t < S || t > b)) t = b;
+                        if (c(e)._overflowWeeks && t === -1) t = nt;
+                        if (c(e)._overflowWeekday && t === -1) t = it;
+                        c(e).overflow = t
+                    }
+                    return e
+                }
+
+                var wn = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+                    Dn = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+                    Tn = /Z|[+-]\d\d(?::?\d\d)?/,
+                    En = [["YYYYYY-MM-DD", /[+-]\d{6}-\d\d-\d\d/], ["YYYY-MM-DD", /\d{4}-\d\d-\d\d/], ["GGGG-[W]WW-E", /\d{4}-W\d\d-\d/], ["GGGG-[W]WW", /\d{4}-W\d\d/, false], ["YYYY-DDD", /\d{4}-\d{3}/], ["YYYY-MM", /\d{4}-\d\d/, false], ["YYYYYYMMDD", /[+-]\d{10}/], ["YYYYMMDD", /\d{8}/], ["GGGG[W]WWE", /\d{4}W\d{3}/], ["GGGG[W]WW", /\d{4}W\d{2}/, false], ["YYYYDDD", /\d{7}/], ["YYYYMM", /\d{6}/, false], ["YYYY", /\d{4}/, false]],
+                    Yn = [["HH:mm:ss.SSSS", /\d\d:\d\d:\d\d\.\d+/], ["HH:mm:ss,SSSS", /\d\d:\d\d:\d\d,\d+/], ["HH:mm:ss", /\d\d:\d\d:\d\d/], ["HH:mm", /\d\d:\d\d/], ["HHmmss.SSSS", /\d\d\d\d\d\d\.\d+/], ["HHmmss,SSSS", /\d\d\d\d\d\d,\d+/], ["HHmmss", /\d\d\d\d\d\d/], ["HHmm", /\d\d\d\d/], ["HH", /\d\d/]],
+                    Pn = /^\/?Date\((-?\d+)/i,
+                    Cn = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,
+                    Rn = {
+                        UT: 0,
+                        GMT: 0,
+                        EDT: -4 * 60,
+                        EST: -5 * 60,
+                        CDT: -5 * 60,
+                        CST: -6 * 60,
+                        MDT: -6 * 60,
+                        MST: -7 * 60,
+                        PDT: -7 * 60,
+                        PST: -8 * 60
+                    };
+
+                function An(e) {
+                    var t, n, i = e._i, r = wn.exec(i) || Dn.exec(i), a, s, o, u, d = En.length, l = Yn.length;
+                    if (r) {
+                        c(e).iso = true;
+                        for (t = 0, n = d; t < n; t++) if (En[t][1].exec(r[1])) {
+                            s = En[t][0];
+                            a = En[t][2] !== false;
+                            break
+                        }
+                        if (s == null) {
+                            e._isValid = false;
+                            return
+                        }
+                        if (r[3]) {
+                            for (t = 0, n = l; t < n; t++) if (Yn[t][1].exec(r[3])) {
+                                o = (r[2] || " ") + Yn[t][0];
+                                break
+                            }
+                            if (o == null) {
+                                e._isValid = false;
+                                return
+                            }
+                        }
+                        if (!a && o != null) {
+                            e._isValid = false;
+                            return
+                        }
+                        if (r[4]) if (Tn.exec(r[4])) u = "Z"; else {
+                            e._isValid = false;
+                            return
+                        }
+                        e._f = s + (o || "") + (u || "");
+                        Vn(e)
+                    } else e._isValid = false
+                }
+
+                function xn(e, t, n, i, r, a) {
+                    var s = [On(e), ot.indexOf(t), parseInt(n, 10), parseInt(i, 10), parseInt(r, 10)];
+                    if (a) s.push(parseInt(a, 10));
+                    return s
+                }
+
+                function On(e) {
+                    var t = parseInt(e, 10);
+                    if (t <= 49) return 2e3 + t; else if (t <= 999) return 1900 + t;
+                    return t
+                }
+
+                function In(e) {
+                    return e.replace(/\([^()]*\)|[\n\t]/g, " ").replace(/(\s\s+)/g, " ").replace(/^\s\s*/, "").replace(/\s\s*$/, "")
+                }
+
+                function Wn(e, t, n) {
+                    if (e) {
+                        var i = jt.indexOf(e), r = new Date(t[0], t[1], t[2]).getDay();
+                        if (i !== r) {
+                            c(n).weekdayMismatch = true;
+                            n._isValid = false;
+                            return false
+                        }
+                    }
+                    return true
+                }
+
+                function Hn(e, t, n) {
+                    if (e) return Rn[e]; else if (t) return 0; else {
+                        var i = parseInt(n, 10), r = i % 100, a = (i - r) / 100;
+                        return a * 60 + r
+                    }
+                }
+
+                function jn(e) {
+                    var t = Cn.exec(In(e._i)), n;
+                    if (t) {
+                        n = xn(t[4], t[3], t[2], t[5], t[6], t[7]);
+                        if (!Wn(t[1], n, e)) return;
+                        e._a = n;
+                        e._tzm = Hn(t[8], t[9], t[10]);
+                        e._d = wt.apply(null, e._a);
+                        e._d.setUTCMinutes(e._d.getUTCMinutes() - e._tzm);
+                        c(e).rfc2822 = true
+                    } else e._isValid = false
+                }
+
+                function Fn(e) {
+                    var t = Pn.exec(e._i);
+                    if (t !== null) {
+                        e._d = new Date(+t[1]);
+                        return
+                    }
+                    An(e);
+                    if (e._isValid === false) delete e._isValid; else return;
+                    jn(e);
+                    if (e._isValid === false) delete e._isValid; else return;
+                    if (e._strict) e._isValid = false; else h.createFromInputFallback(e)
+                }
+
+                function Bn(e, t, n) {
+                    if (e != null) return e;
+                    if (t != null) return t;
+                    return n
+                }
+
+                function Nn(e) {
+                    var t = new Date(h.now());
+                    if (e._useUTC) return [t.getUTCFullYear(), t.getUTCMonth(), t.getUTCDate()];
+                    return [t.getFullYear(), t.getMonth(), t.getDate()]
+                }
+
+                function zn(e) {
+                    var t, n, i = [], r, a, s;
+                    if (e._d) return;
+                    r = Nn(e);
+                    if (e._w && e._a[b] == null && e._a[k] == null) Un(e);
+                    if (e._dayOfYear != null) {
+                        s = Bn(e._a[S], r[S]);
+                        if (e._dayOfYear > Lt(s) || e._dayOfYear === 0) c(e)._overflowDayOfYear = true;
+                        n = wt(s, 0, e._dayOfYear);
+                        e._a[k] = n.getUTCMonth();
+                        e._a[b] = n.getUTCDate()
+                    }
+                    for (t = 0; t < 3 && e._a[t] == null; ++t) e._a[t] = i[t] = r[t];
+                    for (; t < 7; t++) e._a[t] = i[t] = e._a[t] == null ? t === 2 ? 1 : 0 : e._a[t];
+                    if (e._a[w] === 24 && e._a[D] === 0 && e._a[T] === 0 && e._a[tt] === 0) {
+                        e._nextDay = true;
+                        e._a[w] = 0
+                    }
+                    e._d = (e._useUTC ? wt : bt).apply(null, i);
+                    a = e._useUTC ? e._d.getUTCDay() : e._d.getDay();
+                    if (e._tzm != null) e._d.setUTCMinutes(e._d.getUTCMinutes() - e._tzm);
+                    if (e._nextDay) e._a[w] = 24;
+                    if (e._w && typeof e._w.d !== "undefined" && e._w.d !== a) c(e).weekdayMismatch = true
+                }
+
+                function Un(e) {
+                    var t, n, i, r, a, s, o, u, d;
+                    t = e._w;
+                    if (t.GG != null || t.W != null || t.E != null) {
+                        a = 1;
+                        s = 4;
+                        n = Bn(t.GG, e._a[S], Et(C(), 1, 4).year);
+                        i = Bn(t.W, 1);
+                        r = Bn(t.E, 1);
+                        if (r < 1 || r > 7) u = true
+                    } else {
+                        a = e._locale._week.dow;
+                        s = e._locale._week.doy;
+                        d = Et(C(), a, s);
+                        n = Bn(t.gg, e._a[S], d.year);
+                        i = Bn(t.w, d.week);
+                        if (t.d != null) {
+                            r = t.d;
+                            if (r < 0 || r > 6) u = true
+                        } else if (t.e != null) {
+                            r = t.e + a;
+                            if (t.e < 0 || t.e > 6) u = true
+                        } else r = a
+                    }
+                    if (i < 1 || i > Y(n, a, s)) c(e)._overflowWeeks = true; else if (u != null) c(e)._overflowWeekday = true; else {
+                        o = Tt(n, i, r, a, s);
+                        e._a[S] = o.year;
+                        e._dayOfYear = o.dayOfYear
+                    }
+                }
+
+                function Vn(e) {
+                    if (e._f === h.ISO_8601) {
+                        An(e);
+                        return
+                    }
+                    if (e._f === h.RFC_2822) {
+                        jn(e);
+                        return
+                    }
+                    e._a = [];
+                    c(e).empty = true;
+                    var t = "" + e._i, n, i, r, a, s, o = t.length, u = 0, d, l;
+                    r = _e(e._f, e._locale).match(se) || [];
+                    l = r.length;
+                    for (n = 0; n < l; n++) {
+                        a = r[n];
+                        i = (t.match(Xe(a, e)) || [])[0];
+                        if (i) {
+                            s = t.substr(0, t.indexOf(i));
+                            if (s.length > 0) c(e).unusedInput.push(s);
+                            t = t.slice(t.indexOf(i) + i.length);
+                            u += i.length
+                        }
+                        if (de[a]) {
+                            if (i) c(e).empty = false; else c(e).unusedTokens.push(a);
+                            et(a, i, e)
+                        } else if (e._strict && !i) c(e).unusedTokens.push(a)
+                    }
+                    c(e).charsLeftOver = o - u;
+                    if (t.length > 0) c(e).unusedInput.push(t);
+                    if (e._a[w] <= 12 && c(e).bigHour === true && e._a[w] > 0) c(e).bigHour = undefined;
+                    c(e).parsedDateParts = e._a.slice(0);
+                    c(e).meridiem = e._meridiem;
+                    e._a[w] = Gn(e._locale, e._a[w], e._meridiem);
+                    d = c(e).era;
+                    if (d !== null) e._a[S] = e._locale.erasConvertYear(d, e._a[S]);
+                    zn(e);
+                    bn(e)
+                }
+
+                function Gn(e, t, n) {
+                    var i;
+                    if (n == null) return t;
+                    if (e.meridiemHour != null) return e.meridiemHour(t, n); else if (e.isPM != null) {
+                        i = e.isPM(n);
+                        if (i && t < 12) t += 12;
+                        if (!i && t === 12) t = 0;
+                        return t
+                    } else return t
+                }
+
+                function Jn(e) {
+                    var t, n, i, r, a, s, o = false, u = e._f.length;
+                    if (u === 0) {
+                        c(e).invalidFormat = true;
+                        e._d = new Date(NaN);
+                        return
+                    }
+                    for (r = 0; r < u; r++) {
+                        a = 0;
+                        s = false;
+                        t = K({}, e);
+                        if (e._useUTC != null) t._useUTC = e._useUTC;
+                        t._f = e._f[r];
+                        Vn(t);
+                        if (V(t)) s = true;
+                        a += c(t).charsLeftOver;
+                        a += c(t).unusedTokens.length * 10;
+                        c(t).score = a;
+                        if (!o) {
+                            if (i == null || a < i || s) {
+                                i = a;
+                                n = t;
+                                if (s) o = true
+                            }
+                        } else if (a < i) {
+                            i = a;
+                            n = t
+                        }
+                    }
+                    z(e, n || t)
+                }
+
+                function qn(e) {
+                    if (e._d) return;
+                    var t = we(e._i), n = t.day === undefined ? t.date : t.day;
+                    e._a = N([t.year, t.month, n, t.hour, t.minute, t.second, t.millisecond], function (e) {
+                        return e && parseInt(e, 10)
+                    });
+                    zn(e)
+                }
+
+                function Kn(e) {
+                    var t = new X(bn(Xn(e)));
+                    if (t._nextDay) {
+                        t.add(1, "d");
+                        t._nextDay = undefined
+                    }
+                    return t
+                }
+
+                function Xn(e) {
+                    var t = e._i, n = e._f;
+                    e._locale = e._locale || Sn(e._l);
+                    if (t === null || n === undefined && t === "") return G({nullInput: true});
+                    if (typeof t === "string") e._i = t = e._locale.preparse(t);
+                    if (_(t)) return new X(bn(t)); else if (B(t)) e._d = t; else if (s(n)) Jn(e); else if (n) Vn(e); else Zn(e);
+                    if (!V(e)) e._d = null;
+                    return e
+                }
+
+                function Zn(e) {
+                    var t = e._i;
+                    if (o(t)) e._d = new Date(h.now()); else if (B(t)) e._d = new Date(t.valueOf()); else if (typeof t === "string") Fn(e); else if (s(t)) {
+                        e._a = N(t.slice(0), function (e) {
+                            return parseInt(e, 10)
+                        });
+                        zn(e)
+                    } else if (j(t)) qn(e); else if (d(t)) e._d = new Date(t); else h.createFromInputFallback(e)
+                }
+
+                function $n(e, t, n, i, r) {
+                    var a = {};
+                    if (t === true || t === false) {
+                        i = t;
+                        t = undefined
+                    }
+                    if (n === true || n === false) {
+                        i = n;
+                        n = undefined
+                    }
+                    if (j(e) && F(e) || s(e) && e.length === 0) e = undefined;
+                    a._isAMomentObject = true;
+                    a._useUTC = a._isUTC = r;
+                    a._l = n;
+                    a._i = e;
+                    a._f = t;
+                    a._strict = i;
+                    return Kn(a)
+                }
+
+                function C(e, t, n, i) {
+                    return $n(e, t, n, i, false)
+                }
+
+                h.createFromInputFallback = e("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), " + "which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are " + "discouraged. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.", function (e) {
+                    e._d = new Date(e._i + (e._useUTC ? " UTC" : ""))
+                }), h.ISO_8601 = function () {
+                }, h.RFC_2822 = function () {
+                };
+                var Qn = e("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/", function () {
+                        var e = C.apply(null, arguments);
+                        if (this.isValid() && e.isValid()) return e < this ? this : e; else return G()
+                    }),
+                    ei = e("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/", function () {
+                        var e = C.apply(null, arguments);
+                        if (this.isValid() && e.isValid()) return e > this ? this : e; else return G()
+                    });
+
+                function ti(e, t) {
+                    var n, i;
+                    if (t.length === 1 && s(t[0])) t = t[0];
+                    if (!t.length) return C();
+                    n = t[0];
+                    for (i = 1; i < t.length; ++i) if (!t[i].isValid() || t[i][e](n)) n = t[i];
+                    return n
+                }
+
+                function ni() {
+                    var e = [].slice.call(arguments, 0);
+                    return ti("isBefore", e)
+                }
+
+                function ii() {
+                    var e = [].slice.call(arguments, 0);
+                    return ti("isAfter", e)
+                }
+
+                var ri = function () {
+                    return Date.now ? Date.now() : +new Date
+                }, ai = ["year", "quarter", "month", "week", "day", "hour", "minute", "second", "millisecond"];
+
+                function si(e) {
+                    var t, n = false, i, r = ai.length;
+                    for (t in e) if (u(e, t) && !(E.call(ai, t) !== -1 && (e[t] == null || !isNaN(e[t])))) return false;
+                    for (i = 0; i < r; ++i) if (e[ai[i]]) {
+                        if (n) return false;
+                        if (parseFloat(e[ai[i]]) !== y(e[ai[i]])) n = true
+                    }
+                    return true
+                }
+
+                function oi() {
+                    return this._isValid
+                }
+
+                function ui() {
+                    return R(NaN)
+                }
+
+                function di(e) {
+                    var t = we(e), n = t.year || 0, i = t.quarter || 0, r = t.month || 0, a = t.week || t.isoWeek || 0,
+                        s = t.day || 0, o = t.hour || 0, u = t.minute || 0, d = t.second || 0, l = t.millisecond || 0;
+                    this._isValid = si(t);
+                    this._milliseconds = +l + d * 1e3 + u * 6e4 + o * 1e3 * 60 * 60;
+                    this._days = +s + a * 7;
+                    this._months = +r + i * 3 + n * 12;
+                    this._data = {};
+                    this._locale = Sn();
+                    this._bubble()
+                }
+
+                function li(e) {
+                    return e instanceof di
+                }
+
+                function hi(e) {
+                    if (e < 0) return Math.round(-1 * e) * -1; else return Math.round(e)
+                }
+
+                function ci(e, t, n) {
+                    var i = Math.min(e.length, t.length), r = Math.abs(e.length - t.length), a = 0, s;
+                    for (s = 0; s < i; s++) if (n && e[s] !== t[s] || !n && y(e[s]) !== y(t[s])) a++;
+                    return a + r
+                }
+
+                function _i(e, n) {
+                    i(e, 0, 0, function () {
+                        var e = this.utcOffset(), t = "+";
+                        if (e < 0) {
+                            e = -e;
+                            t = "-"
+                        }
+                        return t + a(~~(e / 60), 2) + n + a(~~e % 60, 2)
+                    })
+                }
+
+                _i("Z", ":"), _i("ZZ", ""), g("Z", Ge), g("ZZ", Ge), L(["Z", "ZZ"], function (e, t, n) {
+                    n._useUTC = true;
+                    n._tzm = mi(Ge, e)
+                });
+                var fi = /([\+\-]|\d\d)/gi;
+
+                function mi(e, t) {
+                    var n = (t || "").match(e), i, r, a;
+                    if (n === null) return null;
+                    i = n[n.length - 1] || [];
+                    r = (i + "").match(fi) || ["-", 0, 0];
+                    a = +(r[1] * 60) + y(r[2]);
+                    return a === 0 ? 0 : r[0] === "+" ? a : -a
+                }
+
+                function pi(e, t) {
+                    var n, i;
+                    if (t._isUTC) {
+                        n = t.clone();
+                        i = (_(e) || B(e) ? e.valueOf() : C(e).valueOf()) - n.valueOf();
+                        n._d.setTime(n._d.valueOf() + i);
+                        h.updateOffset(n, false);
+                        return n
+                    } else return C(e).local()
+                }
+
+                function yi(e) {
+                    return -Math.round(e._d.getTimezoneOffset())
+                }
+
+                function vi(e, t, n) {
+                    var i = this._offset || 0, r;
+                    if (!this.isValid()) return e != null ? this : NaN;
+                    if (e != null) {
+                        if (typeof e === "string") {
+                            e = mi(Ge, e);
+                            if (e === null) return this
+                        } else if (Math.abs(e) < 16 && !n) e = e * 60;
+                        if (!this._isUTC && t) r = yi(this);
+                        this._offset = e;
+                        this._isUTC = true;
+                        if (r != null) this.add(r, "m");
+                        if (i !== e) if (!t || this._changeInProgress) Oi(this, R(e - i, "m"), 1, false); else if (!this._changeInProgress) {
+                            this._changeInProgress = true;
+                            h.updateOffset(this, true);
+                            this._changeInProgress = null
+                        }
+                        return this
+                    } else return this._isUTC ? i : yi(this)
+                }
+
+                function gi(e, t) {
+                    if (e != null) {
+                        if (typeof e !== "string") e = -e;
+                        this.utcOffset(e, t);
+                        return this
+                    } else return -this.utcOffset()
+                }
+
+                function Mi(e) {
+                    return this.utcOffset(0, e)
+                }
+
+                function Li(e) {
+                    if (this._isUTC) {
+                        this.utcOffset(0, e);
+                        this._isUTC = false;
+                        if (e) this.subtract(yi(this), "m")
+                    }
+                    return this
+                }
+
+                function Si() {
+                    if (this._tzm != null) this.utcOffset(this._tzm, false, true); else if (typeof this._i === "string") {
+                        var e = mi(Ve, this._i);
+                        if (e != null) this.utcOffset(e); else this.utcOffset(0, true)
+                    }
+                    return this
+                }
+
+                function ki(e) {
+                    if (!this.isValid()) return false;
+                    e = e ? C(e).utcOffset() : 0;
+                    return (this.utcOffset() - e) % 60 === 0
+                }
+
+                function bi() {
+                    return this.utcOffset() > this.clone().month(0).utcOffset() || this.utcOffset() > this.clone().month(5).utcOffset()
+                }
+
+                function wi() {
+                    if (!o(this._isDSTShifted)) return this._isDSTShifted;
+                    var e = {}, t;
+                    K(e, this);
+                    e = Xn(e);
+                    if (e._a) {
+                        t = e._isUTC ? l(e._a) : C(e._a);
+                        this._isDSTShifted = this.isValid() && ci(e._a, t.toArray()) > 0
+                    } else this._isDSTShifted = false;
+                    return this._isDSTShifted
+                }
+
+                function Di() {
+                    return this.isValid() ? !this._isUTC : false
+                }
+
+                function Ti() {
+                    return this.isValid() ? this._isUTC : false
+                }
+
+                function Ei() {
+                    return this.isValid() ? this._isUTC && this._offset === 0 : false
+                }
+
+                h.updateOffset = function () {
+                };
+                var Yi = /^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,
+                    Pi = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+
+                function R(e, t) {
+                    var n = e, i = null, r, a, s;
+                    if (li(e)) n = {ms: e._milliseconds, d: e._days, M: e._months}; else if (d(e) || !isNaN(+e)) {
+                        n = {};
+                        if (t) n[t] = +e; else n.milliseconds = +e
+                    } else if (i = Yi.exec(e)) {
+                        r = i[1] === "-" ? -1 : 1;
+                        n = {
+                            y: 0,
+                            d: y(i[b]) * r,
+                            h: y(i[w]) * r,
+                            m: y(i[D]) * r,
+                            s: y(i[T]) * r,
+                            ms: y(hi(i[tt] * 1e3)) * r
+                        }
+                    } else if (i = Pi.exec(e)) {
+                        r = i[1] === "-" ? -1 : 1;
+                        n = {
+                            y: Ci(i[2], r),
+                            M: Ci(i[3], r),
+                            w: Ci(i[4], r),
+                            d: Ci(i[5], r),
+                            h: Ci(i[6], r),
+                            m: Ci(i[7], r),
+                            s: Ci(i[8], r)
+                        }
+                    } else if (n == null) n = {}; else if (typeof n === "object" && ("from" in n || "to" in n)) {
+                        s = Ai(C(n.from), C(n.to));
+                        n = {};
+                        n.ms = s.milliseconds;
+                        n.M = s.months
+                    }
+                    a = new di(n);
+                    if (li(e) && u(e, "_locale")) a._locale = e._locale;
+                    if (li(e) && u(e, "_isValid")) a._isValid = e._isValid;
+                    return a
+                }
+
+                function Ci(e, t) {
+                    var n = e && parseFloat(e.replace(",", "."));
+                    return (isNaN(n) ? 0 : n) * t
+                }
+
+                function Ri(e, t) {
+                    var n = {};
+                    n.months = t.month() - e.month() + (t.year() - e.year()) * 12;
+                    if (e.clone().add(n.months, "M").isAfter(t)) --n.months;
+                    n.milliseconds = +t - +e.clone().add(n.months, "M");
+                    return n
+                }
+
+                function Ai(e, t) {
+                    var n;
+                    if (!(e.isValid() && t.isValid())) return {milliseconds: 0, months: 0};
+                    t = pi(t, e);
+                    if (e.isBefore(t)) n = Ri(e, t); else {
+                        n = Ri(t, e);
+                        n.milliseconds = -n.milliseconds;
+                        n.months = -n.months
+                    }
+                    return n
+                }
+
+                function xi(r, a) {
+                    return function (e, t) {
+                        var n, i;
+                        if (t !== null && !isNaN(+t)) {
+                            ee(a, "moment()." + a + "(period, number) is deprecated. Please use moment()." + a + "(number, period). " + "See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.");
+                            i = e;
+                            e = t;
+                            t = i
+                        }
+                        n = R(e, t);
+                        Oi(this, n, r);
+                        return this
+                    }
+                }
+
+                function Oi(e, t, n, i) {
+                    var r = t._milliseconds, a = hi(t._days), s = hi(t._months);
+                    if (!e.isValid()) return;
+                    i = i == null ? true : i;
+                    if (s) mt(e, Pe(e, "Month") + s * n);
+                    if (a) Ce(e, "Date", Pe(e, "Date") + a * n);
+                    if (r) e._d.setTime(e._d.valueOf() + r * n);
+                    if (i) h.updateOffset(e, a || s)
+                }
+
+                R.fn = di.prototype, R.invalid = ui;
+                var Ii = xi(1, "add"), Wi = xi(-1, "subtract");
+
+                function Hi(e) {
+                    return typeof e === "string" || e instanceof String
+                }
+
+                function ji(e) {
+                    return _(e) || B(e) || Hi(e) || d(e) || Bi(e) || Fi(e) || e === null || e === undefined
+                }
+
+                function Fi(e) {
+                    var t = j(e) && !F(e), n = false,
+                        i = ["years", "year", "y", "months", "month", "M", "days", "day", "d", "dates", "date", "D", "hours", "hour", "h", "minutes", "minute", "m", "seconds", "second", "s", "milliseconds", "millisecond", "ms"],
+                        r, a, s = i.length;
+                    for (r = 0; r < s; r += 1) {
+                        a = i[r];
+                        n = n || u(e, a)
+                    }
+                    return t && n
+                }
+
+                function Bi(t) {
+                    var e = s(t), n = false;
+                    if (e) n = t.filter(function (e) {
+                        return !d(e) && Hi(t)
+                    }).length === 0;
+                    return e && n
+                }
+
+                function Ni(e) {
+                    var t = j(e) && !F(e), n = false,
+                        i = ["sameDay", "nextDay", "lastDay", "nextWeek", "lastWeek", "sameElse"], r, a;
+                    for (r = 0; r < i.length; r += 1) {
+                        a = i[r];
+                        n = n || u(e, a)
+                    }
+                    return t && n
+                }
+
+                function zi(e, t) {
+                    var n = e.diff(t, "days", true);
+                    return n < -6 ? "sameElse" : n < -1 ? "lastWeek" : n < 0 ? "lastDay" : n < 1 ? "sameDay" : n < 2 ? "nextDay" : n < 7 ? "nextWeek" : "sameElse"
+                }
+
+                function Ui(e, t) {
+                    if (arguments.length === 1) if (!arguments[0]) {
+                        e = undefined;
+                        t = undefined
+                    } else if (ji(arguments[0])) {
+                        e = arguments[0];
+                        t = undefined
+                    } else if (Ni(arguments[0])) {
+                        t = arguments[0];
+                        e = undefined
+                    }
+                    var n = e || C(), i = pi(n, this).startOf("day"), r = h.calendarFormat(this, i) || "sameElse",
+                        a = t && (f(t[r]) ? t[r].call(this, n) : t[r]);
+                    return this.format(a || this.localeData().calendar(r, this, C(n)))
+                }
+
+                function Vi() {
+                    return new X(this)
+                }
+
+                function Gi(e, t) {
+                    var n = _(e) ? e : C(e);
+                    if (!(this.isValid() && n.isValid())) return false;
+                    t = m(t) || "millisecond";
+                    if (t === "millisecond") return this.valueOf() > n.valueOf(); else return n.valueOf() < this.clone().startOf(t).valueOf()
+                }
+
+                function Ji(e, t) {
+                    var n = _(e) ? e : C(e);
+                    if (!(this.isValid() && n.isValid())) return false;
+                    t = m(t) || "millisecond";
+                    if (t === "millisecond") return this.valueOf() < n.valueOf(); else return this.clone().endOf(t).valueOf() < n.valueOf()
+                }
+
+                function qi(e, t, n, i) {
+                    var r = _(e) ? e : C(e), a = _(t) ? t : C(t);
+                    if (!(this.isValid() && r.isValid() && a.isValid())) return false;
+                    i = i || "()";
+                    return (i[0] === "(" ? this.isAfter(r, n) : !this.isBefore(r, n)) && (i[1] === ")" ? this.isBefore(a, n) : !this.isAfter(a, n))
+                }
+
+                function Ki(e, t) {
+                    var n = _(e) ? e : C(e), i;
+                    if (!(this.isValid() && n.isValid())) return false;
+                    t = m(t) || "millisecond";
+                    if (t === "millisecond") return this.valueOf() === n.valueOf(); else {
+                        i = n.valueOf();
+                        return this.clone().startOf(t).valueOf() <= i && i <= this.clone().endOf(t).valueOf()
+                    }
+                }
+
+                function Xi(e, t) {
+                    return this.isSame(e, t) || this.isAfter(e, t)
+                }
+
+                function Zi(e, t) {
+                    return this.isSame(e, t) || this.isBefore(e, t)
+                }
+
+                function $i(e, t, n) {
+                    var i, r, a;
+                    if (!this.isValid()) return NaN;
+                    i = pi(e, this);
+                    if (!i.isValid()) return NaN;
+                    r = (i.utcOffset() - this.utcOffset()) * 6e4;
+                    t = m(t);
+                    switch (t) {
+                        case"year":
+                            a = Qi(this, i) / 12;
+                            break;
+                        case"month":
+                            a = Qi(this, i);
+                            break;
+                        case"quarter":
+                            a = Qi(this, i) / 3;
+                            break;
+                        case"second":
+                            a = (this - i) / 1e3;
+                            break;
+                        case"minute":
+                            a = (this - i) / 6e4;
+                            break;
+                        case"hour":
+                            a = (this - i) / 36e5;
+                            break;
+                        case"day":
+                            a = (this - i - r) / 864e5;
+                            break;
+                        case"week":
+                            a = (this - i - r) / 6048e5;
+                            break;
+                        default:
+                            a = this - i
+                    }
+                    return n ? a : p(a)
+                }
+
+                function Qi(e, t) {
+                    if (e.date() < t.date()) return -Qi(t, e);
+                    var n = (t.year() - e.year()) * 12 + (t.month() - e.month()), i = e.clone().add(n, "months"), r, a;
+                    if (t - i < 0) {
+                        r = e.clone().add(n - 1, "months");
+                        a = (t - i) / (i - r)
+                    } else {
+                        r = e.clone().add(n + 1, "months");
+                        a = (t - i) / (r - i)
+                    }
+                    return -(n + a) || 0
+                }
+
+                function er() {
+                    return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")
+                }
+
+                function tr(e) {
+                    if (!this.isValid()) return null;
+                    var t = e !== true, n = t ? this.clone().utc() : this;
+                    if (n.year() < 0 || n.year() > 9999) return ce(n, t ? "YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]" : "YYYYYY-MM-DD[T]HH:mm:ss.SSSZ");
+                    if (f(Date.prototype.toISOString)) if (t) return this.toDate().toISOString(); else return new Date(this.valueOf() + this.utcOffset() * 60 * 1e3).toISOString().replace("Z", ce(n, "Z"));
+                    return ce(n, t ? "YYYY-MM-DD[T]HH:mm:ss.SSS[Z]" : "YYYY-MM-DD[T]HH:mm:ss.SSSZ")
+                }
+
+                function nr() {
+                    if (!this.isValid()) return "moment.invalid(/* " + this._i + " */)";
+                    var e = "moment", t = "", n, i, r, a;
+                    if (!this.isLocal()) {
+                        e = this.utcOffset() === 0 ? "moment.utc" : "moment.parseZone";
+                        t = "Z"
+                    }
+                    n = "[" + e + '("]';
+                    i = 0 <= this.year() && this.year() <= 9999 ? "YYYY" : "YYYYYY";
+                    r = "-MM-DD[T]HH:mm:ss.SSS";
+                    a = t + '[")]';
+                    return this.format(n + i + r + a)
+                }
+
+                function ir(e) {
+                    if (!e) e = this.isUtc() ? h.defaultFormatUtc : h.defaultFormat;
+                    var t = ce(this, e);
+                    return this.localeData().postformat(t)
+                }
+
+                function rr(e, t) {
+                    if (this.isValid() && (_(e) && e.isValid() || C(e).isValid())) return R({
+                        to: this,
+                        from: e
+                    }).locale(this.locale()).humanize(!t); else return this.localeData().invalidDate()
+                }
+
+                function ar(e) {
+                    return this.from(C(), e)
+                }
+
+                function sr(e, t) {
+                    if (this.isValid() && (_(e) && e.isValid() || C(e).isValid())) return R({
+                        from: this,
+                        to: e
+                    }).locale(this.locale()).humanize(!t); else return this.localeData().invalidDate()
+                }
+
+                function or(e) {
+                    return this.to(C(), e)
+                }
+
+                function ur(e) {
+                    var t;
+                    if (e === undefined) return this._locale._abbr; else {
+                        t = Sn(e);
+                        if (t != null) this._locale = t;
+                        return this
+                    }
+                }
+
+                h.defaultFormat = "YYYY-MM-DDTHH:mm:ssZ", h.defaultFormatUtc = "YYYY-MM-DDTHH:mm:ss[Z]";
+                var dr = e("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.", function (e) {
+                    if (e === undefined) return this.localeData(); else return this.locale(e)
+                });
+
+                function lr() {
+                    return this._locale
+                }
+
+                var hr = 1e3, cr = 60 * hr, _r = 60 * cr, fr = (365 * 400 + 97) * 24 * _r;
+
+                function mr(e, t) {
+                    return (e % t + t) % t
+                }
+
+                function pr(e, t, n) {
+                    if (e < 100 && e >= 0) return new Date(e + 400, t, n) - fr; else return new Date(e, t, n).valueOf()
+                }
+
+                function yr(e, t, n) {
+                    if (e < 100 && e >= 0) return Date.UTC(e + 400, t, n) - fr; else return Date.UTC(e, t, n)
+                }
+
+                function vr(e) {
+                    var t, n;
+                    e = m(e);
+                    if (e === undefined || e === "millisecond" || !this.isValid()) return this;
+                    n = this._isUTC ? yr : pr;
+                    switch (e) {
+                        case"year":
+                            t = n(this.year(), 0, 1);
+                            break;
+                        case"quarter":
+                            t = n(this.year(), this.month() - this.month() % 3, 1);
+                            break;
+                        case"month":
+                            t = n(this.year(), this.month(), 1);
+                            break;
+                        case"week":
+                            t = n(this.year(), this.month(), this.date() - this.weekday());
+                            break;
+                        case"isoWeek":
+                            t = n(this.year(), this.month(), this.date() - (this.isoWeekday() - 1));
+                            break;
+                        case"day":
+                        case"date":
+                            t = n(this.year(), this.month(), this.date());
+                            break;
+                        case"hour":
+                            t = this._d.valueOf();
+                            t -= mr(t + (this._isUTC ? 0 : this.utcOffset() * cr), _r);
+                            break;
+                        case"minute":
+                            t = this._d.valueOf();
+                            t -= mr(t, cr);
+                            break;
+                        case"second":
+                            t = this._d.valueOf();
+                            t -= mr(t, hr);
+                            break
+                    }
+                    this._d.setTime(t);
+                    h.updateOffset(this, true);
+                    return this
+                }
+
+                function gr(e) {
+                    var t, n;
+                    e = m(e);
+                    if (e === undefined || e === "millisecond" || !this.isValid()) return this;
+                    n = this._isUTC ? yr : pr;
+                    switch (e) {
+                        case"year":
+                            t = n(this.year() + 1, 0, 1) - 1;
+                            break;
+                        case"quarter":
+                            t = n(this.year(), this.month() - this.month() % 3 + 3, 1) - 1;
+                            break;
+                        case"month":
+                            t = n(this.year(), this.month() + 1, 1) - 1;
+                            break;
+                        case"week":
+                            t = n(this.year(), this.month(), this.date() - this.weekday() + 7) - 1;
+                            break;
+                        case"isoWeek":
+                            t = n(this.year(), this.month(), this.date() - (this.isoWeekday() - 1) + 7) - 1;
+                            break;
+                        case"day":
+                        case"date":
+                            t = n(this.year(), this.month(), this.date() + 1) - 1;
+                            break;
+                        case"hour":
+                            t = this._d.valueOf();
+                            t += _r - mr(t + (this._isUTC ? 0 : this.utcOffset() * cr), _r) - 1;
+                            break;
+                        case"minute":
+                            t = this._d.valueOf();
+                            t += cr - mr(t, cr) - 1;
+                            break;
+                        case"second":
+                            t = this._d.valueOf();
+                            t += hr - mr(t, hr) - 1;
+                            break
+                    }
+                    this._d.setTime(t);
+                    h.updateOffset(this, true);
+                    return this
+                }
+
+                function Mr() {
+                    return this._d.valueOf() - (this._offset || 0) * 6e4
+                }
+
+                function Lr() {
+                    return Math.floor(this.valueOf() / 1e3)
+                }
+
+                function Sr() {
+                    return new Date(this.valueOf())
+                }
+
+                function kr() {
+                    var e = this;
+                    return [e.year(), e.month(), e.date(), e.hour(), e.minute(), e.second(), e.millisecond()]
+                }
+
+                function br() {
+                    var e = this;
+                    return {
+                        years: e.year(),
+                        months: e.month(),
+                        date: e.date(),
+                        hours: e.hours(),
+                        minutes: e.minutes(),
+                        seconds: e.seconds(),
+                        milliseconds: e.milliseconds()
+                    }
+                }
+
+                function wr() {
+                    return this.isValid() ? this.toISOString() : null
+                }
+
+                function Dr() {
+                    return V(this)
+                }
+
+                function Tr() {
+                    return z({}, c(this))
+                }
+
+                function Er() {
+                    return c(this).overflow
+                }
+
+                function Yr() {
+                    return {
+                        input: this._i,
+                        format: this._f,
+                        locale: this._locale,
+                        isUTC: this._isUTC,
+                        strict: this._strict
+                    }
+                }
+
+                function Pr(e, t) {
+                    var n, i, r, a = this._eras || Sn("en")._eras;
+                    for (n = 0, i = a.length; n < i; ++n) {
+                        switch (typeof a[n].since) {
+                            case"string":
+                                r = h(a[n].since).startOf("day");
+                                a[n].since = r.valueOf();
+                                break
+                        }
+                        switch (typeof a[n].until) {
+                            case"undefined":
+                                a[n].until = +Infinity;
+                                break;
+                            case"string":
+                                r = h(a[n].until).startOf("day").valueOf();
+                                a[n].until = r.valueOf();
+                                break
+                        }
+                    }
+                    return a
+                }
+
+                function Cr(e, t, n) {
+                    var i, r, a = this.eras(), s, o, u;
+                    e = e.toUpperCase();
+                    for (i = 0, r = a.length; i < r; ++i) {
+                        s = a[i].name.toUpperCase();
+                        o = a[i].abbr.toUpperCase();
+                        u = a[i].narrow.toUpperCase();
+                        if (n) switch (t) {
+                            case"N":
+                            case"NN":
+                            case"NNN":
+                                if (o === e) return a[i];
+                                break;
+                            case"NNNN":
+                                if (s === e) return a[i];
+                                break;
+                            case"NNNNN":
+                                if (u === e) return a[i];
+                                break
+                        } else if ([s, o, u].indexOf(e) >= 0) return a[i]
+                    }
+                }
+
+                function Rr(e, t) {
+                    var n = e.since <= e.until ? +1 : -1;
+                    if (t === undefined) return h(e.since).year(); else return h(e.since).year() + (t - e.offset) * n
+                }
+
+                function Ar() {
+                    var e, t, n, i = this.localeData().eras();
+                    for (e = 0, t = i.length; e < t; ++e) {
+                        n = this.clone().startOf("day").valueOf();
+                        if (i[e].since <= n && n <= i[e].until) return i[e].name;
+                        if (i[e].until <= n && n <= i[e].since) return i[e].name
+                    }
+                    return ""
+                }
+
+                function xr() {
+                    var e, t, n, i = this.localeData().eras();
+                    for (e = 0, t = i.length; e < t; ++e) {
+                        n = this.clone().startOf("day").valueOf();
+                        if (i[e].since <= n && n <= i[e].until) return i[e].narrow;
+                        if (i[e].until <= n && n <= i[e].since) return i[e].narrow
+                    }
+                    return ""
+                }
+
+                function Or() {
+                    var e, t, n, i = this.localeData().eras();
+                    for (e = 0, t = i.length; e < t; ++e) {
+                        n = this.clone().startOf("day").valueOf();
+                        if (i[e].since <= n && n <= i[e].until) return i[e].abbr;
+                        if (i[e].until <= n && n <= i[e].since) return i[e].abbr
+                    }
+                    return ""
+                }
+
+                function Ir() {
+                    var e, t, n, i, r = this.localeData().eras();
+                    for (e = 0, t = r.length; e < t; ++e) {
+                        n = r[e].since <= r[e].until ? +1 : -1;
+                        i = this.clone().startOf("day").valueOf();
+                        if (r[e].since <= i && i <= r[e].until || r[e].until <= i && i <= r[e].since) return (this.year() - h(r[e].since).year()) * n + r[e].offset
+                    }
+                    return this.year()
+                }
+
+                function Wr(e) {
+                    if (!u(this, "_erasNameRegex")) Ur.call(this);
+                    return e ? this._erasNameRegex : this._erasRegex
+                }
+
+                function Hr(e) {
+                    if (!u(this, "_erasAbbrRegex")) Ur.call(this);
+                    return e ? this._erasAbbrRegex : this._erasRegex
+                }
+
+                function jr(e) {
+                    if (!u(this, "_erasNarrowRegex")) Ur.call(this);
+                    return e ? this._erasNarrowRegex : this._erasRegex
+                }
+
+                function Fr(e, t) {
+                    return t.erasAbbrRegex(e)
+                }
+
+                function Br(e, t) {
+                    return t.erasNameRegex(e)
+                }
+
+                function Nr(e, t) {
+                    return t.erasNarrowRegex(e)
+                }
+
+                function zr(e, t) {
+                    return t._eraYearOrdinalRegex || ze
+                }
+
+                function Ur() {
+                    var e = [], t = [], n = [], i = [], r, a, s = this.eras();
+                    for (r = 0, a = s.length; r < a; ++r) {
+                        t.push(M(s[r].name));
+                        e.push(M(s[r].abbr));
+                        n.push(M(s[r].narrow));
+                        i.push(M(s[r].name));
+                        i.push(M(s[r].abbr));
+                        i.push(M(s[r].narrow))
+                    }
+                    this._erasRegex = new RegExp("^(" + i.join("|") + ")", "i");
+                    this._erasNameRegex = new RegExp("^(" + t.join("|") + ")", "i");
+                    this._erasAbbrRegex = new RegExp("^(" + e.join("|") + ")", "i");
+                    this._erasNarrowRegex = new RegExp("^(" + n.join("|") + ")", "i")
+                }
+
+                function Vr(e, t) {
+                    i(0, [e, e.length], 0, t)
+                }
+
+                function Gr(e) {
+                    return $r.call(this, e, this.week(), this.weekday(), this.localeData()._week.dow, this.localeData()._week.doy)
+                }
+
+                function Jr(e) {
+                    return $r.call(this, e, this.isoWeek(), this.isoWeekday(), 1, 4)
+                }
+
+                function qr() {
+                    return Y(this.year(), 1, 4)
+                }
+
+                function Kr() {
+                    return Y(this.isoWeekYear(), 1, 4)
+                }
+
+                function Xr() {
+                    var e = this.localeData()._week;
+                    return Y(this.year(), e.dow, e.doy)
+                }
+
+                function Zr() {
+                    var e = this.localeData()._week;
+                    return Y(this.weekYear(), e.dow, e.doy)
+                }
+
+                function $r(e, t, n, i, r) {
+                    var a;
+                    if (e == null) return Et(this, i, r).year; else {
+                        a = Y(e, i, r);
+                        if (t > a) t = a;
+                        return Qr.call(this, e, t, n, i, r)
+                    }
+                }
+
+                function Qr(e, t, n, i, r) {
+                    var a = Tt(e, t, n, i, r), s = wt(a.year, 0, a.dayOfYear);
+                    this.year(s.getUTCFullYear());
+                    this.month(s.getUTCMonth());
+                    this.date(s.getUTCDate());
+                    return this
+                }
+
+                function ea(e) {
+                    return e == null ? Math.ceil((this.month() + 1) / 3) : this.month((e - 1) * 3 + this.month() % 3)
+                }
+
+                i("N", 0, 0, "eraAbbr"), i("NN", 0, 0, "eraAbbr"), i("NNN", 0, 0, "eraAbbr"), i("NNNN", 0, 0, "eraName"), i("NNNNN", 0, 0, "eraNarrow"), i("y", ["y", 1], "yo", "eraYear"), i("y", ["yy", 2], 0, "eraYear"), i("y", ["yyy", 3], 0, "eraYear"), i("y", ["yyyy", 4], 0, "eraYear"), g("N", Fr), g("NN", Fr), g("NNN", Fr), g("NNNN", Br), g("NNNNN", Nr), L(["N", "NN", "NNN", "NNNN", "NNNNN"], function (e, t, n, i) {
+                    var r = n._locale.erasParse(e, i, n._strict);
+                    if (r) c(n).era = r; else c(n).invalidEra = e
+                }), g("y", ze), g("yy", ze), g("yyy", ze), g("yyyy", ze), g("yo", zr), L(["y", "yy", "yyy", "yyyy"], S), L(["yo"], function (e, t, n, i) {
+                    var r;
+                    if (n._locale._eraYearOrdinalRegex) r = e.match(n._locale._eraYearOrdinalRegex);
+                    if (n._locale.eraYearOrdinalParse) t[S] = n._locale.eraYearOrdinalParse(e, r); else t[S] = parseInt(e, 10)
+                }), i(0, ["gg", 2], 0, function () {
+                    return this.weekYear() % 100
+                }), i(0, ["GG", 2], 0, function () {
+                    return this.isoWeekYear() % 100
+                }), Vr("gggg", "weekYear"), Vr("ggggg", "weekYear"), Vr("GGGG", "isoWeekYear"), Vr("GGGGG", "isoWeekYear"), t("weekYear", "gg"), t("isoWeekYear", "GG"), n("weekYear", 1), n("isoWeekYear", 1), g("G", Ue), g("g", Ue), g("GG", v, r), g("gg", v, r), g("GGGG", Be, Ie), g("gggg", Be, Ie), g("GGGGG", Ne, We), g("ggggg", Ne, We), Qe(["gggg", "ggggg", "GGGG", "GGGGG"], function (e, t, n, i) {
+                    t[i.substr(0, 2)] = y(e)
+                }), Qe(["gg", "GG"], function (e, t, n, i) {
+                    t[i] = h.parseTwoDigitYear(e)
+                }), i("Q", 0, "Qo", "quarter"), t("quarter", "Q"), n("quarter", 7), g("Q", xe), L("Q", function (e, t) {
+                    t[k] = (y(e) - 1) * 3
+                }), i("D", ["DD", 2], "Do", "date"), t("date", "D"), n("date", 9), g("D", v), g("DD", v, r), g("Do", function (e, t) {
+                    return e ? t._dayOfMonthOrdinalParse || t._ordinalParse : t._dayOfMonthOrdinalParseLenient
+                }), L(["D", "DD"], b), L("Do", function (e, t) {
+                    t[b] = y(e.match(v)[0])
+                });
+                var ta = Ye("Date", true);
+
+                function na(e) {
+                    var t = Math.round((this.clone().startOf("day") - this.clone().startOf("year")) / 864e5) + 1;
+                    return e == null ? t : this.add(e - t, "d")
+                }
+
+                i("DDD", ["DDDD", 3], "DDDo", "dayOfYear"), t("dayOfYear", "DDD"), n("dayOfYear", 4), g("DDD", Fe), g("DDDD", Oe), L(["DDD", "DDDD"], function (e, t, n) {
+                    n._dayOfYear = y(e)
+                }), i("m", ["mm", 2], 0, "minute"), t("minute", "m"), n("minute", 14), g("m", v), g("mm", v, r), L(["m", "mm"], D);
+                var ia = Ye("Minutes", false),
+                    ra = (i("s", ["ss", 2], 0, "second"), t("second", "s"), n("second", 15), g("s", v), g("ss", v, r), L(["s", "ss"], T), Ye("Seconds", false)),
+                    aa, sa;
+                for (i("S", 0, 0, function () {
+                    return ~~(this.millisecond() / 100)
+                }), i(0, ["SS", 2], 0, function () {
+                    return ~~(this.millisecond() / 10)
+                }), i(0, ["SSS", 3], 0, "millisecond"), i(0, ["SSSS", 4], 0, function () {
+                    return this.millisecond() * 10
+                }), i(0, ["SSSSS", 5], 0, function () {
+                    return this.millisecond() * 100
+                }), i(0, ["SSSSSS", 6], 0, function () {
+                    return this.millisecond() * 1e3
+                }), i(0, ["SSSSSSS", 7], 0, function () {
+                    return this.millisecond() * 1e4
+                }), i(0, ["SSSSSSSS", 8], 0, function () {
+                    return this.millisecond() * 1e5
+                }), i(0, ["SSSSSSSSS", 9], 0, function () {
+                    return this.millisecond() * 1e6
+                }), t("millisecond", "ms"), n("millisecond", 16), g("S", Fe, xe), g("SS", Fe, r), g("SSS", Fe, Oe), aa = "SSSS"; aa.length <= 9; aa += "S") g(aa, ze);
+
+                function oa(e, t) {
+                    t[tt] = y(("0." + e) * 1e3)
+                }
+
+                for (aa = "S"; aa.length <= 9; aa += "S") L(aa, oa);
+
+                function ua() {
+                    return this._isUTC ? "UTC" : ""
+                }
+
+                function da() {
+                    return this._isUTC ? "Coordinated Universal Time" : ""
+                }
+
+                sa = Ye("Milliseconds", false), i("z", 0, 0, "zoneAbbr"), i("zz", 0, 0, "zoneName");
+                var A = X.prototype;
+                if (A.add = Ii, A.calendar = Ui, A.clone = Vi, A.diff = $i, A.endOf = gr, A.format = ir, A.from = rr, A.fromNow = ar, A.to = sr, A.toNow = or, A.get = Re, A.invalidAt = Er, A.isAfter = Gi, A.isBefore = Ji, A.isBetween = qi, A.isSame = Ki, A.isSameOrAfter = Xi, A.isSameOrBefore = Zi, A.isValid = Dr, A.lang = dr, A.locale = ur, A.localeData = lr, A.max = ei, A.min = Qn, A.parsingFlags = Tr, A.set = Ae, A.startOf = vr, A.subtract = Wi, A.toArray = kr, A.toObject = br, A.toDate = Sr, A.toISOString = tr, A.inspect = nr, typeof Symbol !== "undefined" && Symbol.for != null) A[Symbol.for("nodejs.util.inspect.custom")] = function () {
+                    return "Moment<" + this.format() + ">"
+                };
+
+                function la(e) {
+                    return C(e * 1e3)
+                }
+
+                function ha() {
+                    return C.apply(null, arguments).parseZone()
+                }
+
+                function ca(e) {
+                    return e
+                }
+
+                A.toJSON = wr, A.toString = er, A.unix = Lr, A.valueOf = Mr, A.creationData = Yr, A.eraName = Ar, A.eraNarrow = xr, A.eraAbbr = Or, A.eraYear = Ir, A.year = St, A.isLeapYear = kt, A.weekYear = Gr, A.isoWeekYear = Jr, A.quarter = A.quarters = ea, A.month = pt, A.daysInMonth = yt, A.week = A.weeks = At, A.isoWeek = A.isoWeeks = xt, A.weeksInYear = Xr, A.weeksInWeekYear = Zr, A.isoWeeksInYear = qr, A.isoWeeksInISOWeekYear = Kr, A.date = ta, A.day = A.days = Kt, A.weekday = Xt, A.isoWeekday = Zt, A.dayOfYear = na, A.hour = A.hours = dn, A.minute = A.minutes = ia, A.second = A.seconds = ra, A.millisecond = A.milliseconds = sa, A.utcOffset = vi, A.utc = Mi, A.local = Li, A.parseZone = Si, A.hasAlignedHourOffset = ki, A.isDST = bi, A.isLocal = Di, A.isUtcOffset = Ti, A.isUtc = Ei, A.isUTC = Ei, A.zoneAbbr = ua, A.zoneName = da, A.dates = e("dates accessor is deprecated. Use date instead.", ta), A.months = e("months accessor is deprecated. Use month instead", pt), A.years = e("years accessor is deprecated. Use year instead", St), A.zone = e("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/", gi), A.isDSTShifted = e("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information", wi);
+                var x = ie.prototype;
+
+                function _a(e, t, n, i) {
+                    var r = Sn(), a = l().set(i, t);
+                    return r[n](a, e)
+                }
+
+                function fa(e, t, n) {
+                    if (d(e)) {
+                        t = e;
+                        e = undefined
+                    }
+                    e = e || "";
+                    if (t != null) return _a(e, t, n, "month");
+                    var i, r = [];
+                    for (i = 0; i < 12; i++) r[i] = _a(e, i, n, "month");
+                    return r
+                }
+
+                function ma(e, t, n, i) {
+                    if (typeof e === "boolean") {
+                        if (d(t)) {
+                            n = t;
+                            t = undefined
+                        }
+                        t = t || ""
+                    } else {
+                        t = e;
+                        n = t;
+                        e = false;
+                        if (d(t)) {
+                            n = t;
+                            t = undefined
+                        }
+                        t = t || ""
+                    }
+                    var r = Sn(), a = e ? r._week.dow : 0, s, o = [];
+                    if (n != null) return _a(t, (n + a) % 7, i, "day");
+                    for (s = 0; s < 7; s++) o[s] = _a(t, (s + a) % 7, i, "day");
+                    return o
+                }
+
+                function pa(e, t) {
+                    return fa(e, t, "months")
+                }
+
+                function ya(e, t) {
+                    return fa(e, t, "monthsShort")
+                }
+
+                function va(e, t, n) {
+                    return ma(e, t, n, "weekdays")
+                }
+
+                function ga(e, t, n) {
+                    return ma(e, t, n, "weekdaysShort")
+                }
+
+                function Ma(e, t, n) {
+                    return ma(e, t, n, "weekdaysMin")
+                }
+
+                x.calendar = ae, x.longDateFormat = me, x.invalidDate = ye, x.ordinal = Me, x.preparse = ca, x.postformat = ca, x.relativeTime = Se, x.pastFuture = ke, x.set = te, x.eras = Pr, x.erasParse = Cr, x.erasConvertYear = Rr, x.erasAbbrRegex = Hr, x.erasNameRegex = Wr, x.erasNarrowRegex = jr, x.months = ht, x.monthsShort = ct, x.monthsParse = ft, x.monthsRegex = gt, x.monthsShortRegex = vt, x.week = Yt, x.firstDayOfYear = Rt, x.firstDayOfWeek = Ct, x.weekdays = Ut, x.weekdaysMin = Gt, x.weekdaysShort = Vt, x.weekdaysParse = qt, x.weekdaysRegex = $t, x.weekdaysShortRegex = Qt, x.weekdaysMinRegex = en, x.isPM = on, x.meridiem = ln, gn("en", {
+                    eras: [{
+                        since: "0001-01-01",
+                        until: +Infinity,
+                        offset: 1,
+                        name: "Anno Domini",
+                        narrow: "AD",
+                        abbr: "AD"
+                    }, {
+                        since: "0000-12-31",
+                        until: -Infinity,
+                        offset: 1,
+                        name: "Before Christ",
+                        narrow: "BC",
+                        abbr: "BC"
+                    }], dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, ordinal: function (e) {
+                        var t = e % 10,
+                            n = y(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                        return e + n
+                    }
+                }), h.lang = e("moment.lang is deprecated. Use moment.locale instead.", gn), h.langData = e("moment.langData is deprecated. Use moment.localeData instead.", Sn);
+                var La = Math.abs;
+
+                function Sa() {
+                    var e = this._data;
+                    this._milliseconds = La(this._milliseconds);
+                    this._days = La(this._days);
+                    this._months = La(this._months);
+                    e.milliseconds = La(e.milliseconds);
+                    e.seconds = La(e.seconds);
+                    e.minutes = La(e.minutes);
+                    e.hours = La(e.hours);
+                    e.months = La(e.months);
+                    e.years = La(e.years);
+                    return this
+                }
+
+                function ka(e, t, n, i) {
+                    var r = R(t, n);
+                    e._milliseconds += i * r._milliseconds;
+                    e._days += i * r._days;
+                    e._months += i * r._months;
+                    return e._bubble()
+                }
+
+                function ba(e, t) {
+                    return ka(this, e, t, 1)
+                }
+
+                function wa(e, t) {
+                    return ka(this, e, t, -1)
+                }
+
+                function Da(e) {
+                    if (e < 0) return Math.floor(e); else return Math.ceil(e)
+                }
+
+                function Ta() {
+                    var e = this._milliseconds, t = this._days, n = this._months, i = this._data, r, a, s, o, u;
+                    if (!(e >= 0 && t >= 0 && n >= 0 || e <= 0 && t <= 0 && n <= 0)) {
+                        e += Da(Ya(n) + t) * 864e5;
+                        t = 0;
+                        n = 0
+                    }
+                    i.milliseconds = e % 1e3;
+                    r = p(e / 1e3);
+                    i.seconds = r % 60;
+                    a = p(r / 60);
+                    i.minutes = a % 60;
+                    s = p(a / 60);
+                    i.hours = s % 24;
+                    t += p(s / 24);
+                    u = p(Ea(t));
+                    n += u;
+                    t -= Da(Ya(u));
+                    o = p(n / 12);
+                    n %= 12;
+                    i.days = t;
+                    i.months = n;
+                    i.years = o;
+                    return this
+                }
+
+                function Ea(e) {
+                    return e * 4800 / 146097
+                }
+
+                function Ya(e) {
+                    return e * 146097 / 4800
+                }
+
+                function Pa(e) {
+                    if (!this.isValid()) return NaN;
+                    var t, n, i = this._milliseconds;
+                    e = m(e);
+                    if (e === "month" || e === "quarter" || e === "year") {
+                        t = this._days + i / 864e5;
+                        n = this._months + Ea(t);
+                        switch (e) {
+                            case"month":
+                                return n;
+                            case"quarter":
+                                return n / 3;
+                            case"year":
+                                return n / 12
+                        }
+                    } else {
+                        t = this._days + Math.round(Ya(this._months));
+                        switch (e) {
+                            case"week":
+                                return t / 7 + i / 6048e5;
+                            case"day":
+                                return t + i / 864e5;
+                            case"hour":
+                                return t * 24 + i / 36e5;
+                            case"minute":
+                                return t * 1440 + i / 6e4;
+                            case"second":
+                                return t * 86400 + i / 1e3;
+                            case"millisecond":
+                                return Math.floor(t * 864e5) + i;
+                            default:
+                                throw new Error("Unknown unit " + e)
+                        }
+                    }
+                }
+
+                function Ca() {
+                    if (!this.isValid()) return NaN;
+                    return this._milliseconds + this._days * 864e5 + this._months % 12 * 2592e6 + y(this._months / 12) * 31536e6
+                }
+
+                function Ra(e) {
+                    return function () {
+                        return this.as(e)
+                    }
+                }
+
+                var Aa = Ra("ms"), xa = Ra("s"), Oa = Ra("m"), Ia = Ra("h"), Wa = Ra("d"), Ha = Ra("w"), ja = Ra("M"),
+                    Fa = Ra("Q"), Ba = Ra("y");
+
+                function Na() {
+                    return R(this)
+                }
+
+                function za(e) {
+                    e = m(e);
+                    return this.isValid() ? this[e + "s"]() : NaN
+                }
+
+                function Ua(e) {
+                    return function () {
+                        return this.isValid() ? this._data[e] : NaN
+                    }
+                }
+
+                var Va = Ua("milliseconds"), Ga = Ua("seconds"), Ja = Ua("minutes"), qa = Ua("hours"), Ka = Ua("days"),
+                    Xa = Ua("months"), Za = Ua("years");
+
+                function $a() {
+                    return p(this.days() / 7)
+                }
+
+                var Qa = Math.round, es = {ss: 44, s: 45, m: 45, h: 22, d: 26, w: null, M: 11};
+
+                function ts(e, t, n, i, r) {
+                    return r.relativeTime(t || 1, !!n, e, i)
+                }
+
+                function ns(e, t, n, i) {
+                    var r = R(e).abs(), a = Qa(r.as("s")), s = Qa(r.as("m")), o = Qa(r.as("h")), u = Qa(r.as("d")),
+                        d = Qa(r.as("M")), l = Qa(r.as("w")), h = Qa(r.as("y")),
+                        c = a <= n.ss && ["s", a] || a < n.s && ["ss", a] || s <= 1 && ["m"] || s < n.m && ["mm", s] || o <= 1 && ["h"] || o < n.h && ["hh", o] || u <= 1 && ["d"] || u < n.d && ["dd", u];
+                    if (n.w != null) c = c || l <= 1 && ["w"] || l < n.w && ["ww", l];
+                    c = c || d <= 1 && ["M"] || d < n.M && ["MM", d] || h <= 1 && ["y"] || ["yy", h];
+                    c[2] = t;
+                    c[3] = +e > 0;
+                    c[4] = i;
+                    return ts.apply(null, c)
+                }
+
+                function is(e) {
+                    if (e === undefined) return Qa;
+                    if (typeof e === "function") {
+                        Qa = e;
+                        return true
+                    }
+                    return false
+                }
+
+                function rs(e, t) {
+                    if (es[e] === undefined) return false;
+                    if (t === undefined) return es[e];
+                    es[e] = t;
+                    if (e === "s") es.ss = t - 1;
+                    return true
+                }
+
+                function as(e, t) {
+                    if (!this.isValid()) return this.localeData().invalidDate();
+                    var n = false, i = es, r, a;
+                    if (typeof e === "object") {
+                        t = e;
+                        e = false
+                    }
+                    if (typeof e === "boolean") n = e;
+                    if (typeof t === "object") {
+                        i = Object.assign({}, es, t);
+                        if (t.s != null && t.ss == null) i.ss = t.s - 1
+                    }
+                    r = this.localeData();
+                    a = ns(this, !n, i, r);
+                    if (n) a = r.pastFuture(+this, a);
+                    return r.postformat(a)
+                }
+
+                var ss = Math.abs;
+
+                function os(e) {
+                    return (e > 0) - (e < 0) || +e
+                }
+
+                function us() {
+                    if (!this.isValid()) return this.localeData().invalidDate();
+                    var e = ss(this._milliseconds) / 1e3, t = ss(this._days), n = ss(this._months), i, r, a, s,
+                        o = this.asSeconds(), u, d, l, h;
+                    if (!o) return "P0D";
+                    i = p(e / 60);
+                    r = p(i / 60);
+                    e %= 60;
+                    i %= 60;
+                    a = p(n / 12);
+                    n %= 12;
+                    s = e ? e.toFixed(3).replace(/\.?0+$/, "") : "";
+                    u = o < 0 ? "-" : "";
+                    d = os(this._months) !== os(o) ? "-" : "";
+                    l = os(this._days) !== os(o) ? "-" : "";
+                    h = os(this._milliseconds) !== os(o) ? "-" : "";
+                    return u + "P" + (a ? d + a + "Y" : "") + (n ? d + n + "M" : "") + (t ? l + t + "D" : "") + (r || i || e ? "T" : "") + (r ? h + r + "H" : "") + (i ? h + i + "M" : "") + (e ? h + s + "S" : "")
+                }
+
+                var O = di.prototype;
+                return O.isValid = oi, O.abs = Sa, O.add = ba, O.subtract = wa, O.as = Pa, O.asMilliseconds = Aa, O.asSeconds = xa, O.asMinutes = Oa, O.asHours = Ia, O.asDays = Wa, O.asWeeks = Ha, O.asMonths = ja, O.asQuarters = Fa, O.asYears = Ba, O.valueOf = Ca, O._bubble = Ta, O.clone = Na, O.get = za, O.milliseconds = Va, O.seconds = Ga, O.minutes = Ja, O.hours = qa, O.days = Ka, O.weeks = $a, O.months = Xa, O.years = Za, O.humanize = as, O.toISOString = us, O.toString = us, O.toJSON = us, O.locale = ur, O.localeData = lr, O.toIsoString = e("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)", us), O.lang = dr, i("X", 0, 0, "unix"), i("x", 0, 0, "valueOf"), g("x", Ue), g("X", Je), L("X", function (e, t, n) {
+                    n._d = new Date(parseFloat(e) * 1e3)
+                }), L("x", function (e, t, n) {
+                    n._d = new Date(y(e))
+                }),
+//! moment.js
+                    h.version = "2.29.4", H(C), h.fn = A, h.min = ni, h.max = ii, h.now = ri, h.utc = l, h.unix = la, h.months = pa, h.isDate = B, h.locale = gn, h.invalid = G, h.duration = R, h.isMoment = _, h.weekdays = va, h.parseZone = ha, h.localeData = Sn, h.isDuration = li, h.monthsShort = ya, h.weekdaysMin = Ma, h.defineLocale = Mn, h.updateLocale = Ln, h.locales = kn, h.weekdaysShort = ga, h.normalizeUnits = m, h.relativeTimeRounding = is, h.relativeTimeThreshold = rs, h.calendarFormat = zi, h.prototype = A, h.HTML5_FMT = {
+                    DATETIME_LOCAL: "YYYY-MM-DDTHH:mm",
+                    DATETIME_LOCAL_SECONDS: "YYYY-MM-DDTHH:mm:ss",
+                    DATETIME_LOCAL_MS: "YYYY-MM-DDTHH:mm:ss.SSS",
+                    DATE: "YYYY-MM-DD",
+                    TIME: "HH:mm",
+                    TIME_SECONDS: "HH:mm:ss",
+                    TIME_MS: "HH:mm:ss.SSS",
+                    WEEK: "GGGG-[W]WW",
+                    MONTH: "YYYY-MM"
+                }, h
+            }()
+        }.call(this, hs(283)(e))
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0, t.default = function (e, t) {
+            if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function")
+        }
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var n = n(259), r = (n = n) && n.__esModule ? n : {default: n};
+
+        function i(e, t) {
+            for (var n = 0; n < t.length; n++) {
+                var i = t[n];
+                i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), (0, r.default)(e, i.key, i)
+            }
+        }
+
+        t.default = function (e, t, n) {
+            return t && i(e.prototype, t), n && i(e, n), e
+        }
+    }, function (e, t) {
+        e = e.exports = {version: "2.6.12"};
+        "number" == typeof __e && (__e = e)
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = a(n(1)), r = a(n(2)), n = a(n(10));
+
+        function a(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(s, null, [{
+            key: "e", value: function (e, t) {
+                e = "[" + (e = e && !s.FORCE_GLOBAL_TAG ? e : s.GLOBAL_TAG) + "] > " + t;
+                s.ENABLE_CALLBACK && s.emitter.emit("log", "error", e), s.ENABLE_ERROR && (console.error ? console.error(e) : console.warn ? console.warn(e) : console.log(e))
+            }
+        }, {
+            key: "i", value: function (e, t) {
+                e = "[" + (e = e && !s.FORCE_GLOBAL_TAG ? e : s.GLOBAL_TAG) + "] > " + t;
+                s.ENABLE_CALLBACK && s.emitter.emit("log", "info", e), s.ENABLE_INFO && (console.info ? console.info(e) : console.log(e))
+            }
+        }, {
+            key: "w", value: function (e, t) {
+                e = "[" + (e = e && !s.FORCE_GLOBAL_TAG ? e : s.GLOBAL_TAG) + "] > " + t;
+                s.ENABLE_CALLBACK && s.emitter.emit("log", "warn", e), s.ENABLE_WARN && (console.warn ? console.warn(e) : console.log(e))
+            }
+        }, {
+            key: "d", value: function (e, t) {
+                e = "[" + (e = e && !s.FORCE_GLOBAL_TAG ? e : s.GLOBAL_TAG) + "] > " + t;
+                s.ENABLE_CALLBACK && s.emitter.emit("log", "debug", e), s.ENABLE_DEBUG && (console.debug ? console.debug(e) : console.log(e))
+            }
+        }, {
+            key: "v", value: function (e, t) {
+                e = "[" + (e = e && !s.FORCE_GLOBAL_TAG ? e : s.GLOBAL_TAG) + "] > " + t;
+                s.ENABLE_CALLBACK && s.emitter.emit("log", "verbose", e), s.ENABLE_VERBOSE && console.log(e)
+            }
+        }]);
+        r = s;
+
+        function s() {
+            (0, i.default)(this, s)
+        }
+
+        r.GLOBAL_TAG = "flv.js", r.FORCE_GLOBAL_TAG = !1, r.ENABLE_ERROR = !0, r.ENABLE_INFO = !0, r.ENABLE_WARN = !0, r.ENABLE_DEBUG = !0, r.ENABLE_VERBOSE = !0, r.ENABLE_CALLBACK = !1, r.emitter = new n.default, t.default = r
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.NotImplementedException = t.InvalidArgumentException = t.IllegalStateException = t.RuntimeException = void 0;
+        var i = o(n(21)), r = o(n(25)), a = o(n(26)), s = o(n(1)), n = o(n(2));
+
+        function o(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var u = t.RuntimeException = ((0, n.default)(d, [{
+            key: "toString", value: function () {
+                return this.name + ": " + this.message
+            }
+        }, {
+            key: "name", get: function () {
+                return "RuntimeException"
+            }
+        }, {
+            key: "message", get: function () {
+                return this._message
+            }
+        }]), d);
+
+        function d(e) {
+            (0, s.default)(this, d), this._message = e
+        }
+
+        t.IllegalStateException = ((0, a.default)(l, u), (0, n.default)(l, [{
+            key: "name", get: function () {
+                return "IllegalStateException"
+            }
+        }]), l);
+
+        function l(e) {
+            return (0, s.default)(this, l), (0, r.default)(this, (l.__proto__ || (0, i.default)(l)).call(this, e))
+        }
+
+        t.InvalidArgumentException = ((0, a.default)(h, u), (0, n.default)(h, [{
+            key: "name", get: function () {
+                return "InvalidArgumentException"
+            }
+        }]), h);
+
+        function h(e) {
+            return (0, s.default)(this, h), (0, r.default)(this, (h.__proto__ || (0, i.default)(h)).call(this, e))
+        }
+
+        t.NotImplementedException = ((0, a.default)(c, u), (0, n.default)(c, [{
+            key: "name", get: function () {
+                return "NotImplementedException"
+            }
+        }]), c);
+
+        function c(e) {
+            return (0, s.default)(this, c), (0, r.default)(this, (c.__proto__ || (0, i.default)(c)).call(this, e))
+        }
+    }, function (e, t) {
+        e = e.exports = "undefined" != typeof window && window.Math == Math ? window : "undefined" != typeof self && self.Math == Math ? self : Function("return this")();
+        "number" == typeof __g && (__g = e)
+    }, function (e, t, n) {
+        var i = n(49)("wks"), r = n(35), a = n(6).Symbol, s = "function" == typeof a;
+        (e.exports = function (e) {
+            return i[e] || (i[e] = s && a[e] || (s ? a : r)("Symbol." + e))
+        }).store = i
+    }, function (e, t, n) {
+        function m(e, t, n) {
+            var i, r, a, s = e & m.F, o = e & m.G, u = e & m.S, d = e & m.P, l = e & m.B, h = e & m.W,
+                c = o ? y : y[t] || (y[t] = {}), _ = c[L], f = o ? p : u ? p[t] : (p[t] || {})[L];
+            for (i in n = o ? t : n) (r = !s && f && void 0 !== f[i]) && M(c, i) || (a = (r ? f : n)[i], c[i] = o && "function" != typeof f[i] ? n[i] : l && r ? v(a, p) : h && f[i] == a ? function (i) {
+                function e(e, t, n) {
+                    if (this instanceof i) {
+                        switch (arguments.length) {
+                            case 0:
+                                return new i;
+                            case 1:
+                                return new i(e);
+                            case 2:
+                                return new i(e, t)
+                        }
+                        return new i(e, t, n)
+                    }
+                    return i.apply(this, arguments)
+                }
+
+                return e[L] = i[L], e
+            }(a) : d && "function" == typeof a ? v(Function.call, a) : a, d && ((c.virtual || (c.virtual = {}))[i] = a, e & m.R && _ && !_[i] && g(_, i, a)))
+        }
+
+        var p = n(6), y = n(3), v = n(22), g = n(17), M = n(18), L = "prototype";
+        m.F = 1, m.G = 2, m.S = 4, m.P = 8, m.B = 16, m.W = 32, m.U = 64, m.R = 128, e.exports = m
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var i = s(n(270)), r = s(n(272)),
+            a = "function" == typeof r.default && "symbol" == typeof i.default ? function (e) {
+                return typeof e
+            } : function (e) {
+                return e && "function" == typeof r.default && e.constructor === r.default && e !== r.default.prototype ? "symbol" : typeof e
+            };
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        t.default = "function" == typeof r.default && "symbol" === a(i.default) ? function (e) {
+            return void 0 === e ? "undefined" : a(e)
+        } : function (e) {
+            return e && "function" == typeof r.default && e.constructor === r.default && e !== r.default.prototype ? "symbol" : void 0 === e ? "undefined" : a(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = "object" == typeof Reflect ? Reflect : null,
+            u = i && "function" == typeof i.apply ? i.apply : function (e, t, n) {
+                return Function.prototype.apply.call(e, t, n)
+            };
+        var r = i && "function" == typeof i.ownKeys ? i.ownKeys : Object.getOwnPropertySymbols ? function (e) {
+            return Object.getOwnPropertyNames(e).concat(Object.getOwnPropertySymbols(e))
+        } : function (e) {
+            return Object.getOwnPropertyNames(e)
+        }, a = Number.isNaN || function (e) {
+            return e != e
+        };
+
+        function s() {
+            s.init.call(this)
+        }
+
+        e.exports = s, e.exports.once = function (o, u) {
+            return new Promise(function (e, t) {
+                function n(e) {
+                    o.removeListener(u, i), t(e)
+                }
+
+                function i() {
+                    "function" == typeof o.removeListener && o.removeListener("error", n), e([].slice.call(arguments))
+                }
+
+                var r, a, s;
+                p(o, u, i, {once: !0}), "error" !== u && (a = n, s = {once: !0}, "function" == typeof (r = o).on && p(r, "error", a, s))
+            })
+        }, (s.EventEmitter = s).prototype._events = void 0, s.prototype._eventsCount = 0, s.prototype._maxListeners = void 0;
+        var o = 10;
+
+        function d(e) {
+            if ("function" != typeof e) throw new TypeError('The "listener" argument must be of type Function. Received type ' + typeof e)
+        }
+
+        function l(e) {
+            return void 0 === e._maxListeners ? s.defaultMaxListeners : e._maxListeners
+        }
+
+        function h(e, t, n, i) {
+            var r, a;
+            return d(n), void 0 === (r = e._events) ? (r = e._events = Object.create(null), e._eventsCount = 0) : (void 0 !== r.newListener && (e.emit("newListener", t, n.listener || n), r = e._events), a = r[t]), void 0 === a ? (a = r[t] = n, ++e._eventsCount) : ("function" == typeof a ? a = r[t] = i ? [n, a] : [a, n] : i ? a.unshift(n) : a.push(n), 0 < (r = l(e)) && a.length > r && !a.warned && (a.warned = !0, (i = new Error("Possible EventEmitter memory leak detected. " + a.length + " " + String(t) + " listeners added. Use emitter.setMaxListeners() to increase limit")).name = "MaxListenersExceededWarning", i.emitter = e, i.type = t, i.count = a.length, n = i, console && console.warn && console.warn(n))), e
+        }
+
+        function c(e, t, n) {
+            e = {fired: !1, wrapFn: void 0, target: e, type: t, listener: n}, t = function () {
+                if (!this.fired) return this.target.removeListener(this.type, this.wrapFn), this.fired = !0, 0 === arguments.length ? this.listener.call(this.target) : this.listener.apply(this.target, arguments)
+            }.bind(e);
+            return t.listener = n, e.wrapFn = t
+        }
+
+        function _(e, t, n) {
+            e = e._events;
+            if (void 0 === e) return [];
+            e = e[t];
+            {
+                if (void 0 === e) return [];
+                if ("function" == typeof e) return n ? [e.listener || e] : [e];
+                if (n) {
+                    for (var i = e, r = new Array(i.length), a = 0; a < r.length; ++a) r[a] = i[a].listener || i[a];
+                    return r
+                }
+                return m(e, e.length)
+            }
+        }
+
+        function f(e) {
+            var t = this._events;
+            if (void 0 !== t) {
+                t = t[e];
+                if ("function" == typeof t) return 1;
+                if (void 0 !== t) return t.length
+            }
+            return 0
+        }
+
+        function m(e, t) {
+            for (var n = new Array(t), i = 0; i < t; ++i) n[i] = e[i];
+            return n
+        }
+
+        function p(n, i, r, a) {
+            if ("function" == typeof n.on) a.once ? n.once(i, r) : n.on(i, r); else {
+                if ("function" != typeof n.addEventListener) throw new TypeError('The "emitter" argument must be of type EventEmitter. Received type ' + typeof n);
+                n.addEventListener(i, function e(t) {
+                    a.once && n.removeEventListener(i, e), r(t)
+                })
+            }
+        }
+
+        Object.defineProperty(s, "defaultMaxListeners", {
+            enumerable: !0, get: function () {
+                return o
+            }, set: function (e) {
+                if ("number" != typeof e || e < 0 || a(e)) throw new RangeError('The value of "defaultMaxListeners" is out of range. It must be a non-negative number. Received ' + e + ".");
+                o = e
+            }
+        }), s.init = function () {
+            void 0 !== this._events && this._events !== Object.getPrototypeOf(this)._events || (this._events = Object.create(null), this._eventsCount = 0), this._maxListeners = this._maxListeners || void 0
+        }, s.prototype.setMaxListeners = function (e) {
+            if ("number" != typeof e || e < 0 || a(e)) throw new RangeError('The value of "n" is out of range. It must be a non-negative number. Received ' + e + ".");
+            return this._maxListeners = e, this
+        }, s.prototype.getMaxListeners = function () {
+            return l(this)
+        }, s.prototype.emit = function (e) {
+            for (var t = [], n = 1; n < arguments.length; n++) t.push(arguments[n]);
+            var i = "error" === e, r = this._events;
+            if (void 0 !== r) i = i && void 0 === r.error; else if (!i) return !1;
+            if (i) {
+                if ((a = 0 < t.length ? t[0] : a) instanceof Error) throw a;
+                i = new Error("Unhandled error." + (a ? " (" + a.message + ")" : ""));
+                throw i.context = a, i
+            }
+            var a = r[e];
+            if (void 0 === a) return !1;
+            if ("function" == typeof a) u(a, this, t); else for (var s = a.length, o = m(a, s), n = 0; n < s; ++n) u(o[n], this, t);
+            return !0
+        }, s.prototype.on = s.prototype.addListener = function (e, t) {
+            return h(this, e, t, !1)
+        }, s.prototype.prependListener = function (e, t) {
+            return h(this, e, t, !0)
+        }, s.prototype.once = function (e, t) {
+            return d(t), this.on(e, c(this, e, t)), this
+        }, s.prototype.prependOnceListener = function (e, t) {
+            return d(t), this.prependListener(e, c(this, e, t)), this
+        }, s.prototype.off = s.prototype.removeListener = function (e, t) {
+            var n, i, r, a, s;
+            if (d(t), void 0 !== (i = this._events) && void 0 !== (n = i[e])) if (n === t || n.listener === t) 0 == --this._eventsCount ? this._events = Object.create(null) : (delete i[e], i.removeListener && this.emit("removeListener", e, n.listener || t)); else if ("function" != typeof n) {
+                for (r = -1, a = n.length - 1; 0 <= a; a--) if (n[a] === t || n[a].listener === t) {
+                    s = n[a].listener, r = a;
+                    break
+                }
+                if (r < 0) return this;
+                if (0 === r) n.shift(); else {
+                    for (var o = n, u = r; u + 1 < o.length; u++) o[u] = o[u + 1];
+                    o.pop()
+                }
+                1 === n.length && (i[e] = n[0]), void 0 !== i.removeListener && this.emit("removeListener", e, s || t)
+            }
+            return this
+        }, s.prototype.removeAllListeners = function (e) {
+            var t, n = this._events;
+            if (void 0 !== n) {
+                if (void 0 === n.removeListener) return 0 === arguments.length ? (this._events = Object.create(null), this._eventsCount = 0) : void 0 !== n[e] && (0 == --this._eventsCount ? this._events = Object.create(null) : delete n[e]), this;
+                if (0 === arguments.length) {
+                    for (var i, r = Object.keys(n), a = 0; a < r.length; ++a) "removeListener" !== (i = r[a]) && this.removeAllListeners(i);
+                    return this.removeAllListeners("removeListener"), this._events = Object.create(null), this._eventsCount = 0, this
+                }
+                if ("function" == typeof (t = n[e])) this.removeListener(e, t); else if (void 0 !== t) for (a = t.length - 1; 0 <= a; a--) this.removeListener(e, t[a])
+            }
+            return this
+        }, s.prototype.listeners = function (e) {
+            return _(this, e, !0)
+        }, s.prototype.rawListeners = function (e) {
+            return _(this, e, !1)
+        }, s.listenerCount = function (e, t) {
+            return "function" == typeof e.listenerCount ? e.listenerCount(t) : f.call(e, t)
+        }, s.prototype.listenerCount = f, s.prototype.eventNames = function () {
+            return 0 < this._eventsCount ? r(this._events) : []
+        }
+    }, function (e, t, n) {
+        e.exports = {default: n(236), __esModule: !0}
+    }, function (e, t, n) {
+        var i = n(13), r = n(69), a = n(45), s = Object.defineProperty;
+        t.f = n(14) ? Object.defineProperty : function (e, t, n) {
+            if (i(e), t = a(t, !0), i(n), r) try {
+                return s(e, t, n)
+            } catch (e) {
+            }
+            if ("get" in n || "set" in n) throw TypeError("Accessors not supported!");
+            return "value" in n && (e[t] = n.value), e
+        }
+    }, function (e, t, n) {
+        var i = n(16);
+        e.exports = function (e) {
+            if (i(e)) return e;
+            throw TypeError(e + " is not an object!")
+        }
+    }, function (e, t, n) {
+        e.exports = !n(23)(function () {
+            return 7 != Object.defineProperty({}, "a", {
+                get: function () {
+                    return 7
+                }
+            }).a
+        })
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.BaseLoader = t.LoaderErrors = t.LoaderStatus = void 0;
+        var i = s(n(1)), r = s(n(2)), a = n(5);
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var o = t.LoaderStatus = {kIdle: 0, kConnecting: 1, kBuffering: 2, kError: 3, kComplete: 4};
+        t.LoaderErrors = {
+            OK: "OK",
+            EXCEPTION: "Exception",
+            HTTP_STATUS_CODE_INVALID: "HttpStatusCodeInvalid",
+            CONNECTING_TIMEOUT: "ConnectingTimeout",
+            EARLY_EOF: "EarlyEof",
+            UNRECOVERABLE_EARLY_EOF: "UnrecoverableEarlyEof"
+        }, t.BaseLoader = ((0, r.default)(u, [{
+            key: "destroy", value: function () {
+                this._status = o.kIdle, this._onContentLengthKnown = null, this._onURLRedirect = null, this._onDataArrival = null, this._onError = null, this._onComplete = null
+            }
+        }, {
+            key: "isWorking", value: function () {
+                return this._status === o.kConnecting || this._status === o.kBuffering
+            }
+        }, {
+            key: "open", value: function (e, t) {
+                throw new a.NotImplementedException("Unimplemented abstract function!")
+            }
+        }, {
+            key: "abort", value: function () {
+                throw new a.NotImplementedException("Unimplemented abstract function!")
+            }
+        }, {
+            key: "type", get: function () {
+                return this._type
+            }
+        }, {
+            key: "status", get: function () {
+                return this._status
+            }
+        }, {
+            key: "needStashBuffer", get: function () {
+                return this._needStash
+            }
+        }, {
+            key: "onContentLengthKnown", get: function () {
+                return this._onContentLengthKnown
+            }, set: function (e) {
+                this._onContentLengthKnown = e
+            }
+        }, {
+            key: "onURLRedirect", get: function () {
+                return this._onURLRedirect
+            }, set: function (e) {
+                this._onURLRedirect = e
+            }
+        }, {
+            key: "onDataArrival", get: function () {
+                return this._onDataArrival
+            }, set: function (e) {
+                this._onDataArrival = e
+            }
+        }, {
+            key: "onError", get: function () {
+                return this._onError
+            }, set: function (e) {
+                this._onError = e
+            }
+        }, {
+            key: "onComplete", get: function () {
+                return this._onComplete
+            }, set: function (e) {
+                this._onComplete = e
+            }
+        }]), u);
+
+        function u(e) {
+            (0, i.default)(this, u), this._type = e || "undefined", this._status = o.kIdle, this._needStash = !1, this._onContentLengthKnown = null, this._onURLRedirect = null, this._onDataArrival = null, this._onError = null, this._onComplete = null
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            return "object" == typeof e ? null !== e : "function" == typeof e
+        }
+    }, function (e, t, n) {
+        var i = n(12), r = n(28);
+        e.exports = n(14) ? function (e, t, n) {
+            return i.f(e, t, r(1, n))
+        } : function (e, t, n) {
+            return e[t] = n, e
+        }
+    }, function (e, t) {
+        var n = {}.hasOwnProperty;
+        e.exports = function (e, t) {
+            return n.call(e, t)
+        }
+    }, function (e, t, n) {
+        var i = n(72), r = n(43);
+        e.exports = function (e) {
+            return i(r(e))
+        }
+    }, function (e, t, n) {
+        e.exports = {default: n(292), __esModule: !0}
+    }, function (e, t, n) {
+        e.exports = {default: n(302), __esModule: !0}
+    }, function (e, t, n) {
+        var a = n(34);
+        e.exports = function (i, r, e) {
+            if (a(i), void 0 === r) return i;
+            switch (e) {
+                case 1:
+                    return function (e) {
+                        return i.call(r, e)
+                    };
+                case 2:
+                    return function (e, t) {
+                        return i.call(r, e, t)
+                    };
+                case 3:
+                    return function (e, t, n) {
+                        return i.call(r, e, t, n)
+                    }
+            }
+            return function () {
+                return i.apply(r, arguments)
+            }
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            try {
+                return !!e()
+            } catch (e) {
+                return !0
+            }
+        }
+    }, function (e, t, n) {
+        var i = n(43);
+        e.exports = function (e) {
+            return Object(i(e))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var n = n(9), i = (n = n) && n.__esModule ? n : {default: n};
+        t.default = function (e, t) {
+            if (e) return !t || "object" !== (void 0 === t ? "undefined" : (0, i.default)(t)) && "function" != typeof t ? e : t;
+            throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
+        }
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var i = s(n(38)), r = s(n(304)), a = s(n(9));
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        t.default = function (e, t) {
+            if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + (void 0 === t ? "undefined" : (0, a.default)(t)));
+            e.prototype = (0, r.default)(t && t.prototype, {
+                constructor: {
+                    value: e,
+                    enumerable: !1,
+                    writable: !0,
+                    configurable: !0
+                }
+            }), t && (i.default ? (0, i.default)(e, t) : e.__proto__ = t)
+        }
+    }, function (e, t) {
+        e.exports = !0
+    }, function (e, t) {
+        e.exports = function (e, t) {
+            return {enumerable: !(1 & e), configurable: !(2 & e), writable: !(4 & e), value: t}
+        }
+    }, function (e, t) {
+        e.exports = {}
+    }, function (e, t, n) {
+        var i = n(71), r = n(50);
+        e.exports = Object.keys || function (e) {
+            return i(e, r)
+        }
+    }, function (e, t) {
+        var n = {}.toString;
+        e.exports = function (e) {
+            return n.call(e).slice(8, -1)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var a = i(n(21)), s = i(n(308));
+
+        function i(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        t.default = function e(t, n, i) {
+            null === t && (t = Function.prototype);
+            var r = (0, s.default)(t, n);
+            if (void 0 !== r) {
+                if ("value" in r) return r.value;
+                r = r.get;
+                return void 0 !== r ? r.call(i) : void 0
+            }
+            r = (0, a.default)(t);
+            if (null !== r) return e(r, n, i)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var n = n(20), n = (n = n) && n.__esModule ? n : {default: n};
+        var i = {};
+        var r, a, s = self.navigator.userAgent.toLowerCase(),
+            o = /(edge)\/([\w.]+)/.exec(s) || /(opr)[\/]([\w.]+)/.exec(s) || /(chrome)[ \/]([\w.]+)/.exec(s) || /(iemobile)[\/]([\w.]+)/.exec(s) || /(version)(applewebkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(s) || /(webkit)[ \/]([\w.]+).*(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(s) || /(webkit)[ \/]([\w.]+)/.exec(s) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(s) || /(msie) ([\w.]+)/.exec(s) || 0 <= s.indexOf("trident") && /(rv)(?::| )([\w.]+)/.exec(s) || s.indexOf("compatible") < 0 && /(firefox)[ \/]([\w.]+)/.exec(s) || [],
+            s = /(ipad)/.exec(s) || /(ipod)/.exec(s) || /(windows phone)/.exec(s) || /(iphone)/.exec(s) || /(kindle)/.exec(s) || /(android)/.exec(s) || /(windows)/.exec(s) || /(mac)/.exec(s) || /(linux)/.exec(s) || /(cros)/.exec(s) || [],
+            o = {
+                browser: o[5] || o[3] || o[1] || "",
+                version: o[2] || o[4] || "0",
+                majorVersion: o[4] || o[2] || "0",
+                platform: s[0] || ""
+            }, s = {};
+        for (a in o.browser && (s[o.browser] = !0, r = o.majorVersion.split("."), s.version = {
+            major: parseInt(o.majorVersion, 10),
+            string: o.version
+        }, 1 < r.length && (s.version.minor = parseInt(r[1], 10)), 2 < r.length && (s.version.build = parseInt(r[2], 10))), o.platform && (s[o.platform] = !0), (s.chrome || s.opr || s.safari) && (s.webkit = !0), (s.rv || s.iemobile) && (s.rv && delete s.rv, o.browser = "msie", s.msie = !0), s.edge && (delete s.edge, o.browser = "msedge", s.msedge = !0), s.opr && (o.browser = "opera", s.opera = !0), s.safari && s.android && (s[o.browser = "android"] = !0), s.name = o.browser, s.platform = o.platform, i) i.hasOwnProperty(a) && delete i[a];
+        (0, n.default)(i, s), t.default = i
+    }, function (e, t) {
+        e.exports = function (e) {
+            if ("function" != typeof e) throw TypeError(e + " is not a function!");
+            return e
+        }
+    }, function (e, t) {
+        var n = 0, i = Math.random();
+        e.exports = function (e) {
+            return "Symbol(".concat(void 0 === e ? "" : e, ")_", (++n + i).toString(36))
+        }
+    }, function (e, t, n) {
+        var i = n(12).f, r = n(18), a = n(7)("toStringTag");
+        e.exports = function (e, t, n) {
+            e && !r(e = n ? e : e.prototype, a) && i(e, a, {configurable: !0, value: t})
+        }
+    }, function (e, t) {
+        t.f = {}.propertyIsEnumerable
+    }, function (e, t, n) {
+        e.exports = {default: n(295), __esModule: !0}
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        t.default = {
+            ERROR: "error",
+            LOADING_COMPLETE: "loading_complete",
+            RECOVERED_EARLY_EOF: "recovered_early_eof",
+            MEDIA_INFO: "media_info",
+            METADATA_ARRIVED: "metadata_arrived",
+            SCRIPTDATA_ARRIVED: "scriptdata_arrived",
+            STATISTICS_INFO: "statistics_info",
+            VIDEO_RESOLUTION_CHANGED: "video_resolution_changed",
+            MEDIA_SOURCE_ENDED: "media_source_ended",
+            MEDIA_SOURCE_CLOSE: "media_source_close",
+            VIDEO_FROZEN: "video_decoded_frame_frozen",
+            MS_BUFFER_FULL: "media_source_buffer_full",
+            LOADED_META_DATA: "loaded_meta_data"
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        t.default = {
+            IO_ERROR: "io_error",
+            DEMUX_ERROR: "demux_error",
+            INIT_SEGMENT: "init_segment",
+            MEDIA_SEGMENT: "media_segment",
+            LOADING_COMPLETE: "loading_complete",
+            RECOVERED_EARLY_EOF: "recovered_early_eof",
+            MEDIA_INFO: "media_info",
+            METADATA_ARRIVED: "metadata_arrived",
+            SCRIPTDATA_ARRIVED: "scriptdata_arrived",
+            STATISTICS_INFO: "statistics_info",
+            RECOMMEND_SEEKPOINT: "recommend_seekpoint",
+            VIDEO_RESOLUTION_CHANGED: "video_resolution_changed",
+            PARSEDDATA_ARRIVED: "parseddata_arrived"
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(237)(!0);
+        n(68)(String, "String", function (e) {
+            this._t = String(e), this._i = 0
+        }, function () {
+            var e = this._t, t = this._i;
+            return t >= e.length ? {value: void 0, done: !0} : (e = i(e, t), this._i += e.length, {value: e, done: !1})
+        })
+    }, function (e, t) {
+        var n = Math.ceil, i = Math.floor;
+        e.exports = function (e) {
+            return isNaN(e = +e) ? 0 : (0 < e ? i : n)(e)
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            if (null == e) throw TypeError("Can't call method on  " + e);
+            return e
+        }
+    }, function (e, t, n) {
+        var i = n(16), r = n(6).document, a = i(r) && i(r.createElement);
+        e.exports = function (e) {
+            return a ? r.createElement(e) : {}
+        }
+    }, function (e, t, n) {
+        var r = n(16);
+        e.exports = function (e, t) {
+            if (!r(e)) return e;
+            var n, i;
+            if (t && "function" == typeof (n = e.toString) && !r(i = n.call(e)) || "function" == typeof (n = e.valueOf) && !r(i = n.call(e)) || !t && "function" == typeof (n = e.toString) && !r(i = n.call(e))) return i;
+            throw TypeError("Can't convert object to primitive value")
+        }
+    }, function (e, t, n) {
+        function i() {
+        }
+
+        var r = n(13), a = n(239), s = n(50), o = n(48)("IE_PROTO"), u = "prototype", d = function () {
+            var e = n(44)("iframe"), t = s.length;
+            for (e.style.display = "none", n(73).appendChild(e), e.src = "javascript:", (e = e.contentWindow.document).open(), e.write("<script>document.F=Object<\/script>"), e.close(), d = e.F; t--;) delete d[u][s[t]];
+            return d()
+        };
+        e.exports = Object.create || function (e, t) {
+            var n;
+            return null !== e ? (i[u] = r(e), n = new i, i[u] = null, n[o] = e) : n = d(), void 0 === t ? n : a(n, t)
+        }
+    }, function (e, t, n) {
+        var i = n(42), r = Math.min;
+        e.exports = function (e) {
+            return 0 < e ? r(i(e), 9007199254740991) : 0
+        }
+    }, function (e, t, n) {
+        var i = n(49)("keys"), r = n(35);
+        e.exports = function (e) {
+            return i[e] || (i[e] = r(e))
+        }
+    }, function (e, t, n) {
+        var i = n(3), r = n(6), a = "__core-js_shared__", s = r[a] || (r[a] = {});
+        (e.exports = function (e, t) {
+            return s[e] || (s[e] = void 0 !== t ? t : {})
+        })("versions", []).push({
+            version: i.version,
+            mode: n(27) ? "pure" : "global",
+            copyright: "© 2020 Denis Pushkarev (zloirock.ru)"
+        })
+    }, function (e, t) {
+        e.exports = "constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")
+    }, function (e, t, n) {
+        "use strict";
+        var r = n(34);
+
+        function i(e) {
+            var n, i;
+            this.promise = new e(function (e, t) {
+                if (void 0 !== n || void 0 !== i) throw TypeError("Bad Promise constructor");
+                n = e, i = t
+            }), this.resolve = r(n), this.reject = r(i)
+        }
+
+        e.exports.f = function (e) {
+            return new i(e)
+        }
+    }, function (e, t, n) {
+        var r = n(8), a = n(3), s = n(23);
+        e.exports = function (e, t) {
+            var n = (a.Object || {})[e] || Object[e], i = {};
+            i[e] = t(n), r(r.S + r.F * s(function () {
+                n(1)
+            }), "Object", i)
+        }
+    }, function (e, t, n) {
+        e.exports = n(257)
+    }, function (e, t, n) {
+        "use strict";
+        t.__esModule = !0;
+        var n = n(11), u = (n = n) && n.__esModule ? n : {default: n};
+        t.default = function (e) {
+            return function () {
+                var o = e.apply(this, arguments);
+                return new u.default(function (a, s) {
+                    return function t(e, n) {
+                        try {
+                            var i = o[e](n), r = i.value
+                        } catch (e) {
+                            return void s(e)
+                        }
+                        if (!i.done) return u.default.resolve(r).then(function (e) {
+                            t("next", e)
+                        }, function (e) {
+                            t("throw", e)
+                        });
+                        a(r)
+                    }("next")
+                })
+            }
+        }
+    }, function (Qt, en, e) {
+        var tn;
+        /*!
+     * jQuery JavaScript Library v3.6.0
+     * https://jquery.com/
+     *
+     * Includes Sizzle.js
+     * https://sizzlejs.com/
+     *
+     * Copyright OpenJS Foundation and other contributors
+     * Released under the MIT license
+     * https://jquery.org/license
+     *
+     * Date: 2021-03-02T17:08Z
+     */
+        !function (e, t) {
+            "use strict";
+            "object" == typeof Qt.exports ? Qt.exports = e.document ? t(e, !0) : function (e) {
+                if (e.document) return t(e);
+                throw new Error("jQuery requires a window with a document")
+            } : t(e)
+        }("undefined" != typeof window ? window : this, function (L, I) {
+            "use strict";
+
+            function v(e) {
+                return "function" == typeof e && "number" != typeof e.nodeType && "function" != typeof e.item
+            }
+
+            function m(e) {
+                return null != e && e === e.window
+            }
+
+            var t = [], W = Object.getPrototypeOf, o = t.slice, H = t.flat ? function (e) {
+                    return t.flat.call(e)
+                } : function (e) {
+                    return t.concat.apply([], e)
+                }, j = t.push, F = t.indexOf, B = {}, N = B.toString, z = B.hasOwnProperty, U = z.toString,
+                V = U.call(Object), p = {}, S = L.document, G = {type: !0, src: !0, nonce: !0, noModule: !0};
+
+            function J(e, t, n) {
+                var i, r, a = (n = n || S).createElement("script");
+                if (a.text = e, t) for (i in G) (r = t[i] || t.getAttribute && t.getAttribute(i)) && a.setAttribute(i, r);
+                n.head.appendChild(a).parentNode.removeChild(a)
+            }
+
+            function f(e) {
+                return null == e ? e + "" : "object" == typeof e || "function" == typeof e ? B[N.call(e)] || "object" : typeof e
+            }
+
+            var k = function (e, t) {
+                return new k.fn.init(e, t)
+            };
+
+            function q(e) {
+                var t = !!e && "length" in e && e.length, n = f(e);
+                return !v(e) && !m(e) && ("array" === n || 0 === t || "number" == typeof t && 0 < t && t - 1 in e)
+            }
+
+            k.fn = k.prototype = {
+                jquery: "3.6.0", constructor: k, length: 0, toArray: function () {
+                    return o.call(this)
+                }, get: function (e) {
+                    return null == e ? o.call(this) : e < 0 ? this[e + this.length] : this[e]
+                }, pushStack: function (e) {
+                    e = k.merge(this.constructor(), e);
+                    return e.prevObject = this, e
+                }, each: function (e) {
+                    return k.each(this, e)
+                }, map: function (n) {
+                    return this.pushStack(k.map(this, function (e, t) {
+                        return n.call(e, t, e)
+                    }))
+                }, slice: function () {
+                    return this.pushStack(o.apply(this, arguments))
+                }, first: function () {
+                    return this.eq(0)
+                }, last: function () {
+                    return this.eq(-1)
+                }, even: function () {
+                    return this.pushStack(k.grep(this, function (e, t) {
+                        return (t + 1) % 2
+                    }))
+                }, odd: function () {
+                    return this.pushStack(k.grep(this, function (e, t) {
+                        return t % 2
+                    }))
+                }, eq: function (e) {
+                    var t = this.length, e = +e + (e < 0 ? t : 0);
+                    return this.pushStack(0 <= e && e < t ? [this[e]] : [])
+                }, end: function () {
+                    return this.prevObject || this.constructor()
+                }, push: j, sort: t.sort, splice: t.splice
+            }, k.extend = k.fn.extend = function () {
+                var e, t, n, i, r, a = arguments[0] || {}, s = 1, o = arguments.length, u = !1;
+                for ("boolean" == typeof a && (u = a, a = arguments[s] || {}, s++), "object" == typeof a || v(a) || (a = {}), s === o && (a = this, s--); s < o; s++) if (null != (e = arguments[s])) for (t in e) n = e[t], "__proto__" !== t && a !== n && (u && n && (k.isPlainObject(n) || (i = Array.isArray(n))) ? (r = a[t], r = i && !Array.isArray(r) ? [] : i || k.isPlainObject(r) ? r : {}, i = !1, a[t] = k.extend(u, r, n)) : void 0 !== n && (a[t] = n));
+                return a
+            }, k.extend({
+                expando: "jQuery" + ("3.6.0" + Math.random()).replace(/\D/g, ""), isReady: !0, error: function (e) {
+                    throw new Error(e)
+                }, noop: function () {
+                }, isPlainObject: function (e) {
+                    return !(!e || "[object Object]" !== N.call(e)) && (!(e = W(e)) || "function" == typeof (e = z.call(e, "constructor") && e.constructor) && U.call(e) === V)
+                }, isEmptyObject: function (e) {
+                    for (var t in e) return !1;
+                    return !0
+                }, globalEval: function (e, t, n) {
+                    J(e, {nonce: t && t.nonce}, n)
+                }, each: function (e, t) {
+                    var n, i = 0;
+                    if (q(e)) for (n = e.length; i < n && !1 !== t.call(e[i], i, e[i]); i++) ; else for (i in e) if (!1 === t.call(e[i], i, e[i])) break;
+                    return e
+                }, makeArray: function (e, t) {
+                    t = t || [];
+                    return null != e && (q(Object(e)) ? k.merge(t, "string" == typeof e ? [e] : e) : j.call(t, e)), t
+                }, inArray: function (e, t, n) {
+                    return null == t ? -1 : F.call(t, e, n)
+                }, merge: function (e, t) {
+                    for (var n = +t.length, i = 0, r = e.length; i < n; i++) e[r++] = t[i];
+                    return e.length = r, e
+                }, grep: function (e, t, n) {
+                    for (var i = [], r = 0, a = e.length, s = !n; r < a; r++) !t(e[r], r) != s && i.push(e[r]);
+                    return i
+                }, map: function (e, t, n) {
+                    var i, r, a = 0, s = [];
+                    if (q(e)) for (i = e.length; a < i; a++) null != (r = t(e[a], a, n)) && s.push(r); else for (a in e) null != (r = t(e[a], a, n)) && s.push(r);
+                    return H(s)
+                }, guid: 1, support: p
+            }), "function" == typeof Symbol && (k.fn[Symbol.iterator] = t[Symbol.iterator]), k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "), function (e, t) {
+                B["[object " + t + "]"] = t.toLowerCase()
+            });
+
+            function i(e, t, n) {
+                for (var i = [], r = void 0 !== n; (e = e[t]) && 9 !== e.nodeType;) if (1 === e.nodeType) {
+                    if (r && k(e).is(n)) break;
+                    i.push(e)
+                }
+                return i
+            }
+
+            function K(e, t) {
+                for (var n = []; e; e = e.nextSibling) 1 === e.nodeType && e !== t && n.push(e);
+                return n
+            }
+
+            var e =
+                    /*!
+         * Sizzle CSS Selector Engine v2.3.6
+         * https://sizzlejs.com/
+         *
+         * Copyright JS Foundation and other contributors
+         * Released under the MIT license
+         * https://js.foundation/
+         *
+         * Date: 2021-02-16
+         */
+                    function (I) {
+                        function h(e, t) {
+                            return e = "0x" + e.slice(1) - 65536, t || (e < 0 ? String.fromCharCode(65536 + e) : String.fromCharCode(e >> 10 | 55296, 1023 & e | 56320))
+                        }
+
+                        function W(e, t) {
+                            return t ? "\0" === e ? "�" : e.slice(0, -1) + "\\" + e.charCodeAt(e.length - 1).toString(16) + " " : "\\" + e
+                        }
+
+                        function H() {
+                            S()
+                        }
+
+                        var e, c, M, a, j, _, F, B, L, u, d, S, k, n, b, f, i, r, m, w = "sizzle" + +new Date,
+                            l = I.document, D = 0, N = 0, z = C(), U = C(), V = C(), p = C(), G = function (e, t) {
+                                return e === t && (d = !0), 0
+                            }, J = {}.hasOwnProperty, t = [], q = t.pop, K = t.push, T = t.push, X = t.slice,
+                            v = function (e, t) {
+                                for (var n = 0, i = e.length; n < i; n++) if (e[n] === t) return n;
+                                return -1
+                            },
+                            Z = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+                            s = "[\\x20\\t\\r\\n\\f]",
+                            o = "(?:\\\\[\\da-fA-F]{1,6}" + s + "?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
+                            $ = "\\[" + s + "*(" + o + ")(?:" + s + "*([*^$|!~]?=)" + s + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + o + "))|)" + s + "*\\]",
+                            Q = ":(" + o + ")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|" + $ + ")*)|.*)\\)|)",
+                            ee = new RegExp(s + "+", "g"),
+                            y = new RegExp("^" + s + "+|((?:^|[^\\\\])(?:\\\\.)*)" + s + "+$", "g"),
+                            te = new RegExp("^" + s + "*," + s + "*"),
+                            ne = new RegExp("^" + s + "*([>+~]|" + s + ")" + s + "*"), ie = new RegExp(s + "|>"),
+                            re = new RegExp(Q), ae = new RegExp("^" + o + "$"), g = {
+                                ID: new RegExp("^#(" + o + ")"),
+                                CLASS: new RegExp("^\\.(" + o + ")"),
+                                TAG: new RegExp("^(" + o + "|[*])"),
+                                ATTR: new RegExp("^" + $),
+                                PSEUDO: new RegExp("^" + Q),
+                                CHILD: new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + s + "*(even|odd|(([+-]|)(\\d*)n|)" + s + "*(?:([+-]|)" + s + "*(\\d+)|))" + s + "*\\)|)", "i"),
+                                bool: new RegExp("^(?:" + Z + ")$", "i"),
+                                needsContext: new RegExp("^" + s + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + s + "*((?:-\\d)?\\d*)" + s + "*\\)|)(?=[^-]|$)", "i")
+                            }, se = /HTML$/i, oe = /^(?:input|select|textarea|button)$/i, ue = /^h\d$/i,
+                            E = /^[^{]+\{\s*\[native \w/, de = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, le = /[+~]/,
+                            Y = new RegExp("\\\\[\\da-fA-F]{1,6}" + s + "?|\\\\([^\\r\\n\\f])", "g"),
+                            he = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, ce = ve(function (e) {
+                                return !0 === e.disabled && "fieldset" === e.nodeName.toLowerCase()
+                            }, {dir: "parentNode", next: "legend"});
+                        try {
+                            T.apply(t = X.call(l.childNodes), l.childNodes), t[l.childNodes.length].nodeType
+                        } catch (e) {
+                            T = {
+                                apply: t.length ? function (e, t) {
+                                    K.apply(e, X.call(t))
+                                } : function (e, t) {
+                                    for (var n = e.length, i = 0; e[n++] = t[i++];) ;
+                                    e.length = n - 1
+                                }
+                            }
+                        }
+
+                        function P(t, e, n, i) {
+                            var r, a, s, o, u, d, l = e && e.ownerDocument, h = e ? e.nodeType : 9;
+                            if (n = n || [], "string" != typeof t || !t || 1 !== h && 9 !== h && 11 !== h) return n;
+                            if (!i && (S(e), e = e || k, b)) {
+                                if (11 !== h && (o = de.exec(t))) if (r = o[1]) {
+                                    if (9 === h) {
+                                        if (!(d = e.getElementById(r))) return n;
+                                        if (d.id === r) return n.push(d), n
+                                    } else if (l && (d = l.getElementById(r)) && m(e, d) && d.id === r) return n.push(d), n
+                                } else {
+                                    if (o[2]) return T.apply(n, e.getElementsByTagName(t)), n;
+                                    if ((r = o[3]) && c.getElementsByClassName && e.getElementsByClassName) return T.apply(n, e.getElementsByClassName(r)), n
+                                }
+                                if (c.qsa && !p[t + " "] && (!f || !f.test(t)) && (1 !== h || "object" !== e.nodeName.toLowerCase())) {
+                                    if (d = t, l = e, 1 === h && (ie.test(t) || ne.test(t))) {
+                                        for ((l = le.test(t) && pe(e.parentNode) || e) === e && c.scope || ((s = e.getAttribute("id")) ? s = s.replace(he, W) : e.setAttribute("id", s = w)), a = (u = _(t)).length; a--;) u[a] = (s ? "#" + s : ":scope") + " " + O(u[a]);
+                                        d = u.join(",")
+                                    }
+                                    try {
+                                        return T.apply(n, l.querySelectorAll(d)), n
+                                    } catch (e) {
+                                        p(t, !0)
+                                    } finally {
+                                        s === w && e.removeAttribute("id")
+                                    }
+                                }
+                            }
+                            return B(t.replace(y, "$1"), e, n, i)
+                        }
+
+                        function C() {
+                            var n = [];
+
+                            function i(e, t) {
+                                return n.push(e + " ") > M.cacheLength && delete i[n.shift()], i[e + " "] = t
+                            }
+
+                            return i
+                        }
+
+                        function R(e) {
+                            return e[w] = !0, e
+                        }
+
+                        function A(e) {
+                            var t = k.createElement("fieldset");
+                            try {
+                                return !!e(t)
+                            } catch (e) {
+                                return !1
+                            } finally {
+                                t.parentNode && t.parentNode.removeChild(t)
+                            }
+                        }
+
+                        function _e(e, t) {
+                            for (var n = e.split("|"), i = n.length; i--;) M.attrHandle[n[i]] = t
+                        }
+
+                        function fe(e, t) {
+                            var n = t && e, i = n && 1 === e.nodeType && 1 === t.nodeType && e.sourceIndex - t.sourceIndex;
+                            if (i) return i;
+                            if (n) for (; n = n.nextSibling;) if (n === t) return -1;
+                            return e ? 1 : -1
+                        }
+
+                        function me(t) {
+                            return function (e) {
+                                return "form" in e ? e.parentNode && !1 === e.disabled ? "label" in e ? "label" in e.parentNode ? e.parentNode.disabled === t : e.disabled === t : e.isDisabled === t || e.isDisabled !== !t && ce(e) === t : e.disabled === t : "label" in e && e.disabled === t
+                            }
+                        }
+
+                        function x(s) {
+                            return R(function (a) {
+                                return a = +a, R(function (e, t) {
+                                    for (var n, i = s([], e.length, a), r = i.length; r--;) e[n = i[r]] && (e[n] = !(t[n] = e[n]))
+                                })
+                            })
+                        }
+
+                        function pe(e) {
+                            return e && void 0 !== e.getElementsByTagName && e
+                        }
+
+                        for (e in c = P.support = {}, j = P.isXML = function (e) {
+                            var t = e && e.namespaceURI, e = e && (e.ownerDocument || e).documentElement;
+                            return !se.test(t || e && e.nodeName || "HTML")
+                        }, S = P.setDocument = function (e) {
+                            var e = e ? e.ownerDocument || e : l;
+                            return e != k && 9 === e.nodeType && e.documentElement && (n = (k = e).documentElement, b = !j(k), l != k && (e = k.defaultView) && e.top !== e && (e.addEventListener ? e.addEventListener("unload", H, !1) : e.attachEvent && e.attachEvent("onunload", H)), c.scope = A(function (e) {
+                                return n.appendChild(e).appendChild(k.createElement("div")), void 0 !== e.querySelectorAll && !e.querySelectorAll(":scope fieldset div").length
+                            }), c.attributes = A(function (e) {
+                                return e.className = "i", !e.getAttribute("className")
+                            }), c.getElementsByTagName = A(function (e) {
+                                return e.appendChild(k.createComment("")), !e.getElementsByTagName("*").length
+                            }), c.getElementsByClassName = E.test(k.getElementsByClassName), c.getById = A(function (e) {
+                                return n.appendChild(e).id = w, !k.getElementsByName || !k.getElementsByName(w).length
+                            }), c.getById ? (M.filter.ID = function (e) {
+                                var t = e.replace(Y, h);
+                                return function (e) {
+                                    return e.getAttribute("id") === t
+                                }
+                            }, M.find.ID = function (e, t) {
+                                if (void 0 !== t.getElementById && b) return (t = t.getElementById(e)) ? [t] : []
+                            }) : (M.filter.ID = function (e) {
+                                var t = e.replace(Y, h);
+                                return function (e) {
+                                    e = void 0 !== e.getAttributeNode && e.getAttributeNode("id");
+                                    return e && e.value === t
+                                }
+                            }, M.find.ID = function (e, t) {
+                                if (void 0 !== t.getElementById && b) {
+                                    var n, i, r, a = t.getElementById(e);
+                                    if (a) {
+                                        if ((n = a.getAttributeNode("id")) && n.value === e) return [a];
+                                        for (r = t.getElementsByName(e), i = 0; a = r[i++];) if ((n = a.getAttributeNode("id")) && n.value === e) return [a]
+                                    }
+                                    return []
+                                }
+                            }), M.find.TAG = c.getElementsByTagName ? function (e, t) {
+                                return void 0 !== t.getElementsByTagName ? t.getElementsByTagName(e) : c.qsa ? t.querySelectorAll(e) : void 0
+                            } : function (e, t) {
+                                var n, i = [], r = 0, a = t.getElementsByTagName(e);
+                                if ("*" !== e) return a;
+                                for (; n = a[r++];) 1 === n.nodeType && i.push(n);
+                                return i
+                            }, M.find.CLASS = c.getElementsByClassName && function (e, t) {
+                                if (void 0 !== t.getElementsByClassName && b) return t.getElementsByClassName(e)
+                            }, i = [], f = [], (c.qsa = E.test(k.querySelectorAll)) && (A(function (e) {
+                                var t;
+                                n.appendChild(e).innerHTML = "<a id='" + w + "'></a><select id='" + w + "-\r\\' msallowcapture=''><option selected=''></option></select>", e.querySelectorAll("[msallowcapture^='']").length && f.push("[*^$]=" + s + "*(?:''|\"\")"), e.querySelectorAll("[selected]").length || f.push("\\[" + s + "*(?:value|" + Z + ")"), e.querySelectorAll("[id~=" + w + "-]").length || f.push("~="), (t = k.createElement("input")).setAttribute("name", ""), e.appendChild(t), e.querySelectorAll("[name='']").length || f.push("\\[" + s + "*name" + s + "*=" + s + "*(?:''|\"\")"), e.querySelectorAll(":checked").length || f.push(":checked"), e.querySelectorAll("a#" + w + "+*").length || f.push(".#.+[+~]"), e.querySelectorAll("\\\f"), f.push("[\\r\\n\\f]")
+                            }), A(function (e) {
+                                e.innerHTML = "<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";
+                                var t = k.createElement("input");
+                                t.setAttribute("type", "hidden"), e.appendChild(t).setAttribute("name", "D"), e.querySelectorAll("[name=d]").length && f.push("name" + s + "*[*^$|!~]?="), 2 !== e.querySelectorAll(":enabled").length && f.push(":enabled", ":disabled"), n.appendChild(e).disabled = !0, 2 !== e.querySelectorAll(":disabled").length && f.push(":enabled", ":disabled"), e.querySelectorAll("*,:x"), f.push(",.*:")
+                            })), (c.matchesSelector = E.test(r = n.matches || n.webkitMatchesSelector || n.mozMatchesSelector || n.oMatchesSelector || n.msMatchesSelector)) && A(function (e) {
+                                c.disconnectedMatch = r.call(e, "*"), r.call(e, "[s!='']:x"), i.push("!=", Q)
+                            }), f = f.length && new RegExp(f.join("|")), i = i.length && new RegExp(i.join("|")), e = E.test(n.compareDocumentPosition), m = e || E.test(n.contains) ? function (e, t) {
+                                var n = 9 === e.nodeType ? e.documentElement : e, t = t && t.parentNode;
+                                return e === t || !(!t || 1 !== t.nodeType || !(n.contains ? n.contains(t) : e.compareDocumentPosition && 16 & e.compareDocumentPosition(t)))
+                            } : function (e, t) {
+                                if (t) for (; t = t.parentNode;) if (t === e) return !0;
+                                return !1
+                            }, G = e ? function (e, t) {
+                                if (e === t) return d = !0, 0;
+                                var n = !e.compareDocumentPosition - !t.compareDocumentPosition;
+                                return n || (1 & (n = (e.ownerDocument || e) == (t.ownerDocument || t) ? e.compareDocumentPosition(t) : 1) || !c.sortDetached && t.compareDocumentPosition(e) === n ? e == k || e.ownerDocument == l && m(l, e) ? -1 : t == k || t.ownerDocument == l && m(l, t) ? 1 : u ? v(u, e) - v(u, t) : 0 : 4 & n ? -1 : 1)
+                            } : function (e, t) {
+                                if (e === t) return d = !0, 0;
+                                var n, i = 0, r = e.parentNode, a = t.parentNode, s = [e], o = [t];
+                                if (!r || !a) return e == k ? -1 : t == k ? 1 : r ? -1 : a ? 1 : u ? v(u, e) - v(u, t) : 0;
+                                if (r === a) return fe(e, t);
+                                for (n = e; n = n.parentNode;) s.unshift(n);
+                                for (n = t; n = n.parentNode;) o.unshift(n);
+                                for (; s[i] === o[i];) i++;
+                                return i ? fe(s[i], o[i]) : s[i] == l ? -1 : o[i] == l ? 1 : 0
+                            }), k
+                        }, P.matches = function (e, t) {
+                            return P(e, null, null, t)
+                        }, P.matchesSelector = function (e, t) {
+                            if (S(e), c.matchesSelector && b && !p[t + " "] && (!i || !i.test(t)) && (!f || !f.test(t))) try {
+                                var n = r.call(e, t);
+                                if (n || c.disconnectedMatch || e.document && 11 !== e.document.nodeType) return n
+                            } catch (e) {
+                                p(t, !0)
+                            }
+                            return 0 < P(t, k, null, [e]).length
+                        }, P.contains = function (e, t) {
+                            return (e.ownerDocument || e) != k && S(e), m(e, t)
+                        }, P.attr = function (e, t) {
+                            (e.ownerDocument || e) != k && S(e);
+                            var n = M.attrHandle[t.toLowerCase()],
+                                n = n && J.call(M.attrHandle, t.toLowerCase()) ? n(e, t, !b) : void 0;
+                            return void 0 !== n ? n : c.attributes || !b ? e.getAttribute(t) : (n = e.getAttributeNode(t)) && n.specified ? n.value : null
+                        }, P.escape = function (e) {
+                            return (e + "").replace(he, W)
+                        }, P.error = function (e) {
+                            throw new Error("Syntax error, unrecognized expression: " + e)
+                        }, P.uniqueSort = function (e) {
+                            var t, n = [], i = 0, r = 0;
+                            if (d = !c.detectDuplicates, u = !c.sortStable && e.slice(0), e.sort(G), d) {
+                                for (; t = e[r++];) t === e[r] && (i = n.push(r));
+                                for (; i--;) e.splice(n[i], 1)
+                            }
+                            return u = null, e
+                        }, a = P.getText = function (e) {
+                            var t, n = "", i = 0, r = e.nodeType;
+                            if (r) {
+                                if (1 === r || 9 === r || 11 === r) {
+                                    if ("string" == typeof e.textContent) return e.textContent;
+                                    for (e = e.firstChild; e; e = e.nextSibling) n += a(e)
+                                } else if (3 === r || 4 === r) return e.nodeValue
+                            } else for (; t = e[i++];) n += a(t);
+                            return n
+                        }, (M = P.selectors = {
+                            cacheLength: 50,
+                            createPseudo: R,
+                            match: g,
+                            attrHandle: {},
+                            find: {},
+                            relative: {
+                                ">": {dir: "parentNode", first: !0},
+                                " ": {dir: "parentNode"},
+                                "+": {dir: "previousSibling", first: !0},
+                                "~": {dir: "previousSibling"}
+                            },
+                            preFilter: {
+                                ATTR: function (e) {
+                                    return e[1] = e[1].replace(Y, h), e[3] = (e[3] || e[4] || e[5] || "").replace(Y, h), "~=" === e[2] && (e[3] = " " + e[3] + " "), e.slice(0, 4)
+                                }, CHILD: function (e) {
+                                    return e[1] = e[1].toLowerCase(), "nth" === e[1].slice(0, 3) ? (e[3] || P.error(e[0]), e[4] = +(e[4] ? e[5] + (e[6] || 1) : 2 * ("even" === e[3] || "odd" === e[3])), e[5] = +(e[7] + e[8] || "odd" === e[3])) : e[3] && P.error(e[0]), e
+                                }, PSEUDO: function (e) {
+                                    var t, n = !e[6] && e[2];
+                                    return g.CHILD.test(e[0]) ? null : (e[3] ? e[2] = e[4] || e[5] || "" : n && re.test(n) && (t = _(n, !0)) && (t = n.indexOf(")", n.length - t) - n.length) && (e[0] = e[0].slice(0, t), e[2] = n.slice(0, t)), e.slice(0, 3))
+                                }
+                            },
+                            filter: {
+                                TAG: function (e) {
+                                    var t = e.replace(Y, h).toLowerCase();
+                                    return "*" === e ? function () {
+                                        return !0
+                                    } : function (e) {
+                                        return e.nodeName && e.nodeName.toLowerCase() === t
+                                    }
+                                }, CLASS: function (e) {
+                                    var t = z[e + " "];
+                                    return t || (t = new RegExp("(^|" + s + ")" + e + "(" + s + "|$)")) && z(e, function (e) {
+                                        return t.test("string" == typeof e.className && e.className || void 0 !== e.getAttribute && e.getAttribute("class") || "")
+                                    })
+                                }, ATTR: function (t, n, i) {
+                                    return function (e) {
+                                        e = P.attr(e, t);
+                                        return null == e ? "!=" === n : !n || (e += "", "=" === n ? e === i : "!=" === n ? e !== i : "^=" === n ? i && 0 === e.indexOf(i) : "*=" === n ? i && -1 < e.indexOf(i) : "$=" === n ? i && e.slice(-i.length) === i : "~=" === n ? -1 < (" " + e.replace(ee, " ") + " ").indexOf(i) : "|=" === n && (e === i || e.slice(0, i.length + 1) === i + "-"))
+                                    }
+                                }, CHILD: function (f, e, t, m, p) {
+                                    var y = "nth" !== f.slice(0, 3), v = "last" !== f.slice(-4), g = "of-type" === e;
+                                    return 1 === m && 0 === p ? function (e) {
+                                        return !!e.parentNode
+                                    } : function (e, t, n) {
+                                        var i, r, a, s, o, u, d = y != v ? "nextSibling" : "previousSibling",
+                                            l = e.parentNode, h = g && e.nodeName.toLowerCase(), c = !n && !g, _ = !1;
+                                        if (l) {
+                                            if (y) {
+                                                for (; d;) {
+                                                    for (s = e; s = s[d];) if (g ? s.nodeName.toLowerCase() === h : 1 === s.nodeType) return !1;
+                                                    u = d = "only" === f && !u && "nextSibling"
+                                                }
+                                                return !0
+                                            }
+                                            if (u = [v ? l.firstChild : l.lastChild], v && c) {
+                                                for (_ = (o = (i = (r = (a = (s = l)[w] || (s[w] = {}))[s.uniqueID] || (a[s.uniqueID] = {}))[f] || [])[0] === D && i[1]) && i[2], s = o && l.childNodes[o]; s = ++o && s && s[d] || (_ = o = 0) || u.pop();) if (1 === s.nodeType && ++_ && s === e) {
+                                                    r[f] = [D, o, _];
+                                                    break
+                                                }
+                                            } else if (!1 === (_ = c ? o = (i = (r = (a = (s = e)[w] || (s[w] = {}))[s.uniqueID] || (a[s.uniqueID] = {}))[f] || [])[0] === D && i[1] : _)) for (; (s = ++o && s && s[d] || (_ = o = 0) || u.pop()) && ((g ? s.nodeName.toLowerCase() !== h : 1 !== s.nodeType) || !++_ || (c && ((r = (a = s[w] || (s[w] = {}))[s.uniqueID] || (a[s.uniqueID] = {}))[f] = [D, _]), s !== e));) ;
+                                            return (_ -= p) === m || _ % m == 0 && 0 <= _ / m
+                                        }
+                                    }
+                                }, PSEUDO: function (e, a) {
+                                    var t,
+                                        s = M.pseudos[e] || M.setFilters[e.toLowerCase()] || P.error("unsupported pseudo: " + e);
+                                    return s[w] ? s(a) : 1 < s.length ? (t = [e, e, "", a], M.setFilters.hasOwnProperty(e.toLowerCase()) ? R(function (e, t) {
+                                        for (var n, i = s(e, a), r = i.length; r--;) e[n = v(e, i[r])] = !(t[n] = i[r])
+                                    }) : function (e) {
+                                        return s(e, 0, t)
+                                    }) : s
+                                }
+                            },
+                            pseudos: {
+                                not: R(function (e) {
+                                    var i = [], r = [], o = F(e.replace(y, "$1"));
+                                    return o[w] ? R(function (e, t, n, i) {
+                                        for (var r, a = o(e, null, i, []), s = e.length; s--;) (r = a[s]) && (e[s] = !(t[s] = r))
+                                    }) : function (e, t, n) {
+                                        return i[0] = e, o(i, null, n, r), i[0] = null, !r.pop()
+                                    }
+                                }), has: R(function (t) {
+                                    return function (e) {
+                                        return 0 < P(t, e).length
+                                    }
+                                }), contains: R(function (t) {
+                                    return t = t.replace(Y, h), function (e) {
+                                        return -1 < (e.textContent || a(e)).indexOf(t)
+                                    }
+                                }), lang: R(function (n) {
+                                    return ae.test(n || "") || P.error("unsupported lang: " + n), n = n.replace(Y, h).toLowerCase(), function (e) {
+                                        var t;
+                                        do {
+                                            if (t = b ? e.lang : e.getAttribute("xml:lang") || e.getAttribute("lang")) return (t = t.toLowerCase()) === n || 0 === t.indexOf(n + "-")
+                                        } while ((e = e.parentNode) && 1 === e.nodeType);
+                                        return !1
+                                    }
+                                }), target: function (e) {
+                                    var t = I.location && I.location.hash;
+                                    return t && t.slice(1) === e.id
+                                }, root: function (e) {
+                                    return e === n
+                                }, focus: function (e) {
+                                    return e === k.activeElement && (!k.hasFocus || k.hasFocus()) && !!(e.type || e.href || ~e.tabIndex)
+                                }, enabled: me(!1), disabled: me(!0), checked: function (e) {
+                                    var t = e.nodeName.toLowerCase();
+                                    return "input" === t && !!e.checked || "option" === t && !!e.selected
+                                }, selected: function (e) {
+                                    return e.parentNode && e.parentNode.selectedIndex, !0 === e.selected
+                                }, empty: function (e) {
+                                    for (e = e.firstChild; e; e = e.nextSibling) if (e.nodeType < 6) return !1;
+                                    return !0
+                                }, parent: function (e) {
+                                    return !M.pseudos.empty(e)
+                                }, header: function (e) {
+                                    return ue.test(e.nodeName)
+                                }, input: function (e) {
+                                    return oe.test(e.nodeName)
+                                }, button: function (e) {
+                                    var t = e.nodeName.toLowerCase();
+                                    return "input" === t && "button" === e.type || "button" === t
+                                }, text: function (e) {
+                                    return "input" === e.nodeName.toLowerCase() && "text" === e.type && (null == (e = e.getAttribute("type")) || "text" === e.toLowerCase())
+                                }, first: x(function () {
+                                    return [0]
+                                }), last: x(function (e, t) {
+                                    return [t - 1]
+                                }), eq: x(function (e, t, n) {
+                                    return [n < 0 ? n + t : n]
+                                }), even: x(function (e, t) {
+                                    for (var n = 0; n < t; n += 2) e.push(n);
+                                    return e
+                                }), odd: x(function (e, t) {
+                                    for (var n = 1; n < t; n += 2) e.push(n);
+                                    return e
+                                }), lt: x(function (e, t, n) {
+                                    for (var i = n < 0 ? n + t : t < n ? t : n; 0 <= --i;) e.push(i);
+                                    return e
+                                }), gt: x(function (e, t, n) {
+                                    for (var i = n < 0 ? n + t : n; ++i < t;) e.push(i);
+                                    return e
+                                })
+                            }
+                        }).pseudos.nth = M.pseudos.eq, {
+                            radio: !0,
+                            checkbox: !0,
+                            file: !0,
+                            password: !0,
+                            image: !0
+                        }) M.pseudos[e] = function (t) {
+                            return function (e) {
+                                return "input" === e.nodeName.toLowerCase() && e.type === t
+                            }
+                        }(e);
+                        for (e in {submit: !0, reset: !0}) M.pseudos[e] = function (n) {
+                            return function (e) {
+                                var t = e.nodeName.toLowerCase();
+                                return ("input" === t || "button" === t) && e.type === n
+                            }
+                        }(e);
+
+                        function ye() {
+                        }
+
+                        function O(e) {
+                            for (var t = 0, n = e.length, i = ""; t < n; t++) i += e[t].value;
+                            return i
+                        }
+
+                        function ve(s, e, t) {
+                            var o = e.dir, u = e.next, d = u || o, l = t && "parentNode" === d, h = N++;
+                            return e.first ? function (e, t, n) {
+                                for (; e = e[o];) if (1 === e.nodeType || l) return s(e, t, n);
+                                return !1
+                            } : function (e, t, n) {
+                                var i, r, a = [D, h];
+                                if (n) {
+                                    for (; e = e[o];) if ((1 === e.nodeType || l) && s(e, t, n)) return !0
+                                } else for (; e = e[o];) if (1 === e.nodeType || l) if (r = (r = e[w] || (e[w] = {}))[e.uniqueID] || (r[e.uniqueID] = {}), u && u === e.nodeName.toLowerCase()) e = e[o] || e; else {
+                                    if ((i = r[d]) && i[0] === D && i[1] === h) return a[2] = i[2];
+                                    if ((r[d] = a)[2] = s(e, t, n)) return !0
+                                }
+                                return !1
+                            }
+                        }
+
+                        function ge(r) {
+                            return 1 < r.length ? function (e, t, n) {
+                                for (var i = r.length; i--;) if (!r[i](e, t, n)) return !1;
+                                return !0
+                            } : r[0]
+                        }
+
+                        function Me(e, t, n, i, r) {
+                            for (var a, s = [], o = 0, u = e.length, d = null != t; o < u; o++) !(a = e[o]) || n && !n(a, i, r) || (s.push(a), d && t.push(o));
+                            return s
+                        }
+
+                        function Le(_, f, m, p, y, e) {
+                            return p && !p[w] && (p = Le(p)), y && !y[w] && (y = Le(y, e)), R(function (e, t, n, i) {
+                                var r, a, s, o = [], u = [], d = t.length, l = e || function (e, t, n) {
+                                        for (var i = 0, r = t.length; i < r; i++) P(e, t[i], n);
+                                        return n
+                                    }(f || "*", n.nodeType ? [n] : n, []), h = !_ || !e && f ? l : Me(l, o, _, n, i),
+                                    c = m ? y || (e ? _ : d || p) ? [] : t : h;
+                                if (m && m(h, c, n, i), p) for (r = Me(c, u), p(r, [], n, i), a = r.length; a--;) (s = r[a]) && (c[u[a]] = !(h[u[a]] = s));
+                                if (e) {
+                                    if (y || _) {
+                                        if (y) {
+                                            for (r = [], a = c.length; a--;) (s = c[a]) && r.push(h[a] = s);
+                                            y(null, c = [], r, i)
+                                        }
+                                        for (a = c.length; a--;) (s = c[a]) && -1 < (r = y ? v(e, s) : o[a]) && (e[r] = !(t[r] = s))
+                                    }
+                                } else c = Me(c === t ? c.splice(d, c.length) : c), y ? y(null, t, c, i) : T.apply(t, c)
+                            })
+                        }
+
+                        function Se(p, y) {
+                            function e(e, t, n, i, r) {
+                                var a, s, o, u = 0, d = "0", l = e && [], h = [], c = L, _ = e || g && M.find.TAG("*", r),
+                                    f = D += null == c ? 1 : Math.random() || .1, m = _.length;
+                                for (r && (L = t == k || t || r); d !== m && null != (a = _[d]); d++) {
+                                    if (g && a) {
+                                        for (s = 0, t || a.ownerDocument == k || (S(a), n = !b); o = p[s++];) if (o(a, t || k, n)) {
+                                            i.push(a);
+                                            break
+                                        }
+                                        r && (D = f)
+                                    }
+                                    v && ((a = !o && a) && u--, e && l.push(a))
+                                }
+                                if (u += d, v && d !== u) {
+                                    for (s = 0; o = y[s++];) o(l, h, t, n);
+                                    if (e) {
+                                        if (0 < u) for (; d--;) l[d] || h[d] || (h[d] = q.call(i));
+                                        h = Me(h)
+                                    }
+                                    T.apply(i, h), r && !e && 0 < h.length && 1 < u + y.length && P.uniqueSort(i)
+                                }
+                                return r && (D = f, L = c), l
+                            }
+
+                            var v = 0 < y.length, g = 0 < p.length;
+                            return v ? R(e) : e
+                        }
+
+                        return ye.prototype = M.filters = M.pseudos, M.setFilters = new ye, _ = P.tokenize = function (e, t) {
+                            var n, i, r, a, s, o, u, d = U[e + " "];
+                            if (d) return t ? 0 : d.slice(0);
+                            for (s = e, o = [], u = M.preFilter; s;) {
+                                for (a in n && !(i = te.exec(s)) || (i && (s = s.slice(i[0].length) || s), o.push(r = [])), n = !1, (i = ne.exec(s)) && (n = i.shift(), r.push({
+                                    value: n,
+                                    type: i[0].replace(y, " ")
+                                }), s = s.slice(n.length)), M.filter) !(i = g[a].exec(s)) || u[a] && !(i = u[a](i)) || (n = i.shift(), r.push({
+                                    value: n,
+                                    type: a,
+                                    matches: i
+                                }), s = s.slice(n.length));
+                                if (!n) break
+                            }
+                            return t ? s.length : s ? P.error(e) : U(e, o).slice(0)
+                        }, F = P.compile = function (e, t) {
+                            var n, i = [], r = [], a = V[e + " "];
+                            if (!a) {
+                                for (n = (t = t || _(e)).length; n--;) ((a = function e(t) {
+                                    for (var i, n, r, a = t.length, s = M.relative[t[0].type], o = s || M.relative[" "], u = s ? 1 : 0, d = ve(function (e) {
+                                        return e === i
+                                    }, o, !0), l = ve(function (e) {
+                                        return -1 < v(i, e)
+                                    }, o, !0), h = [function (e, t, n) {
+                                        return e = !s && (n || t !== L) || ((i = t).nodeType ? d : l)(e, t, n), i = null, e
+                                    }]; u < a; u++) if (n = M.relative[t[u].type]) h = [ve(ge(h), n)]; else {
+                                        if ((n = M.filter[t[u].type].apply(null, t[u].matches))[w]) {
+                                            for (r = ++u; r < a && !M.relative[t[r].type]; r++) ;
+                                            return Le(1 < u && ge(h), 1 < u && O(t.slice(0, u - 1).concat({value: " " === t[u - 2].type ? "*" : ""})).replace(y, "$1"), n, u < r && e(t.slice(u, r)), r < a && e(t = t.slice(r)), r < a && O(t))
+                                        }
+                                        h.push(n)
+                                    }
+                                    return ge(h)
+                                }(t[n]))[w] ? i : r).push(a);
+                                (a = V(e, Se(r, i))).selector = e
+                            }
+                            return a
+                        }, B = P.select = function (e, t, n, i) {
+                            var r, a, s, o, u, d = "function" == typeof e && e, l = !i && _(e = d.selector || e);
+                            if (n = n || [], 1 === l.length) {
+                                if (2 < (a = l[0] = l[0].slice(0)).length && "ID" === (s = a[0]).type && 9 === t.nodeType && b && M.relative[a[1].type]) {
+                                    if (!(t = (M.find.ID(s.matches[0].replace(Y, h), t) || [])[0])) return n;
+                                    d && (t = t.parentNode), e = e.slice(a.shift().value.length)
+                                }
+                                for (r = g.needsContext.test(e) ? 0 : a.length; r-- && (s = a[r], !M.relative[o = s.type]);) if ((u = M.find[o]) && (i = u(s.matches[0].replace(Y, h), le.test(a[0].type) && pe(t.parentNode) || t))) {
+                                    if (a.splice(r, 1), e = i.length && O(a)) break;
+                                    return T.apply(n, i), n
+                                }
+                            }
+                            return (d || F(e, l))(i, t, !b, n, !t || le.test(e) && pe(t.parentNode) || t), n
+                        }, c.sortStable = w.split("").sort(G).join("") === w, c.detectDuplicates = !!d, S(), c.sortDetached = A(function (e) {
+                            return 1 & e.compareDocumentPosition(k.createElement("fieldset"))
+                        }), A(function (e) {
+                            return e.innerHTML = "<a href='#'></a>", "#" === e.firstChild.getAttribute("href")
+                        }) || _e("type|href|height|width", function (e, t, n) {
+                            if (!n) return e.getAttribute(t, "type" === t.toLowerCase() ? 1 : 2)
+                        }), c.attributes && A(function (e) {
+                            return e.innerHTML = "<input/>", e.firstChild.setAttribute("value", ""), "" === e.firstChild.getAttribute("value")
+                        }) || _e("value", function (e, t, n) {
+                            if (!n && "input" === e.nodeName.toLowerCase()) return e.defaultValue
+                        }), A(function (e) {
+                            return null == e.getAttribute("disabled")
+                        }) || _e(Z, function (e, t, n) {
+                            if (!n) return !0 === e[t] ? t.toLowerCase() : (n = e.getAttributeNode(t)) && n.specified ? n.value : null
+                        }), P
+                    }(L),
+                X = (k.find = e, k.expr = e.selectors, k.expr[":"] = k.expr.pseudos, k.uniqueSort = k.unique = e.uniqueSort, k.text = e.getText, k.isXMLDoc = e.isXML, k.contains = e.contains, k.escapeSelector = e.escape, k.expr.match.needsContext);
+
+            function u(e, t) {
+                return e.nodeName && e.nodeName.toLowerCase() === t.toLowerCase()
+            }
+
+            var Z = /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;
+
+            function $(e, n, i) {
+                return v(n) ? k.grep(e, function (e, t) {
+                    return !!n.call(e, t, e) !== i
+                }) : n.nodeType ? k.grep(e, function (e) {
+                    return e === n !== i
+                }) : "string" != typeof n ? k.grep(e, function (e) {
+                    return -1 < F.call(n, e) !== i
+                }) : k.filter(n, e, i)
+            }
+
+            k.filter = function (e, t, n) {
+                var i = t[0];
+                return n && (e = ":not(" + e + ")"), 1 === t.length && 1 === i.nodeType ? k.find.matchesSelector(i, e) ? [i] : [] : k.find.matches(e, k.grep(t, function (e) {
+                    return 1 === e.nodeType
+                }))
+            }, k.fn.extend({
+                find: function (e) {
+                    var t, n, i = this.length, r = this;
+                    if ("string" != typeof e) return this.pushStack(k(e).filter(function () {
+                        for (t = 0; t < i; t++) if (k.contains(r[t], this)) return !0
+                    }));
+                    for (n = this.pushStack([]), t = 0; t < i; t++) k.find(e, r[t], n);
+                    return 1 < i ? k.uniqueSort(n) : n
+                }, filter: function (e) {
+                    return this.pushStack($(this, e || [], !1))
+                }, not: function (e) {
+                    return this.pushStack($(this, e || [], !0))
+                }, is: function (e) {
+                    return !!$(this, "string" == typeof e && X.test(e) ? k(e) : e || [], !1).length
+                }
+            });
+            var Q, ee = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/, te = ((k.fn.init = function (e, t, n) {
+                    if (!e) return this;
+                    if (n = n || Q, "string" != typeof e) return e.nodeType ? (this[0] = e, this.length = 1, this) : v(e) ? void 0 !== n.ready ? n.ready(e) : e(k) : k.makeArray(e, this);
+                    if (!(i = "<" === e[0] && ">" === e[e.length - 1] && 3 <= e.length ? [null, e, null] : ee.exec(e)) || !i[1] && t) return (!t || t.jquery ? t || n : this.constructor(t)).find(e);
+                    if (i[1]) {
+                        if (t = t instanceof k ? t[0] : t, k.merge(this, k.parseHTML(i[1], t && t.nodeType ? t.ownerDocument || t : S, !0)), Z.test(i[1]) && k.isPlainObject(t)) for (var i in t) v(this[i]) ? this[i](t[i]) : this.attr(i, t[i]);
+                        return this
+                    }
+                    return (n = S.getElementById(i[2])) && (this[0] = n, this.length = 1), this
+                }).prototype = k.fn, Q = k(S), /^(?:parents|prev(?:Until|All))/),
+                ne = {children: !0, contents: !0, next: !0, prev: !0};
+
+            function ie(e, t) {
+                for (; (e = e[t]) && 1 !== e.nodeType;) ;
+                return e
+            }
+
+            k.fn.extend({
+                has: function (e) {
+                    var t = k(e, this), n = t.length;
+                    return this.filter(function () {
+                        for (var e = 0; e < n; e++) if (k.contains(this, t[e])) return !0
+                    })
+                }, closest: function (e, t) {
+                    var n, i = 0, r = this.length, a = [], s = "string" != typeof e && k(e);
+                    if (!X.test(e)) for (; i < r; i++) for (n = this[i]; n && n !== t; n = n.parentNode) if (n.nodeType < 11 && (s ? -1 < s.index(n) : 1 === n.nodeType && k.find.matchesSelector(n, e))) {
+                        a.push(n);
+                        break
+                    }
+                    return this.pushStack(1 < a.length ? k.uniqueSort(a) : a)
+                }, index: function (e) {
+                    return e ? "string" == typeof e ? F.call(k(e), this[0]) : F.call(this, e.jquery ? e[0] : e) : this[0] && this[0].parentNode ? this.first().prevAll().length : -1
+                }, add: function (e, t) {
+                    return this.pushStack(k.uniqueSort(k.merge(this.get(), k(e, t))))
+                }, addBack: function (e) {
+                    return this.add(null == e ? this.prevObject : this.prevObject.filter(e))
+                }
+            }), k.each({
+                parent: function (e) {
+                    e = e.parentNode;
+                    return e && 11 !== e.nodeType ? e : null
+                }, parents: function (e) {
+                    return i(e, "parentNode")
+                }, parentsUntil: function (e, t, n) {
+                    return i(e, "parentNode", n)
+                }, next: function (e) {
+                    return ie(e, "nextSibling")
+                }, prev: function (e) {
+                    return ie(e, "previousSibling")
+                }, nextAll: function (e) {
+                    return i(e, "nextSibling")
+                }, prevAll: function (e) {
+                    return i(e, "previousSibling")
+                }, nextUntil: function (e, t, n) {
+                    return i(e, "nextSibling", n)
+                }, prevUntil: function (e, t, n) {
+                    return i(e, "previousSibling", n)
+                }, siblings: function (e) {
+                    return K((e.parentNode || {}).firstChild, e)
+                }, children: function (e) {
+                    return K(e.firstChild)
+                }, contents: function (e) {
+                    return null != e.contentDocument && W(e.contentDocument) ? e.contentDocument : (u(e, "template") && (e = e.content || e), k.merge([], e.childNodes))
+                }
+            }, function (i, r) {
+                k.fn[i] = function (e, t) {
+                    var n = k.map(this, r, e);
+                    return (t = "Until" !== i.slice(-5) ? e : t) && "string" == typeof t && (n = k.filter(t, n)), 1 < this.length && (ne[i] || k.uniqueSort(n), te.test(i) && n.reverse()), this.pushStack(n)
+                }
+            });
+            var b = /[^\x20\t\r\n\f]+/g;
+
+            function l(e) {
+                return e
+            }
+
+            function re(e) {
+                throw e
+            }
+
+            function ae(e, t, n, i) {
+                var r;
+                try {
+                    e && v(r = e.promise) ? r.call(e).done(t).fail(n) : e && v(r = e.then) ? r.call(e, t, n) : t.apply(void 0, [e].slice(i))
+                } catch (e) {
+                    n.apply(void 0, [e])
+                }
+            }
+
+            k.Callbacks = function (i) {
+                var e, n;
+                i = "string" == typeof i ? (e = i, n = {}, k.each(e.match(b) || [], function (e, t) {
+                    n[t] = !0
+                }), n) : k.extend({}, i);
+
+                function r() {
+                    for (o = o || i.once, s = a = !0; d.length; l = -1) for (t = d.shift(); ++l < u.length;) !1 === u[l].apply(t[0], t[1]) && i.stopOnFalse && (l = u.length, t = !1);
+                    i.memory || (t = !1), a = !1, o && (u = t ? [] : "")
+                }
+
+                var a, t, s, o, u = [], d = [], l = -1, h = {
+                    add: function () {
+                        return u && (t && !a && (l = u.length - 1, d.push(t)), function n(e) {
+                            k.each(e, function (e, t) {
+                                v(t) ? i.unique && h.has(t) || u.push(t) : t && t.length && "string" !== f(t) && n(t)
+                            })
+                        }(arguments), t && !a && r()), this
+                    }, remove: function () {
+                        return k.each(arguments, function (e, t) {
+                            for (var n; -1 < (n = k.inArray(t, u, n));) u.splice(n, 1), n <= l && l--
+                        }), this
+                    }, has: function (e) {
+                        return e ? -1 < k.inArray(e, u) : 0 < u.length
+                    }, empty: function () {
+                        return u = u && [], this
+                    }, disable: function () {
+                        return o = d = [], u = t = "", this
+                    }, disabled: function () {
+                        return !u
+                    }, lock: function () {
+                        return o = d = [], t || a || (u = t = ""), this
+                    }, locked: function () {
+                        return !!o
+                    }, fireWith: function (e, t) {
+                        return o || (t = [e, (t = t || []).slice ? t.slice() : t], d.push(t), a || r()), this
+                    }, fire: function () {
+                        return h.fireWith(this, arguments), this
+                    }, fired: function () {
+                        return !!s
+                    }
+                };
+                return h
+            }, k.extend({
+                Deferred: function (e) {
+                    var a = [["notify", "progress", k.Callbacks("memory"), k.Callbacks("memory"), 2], ["resolve", "done", k.Callbacks("once memory"), k.Callbacks("once memory"), 0, "resolved"], ["reject", "fail", k.Callbacks("once memory"), k.Callbacks("once memory"), 1, "rejected"]],
+                        r = "pending", s = {
+                            state: function () {
+                                return r
+                            }, always: function () {
+                                return o.done(arguments).fail(arguments), this
+                            }, catch: function (e) {
+                                return s.then(null, e)
+                            }, pipe: function () {
+                                var r = arguments;
+                                return k.Deferred(function (i) {
+                                    k.each(a, function (e, t) {
+                                        var n = v(r[t[4]]) && r[t[4]];
+                                        o[t[1]](function () {
+                                            var e = n && n.apply(this, arguments);
+                                            e && v(e.promise) ? e.promise().progress(i.notify).done(i.resolve).fail(i.reject) : i[t[0] + "With"](this, n ? [e] : arguments)
+                                        })
+                                    }), r = null
+                                }).promise()
+                            }, then: function (t, n, i) {
+                                var u = 0;
+
+                                function d(r, a, s, o) {
+                                    return function () {
+                                        function e() {
+                                            var e, t;
+                                            if (!(r < u)) {
+                                                if ((e = s.apply(n, i)) === a.promise()) throw new TypeError("Thenable self-resolution");
+                                                t = e && ("object" == typeof e || "function" == typeof e) && e.then, v(t) ? o ? t.call(e, d(u, a, l, o), d(u, a, re, o)) : (u++, t.call(e, d(u, a, l, o), d(u, a, re, o), d(u, a, l, a.notifyWith))) : (s !== l && (n = void 0, i = [e]), (o || a.resolveWith)(n, i))
+                                            }
+                                        }
+
+                                        var n = this, i = arguments, t = o ? e : function () {
+                                            try {
+                                                e()
+                                            } catch (e) {
+                                                k.Deferred.exceptionHook && k.Deferred.exceptionHook(e, t.stackTrace), u <= r + 1 && (s !== re && (n = void 0, i = [e]), a.rejectWith(n, i))
+                                            }
+                                        };
+                                        r ? t() : (k.Deferred.getStackHook && (t.stackTrace = k.Deferred.getStackHook()), L.setTimeout(t))
+                                    }
+                                }
+
+                                return k.Deferred(function (e) {
+                                    a[0][3].add(d(0, e, v(i) ? i : l, e.notifyWith)), a[1][3].add(d(0, e, v(t) ? t : l)), a[2][3].add(d(0, e, v(n) ? n : re))
+                                }).promise()
+                            }, promise: function (e) {
+                                return null != e ? k.extend(e, s) : s
+                            }
+                        }, o = {};
+                    return k.each(a, function (e, t) {
+                        var n = t[2], i = t[5];
+                        s[t[1]] = n.add, i && n.add(function () {
+                            r = i
+                        }, a[3 - e][2].disable, a[3 - e][3].disable, a[0][2].lock, a[0][3].lock), n.add(t[3].fire), o[t[0]] = function () {
+                            return o[t[0] + "With"](this === o ? void 0 : this, arguments), this
+                        }, o[t[0] + "With"] = n.fireWith
+                    }), s.promise(o), e && e.call(o, o), o
+                }, when: function (e) {
+                    function t(t) {
+                        return function (e) {
+                            r[t] = this, a[t] = 1 < arguments.length ? o.call(arguments) : e, --n || s.resolveWith(r, a)
+                        }
+                    }
+
+                    var n = arguments.length, i = n, r = Array(i), a = o.call(arguments), s = k.Deferred();
+                    if (n <= 1 && (ae(e, s.done(t(i)).resolve, s.reject, !n), "pending" === s.state() || v(a[i] && a[i].then))) return s.then();
+                    for (; i--;) ae(a[i], t(i), s.reject);
+                    return s.promise()
+                }
+            });
+            var se = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/,
+                oe = (k.Deferred.exceptionHook = function (e, t) {
+                    L.console && L.console.warn && e && se.test(e.name) && L.console.warn("jQuery.Deferred exception: " + e.message, e.stack, t)
+                }, k.readyException = function (e) {
+                    L.setTimeout(function () {
+                        throw e
+                    })
+                }, k.Deferred());
+
+            function ue() {
+                S.removeEventListener("DOMContentLoaded", ue), L.removeEventListener("load", ue), k.ready()
+            }
+
+            k.fn.ready = function (e) {
+                return oe.then(e).catch(function (e) {
+                    k.readyException(e)
+                }), this
+            }, k.extend({
+                isReady: !1, readyWait: 1, ready: function (e) {
+                    (!0 === e ? --k.readyWait : k.isReady) || (k.isReady = !0) !== e && 0 < --k.readyWait || oe.resolveWith(S, [k])
+                }
+            }), k.ready.then = oe.then, "complete" === S.readyState || "loading" !== S.readyState && !S.documentElement.doScroll ? L.setTimeout(k.ready) : (S.addEventListener("DOMContentLoaded", ue), L.addEventListener("load", ue));
+
+            function h(e, t, n, i, r, a, s) {
+                var o = 0, u = e.length, d = null == n;
+                if ("object" === f(n)) for (o in r = !0, n) h(e, t, o, n[o], !0, a, s); else if (void 0 !== i && (r = !0, v(i) || (s = !0), t = d ? s ? (t.call(e, i), null) : (d = t, function (e, t, n) {
+                    return d.call(k(e), n)
+                }) : t)) for (; o < u; o++) t(e[o], n, s ? i : i.call(e[o], o, t(e[o], n)));
+                return r ? e : d ? t.call(e) : u ? t(e[0], n) : a
+            }
+
+            var de = /^-ms-/, le = /-([a-z])/g;
+
+            function he(e, t) {
+                return t.toUpperCase()
+            }
+
+            function g(e) {
+                return e.replace(de, "ms-").replace(le, he)
+            }
+
+            function y(e) {
+                return 1 === e.nodeType || 9 === e.nodeType || !+e.nodeType
+            }
+
+            function ce() {
+                this.expando = k.expando + ce.uid++
+            }
+
+            ce.uid = 1, ce.prototype = {
+                cache: function (e) {
+                    var t = e[this.expando];
+                    return t || (t = {}, y(e) && (e.nodeType ? e[this.expando] = t : Object.defineProperty(e, this.expando, {
+                        value: t,
+                        configurable: !0
+                    }))), t
+                }, set: function (e, t, n) {
+                    var i, r = this.cache(e);
+                    if ("string" == typeof t) r[g(t)] = n; else for (i in t) r[g(i)] = t[i];
+                    return r
+                }, get: function (e, t) {
+                    return void 0 === t ? this.cache(e) : e[this.expando] && e[this.expando][g(t)]
+                }, access: function (e, t, n) {
+                    return void 0 === t || t && "string" == typeof t && void 0 === n ? this.get(e, t) : (this.set(e, t, n), void 0 !== n ? n : t)
+                }, remove: function (e, t) {
+                    var n, i = e[this.expando];
+                    if (void 0 !== i) {
+                        if (void 0 !== t) {
+                            n = (t = Array.isArray(t) ? t.map(g) : (t = g(t)) in i ? [t] : t.match(b) || []).length;
+                            for (; n--;) delete i[t[n]]
+                        }
+                        void 0 !== t && !k.isEmptyObject(i) || (e.nodeType ? e[this.expando] = void 0 : delete e[this.expando])
+                    }
+                }, hasData: function (e) {
+                    e = e[this.expando];
+                    return void 0 !== e && !k.isEmptyObject(e)
+                }
+            };
+            var M = new ce, d = new ce, _e = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, fe = /[A-Z]/g;
+
+            function me(e, t, n) {
+                var i, r;
+                if (void 0 === n && 1 === e.nodeType) if (i = "data-" + t.replace(fe, "-$&").toLowerCase(), "string" == typeof (n = e.getAttribute(i))) {
+                    try {
+                        n = "true" === (r = n) || "false" !== r && ("null" === r ? null : r === +r + "" ? +r : _e.test(r) ? JSON.parse(r) : r)
+                    } catch (e) {
+                    }
+                    d.set(e, t, n)
+                } else n = void 0;
+                return n
+            }
+
+            k.extend({
+                hasData: function (e) {
+                    return d.hasData(e) || M.hasData(e)
+                }, data: function (e, t, n) {
+                    return d.access(e, t, n)
+                }, removeData: function (e, t) {
+                    d.remove(e, t)
+                }, _data: function (e, t, n) {
+                    return M.access(e, t, n)
+                }, _removeData: function (e, t) {
+                    M.remove(e, t)
+                }
+            }), k.fn.extend({
+                data: function (n, e) {
+                    var t, i, r, a = this[0], s = a && a.attributes;
+                    if (void 0 !== n) return "object" == typeof n ? this.each(function () {
+                        d.set(this, n)
+                    }) : h(this, function (e) {
+                        var t;
+                        if (a && void 0 === e) return void 0 !== (t = d.get(a, n)) || void 0 !== (t = me(a, n)) ? t : void 0;
+                        this.each(function () {
+                            d.set(this, n, e)
+                        })
+                    }, null, e, 1 < arguments.length, null, !0);
+                    if (this.length && (r = d.get(a), 1 === a.nodeType && !M.get(a, "hasDataAttrs"))) {
+                        for (t = s.length; t--;) s[t] && 0 === (i = s[t].name).indexOf("data-") && (i = g(i.slice(5)), me(a, i, r[i]));
+                        M.set(a, "hasDataAttrs", !0)
+                    }
+                    return r
+                }, removeData: function (e) {
+                    return this.each(function () {
+                        d.remove(this, e)
+                    })
+                }
+            }), k.extend({
+                queue: function (e, t, n) {
+                    var i;
+                    if (e) return i = M.get(e, t = (t || "fx") + "queue"), n && (!i || Array.isArray(n) ? i = M.access(e, t, k.makeArray(n)) : i.push(n)), i || []
+                }, dequeue: function (e, t) {
+                    t = t || "fx";
+                    var n = k.queue(e, t), i = n.length, r = n.shift(), a = k._queueHooks(e, t);
+                    "inprogress" === r && (r = n.shift(), i--), r && ("fx" === t && n.unshift("inprogress"), delete a.stop, r.call(e, function () {
+                        k.dequeue(e, t)
+                    }, a)), !i && a && a.empty.fire()
+                }, _queueHooks: function (e, t) {
+                    var n = t + "queueHooks";
+                    return M.get(e, n) || M.access(e, n, {
+                        empty: k.Callbacks("once memory").add(function () {
+                            M.remove(e, [t + "queue", n])
+                        })
+                    })
+                }
+            }), k.fn.extend({
+                queue: function (t, n) {
+                    var e = 2;
+                    return "string" != typeof t && (n = t, t = "fx", e--), arguments.length < e ? k.queue(this[0], t) : void 0 === n ? this : this.each(function () {
+                        var e = k.queue(this, t, n);
+                        k._queueHooks(this, t), "fx" === t && "inprogress" !== e[0] && k.dequeue(this, t)
+                    })
+                }, dequeue: function (e) {
+                    return this.each(function () {
+                        k.dequeue(this, e)
+                    })
+                }, clearQueue: function (e) {
+                    return this.queue(e || "fx", [])
+                }, promise: function (e, t) {
+                    function n() {
+                        --r || a.resolveWith(s, [s])
+                    }
+
+                    var i, r = 1, a = k.Deferred(), s = this, o = this.length;
+                    for ("string" != typeof e && (t = e, e = void 0), e = e || "fx"; o--;) (i = M.get(s[o], e + "queueHooks")) && i.empty && (r++, i.empty.add(n));
+                    return n(), a.promise(t)
+                }
+            });
+
+            function pe(e, t) {
+                return "none" === (e = t || e).style.display || "" === e.style.display && D(e) && "none" === k.css(e, "display")
+            }
+
+            var e = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+                ye = new RegExp("^(?:([+-])=|)(" + e + ")([a-z%]*)$", "i"), c = ["Top", "Right", "Bottom", "Left"],
+                w = S.documentElement, D = function (e) {
+                    return k.contains(e.ownerDocument, e)
+                }, ve = {composed: !0};
+            w.getRootNode && (D = function (e) {
+                return k.contains(e.ownerDocument, e) || e.getRootNode(ve) === e.ownerDocument
+            });
+
+            function ge(e, t, n, i) {
+                var r, a, s = 20, o = i ? function () {
+                        return i.cur()
+                    } : function () {
+                        return k.css(e, t, "")
+                    }, u = o(), d = n && n[3] || (k.cssNumber[t] ? "" : "px"),
+                    l = e.nodeType && (k.cssNumber[t] || "px" !== d && +u) && ye.exec(k.css(e, t));
+                if (l && l[3] !== d) {
+                    for (d = d || l[3], l = +(u /= 2) || 1; s--;) k.style(e, t, l + d), (1 - a) * (1 - (a = o() / u || .5)) <= 0 && (s = 0), l /= a;
+                    k.style(e, t, (l *= 2) + d), n = n || []
+                }
+                return n && (l = +l || +u || 0, r = n[1] ? l + (n[1] + 1) * n[2] : +n[2], i && (i.unit = d, i.start = l, i.end = r)), r
+            }
+
+            var Me = {};
+
+            function T(e, t) {
+                for (var n, i, r, a, s, o = [], u = 0, d = e.length; u < d; u++) (i = e[u]).style && (n = i.style.display, t ? ("none" === n && (o[u] = M.get(i, "display") || null, o[u] || (i.style.display = "")), "" === i.style.display && pe(i) && (o[u] = (s = a = void 0, a = (r = i).ownerDocument, r = r.nodeName, (s = Me[r]) || (a = a.body.appendChild(a.createElement(r)), s = k.css(a, "display"), a.parentNode.removeChild(a), Me[r] = s = "none" === s ? "block" : s), s))) : "none" !== n && (o[u] = "none", M.set(i, "display", n)));
+                for (u = 0; u < d; u++) null != o[u] && (e[u].style.display = o[u]);
+                return e
+            }
+
+            k.fn.extend({
+                show: function () {
+                    return T(this, !0)
+                }, hide: function () {
+                    return T(this)
+                }, toggle: function (e) {
+                    return "boolean" == typeof e ? e ? this.show() : this.hide() : this.each(function () {
+                        pe(this) ? k(this).show() : k(this).hide()
+                    })
+                }
+            });
+            var Le = /^(?:checkbox|radio)$/i, Se = /<([a-z][^\/\0>\x20\t\r\n\f]*)/i,
+                ke = /^$|^module$|\/(?:java|ecma)script/i,
+                E = (R = S.createDocumentFragment().appendChild(S.createElement("div")), (s = S.createElement("input")).setAttribute("type", "radio"), s.setAttribute("checked", "checked"), s.setAttribute("name", "t"), R.appendChild(s), p.checkClone = R.cloneNode(!0).cloneNode(!0).lastChild.checked, R.innerHTML = "<textarea>x</textarea>", p.noCloneChecked = !!R.cloneNode(!0).lastChild.defaultValue, R.innerHTML = "<option></option>", p.option = !!R.lastChild, {
+                    thead: [1, "<table>", "</table>"],
+                    col: [2, "<table><colgroup>", "</colgroup></table>"],
+                    tr: [2, "<table><tbody>", "</tbody></table>"],
+                    td: [3, "<table><tbody><tr>", "</tr></tbody></table>"],
+                    _default: [0, "", ""]
+                });
+
+            function Y(e, t) {
+                var n = void 0 !== e.getElementsByTagName ? e.getElementsByTagName(t || "*") : void 0 !== e.querySelectorAll ? e.querySelectorAll(t || "*") : [];
+                return void 0 === t || t && u(e, t) ? k.merge([e], n) : n
+            }
+
+            function be(e, t) {
+                for (var n = 0, i = e.length; n < i; n++) M.set(e[n], "globalEval", !t || M.get(t[n], "globalEval"))
+            }
+
+            E.tbody = E.tfoot = E.colgroup = E.caption = E.thead, E.th = E.td, p.option || (E.optgroup = E.option = [1, "<select multiple='multiple'>", "</select>"]);
+            var we = /<|&#?\w+;/;
+
+            function De(e, t, n, i, r) {
+                for (var a, s, o, u, d, l = t.createDocumentFragment(), h = [], c = 0, _ = e.length; c < _; c++) if ((a = e[c]) || 0 === a) if ("object" === f(a)) k.merge(h, a.nodeType ? [a] : a); else if (we.test(a)) {
+                    for (s = s || l.appendChild(t.createElement("div")), o = (Se.exec(a) || ["", ""])[1].toLowerCase(), o = E[o] || E._default, s.innerHTML = o[1] + k.htmlPrefilter(a) + o[2], d = o[0]; d--;) s = s.lastChild;
+                    k.merge(h, s.childNodes), (s = l.firstChild).textContent = ""
+                } else h.push(t.createTextNode(a));
+                for (l.textContent = "", c = 0; a = h[c++];) if (i && -1 < k.inArray(a, i)) r && r.push(a); else if (u = D(a), s = Y(l.appendChild(a), "script"), u && be(s), n) for (d = 0; a = s[d++];) ke.test(a.type || "") && n.push(a);
+                return l
+            }
+
+            var Te = /^([^.]*)(?:\.(.+)|)/;
+
+            function n() {
+                return !0
+            }
+
+            function _() {
+                return !1
+            }
+
+            function Ee(e, t) {
+                return e === function () {
+                    try {
+                        return S.activeElement
+                    } catch (e) {
+                    }
+                }() == ("focus" === t)
+            }
+
+            function Ye(e, t, n, i, r, a) {
+                var s, o;
+                if ("object" == typeof t) {
+                    for (o in "string" != typeof n && (i = i || n, n = void 0), t) Ye(e, o, n, i, t[o], a);
+                    return e
+                }
+                if (null == i && null == r ? (r = n, i = n = void 0) : null == r && ("string" == typeof n ? (r = i, i = void 0) : (r = i, i = n, n = void 0)), !1 === r) r = _; else if (!r) return e;
+                return 1 === a && (s = r, (r = function (e) {
+                    return k().off(e), s.apply(this, arguments)
+                }).guid = s.guid || (s.guid = k.guid++)), e.each(function () {
+                    k.event.add(this, t, r, i, n)
+                })
+            }
+
+            function Pe(e, r, a) {
+                a ? (M.set(e, r, !1), k.event.add(e, r, {
+                    namespace: !1, handler: function (e) {
+                        var t, n, i = M.get(this, r);
+                        if (1 & e.isTrigger && this[r]) {
+                            if (i.length) (k.event.special[r] || {}).delegateType && e.stopPropagation(); else if (i = o.call(arguments), M.set(this, r, i), t = a(this, r), this[r](), i !== (n = M.get(this, r)) || t ? M.set(this, r, !1) : n = {}, i !== n) return e.stopImmediatePropagation(), e.preventDefault(), n && n.value
+                        } else i.length && (M.set(this, r, {value: k.event.trigger(k.extend(i[0], k.Event.prototype), i.slice(1), this)}), e.stopImmediatePropagation())
+                    }
+                })) : void 0 === M.get(e, r) && k.event.add(e, r, n)
+            }
+
+            k.event = {
+                global: {}, add: function (t, e, n, i, r) {
+                    var a, s, o, u, d, l, h, c, _, f = M.get(t);
+                    if (y(t)) for (n.handler && (n = (a = n).handler, r = a.selector), r && k.find.matchesSelector(w, r), n.guid || (n.guid = k.guid++), (o = f.events) || (o = f.events = Object.create(null)), (s = f.handle) || (s = f.handle = function (e) {
+                        return void 0 !== k && k.event.triggered !== e.type ? k.event.dispatch.apply(t, arguments) : void 0
+                    }), u = (e = (e || "").match(b) || [""]).length; u--;) h = _ = (c = Te.exec(e[u]) || [])[1], c = (c[2] || "").split(".").sort(), h && (d = k.event.special[h] || {}, h = (r ? d.delegateType : d.bindType) || h, d = k.event.special[h] || {}, _ = k.extend({
+                        type: h,
+                        origType: _,
+                        data: i,
+                        handler: n,
+                        guid: n.guid,
+                        selector: r,
+                        needsContext: r && k.expr.match.needsContext.test(r),
+                        namespace: c.join(".")
+                    }, a), (l = o[h]) || ((l = o[h] = []).delegateCount = 0, d.setup && !1 !== d.setup.call(t, i, c, s) || t.addEventListener && t.addEventListener(h, s)), d.add && (d.add.call(t, _), _.handler.guid || (_.handler.guid = n.guid)), r ? l.splice(l.delegateCount++, 0, _) : l.push(_), k.event.global[h] = !0)
+                }, remove: function (e, t, n, i, r) {
+                    var a, s, o, u, d, l, h, c, _, f, m, p = M.hasData(e) && M.get(e);
+                    if (p && (u = p.events)) {
+                        for (d = (t = (t || "").match(b) || [""]).length; d--;) if (_ = m = (o = Te.exec(t[d]) || [])[1], f = (o[2] || "").split(".").sort(), _) {
+                            for (h = k.event.special[_] || {}, c = u[_ = (i ? h.delegateType : h.bindType) || _] || [], o = o[2] && new RegExp("(^|\\.)" + f.join("\\.(?:.*\\.|)") + "(\\.|$)"), s = a = c.length; a--;) l = c[a], !r && m !== l.origType || n && n.guid !== l.guid || o && !o.test(l.namespace) || i && i !== l.selector && ("**" !== i || !l.selector) || (c.splice(a, 1), l.selector && c.delegateCount--, h.remove && h.remove.call(e, l));
+                            s && !c.length && (h.teardown && !1 !== h.teardown.call(e, f, p.handle) || k.removeEvent(e, _, p.handle), delete u[_])
+                        } else for (_ in u) k.event.remove(e, _ + t[d], n, i, !0);
+                        k.isEmptyObject(u) && M.remove(e, "handle events")
+                    }
+                }, dispatch: function (e) {
+                    var t, n, i, r, a, s = new Array(arguments.length), o = k.event.fix(e),
+                        e = (M.get(this, "events") || Object.create(null))[o.type] || [],
+                        u = k.event.special[o.type] || {};
+                    for (s[0] = o, t = 1; t < arguments.length; t++) s[t] = arguments[t];
+                    if (o.delegateTarget = this, !u.preDispatch || !1 !== u.preDispatch.call(this, o)) {
+                        for (a = k.event.handlers.call(this, o, e), t = 0; (i = a[t++]) && !o.isPropagationStopped();) for (o.currentTarget = i.elem, n = 0; (r = i.handlers[n++]) && !o.isImmediatePropagationStopped();) o.rnamespace && !1 !== r.namespace && !o.rnamespace.test(r.namespace) || (o.handleObj = r, o.data = r.data, void 0 !== (r = ((k.event.special[r.origType] || {}).handle || r.handler).apply(i.elem, s)) && !1 === (o.result = r) && (o.preventDefault(), o.stopPropagation()));
+                        return u.postDispatch && u.postDispatch.call(this, o), o.result
+                    }
+                }, handlers: function (e, t) {
+                    var n, i, r, a, s, o = [], u = t.delegateCount, d = e.target;
+                    if (u && d.nodeType && !("click" === e.type && 1 <= e.button)) for (; d !== this; d = d.parentNode || this) if (1 === d.nodeType && ("click" !== e.type || !0 !== d.disabled)) {
+                        for (a = [], s = {}, n = 0; n < u; n++) void 0 === s[r = (i = t[n]).selector + " "] && (s[r] = i.needsContext ? -1 < k(r, this).index(d) : k.find(r, this, null, [d]).length), s[r] && a.push(i);
+                        a.length && o.push({elem: d, handlers: a})
+                    }
+                    return d = this, u < t.length && o.push({elem: d, handlers: t.slice(u)}), o
+                }, addProp: function (t, e) {
+                    Object.defineProperty(k.Event.prototype, t, {
+                        enumerable: !0,
+                        configurable: !0,
+                        get: v(e) ? function () {
+                            if (this.originalEvent) return e(this.originalEvent)
+                        } : function () {
+                            if (this.originalEvent) return this.originalEvent[t]
+                        },
+                        set: function (e) {
+                            Object.defineProperty(this, t, {enumerable: !0, configurable: !0, writable: !0, value: e})
+                        }
+                    })
+                }, fix: function (e) {
+                    return e[k.expando] ? e : new k.Event(e)
+                }, special: {
+                    load: {noBubble: !0}, click: {
+                        setup: function (e) {
+                            e = this || e;
+                            return Le.test(e.type) && e.click && u(e, "input") && Pe(e, "click", n), !1
+                        }, trigger: function (e) {
+                            e = this || e;
+                            return Le.test(e.type) && e.click && u(e, "input") && Pe(e, "click"), !0
+                        }, _default: function (e) {
+                            e = e.target;
+                            return Le.test(e.type) && e.click && u(e, "input") && M.get(e, "click") || u(e, "a")
+                        }
+                    }, beforeunload: {
+                        postDispatch: function (e) {
+                            void 0 !== e.result && e.originalEvent && (e.originalEvent.returnValue = e.result)
+                        }
+                    }
+                }
+            }, k.removeEvent = function (e, t, n) {
+                e.removeEventListener && e.removeEventListener(t, n)
+            }, k.Event = function (e, t) {
+                if (!(this instanceof k.Event)) return new k.Event(e, t);
+                e && e.type ? (this.originalEvent = e, this.type = e.type, this.isDefaultPrevented = e.defaultPrevented || void 0 === e.defaultPrevented && !1 === e.returnValue ? n : _, this.target = e.target && 3 === e.target.nodeType ? e.target.parentNode : e.target, this.currentTarget = e.currentTarget, this.relatedTarget = e.relatedTarget) : this.type = e, t && k.extend(this, t), this.timeStamp = e && e.timeStamp || Date.now(), this[k.expando] = !0
+            }, k.Event.prototype = {
+                constructor: k.Event,
+                isDefaultPrevented: _,
+                isPropagationStopped: _,
+                isImmediatePropagationStopped: _,
+                isSimulated: !1,
+                preventDefault: function () {
+                    var e = this.originalEvent;
+                    this.isDefaultPrevented = n, e && !this.isSimulated && e.preventDefault()
+                },
+                stopPropagation: function () {
+                    var e = this.originalEvent;
+                    this.isPropagationStopped = n, e && !this.isSimulated && e.stopPropagation()
+                },
+                stopImmediatePropagation: function () {
+                    var e = this.originalEvent;
+                    this.isImmediatePropagationStopped = n, e && !this.isSimulated && e.stopImmediatePropagation(), this.stopPropagation()
+                }
+            }, k.each({
+                altKey: !0,
+                bubbles: !0,
+                cancelable: !0,
+                changedTouches: !0,
+                ctrlKey: !0,
+                detail: !0,
+                eventPhase: !0,
+                metaKey: !0,
+                pageX: !0,
+                pageY: !0,
+                shiftKey: !0,
+                view: !0,
+                char: !0,
+                code: !0,
+                charCode: !0,
+                key: !0,
+                keyCode: !0,
+                button: !0,
+                buttons: !0,
+                clientX: !0,
+                clientY: !0,
+                offsetX: !0,
+                offsetY: !0,
+                pointerId: !0,
+                pointerType: !0,
+                screenX: !0,
+                screenY: !0,
+                targetTouches: !0,
+                toElement: !0,
+                touches: !0,
+                which: !0
+            }, k.event.addProp), k.each({focus: "focusin", blur: "focusout"}, function (e, t) {
+                k.event.special[e] = {
+                    setup: function () {
+                        return Pe(this, e, Ee), !1
+                    }, trigger: function () {
+                        return Pe(this, e), !0
+                    }, _default: function () {
+                        return !0
+                    }, delegateType: t
+                }
+            }), k.each({
+                mouseenter: "mouseover",
+                mouseleave: "mouseout",
+                pointerenter: "pointerover",
+                pointerleave: "pointerout"
+            }, function (e, r) {
+                k.event.special[e] = {
+                    delegateType: r, bindType: r, handle: function (e) {
+                        var t, n = e.relatedTarget, i = e.handleObj;
+                        return n && (n === this || k.contains(this, n)) || (e.type = i.origType, t = i.handler.apply(this, arguments), e.type = r), t
+                    }
+                }
+            }), k.fn.extend({
+                on: function (e, t, n, i) {
+                    return Ye(this, e, t, n, i)
+                }, one: function (e, t, n, i) {
+                    return Ye(this, e, t, n, i, 1)
+                }, off: function (e, t, n) {
+                    var i, r;
+                    if (e && e.preventDefault && e.handleObj) return i = e.handleObj, k(e.delegateTarget).off(i.namespace ? i.origType + "." + i.namespace : i.origType, i.selector, i.handler), this;
+                    if ("object" != typeof e) return !1 !== t && "function" != typeof t || (n = t, t = void 0), !1 === n && (n = _), this.each(function () {
+                        k.event.remove(this, e, n, t)
+                    });
+                    for (r in e) this.off(r, t, e[r]);
+                    return this
+                }
+            });
+            var Ce = /<script|<style|<link/i, Re = /checked\s*(?:[^=]|=\s*.checked.)/i,
+                Ae = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+
+            function xe(e, t) {
+                return u(e, "table") && u(11 !== t.nodeType ? t : t.firstChild, "tr") && k(e).children("tbody")[0] || e
+            }
+
+            function Oe(e) {
+                return e.type = (null !== e.getAttribute("type")) + "/" + e.type, e
+            }
+
+            function Ie(e) {
+                return "true/" === (e.type || "").slice(0, 5) ? e.type = e.type.slice(5) : e.removeAttribute("type"), e
+            }
+
+            function We(e, t) {
+                var n, i, r, a;
+                if (1 === t.nodeType) {
+                    if (M.hasData(e) && (a = M.get(e).events)) for (r in M.remove(t, "handle events"), a) for (n = 0, i = a[r].length; n < i; n++) k.event.add(t, r, a[r][n]);
+                    d.hasData(e) && (e = d.access(e), e = k.extend({}, e), d.set(t, e))
+                }
+            }
+
+            function P(n, i, r, a) {
+                i = H(i);
+                var e, t, s, o, u, d, l = 0, h = n.length, c = h - 1, _ = i[0], f = v(_);
+                if (f || 1 < h && "string" == typeof _ && !p.checkClone && Re.test(_)) return n.each(function (e) {
+                    var t = n.eq(e);
+                    f && (i[0] = _.call(this, e, t.html())), P(t, i, r, a)
+                });
+                if (h && (t = (e = De(i, n[0].ownerDocument, !1, n, a)).firstChild, 1 === e.childNodes.length && (e = t), t || a)) {
+                    for (o = (s = k.map(Y(e, "script"), Oe)).length; l < h; l++) u = e, l !== c && (u = k.clone(u, !0, !0), o && k.merge(s, Y(u, "script"))), r.call(n[l], u, l);
+                    if (o) for (d = s[s.length - 1].ownerDocument, k.map(s, Ie), l = 0; l < o; l++) u = s[l], ke.test(u.type || "") && !M.access(u, "globalEval") && k.contains(d, u) && (u.src && "module" !== (u.type || "").toLowerCase() ? k._evalUrl && !u.noModule && k._evalUrl(u.src, {nonce: u.nonce || u.getAttribute("nonce")}, d) : J(u.textContent.replace(Ae, ""), u, d))
+                }
+                return n
+            }
+
+            function He(e, t, n) {
+                for (var i, r = t ? k.filter(t, e) : e, a = 0; null != (i = r[a]); a++) n || 1 !== i.nodeType || k.cleanData(Y(i)), i.parentNode && (n && D(i) && be(Y(i, "script")), i.parentNode.removeChild(i));
+                return e
+            }
+
+            k.extend({
+                htmlPrefilter: function (e) {
+                    return e
+                }, clone: function (e, t, n) {
+                    var i, r, a, s, o, u, d, l = e.cloneNode(!0), h = D(e);
+                    if (!(p.noCloneChecked || 1 !== e.nodeType && 11 !== e.nodeType || k.isXMLDoc(e))) for (s = Y(l), i = 0, r = (a = Y(e)).length; i < r; i++) o = a[i], u = s[i], d = void 0, "input" === (d = u.nodeName.toLowerCase()) && Le.test(o.type) ? u.checked = o.checked : "input" !== d && "textarea" !== d || (u.defaultValue = o.defaultValue);
+                    if (t) if (n) for (a = a || Y(e), s = s || Y(l), i = 0, r = a.length; i < r; i++) We(a[i], s[i]); else We(e, l);
+                    return 0 < (s = Y(l, "script")).length && be(s, !h && Y(e, "script")), l
+                }, cleanData: function (e) {
+                    for (var t, n, i, r = k.event.special, a = 0; void 0 !== (n = e[a]); a++) if (y(n)) {
+                        if (t = n[M.expando]) {
+                            if (t.events) for (i in t.events) r[i] ? k.event.remove(n, i) : k.removeEvent(n, i, t.handle);
+                            n[M.expando] = void 0
+                        }
+                        n[d.expando] && (n[d.expando] = void 0)
+                    }
+                }
+            }), k.fn.extend({
+                detach: function (e) {
+                    return He(this, e, !0)
+                }, remove: function (e) {
+                    return He(this, e)
+                }, text: function (e) {
+                    return h(this, function (e) {
+                        return void 0 === e ? k.text(this) : this.empty().each(function () {
+                            1 !== this.nodeType && 11 !== this.nodeType && 9 !== this.nodeType || (this.textContent = e)
+                        })
+                    }, null, e, arguments.length)
+                }, append: function () {
+                    return P(this, arguments, function (e) {
+                        1 !== this.nodeType && 11 !== this.nodeType && 9 !== this.nodeType || xe(this, e).appendChild(e)
+                    })
+                }, prepend: function () {
+                    return P(this, arguments, function (e) {
+                        var t;
+                        1 !== this.nodeType && 11 !== this.nodeType && 9 !== this.nodeType || (t = xe(this, e)).insertBefore(e, t.firstChild)
+                    })
+                }, before: function () {
+                    return P(this, arguments, function (e) {
+                        this.parentNode && this.parentNode.insertBefore(e, this)
+                    })
+                }, after: function () {
+                    return P(this, arguments, function (e) {
+                        this.parentNode && this.parentNode.insertBefore(e, this.nextSibling)
+                    })
+                }, empty: function () {
+                    for (var e, t = 0; null != (e = this[t]); t++) 1 === e.nodeType && (k.cleanData(Y(e, !1)), e.textContent = "");
+                    return this
+                }, clone: function (e, t) {
+                    return e = null != e && e, t = null == t ? e : t, this.map(function () {
+                        return k.clone(this, e, t)
+                    })
+                }, html: function (e) {
+                    return h(this, function (e) {
+                        var t = this[0] || {}, n = 0, i = this.length;
+                        if (void 0 === e && 1 === t.nodeType) return t.innerHTML;
+                        if ("string" == typeof e && !Ce.test(e) && !E[(Se.exec(e) || ["", ""])[1].toLowerCase()]) {
+                            e = k.htmlPrefilter(e);
+                            try {
+                                for (; n < i; n++) 1 === (t = this[n] || {}).nodeType && (k.cleanData(Y(t, !1)), t.innerHTML = e);
+                                t = 0
+                            } catch (e) {
+                            }
+                        }
+                        t && this.empty().append(e)
+                    }, null, e, arguments.length)
+                }, replaceWith: function () {
+                    var n = [];
+                    return P(this, arguments, function (e) {
+                        var t = this.parentNode;
+                        k.inArray(this, n) < 0 && (k.cleanData(Y(this)), t && t.replaceChild(e, this))
+                    }, n)
+                }
+            }), k.each({
+                appendTo: "append",
+                prependTo: "prepend",
+                insertBefore: "before",
+                insertAfter: "after",
+                replaceAll: "replaceWith"
+            }, function (e, s) {
+                k.fn[e] = function (e) {
+                    for (var t, n = [], i = k(e), r = i.length - 1, a = 0; a <= r; a++) t = a === r ? this : this.clone(!0), k(i[a])[s](t), j.apply(n, t.get());
+                    return this.pushStack(n)
+                }
+            });
+
+            function je(e) {
+                var t = e.ownerDocument.defaultView;
+                return (t = t && t.opener ? t : L).getComputedStyle(e)
+            }
+
+            function Fe(e, t, n) {
+                var i, r = {};
+                for (i in t) r[i] = e.style[i], e.style[i] = t[i];
+                for (i in n = n.call(e), t) e.style[i] = r[i];
+                return n
+            }
+
+            var Be, Ne, ze, Ue, Ve, Ge, Je, r, qe = new RegExp("^(" + e + ")(?!px)[a-z%]+$", "i"),
+                Ke = new RegExp(c.join("|"), "i");
+
+            function Xe() {
+                var e;
+                r && (Je.style.cssText = "position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0", r.style.cssText = "position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%", w.appendChild(Je).appendChild(r), e = L.getComputedStyle(r), Be = "1%" !== e.top, Ge = 12 === Ze(e.marginLeft), r.style.right = "60%", Ue = 36 === Ze(e.right), Ne = 36 === Ze(e.width), r.style.position = "absolute", ze = 12 === Ze(r.offsetWidth / 3), w.removeChild(Je), r = null)
+            }
+
+            function Ze(e) {
+                return Math.round(parseFloat(e))
+            }
+
+            function $e(e, t, n) {
+                var i, r, a = e.style;
+                return (n = n || je(e)) && ("" !== (r = n.getPropertyValue(t) || n[t]) || D(e) || (r = k.style(e, t)), !p.pixelBoxStyles() && qe.test(r) && Ke.test(t) && (e = a.width, t = a.minWidth, i = a.maxWidth, a.minWidth = a.maxWidth = a.width = r, r = n.width, a.width = e, a.minWidth = t, a.maxWidth = i)), void 0 !== r ? r + "" : r
+            }
+
+            function Qe(e, t) {
+                return {
+                    get: function () {
+                        if (!e()) return (this.get = t).apply(this, arguments);
+                        delete this.get
+                    }
+                }
+            }
+
+            Je = S.createElement("div"), (r = S.createElement("div")).style && (r.style.backgroundClip = "content-box", r.cloneNode(!0).style.backgroundClip = "", p.clearCloneStyle = "content-box" === r.style.backgroundClip, k.extend(p, {
+                boxSizingReliable: function () {
+                    return Xe(), Ne
+                }, pixelBoxStyles: function () {
+                    return Xe(), Ue
+                }, pixelPosition: function () {
+                    return Xe(), Be
+                }, reliableMarginLeft: function () {
+                    return Xe(), Ge
+                }, scrollboxSize: function () {
+                    return Xe(), ze
+                }, reliableTrDimensions: function () {
+                    var e, t, n;
+                    return null == Ve && (e = S.createElement("table"), t = S.createElement("tr"), n = S.createElement("div"), e.style.cssText = "position:absolute;left:-11111px;border-collapse:separate", t.style.cssText = "border:1px solid", t.style.height = "1px", n.style.height = "9px", n.style.display = "block", w.appendChild(e).appendChild(t).appendChild(n), n = L.getComputedStyle(t), Ve = parseInt(n.height, 10) + parseInt(n.borderTopWidth, 10) + parseInt(n.borderBottomWidth, 10) === t.offsetHeight, w.removeChild(e)), Ve
+                }
+            }));
+            var et = ["Webkit", "Moz", "ms"], tt = S.createElement("div").style, nt = {};
+
+            function it(e) {
+                var t = k.cssProps[e] || nt[e];
+                return t || (e in tt ? e : nt[e] = function (e) {
+                    for (var t = e[0].toUpperCase() + e.slice(1), n = et.length; n--;) if ((e = et[n] + t) in tt) return e
+                }(e) || e)
+            }
+
+            var rt = /^(none|table(?!-c[ea]).+)/, at = /^--/,
+                st = {position: "absolute", visibility: "hidden", display: "block"},
+                ot = {letterSpacing: "0", fontWeight: "400"};
+
+            function ut(e, t, n) {
+                var i = ye.exec(t);
+                return i ? Math.max(0, i[2] - (n || 0)) + (i[3] || "px") : t
+            }
+
+            function dt(e, t, n, i, r, a) {
+                var s = "width" === t ? 1 : 0, o = 0, u = 0;
+                if (n === (i ? "border" : "content")) return 0;
+                for (; s < 4; s += 2) "margin" === n && (u += k.css(e, n + c[s], !0, r)), i ? ("content" === n && (u -= k.css(e, "padding" + c[s], !0, r)), "margin" !== n && (u -= k.css(e, "border" + c[s] + "Width", !0, r))) : (u += k.css(e, "padding" + c[s], !0, r), "padding" !== n ? u += k.css(e, "border" + c[s] + "Width", !0, r) : o += k.css(e, "border" + c[s] + "Width", !0, r));
+                return !i && 0 <= a && (u += Math.max(0, Math.ceil(e["offset" + t[0].toUpperCase() + t.slice(1)] - a - u - o - .5)) || 0), u
+            }
+
+            function lt(e, t, n) {
+                var i = je(e), r = (!p.boxSizingReliable() || n) && "border-box" === k.css(e, "boxSizing", !1, i),
+                    a = r, s = $e(e, t, i), o = "offset" + t[0].toUpperCase() + t.slice(1);
+                if (qe.test(s)) {
+                    if (!n) return s;
+                    s = "auto"
+                }
+                return (!p.boxSizingReliable() && r || !p.reliableTrDimensions() && u(e, "tr") || "auto" === s || !parseFloat(s) && "inline" === k.css(e, "display", !1, i)) && e.getClientRects().length && (r = "border-box" === k.css(e, "boxSizing", !1, i), (a = o in e) && (s = e[o])), (s = parseFloat(s) || 0) + dt(e, t, n || (r ? "border" : "content"), a, i, s) + "px"
+            }
+
+            function a(e, t, n, i, r) {
+                return new a.prototype.init(e, t, n, i, r)
+            }
+
+            k.extend({
+                cssHooks: {
+                    opacity: {
+                        get: function (e, t) {
+                            if (t) return "" === (t = $e(e, "opacity")) ? "1" : t
+                        }
+                    }
+                },
+                cssNumber: {
+                    animationIterationCount: !0,
+                    columnCount: !0,
+                    fillOpacity: !0,
+                    flexGrow: !0,
+                    flexShrink: !0,
+                    fontWeight: !0,
+                    gridArea: !0,
+                    gridColumn: !0,
+                    gridColumnEnd: !0,
+                    gridColumnStart: !0,
+                    gridRow: !0,
+                    gridRowEnd: !0,
+                    gridRowStart: !0,
+                    lineHeight: !0,
+                    opacity: !0,
+                    order: !0,
+                    orphans: !0,
+                    widows: !0,
+                    zIndex: !0,
+                    zoom: !0
+                },
+                cssProps: {},
+                style: function (e, t, n, i) {
+                    if (e && 3 !== e.nodeType && 8 !== e.nodeType && e.style) {
+                        var r, a, s, o = g(t), u = at.test(t), d = e.style;
+                        if (u || (t = it(o)), s = k.cssHooks[t] || k.cssHooks[o], void 0 === n) return s && "get" in s && void 0 !== (r = s.get(e, !1, i)) ? r : d[t];
+                        "string" === (a = typeof n) && (r = ye.exec(n)) && r[1] && (n = ge(e, t, r), a = "number"), null != n && n == n && ("number" !== a || u || (n += r && r[3] || (k.cssNumber[o] ? "" : "px")), p.clearCloneStyle || "" !== n || 0 !== t.indexOf("background") || (d[t] = "inherit"), s && "set" in s && void 0 === (n = s.set(e, n, i)) || (u ? d.setProperty(t, n) : d[t] = n))
+                    }
+                },
+                css: function (e, t, n, i) {
+                    var r, a = g(t);
+                    return at.test(t) || (t = it(a)), "normal" === (r = void 0 === (r = (a = k.cssHooks[t] || k.cssHooks[a]) && "get" in a ? a.get(e, !0, n) : r) ? $e(e, t, i) : r) && t in ot && (r = ot[t]), "" === n || n ? (a = parseFloat(r), !0 === n || isFinite(a) ? a || 0 : r) : r
+                }
+            }), k.each(["height", "width"], function (e, s) {
+                k.cssHooks[s] = {
+                    get: function (e, t, n) {
+                        if (t) return !rt.test(k.css(e, "display")) || e.getClientRects().length && e.getBoundingClientRect().width ? lt(e, s, n) : Fe(e, st, function () {
+                            return lt(e, s, n)
+                        })
+                    }, set: function (e, t, n) {
+                        var i = je(e), r = !p.scrollboxSize() && "absolute" === i.position,
+                            a = (r || n) && "border-box" === k.css(e, "boxSizing", !1, i),
+                            n = n ? dt(e, s, n, a, i) : 0;
+                        return a && r && (n -= Math.ceil(e["offset" + s[0].toUpperCase() + s.slice(1)] - parseFloat(i[s]) - dt(e, s, "border", !1, i) - .5)), n && (a = ye.exec(t)) && "px" !== (a[3] || "px") && (e.style[s] = t, t = k.css(e, s)), ut(0, t, n)
+                    }
+                }
+            }), k.cssHooks.marginLeft = Qe(p.reliableMarginLeft, function (e, t) {
+                if (t) return (parseFloat($e(e, "marginLeft")) || e.getBoundingClientRect().left - Fe(e, {marginLeft: 0}, function () {
+                    return e.getBoundingClientRect().left
+                })) + "px"
+            }), k.each({margin: "", padding: "", border: "Width"}, function (r, a) {
+                k.cssHooks[r + a] = {
+                    expand: function (e) {
+                        for (var t = 0, n = {}, i = "string" == typeof e ? e.split(" ") : [e]; t < 4; t++) n[r + c[t] + a] = i[t] || i[t - 2] || i[0];
+                        return n
+                    }
+                }, "margin" !== r && (k.cssHooks[r + a].set = ut)
+            }), k.fn.extend({
+                css: function (e, t) {
+                    return h(this, function (e, t, n) {
+                        var i, r, a = {}, s = 0;
+                        if (Array.isArray(t)) {
+                            for (i = je(e), r = t.length; s < r; s++) a[t[s]] = k.css(e, t[s], !1, i);
+                            return a
+                        }
+                        return void 0 !== n ? k.style(e, t, n) : k.css(e, t)
+                    }, e, t, 1 < arguments.length)
+                }
+            }), ((k.Tween = a).prototype = {
+                constructor: a, init: function (e, t, n, i, r, a) {
+                    this.elem = e, this.prop = n, this.easing = r || k.easing._default, this.options = t, this.start = this.now = this.cur(), this.end = i, this.unit = a || (k.cssNumber[n] ? "" : "px")
+                }, cur: function () {
+                    var e = a.propHooks[this.prop];
+                    return (e && e.get ? e : a.propHooks._default).get(this)
+                }, run: function (e) {
+                    var t, n = a.propHooks[this.prop];
+                    return this.options.duration ? this.pos = t = k.easing[this.easing](e, this.options.duration * e, 0, 1, this.options.duration) : this.pos = t = e, this.now = (this.end - this.start) * t + this.start, this.options.step && this.options.step.call(this.elem, this.now, this), (n && n.set ? n : a.propHooks._default).set(this), this
+                }
+            }).init.prototype = a.prototype, (a.propHooks = {
+                _default: {
+                    get: function (e) {
+                        return 1 !== e.elem.nodeType || null != e.elem[e.prop] && null == e.elem.style[e.prop] ? e.elem[e.prop] : (e = k.css(e.elem, e.prop, "")) && "auto" !== e ? e : 0
+                    }, set: function (e) {
+                        k.fx.step[e.prop] ? k.fx.step[e.prop](e) : 1 !== e.elem.nodeType || !k.cssHooks[e.prop] && null == e.elem.style[it(e.prop)] ? e.elem[e.prop] = e.now : k.style(e.elem, e.prop, e.now + e.unit)
+                    }
+                }
+            }).scrollTop = a.propHooks.scrollLeft = {
+                set: function (e) {
+                    e.elem.nodeType && e.elem.parentNode && (e.elem[e.prop] = e.now)
+                }
+            }, k.easing = {
+                linear: function (e) {
+                    return e
+                }, swing: function (e) {
+                    return .5 - Math.cos(e * Math.PI) / 2
+                }, _default: "swing"
+            }, k.fx = a.prototype.init, k.fx.step = {};
+            var C, ht, s, R, ct = /^(?:toggle|show|hide)$/, _t = /queueHooks$/;
+
+            function ft() {
+                ht && (!1 === S.hidden && L.requestAnimationFrame ? L.requestAnimationFrame(ft) : L.setTimeout(ft, k.fx.interval), k.fx.tick())
+            }
+
+            function mt() {
+                return L.setTimeout(function () {
+                    C = void 0
+                }), C = Date.now()
+            }
+
+            function pt(e, t) {
+                var n, i = 0, r = {height: e};
+                for (t = t ? 1 : 0; i < 4; i += 2 - t) r["margin" + (n = c[i])] = r["padding" + n] = e;
+                return t && (r.opacity = r.width = e), r
+            }
+
+            function yt(e, t, n) {
+                for (var i, r = (A.tweeners[t] || []).concat(A.tweeners["*"]), a = 0, s = r.length; a < s; a++) if (i = r[a].call(n, t, e)) return i
+            }
+
+            function A(r, e, t) {
+                var n, a, i, s, o, u, d, l = 0, h = A.prefilters.length, c = k.Deferred().always(function () {
+                    delete _.elem
+                }), _ = function () {
+                    if (!a) {
+                        for (var e = C || mt(), e = Math.max(0, f.startTime + f.duration - e), t = 1 - (e / f.duration || 0), n = 0, i = f.tweens.length; n < i; n++) f.tweens[n].run(t);
+                        if (c.notifyWith(r, [f, t, e]), t < 1 && i) return e;
+                        i || c.notifyWith(r, [f, 1, 0]), c.resolveWith(r, [f])
+                    }
+                    return !1
+                }, f = c.promise({
+                    elem: r,
+                    props: k.extend({}, e),
+                    opts: k.extend(!0, {specialEasing: {}, easing: k.easing._default}, t),
+                    originalProperties: e,
+                    originalOptions: t,
+                    startTime: C || mt(),
+                    duration: t.duration,
+                    tweens: [],
+                    createTween: function (e, t) {
+                        t = k.Tween(r, f.opts, e, t, f.opts.specialEasing[e] || f.opts.easing);
+                        return f.tweens.push(t), t
+                    },
+                    stop: function (e) {
+                        var t = 0, n = e ? f.tweens.length : 0;
+                        if (!a) {
+                            for (a = !0; t < n; t++) f.tweens[t].run(1);
+                            e ? (c.notifyWith(r, [f, 1, 0]), c.resolveWith(r, [f, e])) : c.rejectWith(r, [f, e])
+                        }
+                        return this
+                    }
+                }), m = f.props, p = m, y = f.opts.specialEasing;
+                for (i in p) if (o = y[s = g(i)], u = p[i], Array.isArray(u) && (o = u[1], u = p[i] = u[0]), i !== s && (p[s] = u, delete p[i]), (d = k.cssHooks[s]) && "expand" in d) for (i in u = d.expand(u), delete p[s], u) i in p || (p[i] = u[i], y[i] = o); else y[s] = o;
+                for (; l < h; l++) if (n = A.prefilters[l].call(f, r, m, f.opts)) return v(n.stop) && (k._queueHooks(f.elem, f.opts.queue).stop = n.stop.bind(n)), n;
+                return k.map(m, yt, f), v(f.opts.start) && f.opts.start.call(r, f), f.progress(f.opts.progress).done(f.opts.done, f.opts.complete).fail(f.opts.fail).always(f.opts.always), k.fx.timer(k.extend(_, {
+                    elem: r,
+                    anim: f,
+                    queue: f.opts.queue
+                })), f
+            }
+
+            k.Animation = k.extend(A, {
+                tweeners: {
+                    "*": [function (e, t) {
+                        var n = this.createTween(e, t);
+                        return ge(n.elem, e, ye.exec(t), n), n
+                    }]
+                }, tweener: function (e, t) {
+                    for (var n, i = 0, r = (e = v(e) ? (t = e, ["*"]) : e.match(b)).length; i < r; i++) n = e[i], A.tweeners[n] = A.tweeners[n] || [], A.tweeners[n].unshift(t)
+                }, prefilters: [function (e, t, n) {
+                    var i, r, a, s, o, u, d, l = "width" in t || "height" in t, h = this, c = {}, _ = e.style,
+                        f = e.nodeType && pe(e), m = M.get(e, "fxshow");
+                    for (i in n.queue || (null == (s = k._queueHooks(e, "fx")).unqueued && (s.unqueued = 0, o = s.empty.fire, s.empty.fire = function () {
+                        s.unqueued || o()
+                    }), s.unqueued++, h.always(function () {
+                        h.always(function () {
+                            s.unqueued--, k.queue(e, "fx").length || s.empty.fire()
+                        })
+                    })), t) if (r = t[i], ct.test(r)) {
+                        if (delete t[i], a = a || "toggle" === r, r === (f ? "hide" : "show")) {
+                            if ("show" !== r || !m || void 0 === m[i]) continue;
+                            f = !0
+                        }
+                        c[i] = m && m[i] || k.style(e, i)
+                    }
+                    if ((u = !k.isEmptyObject(t)) || !k.isEmptyObject(c)) for (i in l && 1 === e.nodeType && (n.overflow = [_.overflow, _.overflowX, _.overflowY], null == (d = m && m.display) && (d = M.get(e, "display")), "none" === (l = k.css(e, "display")) && (d ? l = d : (T([e], !0), d = e.style.display || d, l = k.css(e, "display"), T([e]))), ("inline" === l || "inline-block" === l && null != d) && "none" === k.css(e, "float") && (u || (h.done(function () {
+                        _.display = d
+                    }), null == d && (l = _.display, d = "none" === l ? "" : l)), _.display = "inline-block")), n.overflow && (_.overflow = "hidden", h.always(function () {
+                        _.overflow = n.overflow[0], _.overflowX = n.overflow[1], _.overflowY = n.overflow[2]
+                    })), u = !1, c) u || (m ? "hidden" in m && (f = m.hidden) : m = M.access(e, "fxshow", {display: d}), a && (m.hidden = !f), f && T([e], !0), h.done(function () {
+                        for (i in f || T([e]), M.remove(e, "fxshow"), c) k.style(e, i, c[i])
+                    })), u = yt(f ? m[i] : 0, i, h), i in m || (m[i] = u.start, f && (u.end = u.start, u.start = 0))
+                }], prefilter: function (e, t) {
+                    t ? A.prefilters.unshift(e) : A.prefilters.push(e)
+                }
+            }), k.speed = function (e, t, n) {
+                var i = e && "object" == typeof e ? k.extend({}, e) : {
+                    complete: n || !n && t || v(e) && e,
+                    duration: e,
+                    easing: n && t || t && !v(t) && t
+                };
+                return k.fx.off ? i.duration = 0 : "number" != typeof i.duration && (i.duration in k.fx.speeds ? i.duration = k.fx.speeds[i.duration] : i.duration = k.fx.speeds._default), null != i.queue && !0 !== i.queue || (i.queue = "fx"), i.old = i.complete, i.complete = function () {
+                    v(i.old) && i.old.call(this), i.queue && k.dequeue(this, i.queue)
+                }, i
+            }, k.fn.extend({
+                fadeTo: function (e, t, n, i) {
+                    return this.filter(pe).css("opacity", 0).show().end().animate({opacity: t}, e, n, i)
+                }, animate: function (t, e, n, i) {
+                    function r() {
+                        var e = A(this, k.extend({}, t), s);
+                        (a || M.get(this, "finish")) && e.stop(!0)
+                    }
+
+                    var a = k.isEmptyObject(t), s = k.speed(e, n, i);
+                    return r.finish = r, a || !1 === s.queue ? this.each(r) : this.queue(s.queue, r)
+                }, stop: function (r, e, a) {
+                    function s(e) {
+                        var t = e.stop;
+                        delete e.stop, t(a)
+                    }
+
+                    return "string" != typeof r && (a = e, e = r, r = void 0), e && this.queue(r || "fx", []), this.each(function () {
+                        var e = !0, t = null != r && r + "queueHooks", n = k.timers, i = M.get(this);
+                        if (t) i[t] && i[t].stop && s(i[t]); else for (t in i) i[t] && i[t].stop && _t.test(t) && s(i[t]);
+                        for (t = n.length; t--;) n[t].elem !== this || null != r && n[t].queue !== r || (n[t].anim.stop(a), e = !1, n.splice(t, 1));
+                        !e && a || k.dequeue(this, r)
+                    })
+                }, finish: function (s) {
+                    return !1 !== s && (s = s || "fx"), this.each(function () {
+                        var e, t = M.get(this), n = t[s + "queue"], i = t[s + "queueHooks"], r = k.timers,
+                            a = n ? n.length : 0;
+                        for (t.finish = !0, k.queue(this, s, []), i && i.stop && i.stop.call(this, !0), e = r.length; e--;) r[e].elem === this && r[e].queue === s && (r[e].anim.stop(!0), r.splice(e, 1));
+                        for (e = 0; e < a; e++) n[e] && n[e].finish && n[e].finish.call(this);
+                        delete t.finish
+                    })
+                }
+            }), k.each(["toggle", "show", "hide"], function (e, i) {
+                var r = k.fn[i];
+                k.fn[i] = function (e, t, n) {
+                    return null == e || "boolean" == typeof e ? r.apply(this, arguments) : this.animate(pt(i, !0), e, t, n)
+                }
+            }), k.each({
+                slideDown: pt("show"),
+                slideUp: pt("hide"),
+                slideToggle: pt("toggle"),
+                fadeIn: {opacity: "show"},
+                fadeOut: {opacity: "hide"},
+                fadeToggle: {opacity: "toggle"}
+            }, function (e, i) {
+                k.fn[e] = function (e, t, n) {
+                    return this.animate(i, e, t, n)
+                }
+            }), k.timers = [], k.fx.tick = function () {
+                var e, t = 0, n = k.timers;
+                for (C = Date.now(); t < n.length; t++) (e = n[t])() || n[t] !== e || n.splice(t--, 1);
+                n.length || k.fx.stop(), C = void 0
+            }, k.fx.timer = function (e) {
+                k.timers.push(e), k.fx.start()
+            }, k.fx.interval = 13, k.fx.start = function () {
+                ht || (ht = !0, ft())
+            }, k.fx.stop = function () {
+                ht = null
+            }, k.fx.speeds = {slow: 600, fast: 200, _default: 400}, k.fn.delay = function (i, e) {
+                return i = k.fx && k.fx.speeds[i] || i, this.queue(e = e || "fx", function (e, t) {
+                    var n = L.setTimeout(e, i);
+                    t.stop = function () {
+                        L.clearTimeout(n)
+                    }
+                })
+            }, s = S.createElement("input"), R = S.createElement("select").appendChild(S.createElement("option")), s.type = "checkbox", p.checkOn = "" !== s.value, p.optSelected = R.selected, (s = S.createElement("input")).value = "t", s.type = "radio", p.radioValue = "t" === s.value;
+            var vt, gt = k.expr.attrHandle, Mt = (k.fn.extend({
+                attr: function (e, t) {
+                    return h(this, k.attr, e, t, 1 < arguments.length)
+                }, removeAttr: function (e) {
+                    return this.each(function () {
+                        k.removeAttr(this, e)
+                    })
+                }
+            }), k.extend({
+                attr: function (e, t, n) {
+                    var i, r, a = e.nodeType;
+                    if (3 !== a && 8 !== a && 2 !== a) return void 0 === e.getAttribute ? k.prop(e, t, n) : (1 === a && k.isXMLDoc(e) || (r = k.attrHooks[t.toLowerCase()] || (k.expr.match.bool.test(t) ? vt : void 0)), void 0 !== n ? null === n ? void k.removeAttr(e, t) : r && "set" in r && void 0 !== (i = r.set(e, n, t)) ? i : (e.setAttribute(t, n + ""), n) : !(r && "get" in r && null !== (i = r.get(e, t))) && null == (i = k.find.attr(e, t)) ? void 0 : i)
+                }, attrHooks: {
+                    type: {
+                        set: function (e, t) {
+                            var n;
+                            if (!p.radioValue && "radio" === t && u(e, "input")) return n = e.value, e.setAttribute("type", t), n && (e.value = n), t
+                        }
+                    }
+                }, removeAttr: function (e, t) {
+                    var n, i = 0, r = t && t.match(b);
+                    if (r && 1 === e.nodeType) for (; n = r[i++];) e.removeAttribute(n)
+                }
+            }), vt = {
+                set: function (e, t, n) {
+                    return !1 === t ? k.removeAttr(e, n) : e.setAttribute(n, n), n
+                }
+            }, k.each(k.expr.match.bool.source.match(/\w+/g), function (e, t) {
+                var s = gt[t] || k.find.attr;
+                gt[t] = function (e, t, n) {
+                    var i, r, a = t.toLowerCase();
+                    return n || (r = gt[a], gt[a] = i, i = null != s(e, t, n) ? a : null, gt[a] = r), i
+                }
+            }), /^(?:input|select|textarea|button)$/i), Lt = /^(?:a|area)$/i;
+
+            function x(e) {
+                return (e.match(b) || []).join(" ")
+            }
+
+            function O(e) {
+                return e.getAttribute && e.getAttribute("class") || ""
+            }
+
+            function St(e) {
+                return Array.isArray(e) ? e : "string" == typeof e && e.match(b) || []
+            }
+
+            k.fn.extend({
+                prop: function (e, t) {
+                    return h(this, k.prop, e, t, 1 < arguments.length)
+                }, removeProp: function (e) {
+                    return this.each(function () {
+                        delete this[k.propFix[e] || e]
+                    })
+                }
+            }), k.extend({
+                prop: function (e, t, n) {
+                    var i, r, a = e.nodeType;
+                    if (3 !== a && 8 !== a && 2 !== a) return 1 === a && k.isXMLDoc(e) || (t = k.propFix[t] || t, r = k.propHooks[t]), void 0 !== n ? r && "set" in r && void 0 !== (i = r.set(e, n, t)) ? i : e[t] = n : r && "get" in r && null !== (i = r.get(e, t)) ? i : e[t]
+                }, propHooks: {
+                    tabIndex: {
+                        get: function (e) {
+                            var t = k.find.attr(e, "tabindex");
+                            return t ? parseInt(t, 10) : Mt.test(e.nodeName) || Lt.test(e.nodeName) && e.href ? 0 : -1
+                        }
+                    }
+                }, propFix: {for: "htmlFor", class: "className"}
+            }), p.optSelected || (k.propHooks.selected = {
+                get: function (e) {
+                    e = e.parentNode;
+                    return e && e.parentNode && e.parentNode.selectedIndex, null
+                }, set: function (e) {
+                    e = e.parentNode;
+                    e && (e.selectedIndex, e.parentNode && e.parentNode.selectedIndex)
+                }
+            }), k.each(["tabIndex", "readOnly", "maxLength", "cellSpacing", "cellPadding", "rowSpan", "colSpan", "useMap", "frameBorder", "contentEditable"], function () {
+                k.propFix[this.toLowerCase()] = this
+            }), k.fn.extend({
+                addClass: function (t) {
+                    var e, n, i, r, a, s, o = 0;
+                    if (v(t)) return this.each(function (e) {
+                        k(this).addClass(t.call(this, e, O(this)))
+                    });
+                    if ((e = St(t)).length) for (; n = this[o++];) if (s = O(n), i = 1 === n.nodeType && " " + x(s) + " ") {
+                        for (a = 0; r = e[a++];) i.indexOf(" " + r + " ") < 0 && (i += r + " ");
+                        s !== (s = x(i)) && n.setAttribute("class", s)
+                    }
+                    return this
+                }, removeClass: function (t) {
+                    var e, n, i, r, a, s, o = 0;
+                    if (v(t)) return this.each(function (e) {
+                        k(this).removeClass(t.call(this, e, O(this)))
+                    });
+                    if (!arguments.length) return this.attr("class", "");
+                    if ((e = St(t)).length) for (; n = this[o++];) if (s = O(n), i = 1 === n.nodeType && " " + x(s) + " ") {
+                        for (a = 0; r = e[a++];) for (; -1 < i.indexOf(" " + r + " ");) i = i.replace(" " + r + " ", " ");
+                        s !== (s = x(i)) && n.setAttribute("class", s)
+                    }
+                    return this
+                }, toggleClass: function (r, t) {
+                    var a = typeof r, s = "string" == a || Array.isArray(r);
+                    return "boolean" == typeof t && s ? t ? this.addClass(r) : this.removeClass(r) : v(r) ? this.each(function (e) {
+                        k(this).toggleClass(r.call(this, e, O(this), t), t)
+                    }) : this.each(function () {
+                        var e, t, n, i;
+                        if (s) for (t = 0, n = k(this), i = St(r); e = i[t++];) n.hasClass(e) ? n.removeClass(e) : n.addClass(e); else void 0 !== r && "boolean" != a || ((e = O(this)) && M.set(this, "__className__", e), this.setAttribute && this.setAttribute("class", !e && !1 !== r && M.get(this, "__className__") || ""))
+                    })
+                }, hasClass: function (e) {
+                    for (var t, n = 0, i = " " + e + " "; t = this[n++];) if (1 === t.nodeType && -1 < (" " + x(O(t)) + " ").indexOf(i)) return !0;
+                    return !1
+                }
+            });
+
+            function kt(e) {
+                e.stopPropagation()
+            }
+
+            var bt = /\r/g, wt = (k.fn.extend({
+                    val: function (t) {
+                        var n, e, i, r = this[0];
+                        return arguments.length ? (i = v(t), this.each(function (e) {
+                            1 === this.nodeType && (null == (e = i ? t.call(this, e, k(this).val()) : t) ? e = "" : "number" == typeof e ? e += "" : Array.isArray(e) && (e = k.map(e, function (e) {
+                                return null == e ? "" : e + ""
+                            })), (n = k.valHooks[this.type] || k.valHooks[this.nodeName.toLowerCase()]) && "set" in n && void 0 !== n.set(this, e, "value") || (this.value = e))
+                        })) : r ? (n = k.valHooks[r.type] || k.valHooks[r.nodeName.toLowerCase()]) && "get" in n && void 0 !== (e = n.get(r, "value")) ? e : "string" == typeof (e = r.value) ? e.replace(bt, "") : null == e ? "" : e : void 0
+                    }
+                }), k.extend({
+                    valHooks: {
+                        option: {
+                            get: function (e) {
+                                var t = k.find.attr(e, "value");
+                                return null != t ? t : x(k.text(e))
+                            }
+                        }, select: {
+                            get: function (e) {
+                                for (var t, n = e.options, i = e.selectedIndex, r = "select-one" === e.type, a = r ? null : [], s = r ? i + 1 : n.length, o = i < 0 ? s : r ? i : 0; o < s; o++) if (((t = n[o]).selected || o === i) && !t.disabled && (!t.parentNode.disabled || !u(t.parentNode, "optgroup"))) {
+                                    if (t = k(t).val(), r) return t;
+                                    a.push(t)
+                                }
+                                return a
+                            }, set: function (e, t) {
+                                for (var n, i, r = e.options, a = k.makeArray(t), s = r.length; s--;) ((i = r[s]).selected = -1 < k.inArray(k.valHooks.option.get(i), a)) && (n = !0);
+                                return n || (e.selectedIndex = -1), a
+                            }
+                        }
+                    }
+                }), k.each(["radio", "checkbox"], function () {
+                    k.valHooks[this] = {
+                        set: function (e, t) {
+                            if (Array.isArray(t)) return e.checked = -1 < k.inArray(k(e).val(), t)
+                        }
+                    }, p.checkOn || (k.valHooks[this].get = function (e) {
+                        return null === e.getAttribute("value") ? "on" : e.value
+                    })
+                }), p.focusin = "onfocusin" in L, /^(?:focusinfocus|focusoutblur)$/), Dt = (k.extend(k.event, {
+                    trigger: function (e, t, n, i) {
+                        var r, a, s, o, u, d, l, h = [n || S], c = z.call(e, "type") ? e.type : e,
+                            _ = z.call(e, "namespace") ? e.namespace.split(".") : [], f = l = a = n = n || S;
+                        if (3 !== n.nodeType && 8 !== n.nodeType && !wt.test(c + k.event.triggered) && (-1 < c.indexOf(".") && (c = (_ = c.split(".")).shift(), _.sort()), o = c.indexOf(":") < 0 && "on" + c, (e = e[k.expando] ? e : new k.Event(c, "object" == typeof e && e)).isTrigger = i ? 2 : 3, e.namespace = _.join("."), e.rnamespace = e.namespace ? new RegExp("(^|\\.)" + _.join("\\.(?:.*\\.|)") + "(\\.|$)") : null, e.result = void 0, e.target || (e.target = n), t = null == t ? [e] : k.makeArray(t, [e]), d = k.event.special[c] || {}, i || !d.trigger || !1 !== d.trigger.apply(n, t))) {
+                            if (!i && !d.noBubble && !m(n)) {
+                                for (s = d.delegateType || c, wt.test(s + c) || (f = f.parentNode); f; f = f.parentNode) h.push(f), a = f;
+                                a === (n.ownerDocument || S) && h.push(a.defaultView || a.parentWindow || L)
+                            }
+                            for (r = 0; (f = h[r++]) && !e.isPropagationStopped();) l = f, e.type = 1 < r ? s : d.bindType || c, (u = (M.get(f, "events") || Object.create(null))[e.type] && M.get(f, "handle")) && u.apply(f, t), (u = o && f[o]) && u.apply && y(f) && (e.result = u.apply(f, t), !1 === e.result && e.preventDefault());
+                            return e.type = c, i || e.isDefaultPrevented() || d._default && !1 !== d._default.apply(h.pop(), t) || !y(n) || o && v(n[c]) && !m(n) && ((a = n[o]) && (n[o] = null), k.event.triggered = c, e.isPropagationStopped() && l.addEventListener(c, kt), n[c](), e.isPropagationStopped() && l.removeEventListener(c, kt), k.event.triggered = void 0, a && (n[o] = a)), e.result
+                        }
+                    }, simulate: function (e, t, n) {
+                        n = k.extend(new k.Event, n, {type: e, isSimulated: !0});
+                        k.event.trigger(n, null, t)
+                    }
+                }), k.fn.extend({
+                    trigger: function (e, t) {
+                        return this.each(function () {
+                            k.event.trigger(e, t, this)
+                        })
+                    }, triggerHandler: function (e, t) {
+                        var n = this[0];
+                        if (n) return k.event.trigger(e, t, n, !0)
+                    }
+                }), p.focusin || k.each({focus: "focusin", blur: "focusout"}, function (n, i) {
+                    function r(e) {
+                        k.event.simulate(i, e.target, k.event.fix(e))
+                    }
+
+                    k.event.special[i] = {
+                        setup: function () {
+                            var e = this.ownerDocument || this.document || this, t = M.access(e, i);
+                            t || e.addEventListener(n, r, !0), M.access(e, i, (t || 0) + 1)
+                        }, teardown: function () {
+                            var e = this.ownerDocument || this.document || this, t = M.access(e, i) - 1;
+                            t ? M.access(e, i, t) : (e.removeEventListener(n, r, !0), M.remove(e, i))
+                        }
+                    }
+                }), L.location), Tt = {guid: Date.now()}, Et = /\?/, Yt = (k.parseXML = function (e) {
+                    var t, n;
+                    if (!e || "string" != typeof e) return null;
+                    try {
+                        t = (new L.DOMParser).parseFromString(e, "text/xml")
+                    } catch (e) {
+                    }
+                    return n = t && t.getElementsByTagName("parsererror")[0], t && !n || k.error("Invalid XML: " + (n ? k.map(n.childNodes, function (e) {
+                        return e.textContent
+                    }).join("\n") : e)), t
+                }, /\[\]$/), Pt = /\r?\n/g, Ct = /^(?:submit|button|image|reset|file)$/i,
+                Rt = /^(?:input|select|textarea|keygen)/i;
+            k.param = function (e, t) {
+                function n(e, t) {
+                    t = v(t) ? t() : t, r[r.length] = encodeURIComponent(e) + "=" + encodeURIComponent(null == t ? "" : t)
+                }
+
+                var i, r = [];
+                if (null == e) return "";
+                if (Array.isArray(e) || e.jquery && !k.isPlainObject(e)) k.each(e, function () {
+                    n(this.name, this.value)
+                }); else for (i in e) !function n(i, e, r, a) {
+                    if (Array.isArray(e)) k.each(e, function (e, t) {
+                        r || Yt.test(i) ? a(i, t) : n(i + "[" + ("object" == typeof t && null != t ? e : "") + "]", t, r, a)
+                    }); else if (r || "object" !== f(e)) a(i, e); else for (var t in e) n(i + "[" + t + "]", e[t], r, a)
+                }(i, e[i], t, n);
+                return r.join("&")
+            }, k.fn.extend({
+                serialize: function () {
+                    return k.param(this.serializeArray())
+                }, serializeArray: function () {
+                    return this.map(function () {
+                        var e = k.prop(this, "elements");
+                        return e ? k.makeArray(e) : this
+                    }).filter(function () {
+                        var e = this.type;
+                        return this.name && !k(this).is(":disabled") && Rt.test(this.nodeName) && !Ct.test(e) && (this.checked || !Le.test(e))
+                    }).map(function (e, t) {
+                        var n = k(this).val();
+                        return null == n ? null : Array.isArray(n) ? k.map(n, function (e) {
+                            return {name: t.name, value: e.replace(Pt, "\r\n")}
+                        }) : {name: t.name, value: n.replace(Pt, "\r\n")}
+                    }).get()
+                }
+            });
+            var At = /%20/g, xt = /#.*$/, Ot = /([?&])_=[^&]*/, It = /^(.*?):[ \t]*([^\r\n]*)$/gm,
+                Wt = /^(?:GET|HEAD)$/, Ht = /^\/\//, jt = {}, Ft = {}, Bt = "*/".concat("*"), Nt = S.createElement("a");
+
+            function zt(a) {
+                return function (e, t) {
+                    "string" != typeof e && (t = e, e = "*");
+                    var n, i = 0, r = e.toLowerCase().match(b) || [];
+                    if (v(t)) for (; n = r[i++];) "+" === n[0] ? (n = n.slice(1) || "*", (a[n] = a[n] || []).unshift(t)) : (a[n] = a[n] || []).push(t)
+                }
+            }
+
+            function Ut(t, i, r, a) {
+                var s = {}, o = t === Ft;
+
+                function u(e) {
+                    var n;
+                    return s[e] = !0, k.each(t[e] || [], function (e, t) {
+                        t = t(i, r, a);
+                        return "string" != typeof t || o || s[t] ? o ? !(n = t) : void 0 : (i.dataTypes.unshift(t), u(t), !1)
+                    }), n
+                }
+
+                return u(i.dataTypes[0]) || !s["*"] && u("*")
+            }
+
+            function Vt(e, t) {
+                var n, i, r = k.ajaxSettings.flatOptions || {};
+                for (n in t) void 0 !== t[n] && ((r[n] ? e : i = i || {})[n] = t[n]);
+                return i && k.extend(!0, e, i), e
+            }
+
+            Nt.href = Dt.href, k.extend({
+                active: 0,
+                lastModified: {},
+                etag: {},
+                ajaxSettings: {
+                    url: Dt.href,
+                    type: "GET",
+                    isLocal: /^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Dt.protocol),
+                    global: !0,
+                    processData: !0,
+                    async: !0,
+                    contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+                    accepts: {
+                        "*": Bt,
+                        text: "text/plain",
+                        html: "text/html",
+                        xml: "application/xml, text/xml",
+                        json: "application/json, text/javascript"
+                    },
+                    contents: {xml: /\bxml\b/, html: /\bhtml/, json: /\bjson\b/},
+                    responseFields: {xml: "responseXML", text: "responseText", json: "responseJSON"},
+                    converters: {"* text": String, "text html": !0, "text json": JSON.parse, "text xml": k.parseXML},
+                    flatOptions: {url: !0, context: !0}
+                },
+                ajaxSetup: function (e, t) {
+                    return t ? Vt(Vt(e, k.ajaxSettings), t) : Vt(k.ajaxSettings, e)
+                },
+                ajaxPrefilter: zt(jt),
+                ajaxTransport: zt(Ft),
+                ajax: function (e, t) {
+                    "object" == typeof e && (t = e, e = void 0);
+                    var u, d, l, n, h, c, _, i, f = k.ajaxSetup({}, t = t || {}), m = f.context || f,
+                        p = f.context && (m.nodeType || m.jquery) ? k(m) : k.event, y = k.Deferred(),
+                        v = k.Callbacks("once memory"), g = f.statusCode || {}, r = {}, a = {}, s = "canceled", M = {
+                            readyState: 0, getResponseHeader: function (e) {
+                                var t;
+                                if (c) {
+                                    if (!n) for (n = {}; t = It.exec(l);) n[t[1].toLowerCase() + " "] = (n[t[1].toLowerCase() + " "] || []).concat(t[2]);
+                                    t = n[e.toLowerCase() + " "]
+                                }
+                                return null == t ? null : t.join(", ")
+                            }, getAllResponseHeaders: function () {
+                                return c ? l : null
+                            }, setRequestHeader: function (e, t) {
+                                return null == c && (e = a[e.toLowerCase()] = a[e.toLowerCase()] || e, r[e] = t), this
+                            }, overrideMimeType: function (e) {
+                                return null == c && (f.mimeType = e), this
+                            }, statusCode: function (e) {
+                                if (e) if (c) M.always(e[M.status]); else for (var t in e) g[t] = [g[t], e[t]];
+                                return this
+                            }, abort: function (e) {
+                                e = e || s;
+                                return u && u.abort(e), o(0, e), this
+                            }
+                        };
+                    if (y.promise(M), f.url = ((e || f.url || Dt.href) + "").replace(Ht, Dt.protocol + "//"), f.type = t.method || t.type || f.method || f.type, f.dataTypes = (f.dataType || "*").toLowerCase().match(b) || [""], null == f.crossDomain) {
+                        e = S.createElement("a");
+                        try {
+                            e.href = f.url, e.href = e.href, f.crossDomain = Nt.protocol + "//" + Nt.host != e.protocol + "//" + e.host
+                        } catch (e) {
+                            f.crossDomain = !0
+                        }
+                    }
+                    if (f.data && f.processData && "string" != typeof f.data && (f.data = k.param(f.data, f.traditional)), Ut(jt, f, t, M), !c) {
+                        for (i in (_ = k.event && f.global) && 0 == k.active++ && k.event.trigger("ajaxStart"), f.type = f.type.toUpperCase(), f.hasContent = !Wt.test(f.type), d = f.url.replace(xt, ""), f.hasContent ? f.data && f.processData && 0 === (f.contentType || "").indexOf("application/x-www-form-urlencoded") && (f.data = f.data.replace(At, "+")) : (e = f.url.slice(d.length), f.data && (f.processData || "string" == typeof f.data) && (d += (Et.test(d) ? "&" : "?") + f.data, delete f.data), !1 === f.cache && (d = d.replace(Ot, "$1"), e = (Et.test(d) ? "&" : "?") + "_=" + Tt.guid++ + e), f.url = d + e), f.ifModified && (k.lastModified[d] && M.setRequestHeader("If-Modified-Since", k.lastModified[d]), k.etag[d] && M.setRequestHeader("If-None-Match", k.etag[d])), (f.data && f.hasContent && !1 !== f.contentType || t.contentType) && M.setRequestHeader("Content-Type", f.contentType), M.setRequestHeader("Accept", f.dataTypes[0] && f.accepts[f.dataTypes[0]] ? f.accepts[f.dataTypes[0]] + ("*" !== f.dataTypes[0] ? ", " + Bt + "; q=0.01" : "") : f.accepts["*"]), f.headers) M.setRequestHeader(i, f.headers[i]);
+                        if (f.beforeSend && (!1 === f.beforeSend.call(m, M, f) || c)) return M.abort();
+                        if (s = "abort", v.add(f.complete), M.done(f.success), M.fail(f.error), u = Ut(Ft, f, t, M)) {
+                            if (M.readyState = 1, _ && p.trigger("ajaxSend", [M, f]), c) return M;
+                            f.async && 0 < f.timeout && (h = L.setTimeout(function () {
+                                M.abort("timeout")
+                            }, f.timeout));
+                            try {
+                                c = !1, u.send(r, o)
+                            } catch (e) {
+                                if (c) throw e;
+                                o(-1, e)
+                            }
+                        } else o(-1, "No Transport")
+                    }
+                    return M;
+
+                    function o(e, t, n, i) {
+                        var r, a, s, o = t;
+                        c || (c = !0, h && L.clearTimeout(h), u = void 0, l = i || "", M.readyState = 0 < e ? 4 : 0, i = 200 <= e && e < 300 || 304 === e, n && (s = function (e, t, n) {
+                            for (var i, r, a, s, o = e.contents, u = e.dataTypes; "*" === u[0];) u.shift(), void 0 === i && (i = e.mimeType || t.getResponseHeader("Content-Type"));
+                            if (i) for (r in o) if (o[r] && o[r].test(i)) {
+                                u.unshift(r);
+                                break
+                            }
+                            if (u[0] in n) a = u[0]; else {
+                                for (r in n) {
+                                    if (!u[0] || e.converters[r + " " + u[0]]) {
+                                        a = r;
+                                        break
+                                    }
+                                    s = s || r
+                                }
+                                a = a || s
+                            }
+                            if (a) return a !== u[0] && u.unshift(a), n[a]
+                        }(f, M, n)), !i && -1 < k.inArray("script", f.dataTypes) && k.inArray("json", f.dataTypes) < 0 && (f.converters["text script"] = function () {
+                        }), s = function (e, t, n, i) {
+                            var r, a, s, o, u, d = {}, l = e.dataTypes.slice();
+                            if (l[1]) for (s in e.converters) d[s.toLowerCase()] = e.converters[s];
+                            for (a = l.shift(); a;) if (e.responseFields[a] && (n[e.responseFields[a]] = t), !u && i && e.dataFilter && (t = e.dataFilter(t, e.dataType)), u = a, a = l.shift()) if ("*" === a) a = u; else if ("*" !== u && u !== a) {
+                                if (!(s = d[u + " " + a] || d["* " + a])) for (r in d) if ((o = r.split(" "))[1] === a && (s = d[u + " " + o[0]] || d["* " + o[0]])) {
+                                    !0 === s ? s = d[r] : !0 !== d[r] && (a = o[0], l.unshift(o[1]));
+                                    break
+                                }
+                                if (!0 !== s) if (s && e.throws) t = s(t); else try {
+                                    t = s(t)
+                                } catch (e) {
+                                    return {state: "parsererror", error: s ? e : "No conversion from " + u + " to " + a}
+                                }
+                            }
+                            return {state: "success", data: t}
+                        }(f, s, M, i), i ? (f.ifModified && ((n = M.getResponseHeader("Last-Modified")) && (k.lastModified[d] = n), (n = M.getResponseHeader("etag")) && (k.etag[d] = n)), 204 === e || "HEAD" === f.type ? o = "nocontent" : 304 === e ? o = "notmodified" : (o = s.state, r = s.data, i = !(a = s.error))) : (a = o, !e && o || (o = "error", e < 0 && (e = 0))), M.status = e, M.statusText = (t || o) + "", i ? y.resolveWith(m, [r, o, M]) : y.rejectWith(m, [M, o, a]), M.statusCode(g), g = void 0, _ && p.trigger(i ? "ajaxSuccess" : "ajaxError", [M, f, i ? r : a]), v.fireWith(m, [M, o]), _ && (p.trigger("ajaxComplete", [M, f]), --k.active || k.event.trigger("ajaxStop")))
+                    }
+                },
+                getJSON: function (e, t, n) {
+                    return k.get(e, t, n, "json")
+                },
+                getScript: function (e, t) {
+                    return k.get(e, void 0, t, "script")
+                }
+            }), k.each(["get", "post"], function (e, r) {
+                k[r] = function (e, t, n, i) {
+                    return v(t) && (i = i || n, n = t, t = void 0), k.ajax(k.extend({
+                        url: e,
+                        type: r,
+                        dataType: i,
+                        data: t,
+                        success: n
+                    }, k.isPlainObject(e) && e))
+                }
+            }), k.ajaxPrefilter(function (e) {
+                for (var t in e.headers) "content-type" === t.toLowerCase() && (e.contentType = e.headers[t] || "")
+            }), k._evalUrl = function (e, t, n) {
+                return k.ajax({
+                    url: e,
+                    type: "GET",
+                    dataType: "script",
+                    cache: !0,
+                    async: !1,
+                    global: !1,
+                    converters: {
+                        "text script": function () {
+                        }
+                    },
+                    dataFilter: function (e) {
+                        k.globalEval(e, t, n)
+                    }
+                })
+            }, k.fn.extend({
+                wrapAll: function (e) {
+                    return this[0] && (v(e) && (e = e.call(this[0])), e = k(e, this[0].ownerDocument).eq(0).clone(!0), this[0].parentNode && e.insertBefore(this[0]), e.map(function () {
+                        for (var e = this; e.firstElementChild;) e = e.firstElementChild;
+                        return e
+                    }).append(this)), this
+                }, wrapInner: function (n) {
+                    return v(n) ? this.each(function (e) {
+                        k(this).wrapInner(n.call(this, e))
+                    }) : this.each(function () {
+                        var e = k(this), t = e.contents();
+                        t.length ? t.wrapAll(n) : e.append(n)
+                    })
+                }, wrap: function (t) {
+                    var n = v(t);
+                    return this.each(function (e) {
+                        k(this).wrapAll(n ? t.call(this, e) : t)
+                    })
+                }, unwrap: function (e) {
+                    return this.parent(e).not("body").each(function () {
+                        k(this).replaceWith(this.childNodes)
+                    }), this
+                }
+            }), k.expr.pseudos.hidden = function (e) {
+                return !k.expr.pseudos.visible(e)
+            }, k.expr.pseudos.visible = function (e) {
+                return !!(e.offsetWidth || e.offsetHeight || e.getClientRects().length)
+            }, k.ajaxSettings.xhr = function () {
+                try {
+                    return new L.XMLHttpRequest
+                } catch (e) {
+                }
+            };
+            var Gt = {0: 200, 1223: 204}, Jt = k.ajaxSettings.xhr(),
+                qt = (p.cors = !!Jt && "withCredentials" in Jt, p.ajax = Jt = !!Jt, k.ajaxTransport(function (r) {
+                    var a, s;
+                    if (p.cors || Jt && !r.crossDomain) return {
+                        send: function (e, t) {
+                            var n, i = r.xhr();
+                            if (i.open(r.type, r.url, r.async, r.username, r.password), r.xhrFields) for (n in r.xhrFields) i[n] = r.xhrFields[n];
+                            for (n in r.mimeType && i.overrideMimeType && i.overrideMimeType(r.mimeType), r.crossDomain || e["X-Requested-With"] || (e["X-Requested-With"] = "XMLHttpRequest"), e) i.setRequestHeader(n, e[n]);
+                            a = function (e) {
+                                return function () {
+                                    a && (a = s = i.onload = i.onerror = i.onabort = i.ontimeout = i.onreadystatechange = null, "abort" === e ? i.abort() : "error" === e ? "number" != typeof i.status ? t(0, "error") : t(i.status, i.statusText) : t(Gt[i.status] || i.status, i.statusText, "text" !== (i.responseType || "text") || "string" != typeof i.responseText ? {binary: i.response} : {text: i.responseText}, i.getAllResponseHeaders()))
+                                }
+                            }, i.onload = a(), s = i.onerror = i.ontimeout = a("error"), void 0 !== i.onabort ? i.onabort = s : i.onreadystatechange = function () {
+                                4 === i.readyState && L.setTimeout(function () {
+                                    a && s()
+                                })
+                            }, a = a("abort");
+                            try {
+                                i.send(r.hasContent && r.data || null)
+                            } catch (e) {
+                                if (a) throw e
+                            }
+                        }, abort: function () {
+                            a && a()
+                        }
+                    }
+                }), k.ajaxPrefilter(function (e) {
+                    e.crossDomain && (e.contents.script = !1)
+                }), k.ajaxSetup({
+                    accepts: {script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},
+                    contents: {script: /\b(?:java|ecma)script\b/},
+                    converters: {
+                        "text script": function (e) {
+                            return k.globalEval(e), e
+                        }
+                    }
+                }), k.ajaxPrefilter("script", function (e) {
+                    void 0 === e.cache && (e.cache = !1), e.crossDomain && (e.type = "GET")
+                }), k.ajaxTransport("script", function (n) {
+                    var i, r;
+                    if (n.crossDomain || n.scriptAttrs) return {
+                        send: function (e, t) {
+                            i = k("<script>").attr(n.scriptAttrs || {}).prop({
+                                charset: n.scriptCharset,
+                                src: n.url
+                            }).on("load error", r = function (e) {
+                                i.remove(), r = null, e && t("error" === e.type ? 404 : 200, e.type)
+                            }), S.head.appendChild(i[0])
+                        }, abort: function () {
+                            r && r()
+                        }
+                    }
+                }), []), Kt = /(=)\?(?=&|$)|\?\?/, Xt = (k.ajaxSetup({
+                    jsonp: "callback", jsonpCallback: function () {
+                        var e = qt.pop() || k.expando + "_" + Tt.guid++;
+                        return this[e] = !0, e
+                    }
+                }), k.ajaxPrefilter("json jsonp", function (e, t, n) {
+                    var i, r, a,
+                        s = !1 !== e.jsonp && (Kt.test(e.url) ? "url" : "string" == typeof e.data && 0 === (e.contentType || "").indexOf("application/x-www-form-urlencoded") && Kt.test(e.data) && "data");
+                    if (s || "jsonp" === e.dataTypes[0]) return i = e.jsonpCallback = v(e.jsonpCallback) ? e.jsonpCallback() : e.jsonpCallback, s ? e[s] = e[s].replace(Kt, "$1" + i) : !1 !== e.jsonp && (e.url += (Et.test(e.url) ? "&" : "?") + e.jsonp + "=" + i), e.converters["script json"] = function () {
+                        return a || k.error(i + " was not called"), a[0]
+                    }, e.dataTypes[0] = "json", r = L[i], L[i] = function () {
+                        a = arguments
+                    }, n.always(function () {
+                        void 0 === r ? k(L).removeProp(i) : L[i] = r, e[i] && (e.jsonpCallback = t.jsonpCallback, qt.push(i)), a && v(r) && r(a[0]), a = r = void 0
+                    }), "script"
+                }), p.createHTMLDocument = ((e = S.implementation.createHTMLDocument("").body).innerHTML = "<form></form><form></form>", 2 === e.childNodes.length), k.parseHTML = function (e, t, n) {
+                    return "string" != typeof e ? [] : ("boolean" == typeof t && (n = t, t = !1), t || (p.createHTMLDocument ? ((i = (t = S.implementation.createHTMLDocument("")).createElement("base")).href = S.location.href, t.head.appendChild(i)) : t = S), i = !n && [], (n = Z.exec(e)) ? [t.createElement(n[1])] : (n = De([e], t, i), i && i.length && k(i).remove(), k.merge([], n.childNodes)));
+                    var i
+                }, k.fn.load = function (e, t, n) {
+                    var i, r, a, s = this, o = e.indexOf(" ");
+                    return -1 < o && (i = x(e.slice(o)), e = e.slice(0, o)), v(t) ? (n = t, t = void 0) : t && "object" == typeof t && (r = "POST"), 0 < s.length && k.ajax({
+                        url: e,
+                        type: r || "GET",
+                        dataType: "html",
+                        data: t
+                    }).done(function (e) {
+                        a = arguments, s.html(i ? k("<div>").append(k.parseHTML(e)).find(i) : e)
+                    }).always(n && function (e, t) {
+                        s.each(function () {
+                            n.apply(this, a || [e.responseText, t, e])
+                        })
+                    }), this
+                }, k.expr.pseudos.animated = function (t) {
+                    return k.grep(k.timers, function (e) {
+                        return t === e.elem
+                    }).length
+                }, k.offset = {
+                    setOffset: function (e, t, n) {
+                        var i, r, a, s, o = k.css(e, "position"), u = k(e), d = {};
+                        "static" === o && (e.style.position = "relative"), a = u.offset(), i = k.css(e, "top"), s = k.css(e, "left"), o = ("absolute" === o || "fixed" === o) && -1 < (i + s).indexOf("auto") ? (r = (o = u.position()).top, o.left) : (r = parseFloat(i) || 0, parseFloat(s) || 0), null != (t = v(t) ? t.call(e, n, k.extend({}, a)) : t).top && (d.top = t.top - a.top + r), null != t.left && (d.left = t.left - a.left + o), "using" in t ? t.using.call(e, d) : u.css(d)
+                    }
+                }, k.fn.extend({
+                    offset: function (t) {
+                        if (arguments.length) return void 0 === t ? this : this.each(function (e) {
+                            k.offset.setOffset(this, t, e)
+                        });
+                        var e, n = this[0];
+                        return n ? n.getClientRects().length ? (e = n.getBoundingClientRect(), n = n.ownerDocument.defaultView, {
+                            top: e.top + n.pageYOffset,
+                            left: e.left + n.pageXOffset
+                        }) : {top: 0, left: 0} : void 0
+                    }, position: function () {
+                        if (this[0]) {
+                            var e, t, n, i = this[0], r = {top: 0, left: 0};
+                            if ("fixed" === k.css(i, "position")) t = i.getBoundingClientRect(); else {
+                                for (t = this.offset(), n = i.ownerDocument, e = i.offsetParent || n.documentElement; e && (e === n.body || e === n.documentElement) && "static" === k.css(e, "position");) e = e.parentNode;
+                                e && e !== i && 1 === e.nodeType && ((r = k(e).offset()).top += k.css(e, "borderTopWidth", !0), r.left += k.css(e, "borderLeftWidth", !0))
+                            }
+                            return {
+                                top: t.top - r.top - k.css(i, "marginTop", !0),
+                                left: t.left - r.left - k.css(i, "marginLeft", !0)
+                            }
+                        }
+                    }, offsetParent: function () {
+                        return this.map(function () {
+                            for (var e = this.offsetParent; e && "static" === k.css(e, "position");) e = e.offsetParent;
+                            return e || w
+                        })
+                    }
+                }), k.each({scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function (t, r) {
+                    var a = "pageYOffset" === r;
+                    k.fn[t] = function (e) {
+                        return h(this, function (e, t, n) {
+                            var i;
+                            if (m(e) ? i = e : 9 === e.nodeType && (i = e.defaultView), void 0 === n) return i ? i[r] : e[t];
+                            i ? i.scrollTo(a ? i.pageXOffset : n, a ? n : i.pageYOffset) : e[t] = n
+                        }, t, e, arguments.length)
+                    }
+                }), k.each(["top", "left"], function (e, n) {
+                    k.cssHooks[n] = Qe(p.pixelPosition, function (e, t) {
+                        if (t) return t = $e(e, n), qe.test(t) ? k(e).position()[n] + "px" : t
+                    })
+                }), k.each({Height: "height", Width: "width"}, function (s, o) {
+                    k.each({padding: "inner" + s, content: o, "": "outer" + s}, function (i, a) {
+                        k.fn[a] = function (e, t) {
+                            var n = arguments.length && (i || "boolean" != typeof e),
+                                r = i || (!0 === e || !0 === t ? "margin" : "border");
+                            return h(this, function (e, t, n) {
+                                var i;
+                                return m(e) ? 0 === a.indexOf("outer") ? e["inner" + s] : e.document.documentElement["client" + s] : 9 === e.nodeType ? (i = e.documentElement, Math.max(e.body["scroll" + s], i["scroll" + s], e.body["offset" + s], i["offset" + s], i["client" + s])) : void 0 === n ? k.css(e, t, r) : k.style(e, t, n, r)
+                            }, o, n ? e : void 0, n)
+                        }
+                    })
+                }), k.each(["ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend"], function (e, t) {
+                    k.fn[t] = function (e) {
+                        return this.on(t, e)
+                    }
+                }), k.fn.extend({
+                    bind: function (e, t, n) {
+                        return this.on(e, null, t, n)
+                    }, unbind: function (e, t) {
+                        return this.off(e, null, t)
+                    }, delegate: function (e, t, n, i) {
+                        return this.on(t, e, n, i)
+                    }, undelegate: function (e, t, n) {
+                        return 1 === arguments.length ? this.off(e, "**") : this.off(t, e || "**", n)
+                    }, hover: function (e, t) {
+                        return this.mouseenter(e).mouseleave(t || e)
+                    }
+                }), k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "), function (e, n) {
+                    k.fn[n] = function (e, t) {
+                        return 0 < arguments.length ? this.on(n, null, e, t) : this.trigger(n)
+                    }
+                }), /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g), Zt = (k.proxy = function (e, t) {
+                    var n, i;
+                    if ("string" == typeof t && (i = e[t], t = e, e = i), v(e)) return n = o.call(arguments, 2), (i = function () {
+                        return e.apply(t || this, n.concat(o.call(arguments)))
+                    }).guid = e.guid = e.guid || k.guid++, i
+                }, k.holdReady = function (e) {
+                    e ? k.readyWait++ : k.ready(!0)
+                }, k.isArray = Array.isArray, k.parseJSON = JSON.parse, k.nodeName = u, k.isFunction = v, k.isWindow = m, k.camelCase = g, k.type = f, k.now = Date.now, k.isNumeric = function (e) {
+                    var t = k.type(e);
+                    return ("number" === t || "string" === t) && !isNaN(e - parseFloat(e))
+                }, k.trim = function (e) {
+                    return null == e ? "" : (e + "").replace(Xt, "")
+                }, void 0 !== (tn = function () {
+                    return k
+                }.apply(en, [])) && (Qt.exports = tn), L.jQuery), $t = L.$;
+            return k.noConflict = function (e) {
+                return L.$ === k && (L.$ = $t), e && L.jQuery === k && (L.jQuery = Zt), k
+            }, void 0 === I && (L.jQuery = L.$ = k), k
+        })
+    }, function (e, t, n) {
+        e.exports = {default: n(267), __esModule: !0}
+    }, function (e, t, n) {
+        t.f = n(7)
+    }, function (e, t, n) {
+        var i = n(6), r = n(3), a = n(27), s = n(57), o = n(12).f;
+        e.exports = function (e) {
+            var t = r.Symbol || (r.Symbol = !a && i.Symbol || {});
+            "_" == e.charAt(0) || e in t || o(t, e, {value: s.f(e)})
+        }
+    }, function (e, t) {
+        t.f = Object.getOwnPropertySymbols
+    }, function (e, t, n) {
+        var i = n(37), r = n(28), a = n(19), s = n(45), o = n(18), u = n(69), d = Object.getOwnPropertyDescriptor;
+        t.f = n(14) ? d : function (e, t) {
+            if (e = a(e), t = s(t, !0), u) try {
+                return d(e, t)
+            } catch (e) {
+            }
+            if (o(e, t)) return r(!i.f.call(e, t), e[t])
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = "0x12f9", r = i + "0",
+            r = (t.ERR_COM_PARAM = r + "0001", t.ERR_COM_NOT_PLAYING = r + "0002", t.ERR_COM_NOT_PLAYBACK = r + "0003", t.ERR_COM_IS_MSE = r + "0004", t.ERR_COM_IS_JSDECODER = r + "0005", t.ERR_COM_LOAD_JSDECODER_ERROR = r + "0006", t.ERR_COM_URL_ERROR = r + "0008", t.ERR_COM_RECV_STREAM_TIMEOUT = r + "0009", t.ERR_COM_SETORGET_VOLUME_ERROR = r + "0010", t.ERR_COM_SETVOLUME_ERROR = r + "0011", t.ERR_COM_OPENSOUND_ERROR = r + "0012", i + "1"),
+            r = (t.ERR_STREAM_WS_ERROR = r + "0000", t.ERR_STREAM_OPEN_FAILED = r + "0010", t.ERR_STREAM_INTERRUPT = r + "0011", t.ERR_STREAM_CMD_FAILED = r + "0012", t.ERR_STREAM_SOUND_NOTHAS = r + "0014", t.ERR_STREAM_WS_UNFIND = r + "0015", t.ERR_STREAM_WS_UNCONNECT = r + "0016", t.ERR_STREAM_INTEL_UNSUPPORT = r + "0017", t.ERR_STREAM_TIMEOUT = r + "0018", t.ERR_STREAM_WSS_ERROR = r + "0019", t.ERR_PLAYBACK_FRAMEFORWARD = r + "0020", t.ERR_PLAYBACK_MAX_RATE = r + "0021", t.ERR_PLAYBACK_MIN_RATE = r + "0022", t.ERR_STREAM_WS_TIMEOUT = r + "0023", t.ERR_STREAM_TRANS = r + "0024", t.ERR_STREAM_PLAYBACK_END = r + "0025", t.ERR_STREAM_VIDEO_CODING = r + "0026", t.ERR_STREAM_CONNECT_CLOSED = r + "0027", t.ERR_STREAM_BUFER_ERROR = r + "0028", t.ERR_STREAM_DATA_ERROR = r + "0029", t.ERR_STREAM_LOCK_ERROR = r + "0030", t.ERR_STREAM_MSE_DATA_FULL = r + "0031", t.ERR_STREAM_CODEC_UNSUPPORTED = r + "0032", t.ERR_STREAM_JSDECODER_CODEC_UNSUPPORTED = r + "0033", i + "2");
+        t.ERR_PLAY_FILESYS_UNSUPPORT = r + "0000", t.ERR_PLAY_FILESYS_QUOTA = r + "0010", t.ERR_PLAY_FILESYS_REQUEST = r + "0011", t.ERR_PLAY_FILESYS_GETFILE = r + "0012", t.ERR_PLAY_FILESYS_CREATE = r + "0013", t.ERR_PLAY_FILESYS_WRITE = r + "0014", t.ERR_PLAY_FILESYS_ALREADY_WRITING = r + "0015", t.ERR_PLAY_FILESYS_NOT_WRITING = r + "0016", t.ERR_PLAY_FILESYS_NOT_SUPPORT_DSTTYPE = r + "0017", t.ERR_PLAY_FILESYS_FILENAME_ISNULL = r + "0018", t.ERR_CAPTURE_RAM = "0x12f930010", t.ERR_CAPTURE_NO_PREPARED = "0x12f930011", t.ERR_JSDECODER = i + "400", t.ERR_TALK = i + "500", t.ERR_TALK_GETUSERMEDIA_UNDEFINE = "0x12f950000", t.ERR_TALK_UNSUPPORT_AUDIOTYPE = "0x12f950001"
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function a() {
+            (0, i.default)(this, a), this._firstCheckpoint = 0, this._lastCheckpoint = 0, this._intervalBytes = 0, this._totalBytes = 0, this._lastSecondBytes = 0, self.performance && self.performance.now ? this._now = self.performance.now.bind(self.performance) : this._now = Date.now
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "reset", value: function () {
+                this._firstCheckpoint = this._lastCheckpoint = 0, this._totalBytes = this._intervalBytes = 0, this._lastSecondBytes = 0
+            }
+        }, {
+            key: "addBytes", value: function (e) {
+                0 === this._firstCheckpoint ? (this._firstCheckpoint = this._now(), this._lastCheckpoint = this._firstCheckpoint, this._intervalBytes += e, this._totalBytes += e) : this._now() - this._lastCheckpoint < 1e3 ? (this._intervalBytes += e, this._totalBytes += e) : (this._lastSecondBytes = this._intervalBytes, this._intervalBytes = e, this._totalBytes += e, this._lastCheckpoint = this._now())
+            }
+        }, {
+            key: "currentKBps", get: function () {
+                this.addBytes(0);
+                var e = (this._now() - this._lastCheckpoint) / 1e3;
+                return this._intervalBytes / (e = 0 == e ? 1 : e) / 1024
+            }
+        }, {
+            key: "lastSecondKBps", get: function () {
+                return this.addBytes(0), 0 !== this._lastSecondBytes ? this._lastSecondBytes / 1024 : 500 <= this._now() - this._lastCheckpoint ? this.currentKBps : 0
+            }
+        }, {
+            key: "averageKBps", get: function () {
+                var e = (this._now() - this._firstCheckpoint) / 1e3;
+                return this._totalBytes / e / 1024
+            }
+        }]), t.default = a
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.defaultConfig = void 0;
+        var n = n(20), i = (n = n) && n.__esModule ? n : {default: n};
+        t.createDefaultConfig = function () {
+            return (0, i.default)({}, r)
+        };
+        var r = t.defaultConfig = {
+            enableWorker: !1,
+            enableStashBuffer: !1,
+            stashInitialSize: void 0,
+            isLive: !1,
+            lazyLoad: !0,
+            lazyLoadMaxDuration: 180,
+            lazyLoadRecoverDuration: 30,
+            deferLoadAfterSourceOpen: !0,
+            autoCleanupMaxBackwardDuration: 180,
+            autoCleanupMinBackwardDuration: 120,
+            statisticsInfoReportInterval: 600,
+            fixAudioTimestampGap: !0,
+            accurateSeek: !1,
+            seekType: "range",
+            seekParamStart: "bstart",
+            seekParamEnd: "bend",
+            rangeLoadZeroStart: !1,
+            customSeekHandler: void 0,
+            reuseRedirectedURL: !1,
+            headers: void 0,
+            customLoader: void 0,
+            videoStateMonitorInterval: 1e3,
+            enableDurationMonitor: !1,
+            lowLatencyThreshold: 1.5,
+            highLatencyThreshold: 10,
+            decreaseDurationStep: .4,
+            enableVideoFrozenMonitor: !1,
+            frozenTimesThreshold: 5,
+            enableConstVideoViewSize: !1,
+            constVideoViewWidth: 1920,
+            constVideoViewHeight: 1080,
+            latencyDetectInterval: 6e4,
+            latencyDetectThreshold: 2,
+            latencyDetectAdjustStep: .1,
+            enableAudioGain: !0,
+            audioGainLevel: 2
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = o(n(1)), r = o(n(2)), a = o(n(10)), s = o(n(4));
+
+        function o(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(u, null, [{
+            key: "getConfig", value: function () {
+                return {
+                    globalTag: s.default.GLOBAL_TAG,
+                    forceGlobalTag: s.default.FORCE_GLOBAL_TAG,
+                    enableVerbose: s.default.ENABLE_VERBOSE,
+                    enableDebug: s.default.ENABLE_DEBUG,
+                    enableInfo: s.default.ENABLE_INFO,
+                    enableWarn: s.default.ENABLE_WARN,
+                    enableError: s.default.ENABLE_ERROR,
+                    enableCallback: s.default.ENABLE_CALLBACK
+                }
+            }
+        }, {
+            key: "applyConfig", value: function (e) {
+                s.default.GLOBAL_TAG = e.globalTag, s.default.FORCE_GLOBAL_TAG = e.forceGlobalTag, s.default.ENABLE_VERBOSE = e.enableVerbose, s.default.ENABLE_DEBUG = e.enableDebug, s.default.ENABLE_INFO = e.enableInfo, s.default.ENABLE_WARN = e.enableWarn, s.default.ENABLE_ERROR = e.enableError, s.default.ENABLE_CALLBACK = e.enableCallback
+            }
+        }, {
+            key: "_notifyChange", value: function () {
+                var e, t = u.emitter;
+                0 < t.listenerCount("change") && (e = u.getConfig(), t.emit("change", e))
+            }
+        }, {
+            key: "registerListener", value: function (e) {
+                u.emitter.addListener("change", e)
+            }
+        }, {
+            key: "removeListener", value: function (e) {
+                u.emitter.removeListener("change", e)
+            }
+        }, {
+            key: "addLogListener", value: function (e) {
+                s.default.emitter.addListener("log", e), 0 < s.default.emitter.listenerCount("log") && (s.default.ENABLE_CALLBACK = !0, u._notifyChange())
+            }
+        }, {
+            key: "removeLogListener", value: function (e) {
+                s.default.emitter.removeListener("log", e), 0 === s.default.emitter.listenerCount("log") && (s.default.ENABLE_CALLBACK = !1, u._notifyChange())
+            }
+        }, {
+            key: "forceGlobalTag", get: function () {
+                return s.default.FORCE_GLOBAL_TAG
+            }, set: function (e) {
+                s.default.FORCE_GLOBAL_TAG = e, u._notifyChange()
+            }
+        }, {
+            key: "globalTag", get: function () {
+                return s.default.GLOBAL_TAG
+            }, set: function (e) {
+                s.default.GLOBAL_TAG = e, u._notifyChange()
+            }
+        }, {
+            key: "enableAll", get: function () {
+                return s.default.ENABLE_VERBOSE && s.default.ENABLE_DEBUG && s.default.ENABLE_INFO && s.default.ENABLE_WARN && s.default.ENABLE_ERROR
+            }, set: function (e) {
+                s.default.ENABLE_VERBOSE = e, s.default.ENABLE_DEBUG = e, s.default.ENABLE_INFO = e, s.default.ENABLE_WARN = e, s.default.ENABLE_ERROR = e, u._notifyChange()
+            }
+        }, {
+            key: "enableDebug", get: function () {
+                return s.default.ENABLE_DEBUG
+            }, set: function (e) {
+                s.default.ENABLE_DEBUG = e, u._notifyChange()
+            }
+        }, {
+            key: "enableVerbose", get: function () {
+                return s.default.ENABLE_VERBOSE
+            }, set: function (e) {
+                s.default.ENABLE_VERBOSE = e, u._notifyChange()
+            }
+        }, {
+            key: "enableInfo", get: function () {
+                return s.default.ENABLE_INFO
+            }, set: function (e) {
+                s.default.ENABLE_INFO = e, u._notifyChange()
+            }
+        }, {
+            key: "enableWarn", get: function () {
+                return s.default.ENABLE_WARN
+            }, set: function (e) {
+                s.default.ENABLE_WARN = e, u._notifyChange()
+            }
+        }, {
+            key: "enableError", get: function () {
+                return s.default.ENABLE_ERROR
+            }, set: function (e) {
+                s.default.ENABLE_ERROR = e, u._notifyChange()
+            }
+        }]);
+        n = u;
+
+        function u() {
+            (0, i.default)(this, u)
+        }
+
+        n.emitter = new a.default, t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function a() {
+            (0, i.default)(this, a), this.mimeType = null, this.duration = null, this.hasAudio = null, this.hasVideo = null, this.audioCodec = null, this.videoCodec = null, this.audioDataRate = null, this.videoDataRate = null, this.audioSampleRate = null, this.audioChannelCount = null, this.width = null, this.height = null, this.fps = null, this.profile = null, this.level = null, this.refFrames = null, this.chromaFormat = null, this.sarNum = null, this.sarDen = null, this.metadata = null, this.segments = null, this.segmentCount = null, this.hasKeyframesIndex = null, this.keyframesIndex = null
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "isComplete", value: function () {
+                var e = !1 === this.hasAudio || !0 === this.hasAudio && null != this.audioCodec && null != this.audioSampleRate && null != this.audioChannelCount,
+                    t = !1 === this.hasVideo || !0 === this.hasVideo && null != this.videoCodec && null != this.width && null != this.height && null != this.fps && null != this.profile && null != this.level && null != this.refFrames && null != this.chromaFormat && null != this.sarNum && null != this.sarDen;
+                return null != this.mimeType && null != this.duration && null != this.metadata && null != this.hasKeyframesIndex && e && t
+            }
+        }, {
+            key: "isSeekable", value: function () {
+                return !0 === this.hasKeyframesIndex
+            }
+        }, {
+            key: "getNearestKeyframe", value: function (e) {
+                if (null == this.keyframesIndex) return null;
+                var t = this.keyframesIndex, e = this._search(t.times, e);
+                return {index: e, milliseconds: t.times[e], fileposition: t.filepositions[e]}
+            }
+        }, {
+            key: "_search", value: function (e, t) {
+                var n, i = 0, r = e.length - 1, a = 0, s = r;
+                for (t < e[0] && (i = 0, a = s + 1); a <= s;) {
+                    if ((n = a + Math.floor((s - a) / 2)) === r || t >= e[n] && t < e[n + 1]) {
+                        i = n;
+                        break
+                    }
+                    e[n] < t ? a = n + 1 : s = n - 1
+                }
+                return i
+            }
+        }]), t.default = a
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        t.default = {
+            OK: "OK",
+            FORMAT_ERROR: "FormatError",
+            FORMAT_UNSUPPORTED: "FormatUnsupported",
+            CODEC_UNSUPPORTED: "CodecUnsupported"
+        }
+    }, function (e, t) {
+    }, function (e, t, n) {
+        "use strict";
+
+        function y() {
+            return this
+        }
+
+        var v = n(27), g = n(8), M = n(70), L = n(17), S = n(29), k = n(238), b = n(36), w = n(74),
+            D = n(7)("iterator"), T = !([].keys && "next" in [].keys()), E = "values";
+        e.exports = function (e, t, n, i, r, a, s) {
+            k(n, t, i);
+
+            function o(e) {
+                if (!T && e in c) return c[e];
+                switch (e) {
+                    case"keys":
+                    case E:
+                        return function () {
+                            return new n(this, e)
+                        }
+                }
+                return function () {
+                    return new n(this, e)
+                }
+            }
+
+            var u, d, i = t + " Iterator", l = r == E, h = !1, c = e.prototype,
+                _ = c[D] || c["@@iterator"] || r && c[r], f = _ || o(r), m = r ? l ? o("entries") : f : void 0,
+                p = "Array" == t && c.entries || _;
+            if (p && (p = w(p.call(new e))) !== Object.prototype && p.next && (b(p, i, !0), v || "function" == typeof p[D] || L(p, D, y)), l && _ && _.name !== E && (h = !0, f = function () {
+                return _.call(this)
+            }), v && !s || !T && !h && c[D] || L(c, D, f), S[t] = f, S[i] = y, r) if (u = {
+                values: l ? f : o(E),
+                keys: a ? f : o("keys"),
+                entries: m
+            }, s) for (d in u) d in c || M(c, d, u[d]); else g(g.P + g.F * (T || h), t, u);
+            return u
+        }
+    }, function (e, t, n) {
+        e.exports = !n(14) && !n(23)(function () {
+            return 7 != Object.defineProperty(n(44)("div"), "a", {
+                get: function () {
+                    return 7
+                }
+            }).a
+        })
+    }, function (e, t, n) {
+        e.exports = n(17)
+    }, function (e, t, n) {
+        var s = n(18), o = n(19), u = n(240)(!1), d = n(48)("IE_PROTO");
+        e.exports = function (e, t) {
+            var n, i = o(e), r = 0, a = [];
+            for (n in i) n != d && s(i, n) && a.push(n);
+            for (; t.length > r;) !s(i, n = t[r++]) || ~u(a, n) || a.push(n);
+            return a
+        }
+    }, function (e, t, n) {
+        var i = n(31);
+        e.exports = Object("z").propertyIsEnumerable(0) ? Object : function (e) {
+            return "String" == i(e) ? e.split("") : Object(e)
+        }
+    }, function (e, t, n) {
+        n = n(6).document;
+        e.exports = n && n.documentElement
+    }, function (e, t, n) {
+        var i = n(18), r = n(24), a = n(48)("IE_PROTO"), s = Object.prototype;
+        e.exports = Object.getPrototypeOf || function (e) {
+            return e = r(e), i(e, a) ? e[a] : "function" == typeof e.constructor && e instanceof e.constructor ? e.constructor.prototype : e instanceof Object ? s : null
+        }
+    }, function (e, t, n) {
+        n(242);
+        for (var i = n(6), r = n(17), a = n(29), s = n(7)("toStringTag"), o = "CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","), u = 0; u < o.length; u++) {
+            var d = o[u], l = i[d], l = l && l.prototype;
+            l && !l[s] && r(l, s, d), a[d] = a.Array
+        }
+    }, function (e, t, n) {
+        var i = n(31), r = n(7)("toStringTag"), a = "Arguments" == i(function () {
+            return arguments
+        }());
+        e.exports = function (e) {
+            var t;
+            return void 0 === e ? "Undefined" : null === e ? "Null" : "string" == typeof (t = function (e, t) {
+                try {
+                    return e[t]
+                } catch (e) {
+                }
+            }(e = Object(e), r)) ? t : a ? i(e) : "Object" == (t = i(e)) && "function" == typeof e.callee ? "Arguments" : t
+        }
+    }, function (e, t, n) {
+        var r = n(13);
+        e.exports = function (t, e, n, i) {
+            try {
+                return i ? e(r(n)[0], n[1]) : e(n)
+            } catch (e) {
+                i = t.return;
+                throw void 0 !== i && r(i.call(t)), e
+            }
+        }
+    }, function (e, t, n) {
+        var i = n(29), r = n(7)("iterator"), a = Array.prototype;
+        e.exports = function (e) {
+            return void 0 !== e && (i.Array === e || a[r] === e)
+        }
+    }, function (e, t, n) {
+        var i = n(76), r = n(7)("iterator"), a = n(29);
+        e.exports = n(3).getIteratorMethod = function (e) {
+            if (null != e) return e[r] || e["@@iterator"] || a[i(e)]
+        }
+    }, function (e, t, n) {
+        var i = n(13), r = n(34), a = n(7)("species");
+        e.exports = function (e, t) {
+            var e = i(e).constructor;
+            return void 0 === e || null == (e = i(e)[a]) ? t : r(e)
+        }
+    }, function (e, t, n) {
+        function i() {
+            var e, t = +this;
+            y.hasOwnProperty(t) && (e = y[t], delete y[t], e())
+        }
+
+        function r(e) {
+            i.call(e.data)
+        }
+
+        var a, s = n(22), o = n(248), u = n(73), d = n(44), l = n(6), h = l.process, c = l.setImmediate,
+            _ = l.clearImmediate, f = l.MessageChannel, m = l.Dispatch, p = 0, y = {}, v = "onreadystatechange";
+        c && _ || (c = function (e) {
+            for (var t = [], n = 1; n < arguments.length;) t.push(arguments[n++]);
+            return y[++p] = function () {
+                o("function" == typeof e ? e : Function(e), t)
+            }, a(p), p
+        }, _ = function (e) {
+            delete y[e]
+        }, "process" == n(31)(h) ? a = function (e) {
+            h.nextTick(s(i, e, 1))
+        } : m && m.now ? a = function (e) {
+            m.now(s(i, e, 1))
+        } : f ? (f = (n = new f).port2, n.port1.onmessage = r, a = s(f.postMessage, f, 1)) : l.addEventListener && "function" == typeof postMessage && !l.importScripts ? (a = function (e) {
+            l.postMessage(e + "", "*")
+        }, l.addEventListener("message", r, !1)) : a = v in d("script") ? function (e) {
+            u.appendChild(d("script"))[v] = function () {
+                u.removeChild(this), i.call(e)
+            }
+        } : function (e) {
+            setTimeout(s(i, e, 1), 0)
+        }), e.exports = {set: c, clear: _}
+    }, function (e, t) {
+        e.exports = function (e) {
+            try {
+                return {e: !1, v: e()}
+            } catch (e) {
+                return {e: !0, v: e}
+            }
+        }
+    }, function (e, t, n) {
+        var i = n(13), r = n(16), a = n(51);
+        e.exports = function (e, t) {
+            if (i(e), r(t) && t.constructor === e) return t;
+            e = a.f(e);
+            return (0, e.resolve)(t), e.promise
+        }
+    }, function (e, t, n) {
+        var a = n(7)("iterator"), s = !1;
+        try {
+            var i = [7][a]();
+            i.return = function () {
+                s = !0
+            }, Array.from(i, function () {
+                throw 2
+            })
+        } catch (e) {
+        }
+        e.exports = function (e, t) {
+            if (!t && !s) return !1;
+            var n = !1;
+            try {
+                var i = [7], r = i[a]();
+                r.next = function () {
+                    return {done: n = !0}
+                }, i[a] = function () {
+                    return r
+                }, e(i)
+            } catch (e) {
+            }
+            return n
+        }
+    }, function (e, t, n) {
+        e.exports = {default: n(255), __esModule: !0}
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.oTool = void 0;
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "$", value: function (e) {
+                var t = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, n = /^(?:\s*(<[\w\W]+>)[^>]*|.([\w-]*))$/;
+                if (t.test(e)) return t = t.exec(e), document.getElementById(t[2]);
+                if (n.test(e)) {
+                    for (var i = n.exec(e), r = document.getElementsByTagName("*"), a = [], s = 0, o = r.length; s < o; s++) r[s].className.match(new RegExp("(\\s|^)" + i[2] + "(\\s|$)")) && a.push(r[s]);
+                    return a
+                }
+            }
+        }, {
+            key: "dateFormat", value: function (e, t) {
+                var n, i = {
+                    "M+": e.getMonth() + 1,
+                    "d+": e.getDate(),
+                    "h+": e.getHours(),
+                    "m+": e.getMinutes(),
+                    "s+": e.getSeconds(),
+                    "q+": Math.floor((e.getMonth() + 3) / 3),
+                    S: e.getMilliseconds()
+                };
+                for (n in /(y+)/.test(t) && (t = t.replace(RegExp.$1, (e.getFullYear() + "").substr(4 - RegExp.$1.length))), i) new RegExp("(" + n + ")").test(t) && (t = t.replace(RegExp.$1, 1 === RegExp.$1.length ? i[n] : ("00" + i[n]).substr(("" + i[n]).length)));
+                return t
+            }
+        }, {
+            key: "downloadFile", value: function (e, t) {
+                var n = e,
+                    e = (e instanceof Blob || e instanceof File || (n = new Blob([e])), window.URL.createObjectURL(n)),
+                    n = window.document.createElement("a"),
+                    e = (n.href = e, n.download = t, document.createEvent("MouseEvents"));
+                e.initEvent("click", !0, !0), n.dispatchEvent(e)
+            }
+        }, {
+            key: "createxmlDoc", value: function () {
+                for (var t, e = ["MSXML2.DOMDocument", "MSXML2.DOMDocument.5.0", "MSXML2.DOMDocument.4.0", "MSXML2.DOMDocument.3.0", "Microsoft.XmlDom"], n = 0, i = e.length; n < i; n++) try {
+                    t = new ActiveXObject(e[n]);
+                    break
+                } catch (e) {
+                    t = document.implementation.createDocument("", "", null);
+                    break
+                }
+                return t.async = "false", t
+            }
+        }, {
+            key: "parseXmlFromStr", value: function (e) {
+                if (null === e || "" === e) return null;
+                var t = this.createxmlDoc();
+                return "Netscape" === navigator.appName || "Opera" === navigator.appName ? t = (new DOMParser).parseFromString(e, "text/xml") : t.loadXML(e), t
+            }
+        }, {
+            key: "encode", value: function (e) {
+                var t, n, i, r, a, s, o = "", u = 0;
+                for (e = this._utf8_encode(e); u < e.length;) i = (t = e.charCodeAt(u++)) >> 2, r = (3 & t) << 4 | (t = e.charCodeAt(u++)) >> 4, a = (15 & t) << 2 | (n = e.charCodeAt(u++)) >> 6, s = 63 & n, isNaN(t) ? a = s = 64 : isNaN(n) && (s = 64), o = o + this._keyStr.charAt(i) + this._keyStr.charAt(r) + this._keyStr.charAt(a) + this._keyStr.charAt(s);
+                return o
+            }
+        }, {
+            key: "decode", value: function (e) {
+                var t, n, i, r, a, s, o = "", u = 0;
+                for (e = e.replace(/[^A-Za-z0-9+/=]/g, ""); u < e.length;) i = this._keyStr.indexOf(e.charAt(u++)), t = (15 & (r = this._keyStr.indexOf(e.charAt(u++)))) << 4 | (a = this._keyStr.indexOf(e.charAt(u++))) >> 2, n = (3 & a) << 6 | (s = this._keyStr.indexOf(e.charAt(u++))), o += String.fromCharCode(i << 2 | r >> 4), 64 !== a && (o += String.fromCharCode(t)), 64 !== s && (o += String.fromCharCode(n));
+                return o = this._utf8_decode(o)
+            }
+        }, {
+            key: "_utf8_encode", value: function (e) {
+                e = e.replace(/\r\n/g, "\n");
+                for (var t = "", n = 0; n < e.length; n++) {
+                    var i = e.charCodeAt(n);
+                    i < 128 ? t += String.fromCharCode(i) : t = 127 < i && i < 2048 ? (t += String.fromCharCode(i >> 6 | 192)) + String.fromCharCode(63 & i | 128) : (t = (t += String.fromCharCode(i >> 12 | 224)) + String.fromCharCode(i >> 6 & 63 | 128)) + String.fromCharCode(63 & i | 128)
+                }
+                return t
+            }
+        }, {
+            key: "_utf8_decode", value: function (e) {
+                for (var t, n, i = "", r = 0, a = 0; r < e.length;) (n = e.charCodeAt(r)) < 128 ? (i += String.fromCharCode(n), r++) : 191 < n && n < 224 ? (a = e.charCodeAt(r + 1), i += String.fromCharCode((31 & n) << 6 | 63 & a), r += 2) : (a = e.charCodeAt(r + 1), t = e.charCodeAt(r + 2), i += String.fromCharCode((15 & n) << 12 | (63 & a) << 6 | 63 & t), r += 3);
+                return i
+            }
+        }, {
+            key: "isFirefox", value: function () {
+                var e = !1, t = navigator.userAgent.toLowerCase(), n = "";
+                return t.match(/firefox\/([\d.]+)/) && (n = t.match(/firefox\/([\d.]+)/)[1], -1 < parseInt(n.split(".")[0], 10) && (e = !0)), e
+            }
+        }, {
+            key: "isSafari", value: function () {
+                var e = !1, t = navigator.userAgent.toLowerCase(), n = "";
+                return t.match(/version\/([\d.]+).safari./) && (n = t.match(/version\/([\d.]+).safari./)[1], -1 < parseInt(n.split(".")[0], 10) && (e = !0)), e
+            }
+        }, {
+            key: "isEdge", value: function () {
+                return -1 < navigator.userAgent.toLowerCase().indexOf("edge")
+            }
+        }, {
+            key: "dataURLtoBlob", value: function (e) {
+                for (var e = e.split(","), t = e[0].match(/:(.*?);/)[1], n = atob(e[1]), i = n.length, r = new Uint8Array(i); i--;) r[i] = n.charCodeAt(i);
+                return new Blob([r], {type: t})
+            }
+        }, {
+            key: "intToHexString", value: function (e) {
+                e = e.toString(16);
+                return e = 1 === e.length ? "0" + e : e
+            }
+        }]);
+        n = a;
+
+        function a() {
+            (0, i.default)(this, a), this._keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+        }
+
+        t.oTool = new n
+    }, function (e, t, n) {
+        var i = n(263), n = n(264), r = n;
+        r.v1 = i, r.v4 = n, e.exports = r
+    }, function (e, t) {
+        var n, i,
+            r = "undefined" != typeof crypto && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || "undefined" != typeof msCrypto && "function" == typeof window.msCrypto.getRandomValues && msCrypto.getRandomValues.bind(msCrypto);
+        r ? (n = new Uint8Array(16), e.exports = function () {
+            return r(n), n
+        }) : (i = new Array(16), e.exports = function () {
+            for (var e, t = 0; t < 16; t++) 0 == (3 & t) && (e = 4294967296 * Math.random()), i[t] = e >>> ((3 & t) << 3) & 255;
+            return i
+        })
+    }, function (e, t) {
+        for (var i = [], n = 0; n < 256; ++n) i[n] = (n + 256).toString(16).substr(1);
+        e.exports = function (e, t) {
+            var t = t || 0, n = i;
+            return [n[e[t++]], n[e[t++]], n[e[t++]], n[e[t++]], "-", n[e[t++]], n[e[t++]], "-", n[e[t++]], n[e[t++]], "-", n[e[t++]], n[e[t++]], "-", n[e[t++]], n[e[t++]], n[e[t++]], n[e[t++]], n[e[t++]], n[e[+t]]].join("")
+        }
+    }, function (e, t, n) {
+        var i = n(71), r = n(50).concat("length", "prototype");
+        t.f = Object.getOwnPropertyNames || function (e) {
+            return i(e, r)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = s(n(1)), r = s(n(2)), a = s(n(0));
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(o, [{
+            key: "D", value: function () {
+                var e;
+                this._config.openDebug && (e = console).debug.apply(e, ["[" + this.TAG + "] %c" + (0, a.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c", "color: blue", "color: black"].concat(Array.prototype.slice.call(arguments)))
+            }
+        }, {
+            key: "I", value: function () {
+                var e;
+                (e = console).info.apply(e, ["[" + this.TAG + "] %c" + (0, a.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c", "color: blue", "color: black"].concat(Array.prototype.slice.call(arguments)))
+            }
+        }, {
+            key: "W", value: function () {
+                var e;
+                (e = console).warm.apply(e, ["[" + this.TAG + "] %c" + (0, a.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c", "color: blue", "color: black"].concat(Array.prototype.slice.call(arguments)))
+            }
+        }, {
+            key: "E", value: function () {
+                var e;
+                (e = console).error.apply(e, ["[" + this.TAG + "] %c" + (0, a.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c", "color: blue", "color: black"].concat(Array.prototype.slice.call(arguments)))
+            }
+        }]);
+        n = o;
+
+        function o(e) {
+            (0, i.default)(this, o), this._bus = e, this.TAG = e.TAG || "Debug", this._config = e._config || e.options || {}
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("af", {
+                months: "Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),
+                monthsShort: "Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),
+                weekdays: "Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),
+                weekdaysShort: "Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),
+                weekdaysMin: "So_Ma_Di_Wo_Do_Vr_Sa".split("_"),
+                meridiemParse: /vm|nm/i,
+                isPM: function (e) {
+                    return /^nm$/i.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return n ? "vm" : "VM"; else return n ? "nm" : "NM"
+                },
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Vandag om] LT",
+                    nextDay: "[Môre om] LT",
+                    nextWeek: "dddd [om] LT",
+                    lastDay: "[Gister om] LT",
+                    lastWeek: "[Laas] dddd [om] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "oor %s",
+                    past: "%s gelede",
+                    s: "'n paar sekondes",
+                    ss: "%d sekondes",
+                    m: "'n minuut",
+                    mm: "%d minute",
+                    h: "'n uur",
+                    hh: "%d ure",
+                    d: "'n dag",
+                    dd: "%d dae",
+                    M: "'n maand",
+                    MM: "%d maande",
+                    y: "'n jaar",
+                    yy: "%d jaar"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+                ordinal: function (e) {
+                    return e + (e === 1 || e === 8 || e >= 20 ? "ste" : "de")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "١", 2: "٢", 3: "٣", 4: "٤", 5: "٥", 6: "٦", 7: "٧", 8: "٨", 9: "٩", 0: "٠"}, n = {
+                    "١": "1",
+                    "٢": "2",
+                    "٣": "3",
+                    "٤": "4",
+                    "٥": "5",
+                    "٦": "6",
+                    "٧": "7",
+                    "٨": "8",
+                    "٩": "9",
+                    "٠": "0"
+                }, o = function (e) {
+                    return e === 0 ? 0 : e === 1 ? 1 : e === 2 ? 2 : e % 100 >= 3 && e % 100 <= 10 ? 3 : e % 100 >= 11 ? 4 : 5
+                }, u = {
+                    s: ["أقل من ثانية", "ثانية واحدة", ["ثانيتان", "ثانيتين"], "%d ثوان", "%d ثانية", "%d ثانية"],
+                    m: ["أقل من دقيقة", "دقيقة واحدة", ["دقيقتان", "دقيقتين"], "%d دقائق", "%d دقيقة", "%d دقيقة"],
+                    h: ["أقل من ساعة", "ساعة واحدة", ["ساعتان", "ساعتين"], "%d ساعات", "%d ساعة", "%d ساعة"],
+                    d: ["أقل من يوم", "يوم واحد", ["يومان", "يومين"], "%d أيام", "%d يومًا", "%d يوم"],
+                    M: ["أقل من شهر", "شهر واحد", ["شهران", "شهرين"], "%d أشهر", "%d شهرا", "%d شهر"],
+                    y: ["أقل من عام", "عام واحد", ["عامان", "عامين"], "%d أعوام", "%d عامًا", "%d عام"]
+                }, i = function (s) {
+                    return function (e, t, n, i) {
+                        var r = o(e), a = u[s][o(e)];
+                        if (r === 2) a = a[t ? 0 : 1];
+                        return a.replace(/%d/i, e)
+                    }
+                },
+                r = ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
+                a;
+            e.defineLocale("ar", {
+                months: r,
+                monthsShort: r,
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "D/‏M/‏YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ص|م/,
+                isPM: function (e) {
+                    return "م" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ص"; else return "م"
+                },
+                calendar: {
+                    sameDay: "[اليوم عند الساعة] LT",
+                    nextDay: "[غدًا عند الساعة] LT",
+                    nextWeek: "dddd [عند الساعة] LT",
+                    lastDay: "[أمس عند الساعة] LT",
+                    lastWeek: "dddd [عند الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "بعد %s",
+                    past: "منذ %s",
+                    s: i("s"),
+                    ss: i("s"),
+                    m: i("m"),
+                    mm: i("m"),
+                    h: i("h"),
+                    hh: i("h"),
+                    d: i("d"),
+                    dd: i("d"),
+                    M: i("M"),
+                    MM: i("M"),
+                    y: i("y"),
+                    yy: i("y")
+                },
+                preparse: function (e) {
+                    return e.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (e) {
+                        return n[e]
+                    }).replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    }).replace(/,/g, "،")
+                },
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var o = function (e) {
+                    return e === 0 ? 0 : e === 1 ? 1 : e === 2 ? 2 : e % 100 >= 3 && e % 100 <= 10 ? 3 : e % 100 >= 11 ? 4 : 5
+                }, u = {
+                    s: ["أقل من ثانية", "ثانية واحدة", ["ثانيتان", "ثانيتين"], "%d ثوان", "%d ثانية", "%d ثانية"],
+                    m: ["أقل من دقيقة", "دقيقة واحدة", ["دقيقتان", "دقيقتين"], "%d دقائق", "%d دقيقة", "%d دقيقة"],
+                    h: ["أقل من ساعة", "ساعة واحدة", ["ساعتان", "ساعتين"], "%d ساعات", "%d ساعة", "%d ساعة"],
+                    d: ["أقل من يوم", "يوم واحد", ["يومان", "يومين"], "%d أيام", "%d يومًا", "%d يوم"],
+                    M: ["أقل من شهر", "شهر واحد", ["شهران", "شهرين"], "%d أشهر", "%d شهرا", "%d شهر"],
+                    y: ["أقل من عام", "عام واحد", ["عامان", "عامين"], "%d أعوام", "%d عامًا", "%d عام"]
+                }, t = function (s) {
+                    return function (e, t, n, i) {
+                        var r = o(e), a = u[s][o(e)];
+                        if (r === 2) a = a[t ? 0 : 1];
+                        return a.replace(/%d/i, e)
+                    }
+                },
+                n = ["جانفي", "فيفري", "مارس", "أفريل", "ماي", "جوان", "جويلية", "أوت", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
+                i;
+            e.defineLocale("ar-dz", {
+                months: n,
+                monthsShort: n,
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "D/‏M/‏YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ص|م/,
+                isPM: function (e) {
+                    return "م" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ص"; else return "م"
+                },
+                calendar: {
+                    sameDay: "[اليوم عند الساعة] LT",
+                    nextDay: "[غدًا عند الساعة] LT",
+                    nextWeek: "dddd [عند الساعة] LT",
+                    lastDay: "[أمس عند الساعة] LT",
+                    lastWeek: "dddd [عند الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "بعد %s",
+                    past: "منذ %s",
+                    s: t("s"),
+                    ss: t("s"),
+                    m: t("m"),
+                    mm: t("m"),
+                    h: t("h"),
+                    hh: t("h"),
+                    d: t("d"),
+                    dd: t("d"),
+                    M: t("M"),
+                    MM: t("M"),
+                    y: t("y"),
+                    yy: t("y")
+                },
+                postformat: function (e) {
+                    return e.replace(/,/g, "،")
+                },
+                week: {dow: 0, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ar-kw", {
+                months: "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
+                monthsShort: "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
+                weekdays: "الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[اليوم على الساعة] LT",
+                    nextDay: "[غدا على الساعة] LT",
+                    nextWeek: "dddd [على الساعة] LT",
+                    lastDay: "[أمس على الساعة] LT",
+                    lastWeek: "dddd [على الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "في %s",
+                    past: "منذ %s",
+                    s: "ثوان",
+                    ss: "%d ثانية",
+                    m: "دقيقة",
+                    mm: "%d دقائق",
+                    h: "ساعة",
+                    hh: "%d ساعات",
+                    d: "يوم",
+                    dd: "%d أيام",
+                    M: "شهر",
+                    MM: "%d أشهر",
+                    y: "سنة",
+                    yy: "%d سنوات"
+                },
+                week: {dow: 0, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "1", 2: "2", 3: "3", 4: "4", 5: "5", 6: "6", 7: "7", 8: "8", 9: "9", 0: "0"}, o = function (e) {
+                    return e === 0 ? 0 : e === 1 ? 1 : e === 2 ? 2 : e % 100 >= 3 && e % 100 <= 10 ? 3 : e % 100 >= 11 ? 4 : 5
+                }, u = {
+                    s: ["أقل من ثانية", "ثانية واحدة", ["ثانيتان", "ثانيتين"], "%d ثوان", "%d ثانية", "%d ثانية"],
+                    m: ["أقل من دقيقة", "دقيقة واحدة", ["دقيقتان", "دقيقتين"], "%d دقائق", "%d دقيقة", "%d دقيقة"],
+                    h: ["أقل من ساعة", "ساعة واحدة", ["ساعتان", "ساعتين"], "%d ساعات", "%d ساعة", "%d ساعة"],
+                    d: ["أقل من يوم", "يوم واحد", ["يومان", "يومين"], "%d أيام", "%d يومًا", "%d يوم"],
+                    M: ["أقل من شهر", "شهر واحد", ["شهران", "شهرين"], "%d أشهر", "%d شهرا", "%d شهر"],
+                    y: ["أقل من عام", "عام واحد", ["عامان", "عامين"], "%d أعوام", "%d عامًا", "%d عام"]
+                }, n = function (s) {
+                    return function (e, t, n, i) {
+                        var r = o(e), a = u[s][o(e)];
+                        if (r === 2) a = a[t ? 0 : 1];
+                        return a.replace(/%d/i, e)
+                    }
+                },
+                i = ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
+                r;
+            e.defineLocale("ar-ly", {
+                months: i,
+                monthsShort: i,
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "D/‏M/‏YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ص|م/,
+                isPM: function (e) {
+                    return "م" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ص"; else return "م"
+                },
+                calendar: {
+                    sameDay: "[اليوم عند الساعة] LT",
+                    nextDay: "[غدًا عند الساعة] LT",
+                    nextWeek: "dddd [عند الساعة] LT",
+                    lastDay: "[أمس عند الساعة] LT",
+                    lastWeek: "dddd [عند الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "بعد %s",
+                    past: "منذ %s",
+                    s: n("s"),
+                    ss: n("s"),
+                    m: n("m"),
+                    mm: n("m"),
+                    h: n("h"),
+                    hh: n("h"),
+                    d: n("d"),
+                    dd: n("d"),
+                    M: n("M"),
+                    MM: n("M"),
+                    y: n("y"),
+                    yy: n("y")
+                },
+                preparse: function (e) {
+                    return e.replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    }).replace(/,/g, "،")
+                },
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ar-ma", {
+                months: "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
+                monthsShort: "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[اليوم على الساعة] LT",
+                    nextDay: "[غدا على الساعة] LT",
+                    nextWeek: "dddd [على الساعة] LT",
+                    lastDay: "[أمس على الساعة] LT",
+                    lastWeek: "dddd [على الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "في %s",
+                    past: "منذ %s",
+                    s: "ثوان",
+                    ss: "%d ثانية",
+                    m: "دقيقة",
+                    mm: "%d دقائق",
+                    h: "ساعة",
+                    hh: "%d ساعات",
+                    d: "يوم",
+                    dd: "%d أيام",
+                    M: "شهر",
+                    MM: "%d أشهر",
+                    y: "سنة",
+                    yy: "%d سنوات"
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "١", 2: "٢", 3: "٣", 4: "٤", 5: "٥", 6: "٦", 7: "٧", 8: "٨", 9: "٩", 0: "٠"}, n = {
+                "١": "1",
+                "٢": "2",
+                "٣": "3",
+                "٤": "4",
+                "٥": "5",
+                "٦": "6",
+                "٧": "7",
+                "٨": "8",
+                "٩": "9",
+                "٠": "0"
+            }, i;
+            e.defineLocale("ar-sa", {
+                months: "يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),
+                monthsShort: "يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ص|م/,
+                isPM: function (e) {
+                    return "م" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ص"; else return "م"
+                },
+                calendar: {
+                    sameDay: "[اليوم على الساعة] LT",
+                    nextDay: "[غدا على الساعة] LT",
+                    nextWeek: "dddd [على الساعة] LT",
+                    lastDay: "[أمس على الساعة] LT",
+                    lastWeek: "dddd [على الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "في %s",
+                    past: "منذ %s",
+                    s: "ثوان",
+                    ss: "%d ثانية",
+                    m: "دقيقة",
+                    mm: "%d دقائق",
+                    h: "ساعة",
+                    hh: "%d ساعات",
+                    d: "يوم",
+                    dd: "%d أيام",
+                    M: "شهر",
+                    MM: "%d أشهر",
+                    y: "سنة",
+                    yy: "%d سنوات"
+                },
+                preparse: function (e) {
+                    return e.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (e) {
+                        return n[e]
+                    }).replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    }).replace(/,/g, "،")
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ar-tn", {
+                months: "جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),
+                monthsShort: "جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),
+                weekdays: "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
+                weekdaysShort: "أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),
+                weekdaysMin: "ح_ن_ث_ر_خ_ج_س".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[اليوم على الساعة] LT",
+                    nextDay: "[غدا على الساعة] LT",
+                    nextWeek: "dddd [على الساعة] LT",
+                    lastDay: "[أمس على الساعة] LT",
+                    lastWeek: "dddd [على الساعة] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "في %s",
+                    past: "منذ %s",
+                    s: "ثوان",
+                    ss: "%d ثانية",
+                    m: "دقيقة",
+                    mm: "%d دقائق",
+                    h: "ساعة",
+                    hh: "%d ساعات",
+                    d: "يوم",
+                    dd: "%d أيام",
+                    M: "شهر",
+                    MM: "%d أشهر",
+                    y: "سنة",
+                    yy: "%d سنوات"
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var r = {
+                1: "-inci",
+                5: "-inci",
+                8: "-inci",
+                70: "-inci",
+                80: "-inci",
+                2: "-nci",
+                7: "-nci",
+                20: "-nci",
+                50: "-nci",
+                3: "-üncü",
+                4: "-üncü",
+                100: "-üncü",
+                6: "-ncı",
+                9: "-uncu",
+                10: "-uncu",
+                30: "-uncu",
+                60: "-ıncı",
+                90: "-ıncı"
+            }, t;
+            e.defineLocale("az", {
+                months: "yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),
+                monthsShort: "yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),
+                weekdays: "Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə".split("_"),
+                weekdaysShort: "Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən".split("_"),
+                weekdaysMin: "Bz_BE_ÇA_Çə_CA_Cü_Şə".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[bugün saat] LT",
+                    nextDay: "[sabah saat] LT",
+                    nextWeek: "[gələn həftə] dddd [saat] LT",
+                    lastDay: "[dünən] LT",
+                    lastWeek: "[keçən həftə] dddd [saat] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s sonra",
+                    past: "%s əvvəl",
+                    s: "bir neçə saniyə",
+                    ss: "%d saniyə",
+                    m: "bir dəqiqə",
+                    mm: "%d dəqiqə",
+                    h: "bir saat",
+                    hh: "%d saat",
+                    d: "bir gün",
+                    dd: "%d gün",
+                    M: "bir ay",
+                    MM: "%d ay",
+                    y: "bir il",
+                    yy: "%d il"
+                },
+                meridiemParse: /gecə|səhər|gündüz|axşam/,
+                isPM: function (e) {
+                    return /^(gündüz|axşam)$/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "gecə"; else if (e < 12) return "səhər"; else if (e < 17) return "gündüz"; else return "axşam"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+                ordinal: function (e) {
+                    if (e === 0) return e + "-ıncı";
+                    var t = e % 10, n = e % 100 - t, i = e >= 100 ? 100 : null;
+                    return e + (r[t] || r[n] || r[i])
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function r(e, t) {
+                var n = e.split("_");
+                return t % 10 === 1 && t % 100 !== 11 ? n[0] : t % 10 >= 2 && t % 10 <= 4 && (t % 100 < 10 || t % 100 >= 20) ? n[1] : n[2]
+            }
+
+            function t(e, t, n) {
+                var i = {
+                    ss: t ? "секунда_секунды_секунд" : "секунду_секунды_секунд",
+                    mm: t ? "хвіліна_хвіліны_хвілін" : "хвіліну_хвіліны_хвілін",
+                    hh: t ? "гадзіна_гадзіны_гадзін" : "гадзіну_гадзіны_гадзін",
+                    dd: "дзень_дні_дзён",
+                    MM: "месяц_месяцы_месяцаў",
+                    yy: "год_гады_гадоў"
+                };
+                if (n === "m") return t ? "хвіліна" : "хвіліну"; else if (n === "h") return t ? "гадзіна" : "гадзіну"; else return e + " " + r(i[n], +e)
+            }
+
+            var n;
+            e.defineLocale("be", {
+                months: {
+                    format: "студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня".split("_"),
+                    standalone: "студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань".split("_")
+                },
+                monthsShort: "студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж".split("_"),
+                weekdays: {
+                    format: "нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу".split("_"),
+                    standalone: "нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота".split("_"),
+                    isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
+                },
+                weekdaysShort: "нд_пн_ат_ср_чц_пт_сб".split("_"),
+                weekdaysMin: "нд_пн_ат_ср_чц_пт_сб".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY г.",
+                    LLL: "D MMMM YYYY г., HH:mm",
+                    LLLL: "dddd, D MMMM YYYY г., HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Сёння ў] LT",
+                    nextDay: "[Заўтра ў] LT",
+                    lastDay: "[Учора ў] LT",
+                    nextWeek: function () {
+                        return "[У] dddd [ў] LT"
+                    },
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                            case 3:
+                            case 5:
+                            case 6:
+                                return "[У мінулую] dddd [ў] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                                return "[У мінулы] dddd [ў] LT"
+                        }
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "праз %s",
+                    past: "%s таму",
+                    s: "некалькі секунд",
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: "дзень",
+                    dd: t,
+                    M: "месяц",
+                    MM: t,
+                    y: "год",
+                    yy: t
+                },
+                meridiemParse: /ночы|раніцы|дня|вечара/,
+                isPM: function (e) {
+                    return /^(дня|вечара)$/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "ночы"; else if (e < 12) return "раніцы"; else if (e < 17) return "дня"; else return "вечара"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"M":
+                        case"d":
+                        case"DDD":
+                        case"w":
+                        case"W":
+                            return (e % 10 === 2 || e % 10 === 3) && e % 100 !== 12 && e % 100 !== 13 ? e + "-і" : e + "-ы";
+                        case"D":
+                            return e + "-га";
+                        default:
+                            return e
+                    }
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("bg", {
+                months: "януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),
+                monthsShort: "яну_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),
+                weekdays: "неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),
+                weekdaysShort: "нед_пон_вто_сря_чет_пет_съб".split("_"),
+                weekdaysMin: "нд_пн_вт_ср_чт_пт_сб".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "D.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY H:mm",
+                    LLLL: "dddd, D MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[Днес в] LT",
+                    nextDay: "[Утре в] LT",
+                    nextWeek: "dddd [в] LT",
+                    lastDay: "[Вчера в] LT",
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                            case 3:
+                            case 6:
+                                return "[Миналата] dddd [в] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[Миналия] dddd [в] LT"
+                        }
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "след %s",
+                    past: "преди %s",
+                    s: "няколко секунди",
+                    ss: "%d секунди",
+                    m: "минута",
+                    mm: "%d минути",
+                    h: "час",
+                    hh: "%d часа",
+                    d: "ден",
+                    dd: "%d дена",
+                    w: "седмица",
+                    ww: "%d седмици",
+                    M: "месец",
+                    MM: "%d месеца",
+                    y: "година",
+                    yy: "%d години"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+                ordinal: function (e) {
+                    var t = e % 10, n = e % 100;
+                    if (e === 0) return e + "-ев"; else if (n === 0) return e + "-ен"; else if (n > 10 && n < 20) return e + "-ти"; else if (t === 1) return e + "-ви"; else if (t === 2) return e + "-ри"; else if (t === 7 || t === 8) return e + "-ми"; else return e + "-ти"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("bm", {
+                months: "Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo".split("_"),
+                monthsShort: "Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des".split("_"),
+                weekdays: "Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri".split("_"),
+                weekdaysShort: "Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib".split("_"),
+                weekdaysMin: "Ka_Nt_Ta_Ar_Al_Ju_Si".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "MMMM [tile] D [san] YYYY",
+                    LLL: "MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm",
+                    LLLL: "dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Bi lɛrɛ] LT",
+                    nextDay: "[Sini lɛrɛ] LT",
+                    nextWeek: "dddd [don lɛrɛ] LT",
+                    lastDay: "[Kunu lɛrɛ] LT",
+                    lastWeek: "dddd [tɛmɛnen lɛrɛ] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s kɔnɔ",
+                    past: "a bɛ %s bɔ",
+                    s: "sanga dama dama",
+                    ss: "sekondi %d",
+                    m: "miniti kelen",
+                    mm: "miniti %d",
+                    h: "lɛrɛ kelen",
+                    hh: "lɛrɛ %d",
+                    d: "tile kelen",
+                    dd: "tile %d",
+                    M: "kalo kelen",
+                    MM: "kalo %d",
+                    y: "san kelen",
+                    yy: "san %d"
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "১", 2: "২", 3: "৩", 4: "৪", 5: "৫", 6: "৬", 7: "৭", 8: "৮", 9: "৯", 0: "০"}, n = {
+                "১": "1",
+                "২": "2",
+                "৩": "3",
+                "৪": "4",
+                "৫": "5",
+                "৬": "6",
+                "৭": "7",
+                "৮": "8",
+                "৯": "9",
+                "০": "0"
+            }, i;
+            e.defineLocale("bn", {
+                months: "জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),
+                monthsShort: "জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে".split("_"),
+                weekdays: "রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার".split("_"),
+                weekdaysShort: "রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি".split("_"),
+                weekdaysMin: "রবি_সোম_মঙ্গল_বুধ_বৃহ_শুক্র_শনি".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm সময়",
+                    LTS: "A h:mm:ss সময়",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm সময়",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm সময়"
+                },
+                calendar: {
+                    sameDay: "[আজ] LT",
+                    nextDay: "[আগামীকাল] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[গতকাল] LT",
+                    lastWeek: "[গত] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s পরে",
+                    past: "%s আগে",
+                    s: "কয়েক সেকেন্ড",
+                    ss: "%d সেকেন্ড",
+                    m: "এক মিনিট",
+                    mm: "%d মিনিট",
+                    h: "এক ঘন্টা",
+                    hh: "%d ঘন্টা",
+                    d: "এক দিন",
+                    dd: "%d দিন",
+                    M: "এক মাস",
+                    MM: "%d মাস",
+                    y: "এক বছর",
+                    yy: "%d বছর"
+                },
+                preparse: function (e) {
+                    return e.replace(/[১২৩৪৫৬৭৮৯০]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "রাত" && e >= 4 || t === "দুপুর" && e < 5 || t === "বিকাল") return e + 12; else return e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "রাত"; else if (e < 10) return "সকাল"; else if (e < 17) return "দুপুর"; else if (e < 20) return "বিকাল"; else return "রাত"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "১", 2: "২", 3: "৩", 4: "৪", 5: "৫", 6: "৬", 7: "৭", 8: "৮", 9: "৯", 0: "০"}, n = {
+                "১": "1",
+                "২": "2",
+                "৩": "3",
+                "৪": "4",
+                "৫": "5",
+                "৬": "6",
+                "৭": "7",
+                "৮": "8",
+                "৯": "9",
+                "০": "0"
+            }, i;
+            e.defineLocale("bn-bd", {
+                months: "জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),
+                monthsShort: "জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে".split("_"),
+                weekdays: "রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার".split("_"),
+                weekdaysShort: "রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি".split("_"),
+                weekdaysMin: "রবি_সোম_মঙ্গল_বুধ_বৃহ_শুক্র_শনি".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm সময়",
+                    LTS: "A h:mm:ss সময়",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm সময়",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm সময়"
+                },
+                calendar: {
+                    sameDay: "[আজ] LT",
+                    nextDay: "[আগামীকাল] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[গতকাল] LT",
+                    lastWeek: "[গত] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s পরে",
+                    past: "%s আগে",
+                    s: "কয়েক সেকেন্ড",
+                    ss: "%d সেকেন্ড",
+                    m: "এক মিনিট",
+                    mm: "%d মিনিট",
+                    h: "এক ঘন্টা",
+                    hh: "%d ঘন্টা",
+                    d: "এক দিন",
+                    dd: "%d দিন",
+                    M: "এক মাস",
+                    MM: "%d মাস",
+                    y: "এক বছর",
+                    yy: "%d বছর"
+                },
+                preparse: function (e) {
+                    return e.replace(/[১২৩৪৫৬৭৮৯০]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /রাত|ভোর|সকাল|দুপুর|বিকাল|সন্ধ্যা|রাত/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "রাত") return e < 4 ? e : e + 12; else if (t === "ভোর") return e; else if (t === "সকাল") return e; else if (t === "দুপুর") return e >= 3 ? e : e + 12; else if (t === "বিকাল") return e + 12; else if (t === "সন্ধ্যা") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "রাত"; else if (e < 6) return "ভোর"; else if (e < 12) return "সকাল"; else if (e < 15) return "দুপুর"; else if (e < 18) return "বিকাল"; else if (e < 20) return "সন্ধ্যা"; else return "রাত"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "༡", 2: "༢", 3: "༣", 4: "༤", 5: "༥", 6: "༦", 7: "༧", 8: "༨", 9: "༩", 0: "༠"}, n = {
+                "༡": "1",
+                "༢": "2",
+                "༣": "3",
+                "༤": "4",
+                "༥": "5",
+                "༦": "6",
+                "༧": "7",
+                "༨": "8",
+                "༩": "9",
+                "༠": "0"
+            }, i;
+            e.defineLocale("bo", {
+                months: "ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),
+                monthsShort: "ཟླ་1_ཟླ་2_ཟླ་3_ཟླ་4_ཟླ་5_ཟླ་6_ཟླ་7_ཟླ་8_ཟླ་9_ཟླ་10_ཟླ་11_ཟླ་12".split("_"),
+                monthsShortRegex: /^(ཟླ་\d{1,2})/,
+                monthsParseExact: true,
+                weekdays: "གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་".split("_"),
+                weekdaysShort: "ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),
+                weekdaysMin: "ཉི_ཟླ_མིག_ལྷག_ཕུར_སངས_སྤེན".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm",
+                    LTS: "A h:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm"
+                },
+                calendar: {
+                    sameDay: "[དི་རིང] LT",
+                    nextDay: "[སང་ཉིན] LT",
+                    nextWeek: "[བདུན་ཕྲག་རྗེས་མ], LT",
+                    lastDay: "[ཁ་སང] LT",
+                    lastWeek: "[བདུན་ཕྲག་མཐའ་མ] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s ལ་",
+                    past: "%s སྔན་ལ",
+                    s: "ལམ་སང",
+                    ss: "%d སྐར་ཆ།",
+                    m: "སྐར་མ་གཅིག",
+                    mm: "%d སྐར་མ",
+                    h: "ཆུ་ཚོད་གཅིག",
+                    hh: "%d ཆུ་ཚོད",
+                    d: "ཉིན་གཅིག",
+                    dd: "%d ཉིན་",
+                    M: "ཟླ་བ་གཅིག",
+                    MM: "%d ཟླ་བ",
+                    y: "ལོ་གཅིག",
+                    yy: "%d ལོ"
+                },
+                preparse: function (e) {
+                    return e.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "མཚན་མོ" && e >= 4 || t === "ཉིན་གུང" && e < 5 || t === "དགོང་དག") return e + 12; else return e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "མཚན་མོ"; else if (e < 10) return "ཞོགས་ཀས"; else if (e < 17) return "ཉིན་གུང"; else if (e < 20) return "དགོང་དག"; else return "མཚན་མོ"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n) {
+                var i = {mm: "munutenn", MM: "miz", dd: "devezh"};
+                return e + " " + r(i[n], e)
+            }
+
+            function n(e) {
+                switch (i(e)) {
+                    case 1:
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 9:
+                        return e + " bloaz";
+                    default:
+                        return e + " vloaz"
+                }
+            }
+
+            function i(e) {
+                if (e > 9) return i(e % 10);
+                return e
+            }
+
+            function r(e, t) {
+                if (t === 2) return a(e);
+                return e
+            }
+
+            function a(e) {
+                var t = {m: "v", b: "v", d: "z"};
+                if (t[e.charAt(0)] === undefined) return e;
+                return t[e.charAt(0)] + e.substring(1)
+            }
+
+            var s = [/^gen/i, /^c[ʼ\']hwe/i, /^meu/i, /^ebr/i, /^mae/i, /^(mez|eve)/i, /^gou/i, /^eos/i, /^gwe/i, /^her/i, /^du/i, /^ker/i],
+                o = /^(genver|c[ʼ\']hwevrer|meurzh|ebrel|mae|mezheven|gouere|eost|gwengolo|here|du|kerzu|gen|c[ʼ\']hwe|meu|ebr|mae|eve|gou|eos|gwe|her|du|ker)/i,
+                u = /^(genver|c[ʼ\']hwevrer|meurzh|ebrel|mae|mezheven|gouere|eost|gwengolo|here|du|kerzu)/i,
+                d = /^(gen|c[ʼ\']hwe|meu|ebr|mae|eve|gou|eos|gwe|her|du|ker)/i,
+                l = [/^sul/i, /^lun/i, /^meurzh/i, /^merc[ʼ\']her/i, /^yaou/i, /^gwener/i, /^sadorn/i],
+                h = [/^Sul/i, /^Lun/i, /^Meu/i, /^Mer/i, /^Yao/i, /^Gwe/i, /^Sad/i],
+                c = [/^Su/i, /^Lu/i, /^Me([^r]|$)/i, /^Mer/i, /^Ya/i, /^Gw/i, /^Sa/i], _;
+            e.defineLocale("br", {
+                months: "Genver_Cʼhwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),
+                monthsShort: "Gen_Cʼhwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),
+                weekdays: "Sul_Lun_Meurzh_Mercʼher_Yaou_Gwener_Sadorn".split("_"),
+                weekdaysShort: "Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),
+                weekdaysMin: "Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),
+                weekdaysParse: c,
+                fullWeekdaysParse: l,
+                shortWeekdaysParse: h,
+                minWeekdaysParse: c,
+                monthsRegex: o,
+                monthsShortRegex: o,
+                monthsStrictRegex: u,
+                monthsShortStrictRegex: d,
+                monthsParse: s,
+                longMonthsParse: s,
+                shortMonthsParse: s,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [a viz] MMMM YYYY",
+                    LLL: "D [a viz] MMMM YYYY HH:mm",
+                    LLLL: "dddd, D [a viz] MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Hiziv da] LT",
+                    nextDay: "[Warcʼhoazh da] LT",
+                    nextWeek: "dddd [da] LT",
+                    lastDay: "[Decʼh da] LT",
+                    lastWeek: "dddd [paset da] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "a-benn %s",
+                    past: "%s ʼzo",
+                    s: "un nebeud segondennoù",
+                    ss: "%d eilenn",
+                    m: "ur vunutenn",
+                    mm: t,
+                    h: "un eur",
+                    hh: "%d eur",
+                    d: "un devezh",
+                    dd: t,
+                    M: "ur miz",
+                    MM: t,
+                    y: "ur bloaz",
+                    yy: n
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
+                ordinal: function (e) {
+                    var t = e === 1 ? "añ" : "vet";
+                    return e + t
+                },
+                week: {dow: 1, doy: 4},
+                meridiemParse: /a.m.|g.m./,
+                isPM: function (e) {
+                    return e === "g.m."
+                },
+                meridiem: function (e, t, n) {
+                    return e < 12 ? "a.m." : "g.m."
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n) {
+                var i = e + " ";
+                switch (n) {
+                    case"ss":
+                        if (e === 1) i += "sekunda"; else if (e === 2 || e === 3 || e === 4) i += "sekunde"; else i += "sekundi";
+                        return i;
+                    case"m":
+                        return t ? "jedna minuta" : "jedne minute";
+                    case"mm":
+                        if (e === 1) i += "minuta"; else if (e === 2 || e === 3 || e === 4) i += "minute"; else i += "minuta";
+                        return i;
+                    case"h":
+                        return t ? "jedan sat" : "jednog sata";
+                    case"hh":
+                        if (e === 1) i += "sat"; else if (e === 2 || e === 3 || e === 4) i += "sata"; else i += "sati";
+                        return i;
+                    case"dd":
+                        if (e === 1) i += "dan"; else i += "dana";
+                        return i;
+                    case"MM":
+                        if (e === 1) i += "mjesec"; else if (e === 2 || e === 3 || e === 4) i += "mjeseca"; else i += "mjeseci";
+                        return i;
+                    case"yy":
+                        if (e === 1) i += "godina"; else if (e === 2 || e === 3 || e === 4) i += "godine"; else i += "godina";
+                        return i
+                }
+            }
+
+            var n;
+            e.defineLocale("bs", {
+                months: "januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),
+                monthsShort: "jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),
+                weekdaysShort: "ned._pon._uto._sri._čet._pet._sub.".split("_"),
+                weekdaysMin: "ne_po_ut_sr_če_pe_su".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd, D. MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[danas u] LT", nextDay: "[sutra u] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[u] [nedjelju] [u] LT";
+                            case 3:
+                                return "[u] [srijedu] [u] LT";
+                            case 6:
+                                return "[u] [subotu] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[u] dddd [u] LT"
+                        }
+                    }, lastDay: "[jučer u] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                            case 3:
+                                return "[prošlu] dddd [u] LT";
+                            case 6:
+                                return "[prošle] [subote] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[prošli] dddd [u] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "prije %s",
+                    s: "par sekundi",
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: "dan",
+                    dd: t,
+                    M: "mjesec",
+                    MM: t,
+                    y: "godinu",
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ca", {
+                months: {
+                    standalone: "gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),
+                    format: "de gener_de febrer_de març_d'abril_de maig_de juny_de juliol_d'agost_de setembre_d'octubre_de novembre_de desembre".split("_"),
+                    isFormat: /D[oD]?(\s)+MMMM/
+                },
+                monthsShort: "gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.".split("_"),
+                monthsParseExact: true,
+                weekdays: "diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),
+                weekdaysShort: "dg._dl._dt._dc._dj._dv._ds.".split("_"),
+                weekdaysMin: "dg_dl_dt_dc_dj_dv_ds".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM [de] YYYY",
+                    ll: "D MMM YYYY",
+                    LLL: "D MMMM [de] YYYY [a les] H:mm",
+                    lll: "D MMM YYYY, H:mm",
+                    LLLL: "dddd D MMMM [de] YYYY [a les] H:mm",
+                    llll: "ddd D MMM YYYY, H:mm"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[avui a " + (this.hours() !== 1 ? "les" : "la") + "] LT"
+                    }, nextDay: function () {
+                        return "[demà a " + (this.hours() !== 1 ? "les" : "la") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [a " + (this.hours() !== 1 ? "les" : "la") + "] LT"
+                    }, lastDay: function () {
+                        return "[ahir a " + (this.hours() !== 1 ? "les" : "la") + "] LT"
+                    }, lastWeek: function () {
+                        return "[el] dddd [passat a " + (this.hours() !== 1 ? "les" : "la") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "d'aquí %s",
+                    past: "fa %s",
+                    s: "uns segons",
+                    ss: "%d segons",
+                    m: "un minut",
+                    mm: "%d minuts",
+                    h: "una hora",
+                    hh: "%d hores",
+                    d: "un dia",
+                    dd: "%d dies",
+                    M: "un mes",
+                    MM: "%d mesos",
+                    y: "un any",
+                    yy: "%d anys"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
+                ordinal: function (e, t) {
+                    var n = e === 1 ? "r" : e === 2 ? "n" : e === 3 ? "r" : e === 4 ? "t" : "è";
+                    if (t === "w" || t === "W") n = "a";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {
+                    format: "leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_"),
+                    standalone: "ledna_února_března_dubna_května_června_července_srpna_září_října_listopadu_prosince".split("_")
+                }, n = "led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),
+                i = [/^led/i, /^úno/i, /^bře/i, /^dub/i, /^kvě/i, /^(čvn|červen$|června)/i, /^(čvc|červenec|července)/i, /^srp/i, /^zář/i, /^říj/i, /^lis/i, /^pro/i],
+                r = /^(leden|únor|březen|duben|květen|červenec|července|červen|června|srpen|září|říjen|listopad|prosinec|led|úno|bře|dub|kvě|čvn|čvc|srp|zář|říj|lis|pro)/i,
+                a;
+
+            function s(e) {
+                return e > 1 && e < 5 && ~~(e / 10) !== 1
+            }
+
+            function o(e, t, n, i) {
+                var r = e + " ";
+                switch (n) {
+                    case"s":
+                        return t || i ? "pár sekund" : "pár sekundami";
+                    case"ss":
+                        if (t || i) return r + (s(e) ? "sekundy" : "sekund"); else return r + "sekundami";
+                    case"m":
+                        return t ? "minuta" : i ? "minutu" : "minutou";
+                    case"mm":
+                        if (t || i) return r + (s(e) ? "minuty" : "minut"); else return r + "minutami";
+                    case"h":
+                        return t ? "hodina" : i ? "hodinu" : "hodinou";
+                    case"hh":
+                        if (t || i) return r + (s(e) ? "hodiny" : "hodin"); else return r + "hodinami";
+                    case"d":
+                        return t || i ? "den" : "dnem";
+                    case"dd":
+                        if (t || i) return r + (s(e) ? "dny" : "dní"); else return r + "dny";
+                    case"M":
+                        return t || i ? "měsíc" : "měsícem";
+                    case"MM":
+                        if (t || i) return r + (s(e) ? "měsíce" : "měsíců"); else return r + "měsíci";
+                    case"y":
+                        return t || i ? "rok" : "rokem";
+                    case"yy":
+                        if (t || i) return r + (s(e) ? "roky" : "let"); else return r + "lety"
+                }
+            }
+
+            e.defineLocale("cs", {
+                months: t,
+                monthsShort: n,
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(leden|ledna|února|únor|březen|března|duben|dubna|květen|května|červenec|července|červen|června|srpen|srpna|září|říjen|října|listopadu|listopad|prosinec|prosince)/i,
+                monthsShortStrictRegex: /^(led|úno|bře|dub|kvě|čvn|čvc|srp|zář|říj|lis|pro)/i,
+                monthsParse: i,
+                longMonthsParse: i,
+                shortMonthsParse: i,
+                weekdays: "neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),
+                weekdaysShort: "ne_po_út_st_čt_pá_so".split("_"),
+                weekdaysMin: "ne_po_út_st_čt_pá_so".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd D. MMMM YYYY H:mm",
+                    l: "D. M. YYYY"
+                },
+                calendar: {
+                    sameDay: "[dnes v] LT", nextDay: "[zítra v] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[v neděli v] LT";
+                            case 1:
+                            case 2:
+                                return "[v] dddd [v] LT";
+                            case 3:
+                                return "[ve středu v] LT";
+                            case 4:
+                                return "[ve čtvrtek v] LT";
+                            case 5:
+                                return "[v pátek v] LT";
+                            case 6:
+                                return "[v sobotu v] LT"
+                        }
+                    }, lastDay: "[včera v] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[minulou neděli v] LT";
+                            case 1:
+                            case 2:
+                                return "[minulé] dddd [v] LT";
+                            case 3:
+                                return "[minulou středu v] LT";
+                            case 4:
+                            case 5:
+                                return "[minulý] dddd [v] LT";
+                            case 6:
+                                return "[minulou sobotu v] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "před %s",
+                    s: o,
+                    ss: o,
+                    m: o,
+                    mm: o,
+                    h: o,
+                    hh: o,
+                    d: o,
+                    dd: o,
+                    M: o,
+                    MM: o,
+                    y: o,
+                    yy: o
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("cv", {
+                months: "кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав".split("_"),
+                monthsShort: "кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш".split("_"),
+                weekdays: "вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун".split("_"),
+                weekdaysShort: "выр_тун_ытл_юн_кӗҫ_эрн_шӑм".split("_"),
+                weekdaysMin: "вр_тн_ыт_юн_кҫ_эр_шм".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD-MM-YYYY",
+                    LL: "YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]",
+                    LLL: "YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm",
+                    LLLL: "dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Паян] LT [сехетре]",
+                    nextDay: "[Ыран] LT [сехетре]",
+                    lastDay: "[Ӗнер] LT [сехетре]",
+                    nextWeek: "[Ҫитес] dddd LT [сехетре]",
+                    lastWeek: "[Иртнӗ] dddd LT [сехетре]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: function (e) {
+                        var t = /сехет$/i.exec(e) ? "рен" : /ҫул$/i.exec(e) ? "тан" : "ран";
+                        return e + t
+                    },
+                    past: "%s каялла",
+                    s: "пӗр-ик ҫеккунт",
+                    ss: "%d ҫеккунт",
+                    m: "пӗр минут",
+                    mm: "%d минут",
+                    h: "пӗр сехет",
+                    hh: "%d сехет",
+                    d: "пӗр кун",
+                    dd: "%d кун",
+                    M: "пӗр уйӑх",
+                    MM: "%d уйӑх",
+                    y: "пӗр ҫул",
+                    yy: "%d ҫул"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
+                ordinal: "%d-мӗш",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("cy", {
+                months: "Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),
+                monthsShort: "Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),
+                weekdays: "Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),
+                weekdaysShort: "Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),
+                weekdaysMin: "Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Heddiw am] LT",
+                    nextDay: "[Yfory am] LT",
+                    nextWeek: "dddd [am] LT",
+                    lastDay: "[Ddoe am] LT",
+                    lastWeek: "dddd [diwethaf am] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "mewn %s",
+                    past: "%s yn ôl",
+                    s: "ychydig eiliadau",
+                    ss: "%d eiliad",
+                    m: "munud",
+                    mm: "%d munud",
+                    h: "awr",
+                    hh: "%d awr",
+                    d: "diwrnod",
+                    dd: "%d diwrnod",
+                    M: "mis",
+                    MM: "%d mis",
+                    y: "blwyddyn",
+                    yy: "%d flynedd"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+                ordinal: function (e) {
+                    var t = e, n = "",
+                        i = ["", "af", "il", "ydd", "ydd", "ed", "ed", "ed", "fed", "fed", "fed", "eg", "fed", "eg", "eg", "fed", "eg", "eg", "fed", "eg", "fed"];
+                    if (t > 20) if (t === 40 || t === 50 || t === 60 || t === 80 || t === 100) n = "fed"; else n = "ain"; else if (t > 0) n = i[t];
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("da", {
+                months: "januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),
+                monthsShort: "jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),
+                weekdays: "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),
+                weekdaysShort: "søn_man_tir_ons_tor_fre_lør".split("_"),
+                weekdaysMin: "sø_ma_ti_on_to_fr_lø".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY HH:mm",
+                    LLLL: "dddd [d.] D. MMMM YYYY [kl.] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[i dag kl.] LT",
+                    nextDay: "[i morgen kl.] LT",
+                    nextWeek: "på dddd [kl.] LT",
+                    lastDay: "[i går kl.] LT",
+                    lastWeek: "[i] dddd[s kl.] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "om %s",
+                    past: "%s siden",
+                    s: "få sekunder",
+                    ss: "%d sekunder",
+                    m: "et minut",
+                    mm: "%d minutter",
+                    h: "en time",
+                    hh: "%d timer",
+                    d: "en dag",
+                    dd: "%d dage",
+                    M: "en måned",
+                    MM: "%d måneder",
+                    y: "et år",
+                    yy: "%d år"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    m: ["eine Minute", "einer Minute"],
+                    h: ["eine Stunde", "einer Stunde"],
+                    d: ["ein Tag", "einem Tag"],
+                    dd: [e + " Tage", e + " Tagen"],
+                    w: ["eine Woche", "einer Woche"],
+                    M: ["ein Monat", "einem Monat"],
+                    MM: [e + " Monate", e + " Monaten"],
+                    y: ["ein Jahr", "einem Jahr"],
+                    yy: [e + " Jahre", e + " Jahren"]
+                };
+                return t ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("de", {
+                months: "Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),
+                monthsShort: "Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),
+                monthsParseExact: true,
+                weekdays: "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),
+                weekdaysShort: "So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),
+                weekdaysMin: "So_Mo_Di_Mi_Do_Fr_Sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY HH:mm",
+                    LLLL: "dddd, D. MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[heute um] LT [Uhr]",
+                    sameElse: "L",
+                    nextDay: "[morgen um] LT [Uhr]",
+                    nextWeek: "dddd [um] LT [Uhr]",
+                    lastDay: "[gestern um] LT [Uhr]",
+                    lastWeek: "[letzten] dddd [um] LT [Uhr]"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "vor %s",
+                    s: "ein paar Sekunden",
+                    ss: "%d Sekunden",
+                    m: t,
+                    mm: "%d Minuten",
+                    h: t,
+                    hh: "%d Stunden",
+                    d: t,
+                    dd: t,
+                    w: t,
+                    ww: "%d Wochen",
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    m: ["eine Minute", "einer Minute"],
+                    h: ["eine Stunde", "einer Stunde"],
+                    d: ["ein Tag", "einem Tag"],
+                    dd: [e + " Tage", e + " Tagen"],
+                    w: ["eine Woche", "einer Woche"],
+                    M: ["ein Monat", "einem Monat"],
+                    MM: [e + " Monate", e + " Monaten"],
+                    y: ["ein Jahr", "einem Jahr"],
+                    yy: [e + " Jahre", e + " Jahren"]
+                };
+                return t ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("de-at", {
+                months: "Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),
+                monthsShort: "Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),
+                monthsParseExact: true,
+                weekdays: "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),
+                weekdaysShort: "So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),
+                weekdaysMin: "So_Mo_Di_Mi_Do_Fr_Sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY HH:mm",
+                    LLLL: "dddd, D. MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[heute um] LT [Uhr]",
+                    sameElse: "L",
+                    nextDay: "[morgen um] LT [Uhr]",
+                    nextWeek: "dddd [um] LT [Uhr]",
+                    lastDay: "[gestern um] LT [Uhr]",
+                    lastWeek: "[letzten] dddd [um] LT [Uhr]"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "vor %s",
+                    s: "ein paar Sekunden",
+                    ss: "%d Sekunden",
+                    m: t,
+                    mm: "%d Minuten",
+                    h: t,
+                    hh: "%d Stunden",
+                    d: t,
+                    dd: t,
+                    w: t,
+                    ww: "%d Wochen",
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    m: ["eine Minute", "einer Minute"],
+                    h: ["eine Stunde", "einer Stunde"],
+                    d: ["ein Tag", "einem Tag"],
+                    dd: [e + " Tage", e + " Tagen"],
+                    w: ["eine Woche", "einer Woche"],
+                    M: ["ein Monat", "einem Monat"],
+                    MM: [e + " Monate", e + " Monaten"],
+                    y: ["ein Jahr", "einem Jahr"],
+                    yy: [e + " Jahre", e + " Jahren"]
+                };
+                return t ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("de-ch", {
+                months: "Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),
+                monthsShort: "Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),
+                monthsParseExact: true,
+                weekdays: "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),
+                weekdaysShort: "So_Mo_Di_Mi_Do_Fr_Sa".split("_"),
+                weekdaysMin: "So_Mo_Di_Mi_Do_Fr_Sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY HH:mm",
+                    LLLL: "dddd, D. MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[heute um] LT [Uhr]",
+                    sameElse: "L",
+                    nextDay: "[morgen um] LT [Uhr]",
+                    nextWeek: "dddd [um] LT [Uhr]",
+                    lastDay: "[gestern um] LT [Uhr]",
+                    lastWeek: "[letzten] dddd [um] LT [Uhr]"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "vor %s",
+                    s: "ein paar Sekunden",
+                    ss: "%d Sekunden",
+                    m: t,
+                    mm: "%d Minuten",
+                    h: t,
+                    hh: "%d Stunden",
+                    d: t,
+                    dd: t,
+                    w: t,
+                    ww: "%d Wochen",
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = ["ޖެނުއަރީ", "ފެބްރުއަރީ", "މާރިޗު", "އޭޕްރީލު", "މޭ", "ޖޫން", "ޖުލައި", "އޯގަސްޓު", "ސެޕްޓެމްބަރު", "އޮކްޓޯބަރު", "ނޮވެމްބަރު", "ޑިސެމްބަރު"],
+                n = ["އާދިއްތަ", "ހޯމަ", "އަންގާރަ", "ބުދަ", "ބުރާސްފަތި", "ހުކުރު", "ހޮނިހިރު"], i;
+            e.defineLocale("dv", {
+                months: t,
+                monthsShort: t,
+                weekdays: n,
+                weekdaysShort: n,
+                weekdaysMin: "އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "D/M/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /މކ|މފ/,
+                isPM: function (e) {
+                    return "މފ" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "މކ"; else return "މފ"
+                },
+                calendar: {
+                    sameDay: "[މިއަދު] LT",
+                    nextDay: "[މާދަމާ] LT",
+                    nextWeek: "dddd LT",
+                    lastDay: "[އިއްޔެ] LT",
+                    lastWeek: "[ފާއިތުވި] dddd LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "ތެރޭގައި %s",
+                    past: "ކުރިން %s",
+                    s: "ސިކުންތުކޮޅެއް",
+                    ss: "d% ސިކުންތު",
+                    m: "މިނިޓެއް",
+                    mm: "މިނިޓު %d",
+                    h: "ގަޑިއިރެއް",
+                    hh: "ގަޑިއިރު %d",
+                    d: "ދުވަހެއް",
+                    dd: "ދުވަސް %d",
+                    M: "މަހެއް",
+                    MM: "މަސް %d",
+                    y: "އަހަރެއް",
+                    yy: "އަހަރު %d"
+                },
+                preparse: function (e) {
+                    return e.replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/,/g, "،")
+                },
+                week: {dow: 7, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function r(e) {
+                return typeof Function !== "undefined" && e instanceof Function || Object.prototype.toString.call(e) === "[object Function]"
+            }
+
+            var t;
+            e.defineLocale("el", {
+                monthsNominativeEl: "Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),
+                monthsGenitiveEl: "Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"),
+                months: function (e, t) {
+                    if (!e) return this._monthsNominativeEl; else if (typeof t === "string" && /D/.test(t.substring(0, t.indexOf("MMMM")))) return this._monthsGenitiveEl[e.month()]; else return this._monthsNominativeEl[e.month()]
+                },
+                monthsShort: "Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"),
+                weekdays: "Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),
+                weekdaysShort: "Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),
+                weekdaysMin: "Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),
+                meridiem: function (e, t, n) {
+                    if (e > 11) return n ? "μμ" : "ΜΜ"; else return n ? "πμ" : "ΠΜ"
+                },
+                isPM: function (e) {
+                    return (e + "").toLowerCase()[0] === "μ"
+                },
+                meridiemParse: /[ΠΜ]\.?Μ?\.?/i,
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendarEl: {
+                    sameDay: "[Σήμερα {}] LT",
+                    nextDay: "[Αύριο {}] LT",
+                    nextWeek: "dddd [{}] LT",
+                    lastDay: "[Χθες {}] LT",
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 6:
+                                return "[το προηγούμενο] dddd [{}] LT";
+                            default:
+                                return "[την προηγούμενη] dddd [{}] LT"
+                        }
+                    },
+                    sameElse: "L"
+                },
+                calendar: function (e, t) {
+                    var n = this._calendarEl[e], i = t && t.hours();
+                    if (r(n)) n = n.apply(t);
+                    return n.replace("{}", i % 12 === 1 ? "στη" : "στις")
+                },
+                relativeTime: {
+                    future: "σε %s",
+                    past: "%s πριν",
+                    s: "λίγα δευτερόλεπτα",
+                    ss: "%d δευτερόλεπτα",
+                    m: "ένα λεπτό",
+                    mm: "%d λεπτά",
+                    h: "μία ώρα",
+                    hh: "%d ώρες",
+                    d: "μία μέρα",
+                    dd: "%d μέρες",
+                    M: "ένας μήνας",
+                    MM: "%d μήνες",
+                    y: "ένας χρόνος",
+                    yy: "%d χρόνια"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}η/,
+                ordinal: "%dη",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-au", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 0, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-ca", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "YYYY-MM-DD",
+                    LL: "MMMM D, YYYY",
+                    LLL: "MMMM D, YYYY h:mm A",
+                    LLLL: "dddd, MMMM D, YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-gb", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-ie", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-il", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-in", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-nz", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("en-sg", {
+                months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+                weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+                weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+                weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Today at] LT",
+                    nextDay: "[Tomorrow at] LT",
+                    nextWeek: "dddd [at] LT",
+                    lastDay: "[Yesterday at] LT",
+                    lastWeek: "[Last] dddd [at] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "in %s",
+                    past: "%s ago",
+                    s: "a few seconds",
+                    ss: "%d seconds",
+                    m: "a minute",
+                    mm: "%d minutes",
+                    h: "an hour",
+                    hh: "%d hours",
+                    d: "a day",
+                    dd: "%d days",
+                    M: "a month",
+                    MM: "%d months",
+                    y: "a year",
+                    yy: "%d years"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("eo", {
+                months: "januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"),
+                monthsShort: "jan_feb_mart_apr_maj_jun_jul_aŭg_sept_okt_nov_dec".split("_"),
+                weekdays: "dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato".split("_"),
+                weekdaysShort: "dim_lun_mard_merk_ĵaŭ_ven_sab".split("_"),
+                weekdaysMin: "di_lu_ma_me_ĵa_ve_sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "[la] D[-an de] MMMM, YYYY",
+                    LLL: "[la] D[-an de] MMMM, YYYY HH:mm",
+                    LLLL: "dddd[n], [la] D[-an de] MMMM, YYYY HH:mm",
+                    llll: "ddd, [la] D[-an de] MMM, YYYY HH:mm"
+                },
+                meridiemParse: /[ap]\.t\.m/i,
+                isPM: function (e) {
+                    return e.charAt(0).toLowerCase() === "p"
+                },
+                meridiem: function (e, t, n) {
+                    if (e > 11) return n ? "p.t.m." : "P.T.M."; else return n ? "a.t.m." : "A.T.M."
+                },
+                calendar: {
+                    sameDay: "[Hodiaŭ je] LT",
+                    nextDay: "[Morgaŭ je] LT",
+                    nextWeek: "dddd[n je] LT",
+                    lastDay: "[Hieraŭ je] LT",
+                    lastWeek: "[pasintan] dddd[n je] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "post %s",
+                    past: "antaŭ %s",
+                    s: "kelkaj sekundoj",
+                    ss: "%d sekundoj",
+                    m: "unu minuto",
+                    mm: "%d minutoj",
+                    h: "unu horo",
+                    hh: "%d horoj",
+                    d: "unu tago",
+                    dd: "%d tagoj",
+                    M: "unu monato",
+                    MM: "%d monatoj",
+                    y: "unu jaro",
+                    yy: "%d jaroj"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}a/,
+                ordinal: "%da",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
+                i = "ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),
+                t = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i],
+                r = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                a;
+            e.defineLocale("es", {
+                months: "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+                monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
+                weekdaysShort: "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
+                weekdaysMin: "do_lu_ma_mi_ju_vi_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY H:mm",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[hoy a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextDay: function () {
+                        return "[mañana a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastDay: function () {
+                        return "[ayer a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastWeek: function () {
+                        return "[el] dddd [pasado a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "en %s",
+                    past: "hace %s",
+                    s: "unos segundos",
+                    ss: "%d segundos",
+                    m: "un minuto",
+                    mm: "%d minutos",
+                    h: "una hora",
+                    hh: "%d horas",
+                    d: "un día",
+                    dd: "%d días",
+                    w: "una semana",
+                    ww: "%d semanas",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un año",
+                    yy: "%d años"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4},
+                invalidDate: "Fecha inválida"
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
+                i = "ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),
+                t = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i],
+                r = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                a;
+            e.defineLocale("es-do", {
+                months: "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+                monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
+                weekdaysShort: "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
+                weekdaysMin: "do_lu_ma_mi_ju_vi_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY h:mm A",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[hoy a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextDay: function () {
+                        return "[mañana a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastDay: function () {
+                        return "[ayer a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastWeek: function () {
+                        return "[el] dddd [pasado a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "en %s",
+                    past: "hace %s",
+                    s: "unos segundos",
+                    ss: "%d segundos",
+                    m: "un minuto",
+                    mm: "%d minutos",
+                    h: "una hora",
+                    hh: "%d horas",
+                    d: "un día",
+                    dd: "%d días",
+                    w: "una semana",
+                    ww: "%d semanas",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un año",
+                    yy: "%d años"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
+                i = "ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),
+                t = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i],
+                r = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                a;
+            e.defineLocale("es-mx", {
+                months: "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+                monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
+                weekdaysShort: "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
+                weekdaysMin: "do_lu_ma_mi_ju_vi_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY H:mm",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[hoy a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextDay: function () {
+                        return "[mañana a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastDay: function () {
+                        return "[ayer a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastWeek: function () {
+                        return "[el] dddd [pasado a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "en %s",
+                    past: "hace %s",
+                    s: "unos segundos",
+                    ss: "%d segundos",
+                    m: "un minuto",
+                    mm: "%d minutos",
+                    h: "una hora",
+                    hh: "%d horas",
+                    d: "un día",
+                    dd: "%d días",
+                    w: "una semana",
+                    ww: "%d semanas",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un año",
+                    yy: "%d años"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 0, doy: 4},
+                invalidDate: "Fecha inválida"
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
+                i = "ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),
+                t = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i],
+                r = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                a;
+            e.defineLocale("es-us", {
+                months: "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+                monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
+                weekdaysShort: "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
+                weekdaysMin: "do_lu_ma_mi_ju_vi_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "MM/DD/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY h:mm A",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[hoy a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextDay: function () {
+                        return "[mañana a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastDay: function () {
+                        return "[ayer a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, lastWeek: function () {
+                        return "[el] dddd [pasado a la" + (this.hours() !== 1 ? "s" : "") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "en %s",
+                    past: "hace %s",
+                    s: "unos segundos",
+                    ss: "%d segundos",
+                    m: "un minuto",
+                    mm: "%d minutos",
+                    h: "una hora",
+                    hh: "%d horas",
+                    d: "un día",
+                    dd: "%d días",
+                    w: "una semana",
+                    ww: "%d semanas",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un año",
+                    yy: "%d años"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    s: ["mõne sekundi", "mõni sekund", "paar sekundit"],
+                    ss: [e + "sekundi", e + "sekundit"],
+                    m: ["ühe minuti", "üks minut"],
+                    mm: [e + " minuti", e + " minutit"],
+                    h: ["ühe tunni", "tund aega", "üks tund"],
+                    hh: [e + " tunni", e + " tundi"],
+                    d: ["ühe päeva", "üks päev"],
+                    M: ["kuu aja", "kuu aega", "üks kuu"],
+                    MM: [e + " kuu", e + " kuud"],
+                    y: ["ühe aasta", "aasta", "üks aasta"],
+                    yy: [e + " aasta", e + " aastat"]
+                };
+                if (t) return r[n][2] ? r[n][2] : r[n][1];
+                return i ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("et", {
+                months: "jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),
+                monthsShort: "jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),
+                weekdays: "pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),
+                weekdaysShort: "P_E_T_K_N_R_L".split("_"),
+                weekdaysMin: "P_E_T_K_N_R_L".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd, D. MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[Täna,] LT",
+                    nextDay: "[Homme,] LT",
+                    nextWeek: "[Järgmine] dddd LT",
+                    lastDay: "[Eile,] LT",
+                    lastWeek: "[Eelmine] dddd LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s pärast",
+                    past: "%s tagasi",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: t,
+                    dd: "%d päeva",
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("eu", {
+                months: "urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),
+                monthsShort: "urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),
+                monthsParseExact: true,
+                weekdays: "igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),
+                weekdaysShort: "ig._al._ar._az._og._ol._lr.".split("_"),
+                weekdaysMin: "ig_al_ar_az_og_ol_lr".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "YYYY[ko] MMMM[ren] D[a]",
+                    LLL: "YYYY[ko] MMMM[ren] D[a] HH:mm",
+                    LLLL: "dddd, YYYY[ko] MMMM[ren] D[a] HH:mm",
+                    l: "YYYY-M-D",
+                    ll: "YYYY[ko] MMM D[a]",
+                    lll: "YYYY[ko] MMM D[a] HH:mm",
+                    llll: "ddd, YYYY[ko] MMM D[a] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[gaur] LT[etan]",
+                    nextDay: "[bihar] LT[etan]",
+                    nextWeek: "dddd LT[etan]",
+                    lastDay: "[atzo] LT[etan]",
+                    lastWeek: "[aurreko] dddd LT[etan]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s barru",
+                    past: "duela %s",
+                    s: "segundo batzuk",
+                    ss: "%d segundo",
+                    m: "minutu bat",
+                    mm: "%d minutu",
+                    h: "ordu bat",
+                    hh: "%d ordu",
+                    d: "egun bat",
+                    dd: "%d egun",
+                    M: "hilabete bat",
+                    MM: "%d hilabete",
+                    y: "urte bat",
+                    yy: "%d urte"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "۱", 2: "۲", 3: "۳", 4: "۴", 5: "۵", 6: "۶", 7: "۷", 8: "۸", 9: "۹", 0: "۰"}, n = {
+                "۱": "1",
+                "۲": "2",
+                "۳": "3",
+                "۴": "4",
+                "۵": "5",
+                "۶": "6",
+                "۷": "7",
+                "۸": "8",
+                "۹": "9",
+                "۰": "0"
+            }, i;
+            e.defineLocale("fa", {
+                months: "ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),
+                monthsShort: "ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),
+                weekdays: "یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),
+                weekdaysShort: "یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),
+                weekdaysMin: "ی_د_س_چ_پ_ج_ش".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /قبل از ظهر|بعد از ظهر/,
+                isPM: function (e) {
+                    return /بعد از ظهر/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "قبل از ظهر"; else return "بعد از ظهر"
+                },
+                calendar: {
+                    sameDay: "[امروز ساعت] LT",
+                    nextDay: "[فردا ساعت] LT",
+                    nextWeek: "dddd [ساعت] LT",
+                    lastDay: "[دیروز ساعت] LT",
+                    lastWeek: "dddd [پیش] [ساعت] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "در %s",
+                    past: "%s پیش",
+                    s: "چند ثانیه",
+                    ss: "%d ثانیه",
+                    m: "یک دقیقه",
+                    mm: "%d دقیقه",
+                    h: "یک ساعت",
+                    hh: "%d ساعت",
+                    d: "یک روز",
+                    dd: "%d روز",
+                    M: "یک ماه",
+                    MM: "%d ماه",
+                    y: "یک سال",
+                    yy: "%d سال"
+                },
+                preparse: function (e) {
+                    return e.replace(/[۰-۹]/g, function (e) {
+                        return n[e]
+                    }).replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    }).replace(/,/g, "،")
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}م/,
+                ordinal: "%dم",
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" "),
+                i = ["nolla", "yhden", "kahden", "kolmen", "neljän", "viiden", "kuuden", n[7], n[8], n[9]], t;
+
+            function r(e, t, n, i) {
+                var r = "";
+                switch (n) {
+                    case"s":
+                        return i ? "muutaman sekunnin" : "muutama sekunti";
+                    case"ss":
+                        r = i ? "sekunnin" : "sekuntia";
+                        break;
+                    case"m":
+                        return i ? "minuutin" : "minuutti";
+                    case"mm":
+                        r = i ? "minuutin" : "minuuttia";
+                        break;
+                    case"h":
+                        return i ? "tunnin" : "tunti";
+                    case"hh":
+                        r = i ? "tunnin" : "tuntia";
+                        break;
+                    case"d":
+                        return i ? "päivän" : "päivä";
+                    case"dd":
+                        r = i ? "päivän" : "päivää";
+                        break;
+                    case"M":
+                        return i ? "kuukauden" : "kuukausi";
+                    case"MM":
+                        r = i ? "kuukauden" : "kuukautta";
+                        break;
+                    case"y":
+                        return i ? "vuoden" : "vuosi";
+                    case"yy":
+                        r = i ? "vuoden" : "vuotta";
+                        break
+                }
+                r = a(e, i) + " " + r;
+                return r
+            }
+
+            function a(e, t) {
+                return e < 10 ? t ? i[e] : n[e] : e
+            }
+
+            e.defineLocale("fi", {
+                months: "tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),
+                monthsShort: "tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),
+                weekdays: "sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),
+                weekdaysShort: "su_ma_ti_ke_to_pe_la".split("_"),
+                weekdaysMin: "su_ma_ti_ke_to_pe_la".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD.MM.YYYY",
+                    LL: "Do MMMM[ta] YYYY",
+                    LLL: "Do MMMM[ta] YYYY, [klo] HH.mm",
+                    LLLL: "dddd, Do MMMM[ta] YYYY, [klo] HH.mm",
+                    l: "D.M.YYYY",
+                    ll: "Do MMM YYYY",
+                    lll: "Do MMM YYYY, [klo] HH.mm",
+                    llll: "ddd, Do MMM YYYY, [klo] HH.mm"
+                },
+                calendar: {
+                    sameDay: "[tänään] [klo] LT",
+                    nextDay: "[huomenna] [klo] LT",
+                    nextWeek: "dddd [klo] LT",
+                    lastDay: "[eilen] [klo] LT",
+                    lastWeek: "[viime] dddd[na] [klo] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s päästä",
+                    past: "%s sitten",
+                    s: r,
+                    ss: r,
+                    m: r,
+                    mm: r,
+                    h: r,
+                    hh: r,
+                    d: r,
+                    dd: r,
+                    M: r,
+                    MM: r,
+                    y: r,
+                    yy: r
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("fil", {
+                months: "Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),
+                monthsShort: "Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),
+                weekdays: "Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),
+                weekdaysShort: "Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),
+                weekdaysMin: "Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "MM/D/YYYY",
+                    LL: "MMMM D, YYYY",
+                    LLL: "MMMM D, YYYY HH:mm",
+                    LLLL: "dddd, MMMM DD, YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "LT [ngayong araw]",
+                    nextDay: "[Bukas ng] LT",
+                    nextWeek: "LT [sa susunod na] dddd",
+                    lastDay: "LT [kahapon]",
+                    lastWeek: "LT [noong nakaraang] dddd",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "sa loob ng %s",
+                    past: "%s ang nakalipas",
+                    s: "ilang segundo",
+                    ss: "%d segundo",
+                    m: "isang minuto",
+                    mm: "%d minuto",
+                    h: "isang oras",
+                    hh: "%d oras",
+                    d: "isang araw",
+                    dd: "%d araw",
+                    M: "isang buwan",
+                    MM: "%d buwan",
+                    y: "isang taon",
+                    yy: "%d taon"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}/,
+                ordinal: function (e) {
+                    return e
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("fo", {
+                months: "januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"),
+                monthsShort: "jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),
+                weekdays: "sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"),
+                weekdaysShort: "sun_mán_týs_mik_hós_frí_ley".split("_"),
+                weekdaysMin: "su_má_tý_mi_hó_fr_le".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D. MMMM, YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Í dag kl.] LT",
+                    nextDay: "[Í morgin kl.] LT",
+                    nextWeek: "dddd [kl.] LT",
+                    lastDay: "[Í gjár kl.] LT",
+                    lastWeek: "[síðstu] dddd [kl] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "um %s",
+                    past: "%s síðani",
+                    s: "fá sekund",
+                    ss: "%d sekundir",
+                    m: "ein minuttur",
+                    mm: "%d minuttir",
+                    h: "ein tími",
+                    hh: "%d tímar",
+                    d: "ein dagur",
+                    dd: "%d dagar",
+                    M: "ein mánaður",
+                    MM: "%d mánaðir",
+                    y: "eitt ár",
+                    yy: "%d ár"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = /^(janvier|février|mars|avril|mai|juin|juillet|août|septembre|octobre|novembre|décembre)/i,
+                n = /(janv\.?|févr\.?|mars|avr\.?|mai|juin|juil\.?|août|sept\.?|oct\.?|nov\.?|déc\.?)/i,
+                i = /(janv\.?|févr\.?|mars|avr\.?|mai|juin|juil\.?|août|sept\.?|oct\.?|nov\.?|déc\.?|janvier|février|mars|avril|mai|juin|juillet|août|septembre|octobre|novembre|décembre)/i,
+                r = [/^janv/i, /^févr/i, /^mars/i, /^avr/i, /^mai/i, /^juin/i, /^juil/i, /^août/i, /^sept/i, /^oct/i, /^nov/i, /^déc/i],
+                a;
+            e.defineLocale("fr", {
+                months: "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),
+                monthsShort: "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),
+                monthsRegex: i,
+                monthsShortRegex: i,
+                monthsStrictRegex: t,
+                monthsShortStrictRegex: n,
+                monthsParse: r,
+                longMonthsParse: r,
+                shortMonthsParse: r,
+                weekdays: "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),
+                weekdaysShort: "dim._lun._mar._mer._jeu._ven._sam.".split("_"),
+                weekdaysMin: "di_lu_ma_me_je_ve_sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Aujourd’hui à] LT",
+                    nextDay: "[Demain à] LT",
+                    nextWeek: "dddd [à] LT",
+                    lastDay: "[Hier à] LT",
+                    lastWeek: "dddd [dernier à] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dans %s",
+                    past: "il y a %s",
+                    s: "quelques secondes",
+                    ss: "%d secondes",
+                    m: "une minute",
+                    mm: "%d minutes",
+                    h: "une heure",
+                    hh: "%d heures",
+                    d: "un jour",
+                    dd: "%d jours",
+                    w: "une semaine",
+                    ww: "%d semaines",
+                    M: "un mois",
+                    MM: "%d mois",
+                    y: "un an",
+                    yy: "%d ans"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"D":
+                            return e + (e === 1 ? "er" : "");
+                        default:
+                        case"M":
+                        case"Q":
+                        case"DDD":
+                        case"d":
+                            return e + (e === 1 ? "er" : "e");
+                        case"w":
+                        case"W":
+                            return e + (e === 1 ? "re" : "e")
+                    }
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("fr-ca", {
+                months: "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),
+                monthsShort: "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),
+                monthsParseExact: true,
+                weekdays: "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),
+                weekdaysShort: "dim._lun._mar._mer._jeu._ven._sam.".split("_"),
+                weekdaysMin: "di_lu_ma_me_je_ve_sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Aujourd’hui à] LT",
+                    nextDay: "[Demain à] LT",
+                    nextWeek: "dddd [à] LT",
+                    lastDay: "[Hier à] LT",
+                    lastWeek: "dddd [dernier à] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dans %s",
+                    past: "il y a %s",
+                    s: "quelques secondes",
+                    ss: "%d secondes",
+                    m: "une minute",
+                    mm: "%d minutes",
+                    h: "une heure",
+                    hh: "%d heures",
+                    d: "un jour",
+                    dd: "%d jours",
+                    M: "un mois",
+                    MM: "%d mois",
+                    y: "un an",
+                    yy: "%d ans"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        default:
+                        case"M":
+                        case"Q":
+                        case"D":
+                        case"DDD":
+                        case"d":
+                            return e + (e === 1 ? "er" : "e");
+                        case"w":
+                        case"W":
+                            return e + (e === 1 ? "re" : "e")
+                    }
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("fr-ch", {
+                months: "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),
+                monthsShort: "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),
+                monthsParseExact: true,
+                weekdays: "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),
+                weekdaysShort: "dim._lun._mar._mer._jeu._ven._sam.".split("_"),
+                weekdaysMin: "di_lu_ma_me_je_ve_sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Aujourd’hui à] LT",
+                    nextDay: "[Demain à] LT",
+                    nextWeek: "dddd [à] LT",
+                    lastDay: "[Hier à] LT",
+                    lastWeek: "dddd [dernier à] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dans %s",
+                    past: "il y a %s",
+                    s: "quelques secondes",
+                    ss: "%d secondes",
+                    m: "une minute",
+                    mm: "%d minutes",
+                    h: "une heure",
+                    hh: "%d heures",
+                    d: "un jour",
+                    dd: "%d jours",
+                    M: "un mois",
+                    MM: "%d mois",
+                    y: "un an",
+                    yy: "%d ans"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        default:
+                        case"M":
+                        case"Q":
+                        case"D":
+                        case"DDD":
+                        case"d":
+                            return e + (e === 1 ? "er" : "e");
+                        case"w":
+                        case"W":
+                            return e + (e === 1 ? "re" : "e")
+                    }
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_"),
+                i = "jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"), t;
+            e.defineLocale("fy", {
+                months: "jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsParseExact: true,
+                weekdays: "snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),
+                weekdaysShort: "si._mo._ti._wo._to._fr._so.".split("_"),
+                weekdaysMin: "Si_Mo_Ti_Wo_To_Fr_So".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD-MM-YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[hjoed om] LT",
+                    nextDay: "[moarn om] LT",
+                    nextWeek: "dddd [om] LT",
+                    lastDay: "[juster om] LT",
+                    lastWeek: "[ôfrûne] dddd [om] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "oer %s",
+                    past: "%s lyn",
+                    s: "in pear sekonden",
+                    ss: "%d sekonden",
+                    m: "ien minút",
+                    mm: "%d minuten",
+                    h: "ien oere",
+                    hh: "%d oeren",
+                    d: "ien dei",
+                    dd: "%d dagen",
+                    M: "ien moanne",
+                    MM: "%d moannen",
+                    y: "ien jier",
+                    yy: "%d jierren"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+                ordinal: function (e) {
+                    return e + (e === 1 || e === 8 || e >= 20 ? "ste" : "de")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t, n, i, r, a, s;
+            e.defineLocale("ga", {
+                months: ["Eanáir", "Feabhra", "Márta", "Aibreán", "Bealtaine", "Meitheamh", "Iúil", "Lúnasa", "Meán Fómhair", "Deireadh Fómhair", "Samhain", "Nollaig"],
+                monthsShort: ["Ean", "Feabh", "Márt", "Aib", "Beal", "Meith", "Iúil", "Lún", "M.F.", "D.F.", "Samh", "Noll"],
+                monthsParseExact: true,
+                weekdays: ["Dé Domhnaigh", "Dé Luain", "Dé Máirt", "Dé Céadaoin", "Déardaoin", "Dé hAoine", "Dé Sathairn"],
+                weekdaysShort: ["Domh", "Luan", "Máirt", "Céad", "Déar", "Aoine", "Sath"],
+                weekdaysMin: ["Do", "Lu", "Má", "Cé", "Dé", "A", "Sa"],
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Inniu ag] LT",
+                    nextDay: "[Amárach ag] LT",
+                    nextWeek: "dddd [ag] LT",
+                    lastDay: "[Inné ag] LT",
+                    lastWeek: "dddd [seo caite] [ag] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "i %s",
+                    past: "%s ó shin",
+                    s: "cúpla soicind",
+                    ss: "%d soicind",
+                    m: "nóiméad",
+                    mm: "%d nóiméad",
+                    h: "uair an chloig",
+                    hh: "%d uair an chloig",
+                    d: "lá",
+                    dd: "%d lá",
+                    M: "mí",
+                    MM: "%d míonna",
+                    y: "bliain",
+                    yy: "%d bliain"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(d|na|mh)/,
+                ordinal: function (e) {
+                    var t = e === 1 ? "d" : e % 10 === 2 ? "na" : "mh";
+                    return e + t
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t, n, i, r, a, s;
+            e.defineLocale("gd", {
+                months: ["Am Faoilleach", "An Gearran", "Am Màrt", "An Giblean", "An Cèitean", "An t-Ògmhios", "An t-Iuchar", "An Lùnastal", "An t-Sultain", "An Dàmhair", "An t-Samhain", "An Dùbhlachd"],
+                monthsShort: ["Faoi", "Gear", "Màrt", "Gibl", "Cèit", "Ògmh", "Iuch", "Lùn", "Sult", "Dàmh", "Samh", "Dùbh"],
+                monthsParseExact: true,
+                weekdays: ["Didòmhnaich", "Diluain", "Dimàirt", "Diciadain", "Diardaoin", "Dihaoine", "Disathairne"],
+                weekdaysShort: ["Did", "Dil", "Dim", "Dic", "Dia", "Dih", "Dis"],
+                weekdaysMin: ["Dò", "Lu", "Mà", "Ci", "Ar", "Ha", "Sa"],
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[An-diugh aig] LT",
+                    nextDay: "[A-màireach aig] LT",
+                    nextWeek: "dddd [aig] LT",
+                    lastDay: "[An-dè aig] LT",
+                    lastWeek: "dddd [seo chaidh] [aig] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "ann an %s",
+                    past: "bho chionn %s",
+                    s: "beagan diogan",
+                    ss: "%d diogan",
+                    m: "mionaid",
+                    mm: "%d mionaidean",
+                    h: "uair",
+                    hh: "%d uairean",
+                    d: "latha",
+                    dd: "%d latha",
+                    M: "mìos",
+                    MM: "%d mìosan",
+                    y: "bliadhna",
+                    yy: "%d bliadhna"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(d|na|mh)/,
+                ordinal: function (e) {
+                    var t = e === 1 ? "d" : e % 10 === 2 ? "na" : "mh";
+                    return e + t
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("gl", {
+                months: "xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro".split("_"),
+                monthsShort: "xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "domingo_luns_martes_mércores_xoves_venres_sábado".split("_"),
+                weekdaysShort: "dom._lun._mar._mér._xov._ven._sáb.".split("_"),
+                weekdaysMin: "do_lu_ma_mé_xo_ve_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY H:mm",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[hoxe " + (this.hours() !== 1 ? "ás" : "á") + "] LT"
+                    }, nextDay: function () {
+                        return "[mañá " + (this.hours() !== 1 ? "ás" : "á") + "] LT"
+                    }, nextWeek: function () {
+                        return "dddd [" + (this.hours() !== 1 ? "ás" : "a") + "] LT"
+                    }, lastDay: function () {
+                        return "[onte " + (this.hours() !== 1 ? "á" : "a") + "] LT"
+                    }, lastWeek: function () {
+                        return "[o] dddd [pasado " + (this.hours() !== 1 ? "ás" : "a") + "] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: function (e) {
+                        if (e.indexOf("un") === 0) return "n" + e;
+                        return "en " + e
+                    },
+                    past: "hai %s",
+                    s: "uns segundos",
+                    ss: "%d segundos",
+                    m: "un minuto",
+                    mm: "%d minutos",
+                    h: "unha hora",
+                    hh: "%d horas",
+                    d: "un día",
+                    dd: "%d días",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un ano",
+                    yy: "%d anos"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    s: ["थोडया सॅकंडांनी", "थोडे सॅकंड"],
+                    ss: [e + " सॅकंडांनी", e + " सॅकंड"],
+                    m: ["एका मिणटान", "एक मिनूट"],
+                    mm: [e + " मिणटांनी", e + " मिणटां"],
+                    h: ["एका वरान", "एक वर"],
+                    hh: [e + " वरांनी", e + " वरां"],
+                    d: ["एका दिसान", "एक दीस"],
+                    dd: [e + " दिसांनी", e + " दीस"],
+                    M: ["एका म्हयन्यान", "एक म्हयनो"],
+                    MM: [e + " म्हयन्यानी", e + " म्हयने"],
+                    y: ["एका वर्सान", "एक वर्स"],
+                    yy: [e + " वर्सांनी", e + " वर्सां"]
+                };
+                return i ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("gom-deva", {
+                months: {
+                    standalone: "जानेवारी_फेब्रुवारी_मार्च_एप्रील_मे_जून_जुलय_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर".split("_"),
+                    format: "जानेवारीच्या_फेब्रुवारीच्या_मार्चाच्या_एप्रीलाच्या_मेयाच्या_जूनाच्या_जुलयाच्या_ऑगस्टाच्या_सप्टेंबराच्या_ऑक्टोबराच्या_नोव्हेंबराच्या_डिसेंबराच्या".split("_"),
+                    isFormat: /MMMM(\s)+D[oD]?/
+                },
+                monthsShort: "जाने._फेब्रु._मार्च_एप्री._मे_जून_जुल._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.".split("_"),
+                monthsParseExact: true,
+                weekdays: "आयतार_सोमार_मंगळार_बुधवार_बिरेस्तार_सुक्रार_शेनवार".split("_"),
+                weekdaysShort: "आयत._सोम._मंगळ._बुध._ब्रेस्त._सुक्र._शेन.".split("_"),
+                weekdaysMin: "आ_सो_मं_बु_ब्रे_सु_शे".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "A h:mm [वाजतां]",
+                    LTS: "A h:mm:ss [वाजतां]",
+                    L: "DD-MM-YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY A h:mm [वाजतां]",
+                    LLLL: "dddd, MMMM Do, YYYY, A h:mm [वाजतां]",
+                    llll: "ddd, D MMM YYYY, A h:mm [वाजतां]"
+                },
+                calendar: {
+                    sameDay: "[आयज] LT",
+                    nextDay: "[फाल्यां] LT",
+                    nextWeek: "[फुडलो] dddd[,] LT",
+                    lastDay: "[काल] LT",
+                    lastWeek: "[फाटलो] dddd[,] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s",
+                    past: "%s आदीं",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: t,
+                    dd: t,
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(वेर)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"D":
+                            return e + "वेर";
+                        default:
+                        case"M":
+                        case"Q":
+                        case"DDD":
+                        case"d":
+                        case"w":
+                        case"W":
+                            return e
+                    }
+                },
+                week: {dow: 0, doy: 3},
+                meridiemParse: /राती|सकाळीं|दनपारां|सांजे/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "राती") return e < 4 ? e : e + 12; else if (t === "सकाळीं") return e; else if (t === "दनपारां") return e > 12 ? e : e + 12; else if (t === "सांजे") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "राती"; else if (e < 12) return "सकाळीं"; else if (e < 16) return "दनपारां"; else if (e < 20) return "सांजे"; else return "राती"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    s: ["thoddea sekondamni", "thodde sekond"],
+                    ss: [e + " sekondamni", e + " sekond"],
+                    m: ["eka mintan", "ek minut"],
+                    mm: [e + " mintamni", e + " mintam"],
+                    h: ["eka voran", "ek vor"],
+                    hh: [e + " voramni", e + " voram"],
+                    d: ["eka disan", "ek dis"],
+                    dd: [e + " disamni", e + " dis"],
+                    M: ["eka mhoinean", "ek mhoino"],
+                    MM: [e + " mhoineamni", e + " mhoine"],
+                    y: ["eka vorsan", "ek voros"],
+                    yy: [e + " vorsamni", e + " vorsam"]
+                };
+                return i ? r[n][0] : r[n][1]
+            }
+
+            var n;
+            e.defineLocale("gom-latn", {
+                months: {
+                    standalone: "Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr".split("_"),
+                    format: "Janerachea_Febrerachea_Marsachea_Abrilachea_Maiachea_Junachea_Julaiachea_Agostachea_Setembrachea_Otubrachea_Novembrachea_Dezembrachea".split("_"),
+                    isFormat: /MMMM(\s)+D[oD]?/
+                },
+                monthsShort: "Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.".split("_"),
+                monthsParseExact: true,
+                weekdays: "Aitar_Somar_Mongllar_Budhvar_Birestar_Sukrar_Son'var".split("_"),
+                weekdaysShort: "Ait._Som._Mon._Bud._Bre._Suk._Son.".split("_"),
+                weekdaysMin: "Ai_Sm_Mo_Bu_Br_Su_Sn".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "A h:mm [vazta]",
+                    LTS: "A h:mm:ss [vazta]",
+                    L: "DD-MM-YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY A h:mm [vazta]",
+                    LLLL: "dddd, MMMM Do, YYYY, A h:mm [vazta]",
+                    llll: "ddd, D MMM YYYY, A h:mm [vazta]"
+                },
+                calendar: {
+                    sameDay: "[Aiz] LT",
+                    nextDay: "[Faleam] LT",
+                    nextWeek: "[Fuddlo] dddd[,] LT",
+                    lastDay: "[Kal] LT",
+                    lastWeek: "[Fattlo] dddd[,] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s",
+                    past: "%s adim",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: t,
+                    dd: t,
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(er)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"D":
+                            return e + "er";
+                        default:
+                        case"M":
+                        case"Q":
+                        case"DDD":
+                        case"d":
+                        case"w":
+                        case"W":
+                            return e
+                    }
+                },
+                week: {dow: 0, doy: 3},
+                meridiemParse: /rati|sokallim|donparam|sanje/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "rati") return e < 4 ? e : e + 12; else if (t === "sokallim") return e; else if (t === "donparam") return e > 12 ? e : e + 12; else if (t === "sanje") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "rati"; else if (e < 12) return "sokallim"; else if (e < 16) return "donparam"; else if (e < 20) return "sanje"; else return "rati"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "૧", 2: "૨", 3: "૩", 4: "૪", 5: "૫", 6: "૬", 7: "૭", 8: "૮", 9: "૯", 0: "૦"}, n = {
+                "૧": "1",
+                "૨": "2",
+                "૩": "3",
+                "૪": "4",
+                "૫": "5",
+                "૬": "6",
+                "૭": "7",
+                "૮": "8",
+                "૯": "9",
+                "૦": "0"
+            }, i;
+            e.defineLocale("gu", {
+                months: "જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર".split("_"),
+                monthsShort: "જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.".split("_"),
+                monthsParseExact: true,
+                weekdays: "રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર".split("_"),
+                weekdaysShort: "રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ".split("_"),
+                weekdaysMin: "ર_સો_મં_બુ_ગુ_શુ_શ".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm વાગ્યે",
+                    LTS: "A h:mm:ss વાગ્યે",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm વાગ્યે",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm વાગ્યે"
+                },
+                calendar: {
+                    sameDay: "[આજ] LT",
+                    nextDay: "[કાલે] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[ગઇકાલે] LT",
+                    lastWeek: "[પાછલા] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s મા",
+                    past: "%s પહેલા",
+                    s: "અમુક પળો",
+                    ss: "%d સેકંડ",
+                    m: "એક મિનિટ",
+                    mm: "%d મિનિટ",
+                    h: "એક કલાક",
+                    hh: "%d કલાક",
+                    d: "એક દિવસ",
+                    dd: "%d દિવસ",
+                    M: "એક મહિનો",
+                    MM: "%d મહિનો",
+                    y: "એક વર્ષ",
+                    yy: "%d વર્ષ"
+                },
+                preparse: function (e) {
+                    return e.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /રાત|બપોર|સવાર|સાંજ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "રાત") return e < 4 ? e : e + 12; else if (t === "સવાર") return e; else if (t === "બપોર") return e >= 10 ? e : e + 12; else if (t === "સાંજ") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "રાત"; else if (e < 10) return "સવાર"; else if (e < 17) return "બપોર"; else if (e < 20) return "સાંજ"; else return "રાત"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("he", {
+                months: "ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),
+                monthsShort: "ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),
+                weekdays: "ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),
+                weekdaysShort: "א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),
+                weekdaysMin: "א_ב_ג_ד_ה_ו_ש".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [ב]MMMM YYYY",
+                    LLL: "D [ב]MMMM YYYY HH:mm",
+                    LLLL: "dddd, D [ב]MMMM YYYY HH:mm",
+                    l: "D/M/YYYY",
+                    ll: "D MMM YYYY",
+                    lll: "D MMM YYYY HH:mm",
+                    llll: "ddd, D MMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[היום ב־]LT",
+                    nextDay: "[מחר ב־]LT",
+                    nextWeek: "dddd [בשעה] LT",
+                    lastDay: "[אתמול ב־]LT",
+                    lastWeek: "[ביום] dddd [האחרון בשעה] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "בעוד %s",
+                    past: "לפני %s",
+                    s: "מספר שניות",
+                    ss: "%d שניות",
+                    m: "דקה",
+                    mm: "%d דקות",
+                    h: "שעה",
+                    hh: function (e) {
+                        if (e === 2) return "שעתיים";
+                        return e + " שעות"
+                    },
+                    d: "יום",
+                    dd: function (e) {
+                        if (e === 2) return "יומיים";
+                        return e + " ימים"
+                    },
+                    M: "חודש",
+                    MM: function (e) {
+                        if (e === 2) return "חודשיים";
+                        return e + " חודשים"
+                    },
+                    y: "שנה",
+                    yy: function (e) {
+                        if (e === 2) return "שנתיים"; else if (e % 10 === 0 && e !== 10) return e + " שנה";
+                        return e + " שנים"
+                    }
+                },
+                meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
+                isPM: function (e) {
+                    return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 5) return "לפנות בוקר"; else if (e < 10) return "בבוקר"; else if (e < 12) return n ? 'לפנה"צ' : "לפני הצהריים"; else if (e < 18) return n ? 'אחה"צ' : "אחרי הצהריים"; else return "בערב"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "१", 2: "२", 3: "३", 4: "४", 5: "५", 6: "६", 7: "७", 8: "८", 9: "९", 0: "०"}, n = {
+                    "१": "1",
+                    "२": "2",
+                    "३": "3",
+                    "४": "4",
+                    "५": "5",
+                    "६": "6",
+                    "७": "7",
+                    "८": "8",
+                    "९": "9",
+                    "०": "0"
+                },
+                i = [/^जन/i, /^फ़र|फर/i, /^मार्च/i, /^अप्रै/i, /^मई/i, /^जून/i, /^जुल/i, /^अग/i, /^सितं|सित/i, /^अक्टू/i, /^नव|नवं/i, /^दिसं|दिस/i],
+                r = [/^जन/i, /^फ़र/i, /^मार्च/i, /^अप्रै/i, /^मई/i, /^जून/i, /^जुल/i, /^अग/i, /^सित/i, /^अक्टू/i, /^नव/i, /^दिस/i],
+                a;
+            e.defineLocale("hi", {
+                months: {
+                    format: "जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),
+                    standalone: "जनवरी_फरवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितंबर_अक्टूबर_नवंबर_दिसंबर".split("_")
+                },
+                monthsShort: "जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),
+                weekdays: "रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),
+                weekdaysShort: "रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),
+                weekdaysMin: "र_सो_मं_बु_गु_शु_श".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm बजे",
+                    LTS: "A h:mm:ss बजे",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm बजे",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm बजे"
+                },
+                monthsParse: i,
+                longMonthsParse: i,
+                shortMonthsParse: r,
+                monthsRegex: /^(जनवरी|जन\.?|फ़रवरी|फरवरी|फ़र\.?|मार्च?|अप्रैल|अप्रै\.?|मई?|जून?|जुलाई|जुल\.?|अगस्त|अग\.?|सितम्बर|सितंबर|सित\.?|अक्टूबर|अक्टू\.?|नवम्बर|नवंबर|नव\.?|दिसम्बर|दिसंबर|दिस\.?)/i,
+                monthsShortRegex: /^(जनवरी|जन\.?|फ़रवरी|फरवरी|फ़र\.?|मार्च?|अप्रैल|अप्रै\.?|मई?|जून?|जुलाई|जुल\.?|अगस्त|अग\.?|सितम्बर|सितंबर|सित\.?|अक्टूबर|अक्टू\.?|नवम्बर|नवंबर|नव\.?|दिसम्बर|दिसंबर|दिस\.?)/i,
+                monthsStrictRegex: /^(जनवरी?|फ़रवरी|फरवरी?|मार्च?|अप्रैल?|मई?|जून?|जुलाई?|अगस्त?|सितम्बर|सितंबर|सित?\.?|अक्टूबर|अक्टू\.?|नवम्बर|नवंबर?|दिसम्बर|दिसंबर?)/i,
+                monthsShortStrictRegex: /^(जन\.?|फ़र\.?|मार्च?|अप्रै\.?|मई?|जून?|जुल\.?|अग\.?|सित\.?|अक्टू\.?|नव\.?|दिस\.?)/i,
+                calendar: {
+                    sameDay: "[आज] LT",
+                    nextDay: "[कल] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[कल] LT",
+                    lastWeek: "[पिछले] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s में",
+                    past: "%s पहले",
+                    s: "कुछ ही क्षण",
+                    ss: "%d सेकंड",
+                    m: "एक मिनट",
+                    mm: "%d मिनट",
+                    h: "एक घंटा",
+                    hh: "%d घंटे",
+                    d: "एक दिन",
+                    dd: "%d दिन",
+                    M: "एक महीने",
+                    MM: "%d महीने",
+                    y: "एक वर्ष",
+                    yy: "%d वर्ष"
+                },
+                preparse: function (e) {
+                    return e.replace(/[१२३४५६७८९०]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /रात|सुबह|दोपहर|शाम/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "रात") return e < 4 ? e : e + 12; else if (t === "सुबह") return e; else if (t === "दोपहर") return e >= 10 ? e : e + 12; else if (t === "शाम") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "रात"; else if (e < 10) return "सुबह"; else if (e < 17) return "दोपहर"; else if (e < 20) return "शाम"; else return "रात"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n) {
+                var i = e + " ";
+                switch (n) {
+                    case"ss":
+                        if (e === 1) i += "sekunda"; else if (e === 2 || e === 3 || e === 4) i += "sekunde"; else i += "sekundi";
+                        return i;
+                    case"m":
+                        return t ? "jedna minuta" : "jedne minute";
+                    case"mm":
+                        if (e === 1) i += "minuta"; else if (e === 2 || e === 3 || e === 4) i += "minute"; else i += "minuta";
+                        return i;
+                    case"h":
+                        return t ? "jedan sat" : "jednog sata";
+                    case"hh":
+                        if (e === 1) i += "sat"; else if (e === 2 || e === 3 || e === 4) i += "sata"; else i += "sati";
+                        return i;
+                    case"dd":
+                        if (e === 1) i += "dan"; else i += "dana";
+                        return i;
+                    case"MM":
+                        if (e === 1) i += "mjesec"; else if (e === 2 || e === 3 || e === 4) i += "mjeseca"; else i += "mjeseci";
+                        return i;
+                    case"yy":
+                        if (e === 1) i += "godina"; else if (e === 2 || e === 3 || e === 4) i += "godine"; else i += "godina";
+                        return i
+                }
+            }
+
+            var n;
+            e.defineLocale("hr", {
+                months: {
+                    format: "siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),
+                    standalone: "siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_")
+                },
+                monthsShort: "sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),
+                monthsParseExact: true,
+                weekdays: "nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),
+                weekdaysShort: "ned._pon._uto._sri._čet._pet._sub.".split("_"),
+                weekdaysMin: "ne_po_ut_sr_če_pe_su".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "Do MMMM YYYY",
+                    LLL: "Do MMMM YYYY H:mm",
+                    LLLL: "dddd, Do MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[danas u] LT", nextDay: "[sutra u] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[u] [nedjelju] [u] LT";
+                            case 3:
+                                return "[u] [srijedu] [u] LT";
+                            case 6:
+                                return "[u] [subotu] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[u] dddd [u] LT"
+                        }
+                    }, lastDay: "[jučer u] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[prošlu] [nedjelju] [u] LT";
+                            case 3:
+                                return "[prošlu] [srijedu] [u] LT";
+                            case 6:
+                                return "[prošle] [subote] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[prošli] dddd [u] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "prije %s",
+                    s: "par sekundi",
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: "dan",
+                    dd: t,
+                    M: "mjesec",
+                    MM: t,
+                    y: "godinu",
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = "vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" "), n;
+
+            function i(e, t, n, i) {
+                var r = e;
+                switch (n) {
+                    case"s":
+                        return i || t ? "néhány másodperc" : "néhány másodperce";
+                    case"ss":
+                        return r + (i || t) ? " másodperc" : " másodperce";
+                    case"m":
+                        return "egy" + (i || t ? " perc" : " perce");
+                    case"mm":
+                        return r + (i || t ? " perc" : " perce");
+                    case"h":
+                        return "egy" + (i || t ? " óra" : " órája");
+                    case"hh":
+                        return r + (i || t ? " óra" : " órája");
+                    case"d":
+                        return "egy" + (i || t ? " nap" : " napja");
+                    case"dd":
+                        return r + (i || t ? " nap" : " napja");
+                    case"M":
+                        return "egy" + (i || t ? " hónap" : " hónapja");
+                    case"MM":
+                        return r + (i || t ? " hónap" : " hónapja");
+                    case"y":
+                        return "egy" + (i || t ? " év" : " éve");
+                    case"yy":
+                        return r + (i || t ? " év" : " éve")
+                }
+                return ""
+            }
+
+            function r(e) {
+                return (e ? "" : "[múlt] ") + "[" + t[this.day()] + "] LT[-kor]"
+            }
+
+            e.defineLocale("hu", {
+                months: "január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),
+                monthsShort: "jan._feb._márc._ápr._máj._jún._júl._aug._szept._okt._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),
+                weekdaysShort: "vas_hét_kedd_sze_csüt_pén_szo".split("_"),
+                weekdaysMin: "v_h_k_sze_cs_p_szo".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "YYYY.MM.DD.",
+                    LL: "YYYY. MMMM D.",
+                    LLL: "YYYY. MMMM D. H:mm",
+                    LLLL: "YYYY. MMMM D., dddd H:mm"
+                },
+                meridiemParse: /de|du/i,
+                isPM: function (e) {
+                    return e.charAt(1).toLowerCase() === "u"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return n === true ? "de" : "DE"; else return n === true ? "du" : "DU"
+                },
+                calendar: {
+                    sameDay: "[ma] LT[-kor]", nextDay: "[holnap] LT[-kor]", nextWeek: function () {
+                        return r.call(this, true)
+                    }, lastDay: "[tegnap] LT[-kor]", lastWeek: function () {
+                        return r.call(this, false)
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s múlva",
+                    past: "%s",
+                    s: i,
+                    ss: i,
+                    m: i,
+                    mm: i,
+                    h: i,
+                    hh: i,
+                    d: i,
+                    dd: i,
+                    M: i,
+                    MM: i,
+                    y: i,
+                    yy: i
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("hy-am", {
+                months: {
+                    format: "հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի".split("_"),
+                    standalone: "հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր".split("_")
+                },
+                monthsShort: "հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ".split("_"),
+                weekdays: "կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ".split("_"),
+                weekdaysShort: "կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),
+                weekdaysMin: "կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY թ.",
+                    LLL: "D MMMM YYYY թ., HH:mm",
+                    LLLL: "dddd, D MMMM YYYY թ., HH:mm"
+                },
+                calendar: {
+                    sameDay: "[այսօր] LT", nextDay: "[վաղը] LT", lastDay: "[երեկ] LT", nextWeek: function () {
+                        return "dddd [օրը ժամը] LT"
+                    }, lastWeek: function () {
+                        return "[անցած] dddd [օրը ժամը] LT"
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s հետո",
+                    past: "%s առաջ",
+                    s: "մի քանի վայրկյան",
+                    ss: "%d վայրկյան",
+                    m: "րոպե",
+                    mm: "%d րոպե",
+                    h: "ժամ",
+                    hh: "%d ժամ",
+                    d: "օր",
+                    dd: "%d օր",
+                    M: "ամիս",
+                    MM: "%d ամիս",
+                    y: "տարի",
+                    yy: "%d տարի"
+                },
+                meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+                isPM: function (e) {
+                    return /^(ցերեկվա|երեկոյան)$/.test(e)
+                },
+                meridiem: function (e) {
+                    if (e < 4) return "գիշերվա"; else if (e < 12) return "առավոտվա"; else if (e < 17) return "ցերեկվա"; else return "երեկոյան"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"DDD":
+                        case"w":
+                        case"W":
+                        case"DDDo":
+                            if (e === 1) return e + "-ին";
+                            return e + "-րդ";
+                        default:
+                            return e
+                    }
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("id", {
+                months: "Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des".split("_"),
+                weekdays: "Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),
+                weekdaysShort: "Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),
+                weekdaysMin: "Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [pukul] HH.mm",
+                    LLLL: "dddd, D MMMM YYYY [pukul] HH.mm"
+                },
+                meridiemParse: /pagi|siang|sore|malam/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "pagi") return e; else if (t === "siang") return e >= 11 ? e : e + 12; else if (t === "sore" || t === "malam") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 11) return "pagi"; else if (e < 15) return "siang"; else if (e < 19) return "sore"; else return "malam"
+                },
+                calendar: {
+                    sameDay: "[Hari ini pukul] LT",
+                    nextDay: "[Besok pukul] LT",
+                    nextWeek: "dddd [pukul] LT",
+                    lastDay: "[Kemarin pukul] LT",
+                    lastWeek: "dddd [lalu pukul] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dalam %s",
+                    past: "%s yang lalu",
+                    s: "beberapa detik",
+                    ss: "%d detik",
+                    m: "semenit",
+                    mm: "%d menit",
+                    h: "sejam",
+                    hh: "%d jam",
+                    d: "sehari",
+                    dd: "%d hari",
+                    M: "sebulan",
+                    MM: "%d bulan",
+                    y: "setahun",
+                    yy: "%d tahun"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function a(e) {
+                if (e % 100 === 11) return true; else if (e % 10 === 1) return false;
+                return true
+            }
+
+            function t(e, t, n, i) {
+                var r = e + " ";
+                switch (n) {
+                    case"s":
+                        return t || i ? "nokkrar sekúndur" : "nokkrum sekúndum";
+                    case"ss":
+                        if (a(e)) return r + (t || i ? "sekúndur" : "sekúndum");
+                        return r + "sekúnda";
+                    case"m":
+                        return t ? "mínúta" : "mínútu";
+                    case"mm":
+                        if (a(e)) return r + (t || i ? "mínútur" : "mínútum"); else if (t) return r + "mínúta";
+                        return r + "mínútu";
+                    case"hh":
+                        if (a(e)) return r + (t || i ? "klukkustundir" : "klukkustundum");
+                        return r + "klukkustund";
+                    case"d":
+                        if (t) return "dagur";
+                        return i ? "dag" : "degi";
+                    case"dd":
+                        if (a(e)) {
+                            if (t) return r + "dagar";
+                            return r + (i ? "daga" : "dögum")
+                        } else if (t) return r + "dagur";
+                        return r + (i ? "dag" : "degi");
+                    case"M":
+                        if (t) return "mánuður";
+                        return i ? "mánuð" : "mánuði";
+                    case"MM":
+                        if (a(e)) {
+                            if (t) return r + "mánuðir";
+                            return r + (i ? "mánuði" : "mánuðum")
+                        } else if (t) return r + "mánuður";
+                        return r + (i ? "mánuð" : "mánuði");
+                    case"y":
+                        return t || i ? "ár" : "ári";
+                    case"yy":
+                        if (a(e)) return r + (t || i ? "ár" : "árum");
+                        return r + (t || i ? "ár" : "ári")
+                }
+            }
+
+            var n;
+            e.defineLocale("is", {
+                months: "janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),
+                monthsShort: "jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),
+                weekdays: "sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),
+                weekdaysShort: "sun_mán_þri_mið_fim_fös_lau".split("_"),
+                weekdaysMin: "Su_Má_Þr_Mi_Fi_Fö_La".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY [kl.] H:mm",
+                    LLLL: "dddd, D. MMMM YYYY [kl.] H:mm"
+                },
+                calendar: {
+                    sameDay: "[í dag kl.] LT",
+                    nextDay: "[á morgun kl.] LT",
+                    nextWeek: "dddd [kl.] LT",
+                    lastDay: "[í gær kl.] LT",
+                    lastWeek: "[síðasta] dddd [kl.] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "eftir %s",
+                    past: "fyrir %s síðan",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: "klukkustund",
+                    hh: t,
+                    d: t,
+                    dd: t,
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("it", {
+                months: "gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),
+                monthsShort: "gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),
+                weekdays: "domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato".split("_"),
+                weekdaysShort: "dom_lun_mar_mer_gio_ven_sab".split("_"),
+                weekdaysMin: "do_lu_ma_me_gi_ve_sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: function () {
+                        return "[Oggi a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT"
+                    }, nextDay: function () {
+                        return "[Domani a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT"
+                    }, nextWeek: function () {
+                        return "dddd [a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT"
+                    }, lastDay: function () {
+                        return "[Ieri a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT"
+                    }, lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[La scorsa] dddd [a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT";
+                            default:
+                                return "[Lo scorso] dddd [a" + (this.hours() > 1 ? "lle " : this.hours() === 0 ? " " : "ll'") + "]LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "tra %s",
+                    past: "%s fa",
+                    s: "alcuni secondi",
+                    ss: "%d secondi",
+                    m: "un minuto",
+                    mm: "%d minuti",
+                    h: "un'ora",
+                    hh: "%d ore",
+                    d: "un giorno",
+                    dd: "%d giorni",
+                    w: "una settimana",
+                    ww: "%d settimane",
+                    M: "un mese",
+                    MM: "%d mesi",
+                    y: "un anno",
+                    yy: "%d anni"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("it-ch", {
+                months: "gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),
+                monthsShort: "gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),
+                weekdays: "domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato".split("_"),
+                weekdaysShort: "dom_lun_mar_mer_gio_ven_sab".split("_"),
+                weekdaysMin: "do_lu_ma_me_gi_ve_sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Oggi alle] LT",
+                    nextDay: "[Domani alle] LT",
+                    nextWeek: "dddd [alle] LT",
+                    lastDay: "[Ieri alle] LT",
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[la scorsa] dddd [alle] LT";
+                            default:
+                                return "[lo scorso] dddd [alle] LT"
+                        }
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: function (e) {
+                        return (/^[0-9].+$/.test(e) ? "tra" : "in") + " " + e
+                    },
+                    past: "%s fa",
+                    s: "alcuni secondi",
+                    ss: "%d secondi",
+                    m: "un minuto",
+                    mm: "%d minuti",
+                    h: "un'ora",
+                    hh: "%d ore",
+                    d: "un giorno",
+                    dd: "%d giorni",
+                    M: "un mese",
+                    MM: "%d mesi",
+                    y: "un anno",
+                    yy: "%d anni"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ja", {
+                eras: [{since: "2019-05-01", offset: 1, name: "令和", narrow: "㋿", abbr: "R"}, {
+                    since: "1989-01-08",
+                    until: "2019-04-30",
+                    offset: 1,
+                    name: "平成",
+                    narrow: "㍻",
+                    abbr: "H"
+                }, {
+                    since: "1926-12-25",
+                    until: "1989-01-07",
+                    offset: 1,
+                    name: "昭和",
+                    narrow: "㍼",
+                    abbr: "S"
+                }, {
+                    since: "1912-07-30",
+                    until: "1926-12-24",
+                    offset: 1,
+                    name: "大正",
+                    narrow: "㍽",
+                    abbr: "T"
+                }, {
+                    since: "1873-01-01",
+                    until: "1912-07-29",
+                    offset: 6,
+                    name: "明治",
+                    narrow: "㍾",
+                    abbr: "M"
+                }, {
+                    since: "0001-01-01",
+                    until: "1873-12-31",
+                    offset: 1,
+                    name: "西暦",
+                    narrow: "AD",
+                    abbr: "AD"
+                }, {since: "0000-12-31", until: -Infinity, offset: 1, name: "紀元前", narrow: "BC", abbr: "BC"}],
+                eraYearOrdinalRegex: /(元|\d+)年/,
+                eraYearOrdinalParse: function (e, t) {
+                    return t[1] === "元" ? 1 : parseInt(t[1] || e, 10)
+                },
+                months: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                weekdays: "日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),
+                weekdaysShort: "日_月_火_水_木_金_土".split("_"),
+                weekdaysMin: "日_月_火_水_木_金_土".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY/MM/DD",
+                    LL: "YYYY年M月D日",
+                    LLL: "YYYY年M月D日 HH:mm",
+                    LLLL: "YYYY年M月D日 dddd HH:mm",
+                    l: "YYYY/MM/DD",
+                    ll: "YYYY年M月D日",
+                    lll: "YYYY年M月D日 HH:mm",
+                    llll: "YYYY年M月D日(ddd) HH:mm"
+                },
+                meridiemParse: /午前|午後/i,
+                isPM: function (e) {
+                    return e === "午後"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "午前"; else return "午後"
+                },
+                calendar: {
+                    sameDay: "[今日] LT", nextDay: "[明日] LT", nextWeek: function (e) {
+                        if (e.week() !== this.week()) return "[来週]dddd LT"; else return "dddd LT"
+                    }, lastDay: "[昨日] LT", lastWeek: function (e) {
+                        if (this.week() !== e.week()) return "[先週]dddd LT"; else return "dddd LT"
+                    }, sameElse: "L"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}日/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"y":
+                            return e === 1 ? "元年" : e + "年";
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "日";
+                        default:
+                            return e
+                    }
+                },
+                relativeTime: {
+                    future: "%s後",
+                    past: "%s前",
+                    s: "数秒",
+                    ss: "%d秒",
+                    m: "1分",
+                    mm: "%d分",
+                    h: "1時間",
+                    hh: "%d時間",
+                    d: "1日",
+                    dd: "%d日",
+                    M: "1ヶ月",
+                    MM: "%dヶ月",
+                    y: "1年",
+                    yy: "%d年"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("jv", {
+                months: "Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),
+                monthsShort: "Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),
+                weekdays: "Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),
+                weekdaysShort: "Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),
+                weekdaysMin: "Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [pukul] HH.mm",
+                    LLLL: "dddd, D MMMM YYYY [pukul] HH.mm"
+                },
+                meridiemParse: /enjing|siyang|sonten|ndalu/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "enjing") return e; else if (t === "siyang") return e >= 11 ? e : e + 12; else if (t === "sonten" || t === "ndalu") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 11) return "enjing"; else if (e < 15) return "siyang"; else if (e < 19) return "sonten"; else return "ndalu"
+                },
+                calendar: {
+                    sameDay: "[Dinten puniko pukul] LT",
+                    nextDay: "[Mbenjang pukul] LT",
+                    nextWeek: "dddd [pukul] LT",
+                    lastDay: "[Kala wingi pukul] LT",
+                    lastWeek: "dddd [kepengker pukul] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "wonten ing %s",
+                    past: "%s ingkang kepengker",
+                    s: "sawetawis detik",
+                    ss: "%d detik",
+                    m: "setunggal menit",
+                    mm: "%d menit",
+                    h: "setunggal jam",
+                    hh: "%d jam",
+                    d: "sedinten",
+                    dd: "%d dinten",
+                    M: "sewulan",
+                    MM: "%d wulan",
+                    y: "setaun",
+                    yy: "%d taun"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ka", {
+                months: "იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი".split("_"),
+                monthsShort: "იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ".split("_"),
+                weekdays: {
+                    standalone: "კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი".split("_"),
+                    format: "კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს".split("_"),
+                    isFormat: /(წინა|შემდეგ)/
+                },
+                weekdaysShort: "კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ".split("_"),
+                weekdaysMin: "კვ_ორ_სა_ოთ_ხუ_პა_შა".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[დღეს] LT[-ზე]",
+                    nextDay: "[ხვალ] LT[-ზე]",
+                    lastDay: "[გუშინ] LT[-ზე]",
+                    nextWeek: "[შემდეგ] dddd LT[-ზე]",
+                    lastWeek: "[წინა] dddd LT-ზე",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: function (e) {
+                        return e.replace(/(წამ|წუთ|საათ|წელ|დღ|თვ)(ი|ე)/, function (e, t, n) {
+                            return n === "ი" ? t + "ში" : t + n + "ში"
+                        })
+                    },
+                    past: function (e) {
+                        if (/(წამი|წუთი|საათი|დღე|თვე)/.test(e)) return e.replace(/(ი|ე)$/, "ის წინ");
+                        if (/წელი/.test(e)) return e.replace(/წელი$/, "წლის წინ");
+                        return e
+                    },
+                    s: "რამდენიმე წამი",
+                    ss: "%d წამი",
+                    m: "წუთი",
+                    mm: "%d წუთი",
+                    h: "საათი",
+                    hh: "%d საათი",
+                    d: "დღე",
+                    dd: "%d დღე",
+                    M: "თვე",
+                    MM: "%d თვე",
+                    y: "წელი",
+                    yy: "%d წელი"
+                },
+                dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+                ordinal: function (e) {
+                    if (e === 0) return e;
+                    if (e === 1) return e + "-ლი";
+                    if (e < 20 || e <= 100 && e % 20 === 0 || e % 100 === 0) return "მე-" + e;
+                    return e + "-ე"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var i = {
+                0: "-ші",
+                1: "-ші",
+                2: "-ші",
+                3: "-ші",
+                4: "-ші",
+                5: "-ші",
+                6: "-шы",
+                7: "-ші",
+                8: "-ші",
+                9: "-шы",
+                10: "-шы",
+                20: "-шы",
+                30: "-шы",
+                40: "-шы",
+                50: "-ші",
+                60: "-шы",
+                70: "-ші",
+                80: "-ші",
+                90: "-шы",
+                100: "-ші"
+            }, t;
+            e.defineLocale("kk", {
+                months: "қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан".split("_"),
+                monthsShort: "қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел".split("_"),
+                weekdays: "жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі".split("_"),
+                weekdaysShort: "жек_дүй_сей_сәр_бей_жұм_сен".split("_"),
+                weekdaysMin: "жк_дй_сй_ср_бй_жм_сн".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Бүгін сағат] LT",
+                    nextDay: "[Ертең сағат] LT",
+                    nextWeek: "dddd [сағат] LT",
+                    lastDay: "[Кеше сағат] LT",
+                    lastWeek: "[Өткен аптаның] dddd [сағат] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s ішінде",
+                    past: "%s бұрын",
+                    s: "бірнеше секунд",
+                    ss: "%d секунд",
+                    m: "бір минут",
+                    mm: "%d минут",
+                    h: "бір сағат",
+                    hh: "%d сағат",
+                    d: "бір күн",
+                    dd: "%d күн",
+                    M: "бір ай",
+                    MM: "%d ай",
+                    y: "бір жыл",
+                    yy: "%d жыл"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
+                ordinal: function (e) {
+                    var t = e % 10, n = e >= 100 ? 100 : null;
+                    return e + (i[e] || i[t] || i[n])
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "១", 2: "២", 3: "៣", 4: "៤", 5: "៥", 6: "៦", 7: "៧", 8: "៨", 9: "៩", 0: "០"}, n = {
+                "១": "1",
+                "២": "2",
+                "៣": "3",
+                "៤": "4",
+                "៥": "5",
+                "៦": "6",
+                "៧": "7",
+                "៨": "8",
+                "៩": "9",
+                "០": "0"
+            }, i;
+            e.defineLocale("km", {
+                months: "មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),
+                monthsShort: "មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),
+                weekdays: "អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),
+                weekdaysShort: "អា_ច_អ_ព_ព្រ_សុ_ស".split("_"),
+                weekdaysMin: "អា_ច_អ_ព_ព្រ_សុ_ស".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ព្រឹក|ល្ងាច/,
+                isPM: function (e) {
+                    return e === "ល្ងាច"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ព្រឹក"; else return "ល្ងាច"
+                },
+                calendar: {
+                    sameDay: "[ថ្ងៃនេះ ម៉ោង] LT",
+                    nextDay: "[ស្អែក ម៉ោង] LT",
+                    nextWeek: "dddd [ម៉ោង] LT",
+                    lastDay: "[ម្សិលមិញ ម៉ោង] LT",
+                    lastWeek: "dddd [សប្តាហ៍មុន] [ម៉ោង] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%sទៀត",
+                    past: "%sមុន",
+                    s: "ប៉ុន្មានវិនាទី",
+                    ss: "%d វិនាទី",
+                    m: "មួយនាទី",
+                    mm: "%d នាទី",
+                    h: "មួយម៉ោង",
+                    hh: "%d ម៉ោង",
+                    d: "មួយថ្ងៃ",
+                    dd: "%d ថ្ងៃ",
+                    M: "មួយខែ",
+                    MM: "%d ខែ",
+                    y: "មួយឆ្នាំ",
+                    yy: "%d ឆ្នាំ"
+                },
+                dayOfMonthOrdinalParse: /ទី\d{1,2}/,
+                ordinal: "ទី%d",
+                preparse: function (e) {
+                    return e.replace(/[១២៣៤៥៦៧៨៩០]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "೧", 2: "೨", 3: "೩", 4: "೪", 5: "೫", 6: "೬", 7: "೭", 8: "೮", 9: "೯", 0: "೦"}, n = {
+                "೧": "1",
+                "೨": "2",
+                "೩": "3",
+                "೪": "4",
+                "೫": "5",
+                "೬": "6",
+                "೭": "7",
+                "೮": "8",
+                "೯": "9",
+                "೦": "0"
+            }, i;
+            e.defineLocale("kn", {
+                months: "ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್".split("_"),
+                monthsShort: "ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ".split("_"),
+                monthsParseExact: true,
+                weekdays: "ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ".split("_"),
+                weekdaysShort: "ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ".split("_"),
+                weekdaysMin: "ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm",
+                    LTS: "A h:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm"
+                },
+                calendar: {
+                    sameDay: "[ಇಂದು] LT",
+                    nextDay: "[ನಾಳೆ] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[ನಿನ್ನೆ] LT",
+                    lastWeek: "[ಕೊನೆಯ] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s ನಂತರ",
+                    past: "%s ಹಿಂದೆ",
+                    s: "ಕೆಲವು ಕ್ಷಣಗಳು",
+                    ss: "%d ಸೆಕೆಂಡುಗಳು",
+                    m: "ಒಂದು ನಿಮಿಷ",
+                    mm: "%d ನಿಮಿಷ",
+                    h: "ಒಂದು ಗಂಟೆ",
+                    hh: "%d ಗಂಟೆ",
+                    d: "ಒಂದು ದಿನ",
+                    dd: "%d ದಿನ",
+                    M: "ಒಂದು ತಿಂಗಳು",
+                    MM: "%d ತಿಂಗಳು",
+                    y: "ಒಂದು ವರ್ಷ",
+                    yy: "%d ವರ್ಷ"
+                },
+                preparse: function (e) {
+                    return e.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "ರಾತ್ರಿ") return e < 4 ? e : e + 12; else if (t === "ಬೆಳಿಗ್ಗೆ") return e; else if (t === "ಮಧ್ಯಾಹ್ನ") return e >= 10 ? e : e + 12; else if (t === "ಸಂಜೆ") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "ರಾತ್ರಿ"; else if (e < 10) return "ಬೆಳಿಗ್ಗೆ"; else if (e < 17) return "ಮಧ್ಯಾಹ್ನ"; else if (e < 20) return "ಸಂಜೆ"; else return "ರಾತ್ರಿ"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
+                ordinal: function (e) {
+                    return e + "ನೇ"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ko", {
+                months: "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),
+                monthsShort: "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),
+                weekdays: "일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),
+                weekdaysShort: "일_월_화_수_목_금_토".split("_"),
+                weekdaysMin: "일_월_화_수_목_금_토".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm",
+                    LTS: "A h:mm:ss",
+                    L: "YYYY.MM.DD.",
+                    LL: "YYYY년 MMMM D일",
+                    LLL: "YYYY년 MMMM D일 A h:mm",
+                    LLLL: "YYYY년 MMMM D일 dddd A h:mm",
+                    l: "YYYY.MM.DD.",
+                    ll: "YYYY년 MMMM D일",
+                    lll: "YYYY년 MMMM D일 A h:mm",
+                    llll: "YYYY년 MMMM D일 dddd A h:mm"
+                },
+                calendar: {
+                    sameDay: "오늘 LT",
+                    nextDay: "내일 LT",
+                    nextWeek: "dddd LT",
+                    lastDay: "어제 LT",
+                    lastWeek: "지난주 dddd LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s 후",
+                    past: "%s 전",
+                    s: "몇 초",
+                    ss: "%d초",
+                    m: "1분",
+                    mm: "%d분",
+                    h: "한 시간",
+                    hh: "%d시간",
+                    d: "하루",
+                    dd: "%d일",
+                    M: "한 달",
+                    MM: "%d달",
+                    y: "일 년",
+                    yy: "%d년"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(일|월|주)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "일";
+                        case"M":
+                            return e + "월";
+                        case"w":
+                        case"W":
+                            return e + "주";
+                        default:
+                            return e
+                    }
+                },
+                meridiemParse: /오전|오후/,
+                isPM: function (e) {
+                    return e === "오후"
+                },
+                meridiem: function (e, t, n) {
+                    return e < 12 ? "오전" : "오후"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "١", 2: "٢", 3: "٣", 4: "٤", 5: "٥", 6: "٦", 7: "٧", 8: "٨", 9: "٩", 0: "٠"}, n = {
+                    "١": "1",
+                    "٢": "2",
+                    "٣": "3",
+                    "٤": "4",
+                    "٥": "5",
+                    "٦": "6",
+                    "٧": "7",
+                    "٨": "8",
+                    "٩": "9",
+                    "٠": "0"
+                },
+                i = ["کانونی دووەم", "شوبات", "ئازار", "نیسان", "ئایار", "حوزەیران", "تەمموز", "ئاب", "ئەیلوول", "تشرینی یەكەم", "تشرینی دووەم", "كانونی یەکەم"],
+                r;
+            e.defineLocale("ku", {
+                months: i,
+                monthsShort: i,
+                weekdays: "یه‌كشه‌ممه‌_دووشه‌ممه‌_سێشه‌ممه‌_چوارشه‌ممه‌_پێنجشه‌ممه‌_هه‌ینی_شه‌ممه‌".split("_"),
+                weekdaysShort: "یه‌كشه‌م_دووشه‌م_سێشه‌م_چوارشه‌م_پێنجشه‌م_هه‌ینی_شه‌ممه‌".split("_"),
+                weekdaysMin: "ی_د_س_چ_پ_ه_ش".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ئێواره‌|به‌یانی/,
+                isPM: function (e) {
+                    return /ئێواره‌/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "به‌یانی"; else return "ئێواره‌"
+                },
+                calendar: {
+                    sameDay: "[ئه‌مرۆ كاتژمێر] LT",
+                    nextDay: "[به‌یانی كاتژمێر] LT",
+                    nextWeek: "dddd [كاتژمێر] LT",
+                    lastDay: "[دوێنێ كاتژمێر] LT",
+                    lastWeek: "dddd [كاتژمێر] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "له‌ %s",
+                    past: "%s",
+                    s: "چه‌ند چركه‌یه‌ك",
+                    ss: "چركه‌ %d",
+                    m: "یه‌ك خوله‌ك",
+                    mm: "%d خوله‌ك",
+                    h: "یه‌ك كاتژمێر",
+                    hh: "%d كاتژمێر",
+                    d: "یه‌ك ڕۆژ",
+                    dd: "%d ڕۆژ",
+                    M: "یه‌ك مانگ",
+                    MM: "%d مانگ",
+                    y: "یه‌ك ساڵ",
+                    yy: "%d ساڵ"
+                },
+                preparse: function (e) {
+                    return e.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (e) {
+                        return n[e]
+                    }).replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    }).replace(/,/g, "،")
+                },
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var i = {
+                0: "-чү",
+                1: "-чи",
+                2: "-чи",
+                3: "-чү",
+                4: "-чү",
+                5: "-чи",
+                6: "-чы",
+                7: "-чи",
+                8: "-чи",
+                9: "-чу",
+                10: "-чу",
+                20: "-чы",
+                30: "-чу",
+                40: "-чы",
+                50: "-чү",
+                60: "-чы",
+                70: "-чи",
+                80: "-чи",
+                90: "-чу",
+                100: "-чү"
+            }, t;
+            e.defineLocale("ky", {
+                months: "январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),
+                monthsShort: "янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_"),
+                weekdays: "Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби".split("_"),
+                weekdaysShort: "Жек_Дүй_Шей_Шар_Бей_Жум_Ише".split("_"),
+                weekdaysMin: "Жк_Дй_Шй_Шр_Бй_Жм_Иш".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Бүгүн саат] LT",
+                    nextDay: "[Эртең саат] LT",
+                    nextWeek: "dddd [саат] LT",
+                    lastDay: "[Кечээ саат] LT",
+                    lastWeek: "[Өткөн аптанын] dddd [күнү] [саат] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s ичинде",
+                    past: "%s мурун",
+                    s: "бирнече секунд",
+                    ss: "%d секунд",
+                    m: "бир мүнөт",
+                    mm: "%d мүнөт",
+                    h: "бир саат",
+                    hh: "%d саат",
+                    d: "бир күн",
+                    dd: "%d күн",
+                    M: "бир ай",
+                    MM: "%d ай",
+                    y: "бир жыл",
+                    yy: "%d жыл"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
+                ordinal: function (e) {
+                    var t = e % 10, n = e >= 100 ? 100 : null;
+                    return e + (i[e] || i[t] || i[n])
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = {
+                    m: ["eng Minutt", "enger Minutt"],
+                    h: ["eng Stonn", "enger Stonn"],
+                    d: ["een Dag", "engem Dag"],
+                    M: ["ee Mount", "engem Mount"],
+                    y: ["ee Joer", "engem Joer"]
+                };
+                return t ? r[n][0] : r[n][1]
+            }
+
+            function n(e) {
+                var t = e.substr(0, e.indexOf(" "));
+                if (r(t)) return "a " + e;
+                return "an " + e
+            }
+
+            function i(e) {
+                var t = e.substr(0, e.indexOf(" "));
+                if (r(t)) return "viru " + e;
+                return "virun " + e
+            }
+
+            function r(e) {
+                e = parseInt(e, 10);
+                if (isNaN(e)) return false;
+                if (e < 0) return true; else if (e < 10) {
+                    if (4 <= e && e <= 7) return true;
+                    return false
+                } else if (e < 100) {
+                    var t = e % 10, n = e / 10;
+                    if (t === 0) return r(n);
+                    return r(t)
+                } else if (e < 1e4) {
+                    while (e >= 10) e = e / 10;
+                    return r(e)
+                } else {
+                    e = e / 1e3;
+                    return r(e)
+                }
+            }
+
+            var a;
+            e.defineLocale("lb", {
+                months: "Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),
+                monthsShort: "Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),
+                monthsParseExact: true,
+                weekdays: "Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),
+                weekdaysShort: "So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),
+                weekdaysMin: "So_Mé_Dë_Më_Do_Fr_Sa".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm [Auer]",
+                    LTS: "H:mm:ss [Auer]",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm [Auer]",
+                    LLLL: "dddd, D. MMMM YYYY H:mm [Auer]"
+                },
+                calendar: {
+                    sameDay: "[Haut um] LT",
+                    sameElse: "L",
+                    nextDay: "[Muer um] LT",
+                    nextWeek: "dddd [um] LT",
+                    lastDay: "[Gëschter um] LT",
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 2:
+                            case 4:
+                                return "[Leschten] dddd [um] LT";
+                            default:
+                                return "[Leschte] dddd [um] LT"
+                        }
+                    }
+                },
+                relativeTime: {
+                    future: n,
+                    past: i,
+                    s: "e puer Sekonnen",
+                    ss: "%d Sekonnen",
+                    m: t,
+                    mm: "%d Minutten",
+                    h: t,
+                    hh: "%d Stonnen",
+                    d: t,
+                    dd: "%d Deeg",
+                    M: t,
+                    MM: "%d Méint",
+                    y: t,
+                    yy: "%d Joer"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("lo", {
+                months: "ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ".split("_"),
+                monthsShort: "ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ".split("_"),
+                weekdays: "ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ".split("_"),
+                weekdaysShort: "ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ".split("_"),
+                weekdaysMin: "ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "ວັນdddd D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
+                isPM: function (e) {
+                    return e === "ຕອນແລງ"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ຕອນເຊົ້າ"; else return "ຕອນແລງ"
+                },
+                calendar: {
+                    sameDay: "[ມື້ນີ້ເວລາ] LT",
+                    nextDay: "[ມື້ອື່ນເວລາ] LT",
+                    nextWeek: "[ວັນ]dddd[ໜ້າເວລາ] LT",
+                    lastDay: "[ມື້ວານນີ້ເວລາ] LT",
+                    lastWeek: "[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "ອີກ %s",
+                    past: "%sຜ່ານມາ",
+                    s: "ບໍ່ເທົ່າໃດວິນາທີ",
+                    ss: "%d ວິນາທີ",
+                    m: "1 ນາທີ",
+                    mm: "%d ນາທີ",
+                    h: "1 ຊົ່ວໂມງ",
+                    hh: "%d ຊົ່ວໂມງ",
+                    d: "1 ມື້",
+                    dd: "%d ມື້",
+                    M: "1 ເດືອນ",
+                    MM: "%d ເດືອນ",
+                    y: "1 ປີ",
+                    yy: "%d ປີ"
+                },
+                dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
+                ordinal: function (e) {
+                    return "ທີ່" + e
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {
+                ss: "sekundė_sekundžių_sekundes",
+                m: "minutė_minutės_minutę",
+                mm: "minutės_minučių_minutes",
+                h: "valanda_valandos_valandą",
+                hh: "valandos_valandų_valandas",
+                d: "diena_dienos_dieną",
+                dd: "dienos_dienų_dienas",
+                M: "mėnuo_mėnesio_mėnesį",
+                MM: "mėnesiai_mėnesių_mėnesius",
+                y: "metai_metų_metus",
+                yy: "metai_metų_metus"
+            }, n;
+
+            function i(e, t, n, i) {
+                if (t) return "kelios sekundės"; else return i ? "kelių sekundžių" : "kelias sekundes"
+            }
+
+            function a(e, t, n, i) {
+                return t ? o(n)[0] : i ? o(n)[1] : o(n)[2]
+            }
+
+            function s(e) {
+                return e % 10 === 0 || e > 10 && e < 20
+            }
+
+            function o(e) {
+                return t[e].split("_")
+            }
+
+            function r(e, t, n, i) {
+                var r = e + " ";
+                if (e === 1) return r + a(e, t, n[0], i); else if (t) return r + (s(e) ? o(n)[1] : o(n)[0]); else if (i) return r + o(n)[1]; else return r + (s(e) ? o(n)[1] : o(n)[2])
+            }
+
+            e.defineLocale("lt", {
+                months: {
+                    format: "sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),
+                    standalone: "sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis".split("_"),
+                    isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
+                },
+                monthsShort: "sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),
+                weekdays: {
+                    format: "sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį".split("_"),
+                    standalone: "sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),
+                    isFormat: /dddd HH:mm/
+                },
+                weekdaysShort: "Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),
+                weekdaysMin: "S_P_A_T_K_Pn_Š".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "YYYY [m.] MMMM D [d.]",
+                    LLL: "YYYY [m.] MMMM D [d.], HH:mm [val.]",
+                    LLLL: "YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",
+                    l: "YYYY-MM-DD",
+                    ll: "YYYY [m.] MMMM D [d.]",
+                    lll: "YYYY [m.] MMMM D [d.], HH:mm [val.]",
+                    llll: "YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"
+                },
+                calendar: {
+                    sameDay: "[Šiandien] LT",
+                    nextDay: "[Rytoj] LT",
+                    nextWeek: "dddd LT",
+                    lastDay: "[Vakar] LT",
+                    lastWeek: "[Praėjusį] dddd LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "po %s",
+                    past: "prieš %s",
+                    s: i,
+                    ss: r,
+                    m: a,
+                    mm: r,
+                    h: a,
+                    hh: r,
+                    d: a,
+                    dd: r,
+                    M: a,
+                    MM: r,
+                    y: a,
+                    yy: r
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-oji/,
+                ordinal: function (e) {
+                    return e + "-oji"
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var i = {
+                ss: "sekundes_sekundēm_sekunde_sekundes".split("_"),
+                m: "minūtes_minūtēm_minūte_minūtes".split("_"),
+                mm: "minūtes_minūtēm_minūte_minūtes".split("_"),
+                h: "stundas_stundām_stunda_stundas".split("_"),
+                hh: "stundas_stundām_stunda_stundas".split("_"),
+                d: "dienas_dienām_diena_dienas".split("_"),
+                dd: "dienas_dienām_diena_dienas".split("_"),
+                M: "mēneša_mēnešiem_mēnesis_mēneši".split("_"),
+                MM: "mēneša_mēnešiem_mēnesis_mēneši".split("_"),
+                y: "gada_gadiem_gads_gadi".split("_"),
+                yy: "gada_gadiem_gads_gadi".split("_")
+            }, t;
+
+            function r(e, t, n) {
+                if (n) return t % 10 === 1 && t % 100 !== 11 ? e[2] : e[3]; else return t % 10 === 1 && t % 100 !== 11 ? e[0] : e[1]
+            }
+
+            function n(e, t, n) {
+                return e + " " + r(i[n], e, t)
+            }
+
+            function a(e, t, n) {
+                return r(i[n], e, t)
+            }
+
+            function s(e, t) {
+                return t ? "dažas sekundes" : "dažām sekundēm"
+            }
+
+            e.defineLocale("lv", {
+                months: "janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),
+                monthsShort: "jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),
+                weekdays: "svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),
+                weekdaysShort: "Sv_P_O_T_C_Pk_S".split("_"),
+                weekdaysMin: "Sv_P_O_T_C_Pk_S".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY.",
+                    LL: "YYYY. [gada] D. MMMM",
+                    LLL: "YYYY. [gada] D. MMMM, HH:mm",
+                    LLLL: "YYYY. [gada] D. MMMM, dddd, HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Šodien pulksten] LT",
+                    nextDay: "[Rīt pulksten] LT",
+                    nextWeek: "dddd [pulksten] LT",
+                    lastDay: "[Vakar pulksten] LT",
+                    lastWeek: "[Pagājušā] dddd [pulksten] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "pēc %s",
+                    past: "pirms %s",
+                    s: s,
+                    ss: n,
+                    m: a,
+                    mm: n,
+                    h: a,
+                    hh: n,
+                    d: a,
+                    dd: n,
+                    M: a,
+                    MM: n,
+                    y: a,
+                    yy: n
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var r = {
+                words: {
+                    ss: ["sekund", "sekunda", "sekundi"],
+                    m: ["jedan minut", "jednog minuta"],
+                    mm: ["minut", "minuta", "minuta"],
+                    h: ["jedan sat", "jednog sata"],
+                    hh: ["sat", "sata", "sati"],
+                    dd: ["dan", "dana", "dana"],
+                    MM: ["mjesec", "mjeseca", "mjeseci"],
+                    yy: ["godina", "godine", "godina"]
+                }, correctGrammaticalCase: function (e, t) {
+                    return e === 1 ? t[0] : e >= 2 && e <= 4 ? t[1] : t[2]
+                }, translate: function (e, t, n) {
+                    var i = r.words[n];
+                    if (n.length === 1) return t ? i[0] : i[1]; else return e + " " + r.correctGrammaticalCase(e, i)
+                }
+            }, t;
+            e.defineLocale("me", {
+                months: "januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),
+                monthsShort: "jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),
+                weekdaysShort: "ned._pon._uto._sri._čet._pet._sub.".split("_"),
+                weekdaysMin: "ne_po_ut_sr_če_pe_su".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd, D. MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[danas u] LT", nextDay: "[sjutra u] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[u] [nedjelju] [u] LT";
+                            case 3:
+                                return "[u] [srijedu] [u] LT";
+                            case 6:
+                                return "[u] [subotu] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[u] dddd [u] LT"
+                        }
+                    }, lastDay: "[juče u] LT", lastWeek: function () {
+                        var e = ["[prošle] [nedjelje] [u] LT", "[prošlog] [ponedjeljka] [u] LT", "[prošlog] [utorka] [u] LT", "[prošle] [srijede] [u] LT", "[prošlog] [četvrtka] [u] LT", "[prošlog] [petka] [u] LT", "[prošle] [subote] [u] LT"];
+                        return e[this.day()]
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "prije %s",
+                    s: "nekoliko sekundi",
+                    ss: r.translate,
+                    m: r.translate,
+                    mm: r.translate,
+                    h: r.translate,
+                    hh: r.translate,
+                    d: "dan",
+                    dd: r.translate,
+                    M: "mjesec",
+                    MM: r.translate,
+                    y: "godinu",
+                    yy: r.translate
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("mi", {
+                months: "Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea".split("_"),
+                monthsShort: "Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki".split("_"),
+                monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+                monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+                monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+                monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
+                weekdays: "Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei".split("_"),
+                weekdaysShort: "Ta_Ma_Tū_We_Tāi_Pa_Hā".split("_"),
+                weekdaysMin: "Ta_Ma_Tū_We_Tāi_Pa_Hā".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [i] HH:mm",
+                    LLLL: "dddd, D MMMM YYYY [i] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[i teie mahana, i] LT",
+                    nextDay: "[apopo i] LT",
+                    nextWeek: "dddd [i] LT",
+                    lastDay: "[inanahi i] LT",
+                    lastWeek: "dddd [whakamutunga i] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "i roto i %s",
+                    past: "%s i mua",
+                    s: "te hēkona ruarua",
+                    ss: "%d hēkona",
+                    m: "he meneti",
+                    mm: "%d meneti",
+                    h: "te haora",
+                    hh: "%d haora",
+                    d: "he ra",
+                    dd: "%d ra",
+                    M: "he marama",
+                    MM: "%d marama",
+                    y: "he tau",
+                    yy: "%d tau"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("mk", {
+                months: "јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември".split("_"),
+                monthsShort: "јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек".split("_"),
+                weekdays: "недела_понеделник_вторник_среда_четврток_петок_сабота".split("_"),
+                weekdaysShort: "нед_пон_вто_сре_чет_пет_саб".split("_"),
+                weekdaysMin: "нe_пo_вт_ср_че_пе_сa".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "D.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY H:mm",
+                    LLLL: "dddd, D MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[Денес во] LT",
+                    nextDay: "[Утре во] LT",
+                    nextWeek: "[Во] dddd [во] LT",
+                    lastDay: "[Вчера во] LT",
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                            case 3:
+                            case 6:
+                                return "[Изминатата] dddd [во] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[Изминатиот] dddd [во] LT"
+                        }
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "за %s",
+                    past: "пред %s",
+                    s: "неколку секунди",
+                    ss: "%d секунди",
+                    m: "една минута",
+                    mm: "%d минути",
+                    h: "еден час",
+                    hh: "%d часа",
+                    d: "еден ден",
+                    dd: "%d дена",
+                    M: "еден месец",
+                    MM: "%d месеци",
+                    y: "една година",
+                    yy: "%d години"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+                ordinal: function (e) {
+                    var t = e % 10, n = e % 100;
+                    if (e === 0) return e + "-ев"; else if (n === 0) return e + "-ен"; else if (n > 10 && n < 20) return e + "-ти"; else if (t === 1) return e + "-ви"; else if (t === 2) return e + "-ри"; else if (t === 7 || t === 8) return e + "-ми"; else return e + "-ти"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ml", {
+                months: "ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ".split("_"),
+                monthsShort: "ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.".split("_"),
+                monthsParseExact: true,
+                weekdays: "ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച".split("_"),
+                weekdaysShort: "ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി".split("_"),
+                weekdaysMin: "ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm -നു",
+                    LTS: "A h:mm:ss -നു",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm -നു",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm -നു"
+                },
+                calendar: {
+                    sameDay: "[ഇന്ന്] LT",
+                    nextDay: "[നാളെ] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[ഇന്നലെ] LT",
+                    lastWeek: "[കഴിഞ്ഞ] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s കഴിഞ്ഞ്",
+                    past: "%s മുൻപ്",
+                    s: "അൽപ നിമിഷങ്ങൾ",
+                    ss: "%d സെക്കൻഡ്",
+                    m: "ഒരു മിനിറ്റ്",
+                    mm: "%d മിനിറ്റ്",
+                    h: "ഒരു മണിക്കൂർ",
+                    hh: "%d മണിക്കൂർ",
+                    d: "ഒരു ദിവസം",
+                    dd: "%d ദിവസം",
+                    M: "ഒരു മാസം",
+                    MM: "%d മാസം",
+                    y: "ഒരു വർഷം",
+                    yy: "%d വർഷം"
+                },
+                meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "രാത്രി" && e >= 4 || t === "ഉച്ച കഴിഞ്ഞ്" || t === "വൈകുന്നേരം") return e + 12; else return e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "രാത്രി"; else if (e < 12) return "രാവിലെ"; else if (e < 17) return "ഉച്ച കഴിഞ്ഞ്"; else if (e < 20) return "വൈകുന്നേരം"; else return "രാത്രി"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                switch (n) {
+                    case"s":
+                        return t ? "хэдхэн секунд" : "хэдхэн секундын";
+                    case"ss":
+                        return e + (t ? " секунд" : " секундын");
+                    case"m":
+                    case"mm":
+                        return e + (t ? " минут" : " минутын");
+                    case"h":
+                    case"hh":
+                        return e + (t ? " цаг" : " цагийн");
+                    case"d":
+                    case"dd":
+                        return e + (t ? " өдөр" : " өдрийн");
+                    case"M":
+                    case"MM":
+                        return e + (t ? " сар" : " сарын");
+                    case"y":
+                    case"yy":
+                        return e + (t ? " жил" : " жилийн");
+                    default:
+                        return e
+                }
+            }
+
+            var n;
+            e.defineLocale("mn", {
+                months: "Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар".split("_"),
+                monthsShort: "1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар".split("_"),
+                monthsParseExact: true,
+                weekdays: "Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба".split("_"),
+                weekdaysShort: "Ням_Дав_Мяг_Лха_Пүр_Баа_Бям".split("_"),
+                weekdaysMin: "Ня_Да_Мя_Лх_Пү_Ба_Бя".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "YYYY оны MMMMын D",
+                    LLL: "YYYY оны MMMMын D HH:mm",
+                    LLLL: "dddd, YYYY оны MMMMын D HH:mm"
+                },
+                meridiemParse: /ҮӨ|ҮХ/i,
+                isPM: function (e) {
+                    return e === "ҮХ"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ҮӨ"; else return "ҮХ"
+                },
+                calendar: {
+                    sameDay: "[Өнөөдөр] LT",
+                    nextDay: "[Маргааш] LT",
+                    nextWeek: "[Ирэх] dddd LT",
+                    lastDay: "[Өчигдөр] LT",
+                    lastWeek: "[Өнгөрсөн] dddd LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s дараа",
+                    past: "%s өмнө",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: t,
+                    dd: t,
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2} өдөр/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + " өдөр";
+                        default:
+                            return e
+                    }
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "१", 2: "२", 3: "३", 4: "४", 5: "५", 6: "६", 7: "७", 8: "८", 9: "९", 0: "०"}, n = {
+                "१": "1",
+                "२": "2",
+                "३": "3",
+                "४": "4",
+                "५": "5",
+                "६": "6",
+                "७": "7",
+                "८": "8",
+                "९": "9",
+                "०": "0"
+            }, i;
+
+            function r(e, t, n, i) {
+                var r = "";
+                if (t) switch (n) {
+                    case"s":
+                        r = "काही सेकंद";
+                        break;
+                    case"ss":
+                        r = "%d सेकंद";
+                        break;
+                    case"m":
+                        r = "एक मिनिट";
+                        break;
+                    case"mm":
+                        r = "%d मिनिटे";
+                        break;
+                    case"h":
+                        r = "एक तास";
+                        break;
+                    case"hh":
+                        r = "%d तास";
+                        break;
+                    case"d":
+                        r = "एक दिवस";
+                        break;
+                    case"dd":
+                        r = "%d दिवस";
+                        break;
+                    case"M":
+                        r = "एक महिना";
+                        break;
+                    case"MM":
+                        r = "%d महिने";
+                        break;
+                    case"y":
+                        r = "एक वर्ष";
+                        break;
+                    case"yy":
+                        r = "%d वर्षे";
+                        break
+                } else switch (n) {
+                    case"s":
+                        r = "काही सेकंदां";
+                        break;
+                    case"ss":
+                        r = "%d सेकंदां";
+                        break;
+                    case"m":
+                        r = "एका मिनिटा";
+                        break;
+                    case"mm":
+                        r = "%d मिनिटां";
+                        break;
+                    case"h":
+                        r = "एका तासा";
+                        break;
+                    case"hh":
+                        r = "%d तासां";
+                        break;
+                    case"d":
+                        r = "एका दिवसा";
+                        break;
+                    case"dd":
+                        r = "%d दिवसां";
+                        break;
+                    case"M":
+                        r = "एका महिन्या";
+                        break;
+                    case"MM":
+                        r = "%d महिन्यां";
+                        break;
+                    case"y":
+                        r = "एका वर्षा";
+                        break;
+                    case"yy":
+                        r = "%d वर्षां";
+                        break
+                }
+                return r.replace(/%d/i, e)
+            }
+
+            e.defineLocale("mr", {
+                months: "जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर".split("_"),
+                monthsShort: "जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.".split("_"),
+                monthsParseExact: true,
+                weekdays: "रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),
+                weekdaysShort: "रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि".split("_"),
+                weekdaysMin: "र_सो_मं_बु_गु_शु_श".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm वाजता",
+                    LTS: "A h:mm:ss वाजता",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm वाजता",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm वाजता"
+                },
+                calendar: {
+                    sameDay: "[आज] LT",
+                    nextDay: "[उद्या] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[काल] LT",
+                    lastWeek: "[मागील] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%sमध्ये",
+                    past: "%sपूर्वी",
+                    s: r,
+                    ss: r,
+                    m: r,
+                    mm: r,
+                    h: r,
+                    hh: r,
+                    d: r,
+                    dd: r,
+                    M: r,
+                    MM: r,
+                    y: r,
+                    yy: r
+                },
+                preparse: function (e) {
+                    return e.replace(/[१२३४५६७८९०]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /पहाटे|सकाळी|दुपारी|सायंकाळी|रात्री/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "पहाटे" || t === "सकाळी") return e; else if (t === "दुपारी" || t === "सायंकाळी" || t === "रात्री") return e >= 12 ? e : e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e >= 0 && e < 6) return "पहाटे"; else if (e < 12) return "सकाळी"; else if (e < 17) return "दुपारी"; else if (e < 20) return "सायंकाळी"; else return "रात्री"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ms", {
+                months: "Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),
+                monthsShort: "Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),
+                weekdays: "Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),
+                weekdaysShort: "Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),
+                weekdaysMin: "Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [pukul] HH.mm",
+                    LLLL: "dddd, D MMMM YYYY [pukul] HH.mm"
+                },
+                meridiemParse: /pagi|tengahari|petang|malam/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "pagi") return e; else if (t === "tengahari") return e >= 11 ? e : e + 12; else if (t === "petang" || t === "malam") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 11) return "pagi"; else if (e < 15) return "tengahari"; else if (e < 19) return "petang"; else return "malam"
+                },
+                calendar: {
+                    sameDay: "[Hari ini pukul] LT",
+                    nextDay: "[Esok pukul] LT",
+                    nextWeek: "dddd [pukul] LT",
+                    lastDay: "[Kelmarin pukul] LT",
+                    lastWeek: "dddd [lepas pukul] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dalam %s",
+                    past: "%s yang lepas",
+                    s: "beberapa saat",
+                    ss: "%d saat",
+                    m: "seminit",
+                    mm: "%d minit",
+                    h: "sejam",
+                    hh: "%d jam",
+                    d: "sehari",
+                    dd: "%d hari",
+                    M: "sebulan",
+                    MM: "%d bulan",
+                    y: "setahun",
+                    yy: "%d tahun"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ms-my", {
+                months: "Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),
+                monthsShort: "Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),
+                weekdays: "Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),
+                weekdaysShort: "Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),
+                weekdaysMin: "Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [pukul] HH.mm",
+                    LLLL: "dddd, D MMMM YYYY [pukul] HH.mm"
+                },
+                meridiemParse: /pagi|tengahari|petang|malam/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "pagi") return e; else if (t === "tengahari") return e >= 11 ? e : e + 12; else if (t === "petang" || t === "malam") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 11) return "pagi"; else if (e < 15) return "tengahari"; else if (e < 19) return "petang"; else return "malam"
+                },
+                calendar: {
+                    sameDay: "[Hari ini pukul] LT",
+                    nextDay: "[Esok pukul] LT",
+                    nextWeek: "dddd [pukul] LT",
+                    lastDay: "[Kelmarin pukul] LT",
+                    lastWeek: "dddd [lepas pukul] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dalam %s",
+                    past: "%s yang lepas",
+                    s: "beberapa saat",
+                    ss: "%d saat",
+                    m: "seminit",
+                    mm: "%d minit",
+                    h: "sejam",
+                    hh: "%d jam",
+                    d: "sehari",
+                    dd: "%d hari",
+                    M: "sebulan",
+                    MM: "%d bulan",
+                    y: "setahun",
+                    yy: "%d tahun"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("mt", {
+                months: "Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru".split("_"),
+                monthsShort: "Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ".split("_"),
+                weekdays: "Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt".split("_"),
+                weekdaysShort: "Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib".split("_"),
+                weekdaysMin: "Ħa_Tn_Tl_Er_Ħa_Ġi_Si".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Illum fil-]LT",
+                    nextDay: "[Għada fil-]LT",
+                    nextWeek: "dddd [fil-]LT",
+                    lastDay: "[Il-bieraħ fil-]LT",
+                    lastWeek: "dddd [li għadda] [fil-]LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "f’ %s",
+                    past: "%s ilu",
+                    s: "ftit sekondi",
+                    ss: "%d sekondi",
+                    m: "minuta",
+                    mm: "%d minuti",
+                    h: "siegħa",
+                    hh: "%d siegħat",
+                    d: "ġurnata",
+                    dd: "%d ġranet",
+                    M: "xahar",
+                    MM: "%d xhur",
+                    y: "sena",
+                    yy: "%d sni"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "၁", 2: "၂", 3: "၃", 4: "၄", 5: "၅", 6: "၆", 7: "၇", 8: "၈", 9: "၉", 0: "၀"}, n = {
+                "၁": "1",
+                "၂": "2",
+                "၃": "3",
+                "၄": "4",
+                "၅": "5",
+                "၆": "6",
+                "၇": "7",
+                "၈": "8",
+                "၉": "9",
+                "၀": "0"
+            }, i;
+            e.defineLocale("my", {
+                months: "ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ".split("_"),
+                monthsShort: "ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ".split("_"),
+                weekdays: "တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ".split("_"),
+                weekdaysShort: "နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),
+                weekdaysMin: "နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[ယနေ.] LT [မှာ]",
+                    nextDay: "[မနက်ဖြန်] LT [မှာ]",
+                    nextWeek: "dddd LT [မှာ]",
+                    lastDay: "[မနေ.က] LT [မှာ]",
+                    lastWeek: "[ပြီးခဲ့သော] dddd LT [မှာ]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "လာမည့် %s မှာ",
+                    past: "လွန်ခဲ့သော %s က",
+                    s: "စက္ကန်.အနည်းငယ်",
+                    ss: "%d စက္ကန့်",
+                    m: "တစ်မိနစ်",
+                    mm: "%d မိနစ်",
+                    h: "တစ်နာရီ",
+                    hh: "%d နာရီ",
+                    d: "တစ်ရက်",
+                    dd: "%d ရက်",
+                    M: "တစ်လ",
+                    MM: "%d လ",
+                    y: "တစ်နှစ်",
+                    yy: "%d နှစ်"
+                },
+                preparse: function (e) {
+                    return e.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("nb", {
+                months: "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),
+                monthsShort: "jan._feb._mars_apr._mai_juni_juli_aug._sep._okt._nov._des.".split("_"),
+                monthsParseExact: true,
+                weekdays: "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),
+                weekdaysShort: "sø._ma._ti._on._to._fr._lø.".split("_"),
+                weekdaysMin: "sø_ma_ti_on_to_fr_lø".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY [kl.] HH:mm",
+                    LLLL: "dddd D. MMMM YYYY [kl.] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[i dag kl.] LT",
+                    nextDay: "[i morgen kl.] LT",
+                    nextWeek: "dddd [kl.] LT",
+                    lastDay: "[i går kl.] LT",
+                    lastWeek: "[forrige] dddd [kl.] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "om %s",
+                    past: "%s siden",
+                    s: "noen sekunder",
+                    ss: "%d sekunder",
+                    m: "ett minutt",
+                    mm: "%d minutter",
+                    h: "en time",
+                    hh: "%d timer",
+                    d: "en dag",
+                    dd: "%d dager",
+                    w: "en uke",
+                    ww: "%d uker",
+                    M: "en måned",
+                    MM: "%d måneder",
+                    y: "ett år",
+                    yy: "%d år"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "१", 2: "२", 3: "३", 4: "४", 5: "५", 6: "६", 7: "७", 8: "८", 9: "९", 0: "०"}, n = {
+                "१": "1",
+                "२": "2",
+                "३": "3",
+                "४": "4",
+                "५": "5",
+                "६": "6",
+                "७": "7",
+                "८": "8",
+                "९": "9",
+                "०": "0"
+            }, i;
+            e.defineLocale("ne", {
+                months: "जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर".split("_"),
+                monthsShort: "जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.".split("_"),
+                monthsParseExact: true,
+                weekdays: "आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार".split("_"),
+                weekdaysShort: "आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.".split("_"),
+                weekdaysMin: "आ._सो._मं._बु._बि._शु._श.".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "Aको h:mm बजे",
+                    LTS: "Aको h:mm:ss बजे",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, Aको h:mm बजे",
+                    LLLL: "dddd, D MMMM YYYY, Aको h:mm बजे"
+                },
+                preparse: function (e) {
+                    return e.replace(/[१२३४५६७८९०]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "राति") return e < 4 ? e : e + 12; else if (t === "बिहान") return e; else if (t === "दिउँसो") return e >= 10 ? e : e + 12; else if (t === "साँझ") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 3) return "राति"; else if (e < 12) return "बिहान"; else if (e < 16) return "दिउँसो"; else if (e < 20) return "साँझ"; else return "राति"
+                },
+                calendar: {
+                    sameDay: "[आज] LT",
+                    nextDay: "[भोलि] LT",
+                    nextWeek: "[आउँदो] dddd[,] LT",
+                    lastDay: "[हिजो] LT",
+                    lastWeek: "[गएको] dddd[,] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%sमा",
+                    past: "%s अगाडि",
+                    s: "केही क्षण",
+                    ss: "%d सेकेण्ड",
+                    m: "एक मिनेट",
+                    mm: "%d मिनेट",
+                    h: "एक घण्टा",
+                    hh: "%d घण्टा",
+                    d: "एक दिन",
+                    dd: "%d दिन",
+                    M: "एक महिना",
+                    MM: "%d महिना",
+                    y: "एक बर्ष",
+                    yy: "%d बर्ष"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),
+                i = "jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),
+                t = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i],
+                r = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+                a;
+            e.defineLocale("nl", {
+                months: "januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
+                monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),
+                weekdaysShort: "zo._ma._di._wo._do._vr._za.".split("_"),
+                weekdaysMin: "zo_ma_di_wo_do_vr_za".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD-MM-YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[vandaag om] LT",
+                    nextDay: "[morgen om] LT",
+                    nextWeek: "dddd [om] LT",
+                    lastDay: "[gisteren om] LT",
+                    lastWeek: "[afgelopen] dddd [om] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "over %s",
+                    past: "%s geleden",
+                    s: "een paar seconden",
+                    ss: "%d seconden",
+                    m: "één minuut",
+                    mm: "%d minuten",
+                    h: "één uur",
+                    hh: "%d uur",
+                    d: "één dag",
+                    dd: "%d dagen",
+                    w: "één week",
+                    ww: "%d weken",
+                    M: "één maand",
+                    MM: "%d maanden",
+                    y: "één jaar",
+                    yy: "%d jaar"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+                ordinal: function (e) {
+                    return e + (e === 1 || e === 8 || e >= 20 ? "ste" : "de")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),
+                i = "jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),
+                t = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i],
+                r = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+                a;
+            e.defineLocale("nl-be", {
+                months: "januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),
+                monthsShort: function (e, t) {
+                    if (!e) return n; else if (/-MMM-/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsRegex: r,
+                monthsShortRegex: r,
+                monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
+                monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),
+                weekdaysShort: "zo._ma._di._wo._do._vr._za.".split("_"),
+                weekdaysMin: "zo_ma_di_wo_do_vr_za".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[vandaag om] LT",
+                    nextDay: "[morgen om] LT",
+                    nextWeek: "dddd [om] LT",
+                    lastDay: "[gisteren om] LT",
+                    lastWeek: "[afgelopen] dddd [om] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "over %s",
+                    past: "%s geleden",
+                    s: "een paar seconden",
+                    ss: "%d seconden",
+                    m: "één minuut",
+                    mm: "%d minuten",
+                    h: "één uur",
+                    hh: "%d uur",
+                    d: "één dag",
+                    dd: "%d dagen",
+                    M: "één maand",
+                    MM: "%d maanden",
+                    y: "één jaar",
+                    yy: "%d jaar"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+                ordinal: function (e) {
+                    return e + (e === 1 || e === 8 || e >= 20 ? "ste" : "de")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("nn", {
+                months: "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),
+                monthsShort: "jan._feb._mars_apr._mai_juni_juli_aug._sep._okt._nov._des.".split("_"),
+                monthsParseExact: true,
+                weekdays: "sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),
+                weekdaysShort: "su._må._ty._on._to._fr._lau.".split("_"),
+                weekdaysMin: "su_må_ty_on_to_fr_la".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY [kl.] H:mm",
+                    LLLL: "dddd D. MMMM YYYY [kl.] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[I dag klokka] LT",
+                    nextDay: "[I morgon klokka] LT",
+                    nextWeek: "dddd [klokka] LT",
+                    lastDay: "[I går klokka] LT",
+                    lastWeek: "[Føregåande] dddd [klokka] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "om %s",
+                    past: "%s sidan",
+                    s: "nokre sekund",
+                    ss: "%d sekund",
+                    m: "eit minutt",
+                    mm: "%d minutt",
+                    h: "ein time",
+                    hh: "%d timar",
+                    d: "ein dag",
+                    dd: "%d dagar",
+                    w: "ei veke",
+                    ww: "%d veker",
+                    M: "ein månad",
+                    MM: "%d månader",
+                    y: "eit år",
+                    yy: "%d år"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("oc-lnc", {
+                months: {
+                    standalone: "genièr_febrièr_març_abril_mai_junh_julhet_agost_setembre_octòbre_novembre_decembre".split("_"),
+                    format: "de genièr_de febrièr_de març_d'abril_de mai_de junh_de julhet_d'agost_de setembre_d'octòbre_de novembre_de decembre".split("_"),
+                    isFormat: /D[oD]?(\s)+MMMM/
+                },
+                monthsShort: "gen._febr._març_abr._mai_junh_julh._ago._set._oct._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "dimenge_diluns_dimars_dimècres_dijòus_divendres_dissabte".split("_"),
+                weekdaysShort: "dg._dl._dm._dc._dj._dv._ds.".split("_"),
+                weekdaysMin: "dg_dl_dm_dc_dj_dv_ds".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM [de] YYYY",
+                    ll: "D MMM YYYY",
+                    LLL: "D MMMM [de] YYYY [a] H:mm",
+                    lll: "D MMM YYYY, H:mm",
+                    LLLL: "dddd D MMMM [de] YYYY [a] H:mm",
+                    llll: "ddd D MMM YYYY, H:mm"
+                },
+                calendar: {
+                    sameDay: "[uèi a] LT",
+                    nextDay: "[deman a] LT",
+                    nextWeek: "dddd [a] LT",
+                    lastDay: "[ièr a] LT",
+                    lastWeek: "dddd [passat a] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "d'aquí %s",
+                    past: "fa %s",
+                    s: "unas segondas",
+                    ss: "%d segondas",
+                    m: "una minuta",
+                    mm: "%d minutas",
+                    h: "una ora",
+                    hh: "%d oras",
+                    d: "un jorn",
+                    dd: "%d jorns",
+                    M: "un mes",
+                    MM: "%d meses",
+                    y: "un an",
+                    yy: "%d ans"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
+                ordinal: function (e, t) {
+                    var n = e === 1 ? "r" : e === 2 ? "n" : e === 3 ? "r" : e === 4 ? "t" : "è";
+                    if (t === "w" || t === "W") n = "a";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "੧", 2: "੨", 3: "੩", 4: "੪", 5: "੫", 6: "੬", 7: "੭", 8: "੮", 9: "੯", 0: "੦"}, n = {
+                "੧": "1",
+                "੨": "2",
+                "੩": "3",
+                "੪": "4",
+                "੫": "5",
+                "੬": "6",
+                "੭": "7",
+                "੮": "8",
+                "੯": "9",
+                "੦": "0"
+            }, i;
+            e.defineLocale("pa-in", {
+                months: "ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ".split("_"),
+                monthsShort: "ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ".split("_"),
+                weekdays: "ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ".split("_"),
+                weekdaysShort: "ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ".split("_"),
+                weekdaysMin: "ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm ਵਜੇ",
+                    LTS: "A h:mm:ss ਵਜੇ",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm ਵਜੇ",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm ਵਜੇ"
+                },
+                calendar: {
+                    sameDay: "[ਅਜ] LT",
+                    nextDay: "[ਕਲ] LT",
+                    nextWeek: "[ਅਗਲਾ] dddd, LT",
+                    lastDay: "[ਕਲ] LT",
+                    lastWeek: "[ਪਿਛਲੇ] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s ਵਿੱਚ",
+                    past: "%s ਪਿਛਲੇ",
+                    s: "ਕੁਝ ਸਕਿੰਟ",
+                    ss: "%d ਸਕਿੰਟ",
+                    m: "ਇਕ ਮਿੰਟ",
+                    mm: "%d ਮਿੰਟ",
+                    h: "ਇੱਕ ਘੰਟਾ",
+                    hh: "%d ਘੰਟੇ",
+                    d: "ਇੱਕ ਦਿਨ",
+                    dd: "%d ਦਿਨ",
+                    M: "ਇੱਕ ਮਹੀਨਾ",
+                    MM: "%d ਮਹੀਨੇ",
+                    y: "ਇੱਕ ਸਾਲ",
+                    yy: "%d ਸਾਲ"
+                },
+                preparse: function (e) {
+                    return e.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "ਰਾਤ") return e < 4 ? e : e + 12; else if (t === "ਸਵੇਰ") return e; else if (t === "ਦੁਪਹਿਰ") return e >= 10 ? e : e + 12; else if (t === "ਸ਼ਾਮ") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "ਰਾਤ"; else if (e < 10) return "ਸਵੇਰ"; else if (e < 17) return "ਦੁਪਹਿਰ"; else if (e < 20) return "ਸ਼ਾਮ"; else return "ਰਾਤ"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var n = "styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),
+                i = "stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),
+                t = [/^sty/i, /^lut/i, /^mar/i, /^kwi/i, /^maj/i, /^cze/i, /^lip/i, /^sie/i, /^wrz/i, /^paź/i, /^lis/i, /^gru/i],
+                r;
+
+            function a(e) {
+                return e % 10 < 5 && e % 10 > 1 && ~~(e / 10) % 10 !== 1
+            }
+
+            function s(e, t, n) {
+                var i = e + " ";
+                switch (n) {
+                    case"ss":
+                        return i + (a(e) ? "sekundy" : "sekund");
+                    case"m":
+                        return t ? "minuta" : "minutę";
+                    case"mm":
+                        return i + (a(e) ? "minuty" : "minut");
+                    case"h":
+                        return t ? "godzina" : "godzinę";
+                    case"hh":
+                        return i + (a(e) ? "godziny" : "godzin");
+                    case"ww":
+                        return i + (a(e) ? "tygodnie" : "tygodni");
+                    case"MM":
+                        return i + (a(e) ? "miesiące" : "miesięcy");
+                    case"yy":
+                        return i + (a(e) ? "lata" : "lat")
+                }
+            }
+
+            e.defineLocale("pl", {
+                months: function (e, t) {
+                    if (!e) return n; else if (/D MMMM/.test(t)) return i[e.month()]; else return n[e.month()]
+                },
+                monthsShort: "sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),
+                monthsParse: t,
+                longMonthsParse: t,
+                shortMonthsParse: t,
+                weekdays: "niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),
+                weekdaysShort: "ndz_pon_wt_śr_czw_pt_sob".split("_"),
+                weekdaysMin: "Nd_Pn_Wt_Śr_Cz_Pt_So".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Dziś o] LT", nextDay: "[Jutro o] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[W niedzielę o] LT";
+                            case 2:
+                                return "[We wtorek o] LT";
+                            case 3:
+                                return "[W środę o] LT";
+                            case 6:
+                                return "[W sobotę o] LT";
+                            default:
+                                return "[W] dddd [o] LT"
+                        }
+                    }, lastDay: "[Wczoraj o] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[W zeszłą niedzielę o] LT";
+                            case 3:
+                                return "[W zeszłą środę o] LT";
+                            case 6:
+                                return "[W zeszłą sobotę o] LT";
+                            default:
+                                return "[W zeszły] dddd [o] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "%s temu",
+                    s: "kilka sekund",
+                    ss: s,
+                    m: s,
+                    mm: s,
+                    h: s,
+                    hh: s,
+                    d: "1 dzień",
+                    dd: "%d dni",
+                    w: "tydzień",
+                    ww: s,
+                    M: "miesiąc",
+                    MM: s,
+                    y: "rok",
+                    yy: s
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("pt", {
+                months: "janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),
+                monthsShort: "jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),
+                weekdays: "Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"),
+                weekdaysShort: "Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),
+                weekdaysMin: "Do_2ª_3ª_4ª_5ª_6ª_Sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY HH:mm",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Hoje às] LT",
+                    nextDay: "[Amanhã às] LT",
+                    nextWeek: "dddd [às] LT",
+                    lastDay: "[Ontem às] LT",
+                    lastWeek: function () {
+                        return this.day() === 0 || this.day() === 6 ? "[Último] dddd [às] LT" : "[Última] dddd [às] LT"
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "em %s",
+                    past: "há %s",
+                    s: "segundos",
+                    ss: "%d segundos",
+                    m: "um minuto",
+                    mm: "%d minutos",
+                    h: "uma hora",
+                    hh: "%d horas",
+                    d: "um dia",
+                    dd: "%d dias",
+                    w: "uma semana",
+                    ww: "%d semanas",
+                    M: "um mês",
+                    MM: "%d meses",
+                    y: "um ano",
+                    yy: "%d anos"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("pt-br", {
+                months: "janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),
+                monthsShort: "jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),
+                weekdays: "domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado".split("_"),
+                weekdaysShort: "dom_seg_ter_qua_qui_sex_sáb".split("_"),
+                weekdaysMin: "do_2ª_3ª_4ª_5ª_6ª_sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D [de] MMMM [de] YYYY",
+                    LLL: "D [de] MMMM [de] YYYY [às] HH:mm",
+                    LLLL: "dddd, D [de] MMMM [de] YYYY [às] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Hoje às] LT",
+                    nextDay: "[Amanhã às] LT",
+                    nextWeek: "dddd [às] LT",
+                    lastDay: "[Ontem às] LT",
+                    lastWeek: function () {
+                        return this.day() === 0 || this.day() === 6 ? "[Último] dddd [às] LT" : "[Última] dddd [às] LT"
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "em %s",
+                    past: "há %s",
+                    s: "poucos segundos",
+                    ss: "%d segundos",
+                    m: "um minuto",
+                    mm: "%d minutos",
+                    h: "uma hora",
+                    hh: "%d horas",
+                    d: "um dia",
+                    dd: "%d dias",
+                    M: "um mês",
+                    MM: "%d meses",
+                    y: "um ano",
+                    yy: "%d anos"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}º/,
+                ordinal: "%dº",
+                invalidDate: "Data inválida"
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n) {
+                var i = {ss: "secunde", mm: "minute", hh: "ore", dd: "zile", ww: "săptămâni", MM: "luni", yy: "ani"},
+                    r = " ";
+                if (e % 100 >= 20 || e >= 100 && e % 100 === 0) r = " de ";
+                return e + r + i[n]
+            }
+
+            var n;
+            e.defineLocale("ro", {
+                months: "ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),
+                monthsShort: "ian._feb._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),
+                weekdaysShort: "Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),
+                weekdaysMin: "Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY H:mm",
+                    LLLL: "dddd, D MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[azi la] LT",
+                    nextDay: "[mâine la] LT",
+                    nextWeek: "dddd [la] LT",
+                    lastDay: "[ieri la] LT",
+                    lastWeek: "[fosta] dddd [la] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "peste %s",
+                    past: "%s în urmă",
+                    s: "câteva secunde",
+                    ss: t,
+                    m: "un minut",
+                    mm: t,
+                    h: "o oră",
+                    hh: t,
+                    d: "o zi",
+                    dd: t,
+                    w: "o săptămână",
+                    ww: t,
+                    M: "o lună",
+                    MM: t,
+                    y: "un an",
+                    yy: t
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function r(e, t) {
+                var n = e.split("_");
+                return t % 10 === 1 && t % 100 !== 11 ? n[0] : t % 10 >= 2 && t % 10 <= 4 && (t % 100 < 10 || t % 100 >= 20) ? n[1] : n[2]
+            }
+
+            function t(e, t, n) {
+                var i = {
+                    ss: t ? "секунда_секунды_секунд" : "секунду_секунды_секунд",
+                    mm: t ? "минута_минуты_минут" : "минуту_минуты_минут",
+                    hh: "час_часа_часов",
+                    dd: "день_дня_дней",
+                    ww: "неделя_недели_недель",
+                    MM: "месяц_месяца_месяцев",
+                    yy: "год_года_лет"
+                };
+                if (n === "m") return t ? "минута" : "минуту"; else return e + " " + r(i[n], +e)
+            }
+
+            var n = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+                i;
+            e.defineLocale("ru", {
+                months: {
+                    format: "января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_"),
+                    standalone: "январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_")
+                },
+                monthsShort: {
+                    format: "янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.".split("_"),
+                    standalone: "янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.".split("_")
+                },
+                weekdays: {
+                    standalone: "воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),
+                    format: "воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу".split("_"),
+                    isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?] ?dddd/
+                },
+                weekdaysShort: "вс_пн_вт_ср_чт_пт_сб".split("_"),
+                weekdaysMin: "вс_пн_вт_ср_чт_пт_сб".split("_"),
+                monthsParse: n,
+                longMonthsParse: n,
+                shortMonthsParse: n,
+                monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+                monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+                monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
+                monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY г.",
+                    LLL: "D MMMM YYYY г., H:mm",
+                    LLLL: "dddd, D MMMM YYYY г., H:mm"
+                },
+                calendar: {
+                    sameDay: "[Сегодня, в] LT",
+                    nextDay: "[Завтра, в] LT",
+                    lastDay: "[Вчера, в] LT",
+                    nextWeek: function (e) {
+                        if (e.week() !== this.week()) switch (this.day()) {
+                            case 0:
+                                return "[В следующее] dddd, [в] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                                return "[В следующий] dddd, [в] LT";
+                            case 3:
+                            case 5:
+                            case 6:
+                                return "[В следующую] dddd, [в] LT"
+                        } else if (this.day() === 2) return "[Во] dddd, [в] LT"; else return "[В] dddd, [в] LT"
+                    },
+                    lastWeek: function (e) {
+                        if (e.week() !== this.week()) switch (this.day()) {
+                            case 0:
+                                return "[В прошлое] dddd, [в] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                                return "[В прошлый] dddd, [в] LT";
+                            case 3:
+                            case 5:
+                            case 6:
+                                return "[В прошлую] dddd, [в] LT"
+                        } else if (this.day() === 2) return "[Во] dddd, [в] LT"; else return "[В] dddd, [в] LT"
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "через %s",
+                    past: "%s назад",
+                    s: "несколько секунд",
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: "час",
+                    hh: t,
+                    d: "день",
+                    dd: t,
+                    w: "неделя",
+                    ww: t,
+                    M: "месяц",
+                    MM: t,
+                    y: "год",
+                    yy: t
+                },
+                meridiemParse: /ночи|утра|дня|вечера/i,
+                isPM: function (e) {
+                    return /^(дня|вечера)$/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "ночи"; else if (e < 12) return "утра"; else if (e < 17) return "дня"; else return "вечера"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"M":
+                        case"d":
+                        case"DDD":
+                            return e + "-й";
+                        case"D":
+                            return e + "-го";
+                        case"w":
+                        case"W":
+                            return e + "-я";
+                        default:
+                            return e
+                    }
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = ["جنوري", "فيبروري", "مارچ", "اپريل", "مئي", "جون", "جولاءِ", "آگسٽ", "سيپٽمبر", "آڪٽوبر", "نومبر", "ڊسمبر"],
+                n = ["آچر", "سومر", "اڱارو", "اربع", "خميس", "جمع", "ڇنڇر"], i;
+            e.defineLocale("sd", {
+                months: t,
+                monthsShort: t,
+                weekdays: n,
+                weekdaysShort: n,
+                weekdaysMin: n,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd، D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /صبح|شام/,
+                isPM: function (e) {
+                    return "شام" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "صبح";
+                    return "شام"
+                },
+                calendar: {
+                    sameDay: "[اڄ] LT",
+                    nextDay: "[سڀاڻي] LT",
+                    nextWeek: "dddd [اڳين هفتي تي] LT",
+                    lastDay: "[ڪالهه] LT",
+                    lastWeek: "[گزريل هفتي] dddd [تي] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s پوء",
+                    past: "%s اڳ",
+                    s: "چند سيڪنڊ",
+                    ss: "%d سيڪنڊ",
+                    m: "هڪ منٽ",
+                    mm: "%d منٽ",
+                    h: "هڪ ڪلاڪ",
+                    hh: "%d ڪلاڪ",
+                    d: "هڪ ڏينهن",
+                    dd: "%d ڏينهن",
+                    M: "هڪ مهينو",
+                    MM: "%d مهينا",
+                    y: "هڪ سال",
+                    yy: "%d سال"
+                },
+                preparse: function (e) {
+                    return e.replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/,/g, "،")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("se", {
+                months: "ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu".split("_"),
+                monthsShort: "ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov".split("_"),
+                weekdays: "sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat".split("_"),
+                weekdaysShort: "sotn_vuos_maŋ_gask_duor_bear_láv".split("_"),
+                weekdaysMin: "s_v_m_g_d_b_L".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "MMMM D. [b.] YYYY",
+                    LLL: "MMMM D. [b.] YYYY [ti.] HH:mm",
+                    LLLL: "dddd, MMMM D. [b.] YYYY [ti.] HH:mm"
+                },
+                calendar: {
+                    sameDay: "[otne ti] LT",
+                    nextDay: "[ihttin ti] LT",
+                    nextWeek: "dddd [ti] LT",
+                    lastDay: "[ikte ti] LT",
+                    lastWeek: "[ovddit] dddd [ti] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s geažes",
+                    past: "maŋit %s",
+                    s: "moadde sekunddat",
+                    ss: "%d sekunddat",
+                    m: "okta minuhta",
+                    mm: "%d minuhtat",
+                    h: "okta diimmu",
+                    hh: "%d diimmut",
+                    d: "okta beaivi",
+                    dd: "%d beaivvit",
+                    M: "okta mánnu",
+                    MM: "%d mánut",
+                    y: "okta jahki",
+                    yy: "%d jagit"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("si", {
+                months: "ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්".split("_"),
+                monthsShort: "ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ".split("_"),
+                weekdays: "ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා".split("_"),
+                weekdaysShort: "ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන".split("_"),
+                weekdaysMin: "ඉ_ස_අ_බ_බ්‍ර_සි_සෙ".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "a h:mm",
+                    LTS: "a h:mm:ss",
+                    L: "YYYY/MM/DD",
+                    LL: "YYYY MMMM D",
+                    LLL: "YYYY MMMM D, a h:mm",
+                    LLLL: "YYYY MMMM D [වැනි] dddd, a h:mm:ss"
+                },
+                calendar: {
+                    sameDay: "[අද] LT[ට]",
+                    nextDay: "[හෙට] LT[ට]",
+                    nextWeek: "dddd LT[ට]",
+                    lastDay: "[ඊයේ] LT[ට]",
+                    lastWeek: "[පසුගිය] dddd LT[ට]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%sකින්",
+                    past: "%sකට පෙර",
+                    s: "තත්පර කිහිපය",
+                    ss: "තත්පර %d",
+                    m: "මිනිත්තුව",
+                    mm: "මිනිත්තු %d",
+                    h: "පැය",
+                    hh: "පැය %d",
+                    d: "දිනය",
+                    dd: "දින %d",
+                    M: "මාසය",
+                    MM: "මාස %d",
+                    y: "වසර",
+                    yy: "වසර %d"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
+                ordinal: function (e) {
+                    return e + " වැනි"
+                },
+                meridiemParse: /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
+                isPM: function (e) {
+                    return e === "ප.ව." || e === "පස් වරු"
+                },
+                meridiem: function (e, t, n) {
+                    if (e > 11) return n ? "ප.ව." : "පස් වරු"; else return n ? "පෙ.ව." : "පෙර වරු"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = "január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"),
+                n = "jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"), i;
+
+            function a(e) {
+                return e > 1 && e < 5
+            }
+
+            function r(e, t, n, i) {
+                var r = e + " ";
+                switch (n) {
+                    case"s":
+                        return t || i ? "pár sekúnd" : "pár sekundami";
+                    case"ss":
+                        if (t || i) return r + (a(e) ? "sekundy" : "sekúnd"); else return r + "sekundami";
+                    case"m":
+                        return t ? "minúta" : i ? "minútu" : "minútou";
+                    case"mm":
+                        if (t || i) return r + (a(e) ? "minúty" : "minút"); else return r + "minútami";
+                    case"h":
+                        return t ? "hodina" : i ? "hodinu" : "hodinou";
+                    case"hh":
+                        if (t || i) return r + (a(e) ? "hodiny" : "hodín"); else return r + "hodinami";
+                    case"d":
+                        return t || i ? "deň" : "dňom";
+                    case"dd":
+                        if (t || i) return r + (a(e) ? "dni" : "dní"); else return r + "dňami";
+                    case"M":
+                        return t || i ? "mesiac" : "mesiacom";
+                    case"MM":
+                        if (t || i) return r + (a(e) ? "mesiace" : "mesiacov"); else return r + "mesiacmi";
+                    case"y":
+                        return t || i ? "rok" : "rokom";
+                    case"yy":
+                        if (t || i) return r + (a(e) ? "roky" : "rokov"); else return r + "rokmi"
+                }
+            }
+
+            e.defineLocale("sk", {
+                months: t,
+                monthsShort: n,
+                weekdays: "nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),
+                weekdaysShort: "ne_po_ut_st_št_pi_so".split("_"),
+                weekdaysMin: "ne_po_ut_st_št_pi_so".split("_"),
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd D. MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[dnes o] LT", nextDay: "[zajtra o] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[v nedeľu o] LT";
+                            case 1:
+                            case 2:
+                                return "[v] dddd [o] LT";
+                            case 3:
+                                return "[v stredu o] LT";
+                            case 4:
+                                return "[vo štvrtok o] LT";
+                            case 5:
+                                return "[v piatok o] LT";
+                            case 6:
+                                return "[v sobotu o] LT"
+                        }
+                    }, lastDay: "[včera o] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[minulú nedeľu o] LT";
+                            case 1:
+                            case 2:
+                                return "[minulý] dddd [o] LT";
+                            case 3:
+                                return "[minulú stredu o] LT";
+                            case 4:
+                            case 5:
+                                return "[minulý] dddd [o] LT";
+                            case 6:
+                                return "[minulú sobotu o] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "pred %s",
+                    s: r,
+                    ss: r,
+                    m: r,
+                    mm: r,
+                    h: r,
+                    hh: r,
+                    d: r,
+                    dd: r,
+                    M: r,
+                    MM: r,
+                    y: r,
+                    yy: r
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function t(e, t, n, i) {
+                var r = e + " ";
+                switch (n) {
+                    case"s":
+                        return t || i ? "nekaj sekund" : "nekaj sekundami";
+                    case"ss":
+                        if (e === 1) r += t ? "sekundo" : "sekundi"; else if (e === 2) r += t || i ? "sekundi" : "sekundah"; else if (e < 5) r += t || i ? "sekunde" : "sekundah"; else r += "sekund";
+                        return r;
+                    case"m":
+                        return t ? "ena minuta" : "eno minuto";
+                    case"mm":
+                        if (e === 1) r += t ? "minuta" : "minuto"; else if (e === 2) r += t || i ? "minuti" : "minutama"; else if (e < 5) r += t || i ? "minute" : "minutami"; else r += t || i ? "minut" : "minutami";
+                        return r;
+                    case"h":
+                        return t ? "ena ura" : "eno uro";
+                    case"hh":
+                        if (e === 1) r += t ? "ura" : "uro"; else if (e === 2) r += t || i ? "uri" : "urama"; else if (e < 5) r += t || i ? "ure" : "urami"; else r += t || i ? "ur" : "urami";
+                        return r;
+                    case"d":
+                        return t || i ? "en dan" : "enim dnem";
+                    case"dd":
+                        if (e === 1) r += t || i ? "dan" : "dnem"; else if (e === 2) r += t || i ? "dni" : "dnevoma"; else r += t || i ? "dni" : "dnevi";
+                        return r;
+                    case"M":
+                        return t || i ? "en mesec" : "enim mesecem";
+                    case"MM":
+                        if (e === 1) r += t || i ? "mesec" : "mesecem"; else if (e === 2) r += t || i ? "meseca" : "mesecema"; else if (e < 5) r += t || i ? "mesece" : "meseci"; else r += t || i ? "mesecev" : "meseci";
+                        return r;
+                    case"y":
+                        return t || i ? "eno leto" : "enim letom";
+                    case"yy":
+                        if (e === 1) r += t || i ? "leto" : "letom"; else if (e === 2) r += t || i ? "leti" : "letoma"; else if (e < 5) r += t || i ? "leta" : "leti"; else r += t || i ? "let" : "leti";
+                        return r
+                }
+            }
+
+            var n;
+            e.defineLocale("sl", {
+                months: "januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),
+                monthsShort: "jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),
+                weekdaysShort: "ned._pon._tor._sre._čet._pet._sob.".split("_"),
+                weekdaysMin: "ne_po_to_sr_če_pe_so".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD. MM. YYYY",
+                    LL: "D. MMMM YYYY",
+                    LLL: "D. MMMM YYYY H:mm",
+                    LLLL: "dddd, D. MMMM YYYY H:mm"
+                },
+                calendar: {
+                    sameDay: "[danes ob] LT", nextDay: "[jutri ob] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[v] [nedeljo] [ob] LT";
+                            case 3:
+                                return "[v] [sredo] [ob] LT";
+                            case 6:
+                                return "[v] [soboto] [ob] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[v] dddd [ob] LT"
+                        }
+                    }, lastDay: "[včeraj ob] LT", lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[prejšnjo] [nedeljo] [ob] LT";
+                            case 3:
+                                return "[prejšnjo] [sredo] [ob] LT";
+                            case 6:
+                                return "[prejšnjo] [soboto] [ob] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[prejšnji] dddd [ob] LT"
+                        }
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "čez %s",
+                    past: "pred %s",
+                    s: t,
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: t,
+                    hh: t,
+                    d: t,
+                    dd: t,
+                    M: t,
+                    MM: t,
+                    y: t,
+                    yy: t
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("sq", {
+                months: "Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"),
+                monthsShort: "Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"),
+                weekdays: "E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"),
+                weekdaysShort: "Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),
+                weekdaysMin: "D_H_Ma_Më_E_P_Sh".split("_"),
+                weekdaysParseExact: true,
+                meridiemParse: /PD|MD/,
+                isPM: function (e) {
+                    return e.charAt(0) === "M"
+                },
+                meridiem: function (e, t, n) {
+                    return e < 12 ? "PD" : "MD"
+                },
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Sot në] LT",
+                    nextDay: "[Nesër në] LT",
+                    nextWeek: "dddd [në] LT",
+                    lastDay: "[Dje në] LT",
+                    lastWeek: "dddd [e kaluar në] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "në %s",
+                    past: "%s më parë",
+                    s: "disa sekonda",
+                    ss: "%d sekonda",
+                    m: "një minutë",
+                    mm: "%d minuta",
+                    h: "një orë",
+                    hh: "%d orë",
+                    d: "një ditë",
+                    dd: "%d ditë",
+                    M: "një muaj",
+                    MM: "%d muaj",
+                    y: "një vit",
+                    yy: "%d vite"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var s = {
+                words: {
+                    ss: ["sekunda", "sekunde", "sekundi"],
+                    m: ["jedan minut", "jednog minuta"],
+                    mm: ["minut", "minuta", "minuta"],
+                    h: ["jedan sat", "jednog sata"],
+                    hh: ["sat", "sata", "sati"],
+                    d: ["jedan dan", "jednog dana"],
+                    dd: ["dan", "dana", "dana"],
+                    M: ["jedan mesec", "jednog meseca"],
+                    MM: ["mesec", "meseca", "meseci"],
+                    y: ["jednu godinu", "jedne godine"],
+                    yy: ["godinu", "godine", "godina"]
+                }, correctGrammaticalCase: function (e, t) {
+                    if (e % 10 >= 1 && e % 10 <= 4 && (e % 100 < 10 || e % 100 >= 20)) return e % 10 === 1 ? t[0] : t[1];
+                    return t[2]
+                }, translate: function (e, t, n, i) {
+                    var r = s.words[n], a;
+                    if (n.length === 1) {
+                        if (n === "y" && t) return "jedna godina";
+                        return i || t ? r[0] : r[1]
+                    }
+                    a = s.correctGrammaticalCase(e, r);
+                    if (n === "yy" && t && a === "godinu") return e + " godina";
+                    return e + " " + a
+                }
+            }, t;
+            e.defineLocale("sr", {
+                months: "januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),
+                monthsShort: "jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),
+                monthsParseExact: true,
+                weekdays: "nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota".split("_"),
+                weekdaysShort: "ned._pon._uto._sre._čet._pet._sub.".split("_"),
+                weekdaysMin: "ne_po_ut_sr_če_pe_su".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "D. M. YYYY.",
+                    LL: "D. MMMM YYYY.",
+                    LLL: "D. MMMM YYYY. H:mm",
+                    LLLL: "dddd, D. MMMM YYYY. H:mm"
+                },
+                calendar: {
+                    sameDay: "[danas u] LT", nextDay: "[sutra u] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[u] [nedelju] [u] LT";
+                            case 3:
+                                return "[u] [sredu] [u] LT";
+                            case 6:
+                                return "[u] [subotu] [u] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[u] dddd [u] LT"
+                        }
+                    }, lastDay: "[juče u] LT", lastWeek: function () {
+                        var e = ["[prošle] [nedelje] [u] LT", "[prošlog] [ponedeljka] [u] LT", "[prošlog] [utorka] [u] LT", "[prošle] [srede] [u] LT", "[prošlog] [četvrtka] [u] LT", "[prošlog] [petka] [u] LT", "[prošle] [subote] [u] LT"];
+                        return e[this.day()]
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "za %s",
+                    past: "pre %s",
+                    s: "nekoliko sekundi",
+                    ss: s.translate,
+                    m: s.translate,
+                    mm: s.translate,
+                    h: s.translate,
+                    hh: s.translate,
+                    d: s.translate,
+                    dd: s.translate,
+                    M: s.translate,
+                    MM: s.translate,
+                    y: s.translate,
+                    yy: s.translate
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var s = {
+                words: {
+                    ss: ["секунда", "секунде", "секунди"],
+                    m: ["један минут", "једног минута"],
+                    mm: ["минут", "минута", "минута"],
+                    h: ["један сат", "једног сата"],
+                    hh: ["сат", "сата", "сати"],
+                    d: ["један дан", "једног дана"],
+                    dd: ["дан", "дана", "дана"],
+                    M: ["један месец", "једног месеца"],
+                    MM: ["месец", "месеца", "месеци"],
+                    y: ["једну годину", "једне године"],
+                    yy: ["годину", "године", "година"]
+                }, correctGrammaticalCase: function (e, t) {
+                    if (e % 10 >= 1 && e % 10 <= 4 && (e % 100 < 10 || e % 100 >= 20)) return e % 10 === 1 ? t[0] : t[1];
+                    return t[2]
+                }, translate: function (e, t, n, i) {
+                    var r = s.words[n], a;
+                    if (n.length === 1) {
+                        if (n === "y" && t) return "једна година";
+                        return i || t ? r[0] : r[1]
+                    }
+                    a = s.correctGrammaticalCase(e, r);
+                    if (n === "yy" && t && a === "годину") return e + " година";
+                    return e + " " + a
+                }
+            }, t;
+            e.defineLocale("sr-cyrl", {
+                months: "јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар".split("_"),
+                monthsShort: "јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.".split("_"),
+                monthsParseExact: true,
+                weekdays: "недеља_понедељак_уторак_среда_четвртак_петак_субота".split("_"),
+                weekdaysShort: "нед._пон._уто._сре._чет._пет._суб.".split("_"),
+                weekdaysMin: "не_по_ут_ср_че_пе_су".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "D. M. YYYY.",
+                    LL: "D. MMMM YYYY.",
+                    LLL: "D. MMMM YYYY. H:mm",
+                    LLLL: "dddd, D. MMMM YYYY. H:mm"
+                },
+                calendar: {
+                    sameDay: "[данас у] LT", nextDay: "[сутра у] LT", nextWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                                return "[у] [недељу] [у] LT";
+                            case 3:
+                                return "[у] [среду] [у] LT";
+                            case 6:
+                                return "[у] [суботу] [у] LT";
+                            case 1:
+                            case 2:
+                            case 4:
+                            case 5:
+                                return "[у] dddd [у] LT"
+                        }
+                    }, lastDay: "[јуче у] LT", lastWeek: function () {
+                        var e = ["[прошле] [недеље] [у] LT", "[прошлог] [понедељка] [у] LT", "[прошлог] [уторка] [у] LT", "[прошле] [среде] [у] LT", "[прошлог] [четвртка] [у] LT", "[прошлог] [петка] [у] LT", "[прошле] [суботе] [у] LT"];
+                        return e[this.day()]
+                    }, sameElse: "L"
+                },
+                relativeTime: {
+                    future: "за %s",
+                    past: "пре %s",
+                    s: "неколико секунди",
+                    ss: s.translate,
+                    m: s.translate,
+                    mm: s.translate,
+                    h: s.translate,
+                    hh: s.translate,
+                    d: s.translate,
+                    dd: s.translate,
+                    M: s.translate,
+                    MM: s.translate,
+                    y: s.translate,
+                    yy: s.translate
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ss", {
+                months: "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split("_"),
+                monthsShort: "Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo".split("_"),
+                weekdays: "Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo".split("_"),
+                weekdaysShort: "Lis_Umb_Lsb_Les_Lsi_Lsh_Umg".split("_"),
+                weekdaysMin: "Li_Us_Lb_Lt_Ls_Lh_Ug".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Namuhla nga] LT",
+                    nextDay: "[Kusasa nga] LT",
+                    nextWeek: "dddd [nga] LT",
+                    lastDay: "[Itolo nga] LT",
+                    lastWeek: "dddd [leliphelile] [nga] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "nga %s",
+                    past: "wenteka nga %s",
+                    s: "emizuzwana lomcane",
+                    ss: "%d mzuzwana",
+                    m: "umzuzu",
+                    mm: "%d emizuzu",
+                    h: "lihora",
+                    hh: "%d emahora",
+                    d: "lilanga",
+                    dd: "%d emalanga",
+                    M: "inyanga",
+                    MM: "%d tinyanga",
+                    y: "umnyaka",
+                    yy: "%d iminyaka"
+                },
+                meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
+                meridiem: function (e, t, n) {
+                    if (e < 11) return "ekuseni"; else if (e < 15) return "emini"; else if (e < 19) return "entsambama"; else return "ebusuku"
+                },
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "ekuseni") return e; else if (t === "emini") return e >= 11 ? e : e + 12; else if (t === "entsambama" || t === "ebusuku") {
+                        if (e === 0) return 0;
+                        return e + 12
+                    }
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}/,
+                ordinal: "%d",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("sv", {
+                months: "januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),
+                monthsShort: "jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),
+                weekdays: "söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),
+                weekdaysShort: "sön_mån_tis_ons_tor_fre_lör".split("_"),
+                weekdaysMin: "sö_må_ti_on_to_fr_lö".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY [kl.] HH:mm",
+                    LLLL: "dddd D MMMM YYYY [kl.] HH:mm",
+                    lll: "D MMM YYYY HH:mm",
+                    llll: "ddd D MMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Idag] LT",
+                    nextDay: "[Imorgon] LT",
+                    lastDay: "[Igår] LT",
+                    nextWeek: "[På] dddd LT",
+                    lastWeek: "[I] dddd[s] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "om %s",
+                    past: "för %s sedan",
+                    s: "några sekunder",
+                    ss: "%d sekunder",
+                    m: "en minut",
+                    mm: "%d minuter",
+                    h: "en timme",
+                    hh: "%d timmar",
+                    d: "en dag",
+                    dd: "%d dagar",
+                    M: "en månad",
+                    MM: "%d månader",
+                    y: "ett år",
+                    yy: "%d år"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(\:e|\:a)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? ":e" : t === 1 ? ":a" : t === 2 ? ":a" : t === 3 ? ":e" : ":e";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("sw", {
+                months: "Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba".split("_"),
+                monthsShort: "Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des".split("_"),
+                weekdays: "Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi".split("_"),
+                weekdaysShort: "Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos".split("_"),
+                weekdaysMin: "J2_J3_J4_J5_Al_Ij_J1".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "hh:mm A",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[leo saa] LT",
+                    nextDay: "[kesho saa] LT",
+                    nextWeek: "[wiki ijayo] dddd [saat] LT",
+                    lastDay: "[jana] LT",
+                    lastWeek: "[wiki iliyopita] dddd [saat] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s baadaye",
+                    past: "tokea %s",
+                    s: "hivi punde",
+                    ss: "sekunde %d",
+                    m: "dakika moja",
+                    mm: "dakika %d",
+                    h: "saa limoja",
+                    hh: "masaa %d",
+                    d: "siku moja",
+                    dd: "siku %d",
+                    M: "mwezi mmoja",
+                    MM: "miezi %d",
+                    y: "mwaka mmoja",
+                    yy: "miaka %d"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = {1: "௧", 2: "௨", 3: "௩", 4: "௪", 5: "௫", 6: "௬", 7: "௭", 8: "௮", 9: "௯", 0: "௦"}, n = {
+                "௧": "1",
+                "௨": "2",
+                "௩": "3",
+                "௪": "4",
+                "௫": "5",
+                "௬": "6",
+                "௭": "7",
+                "௮": "8",
+                "௯": "9",
+                "௦": "0"
+            }, i;
+            e.defineLocale("ta", {
+                months: "ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),
+                monthsShort: "ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),
+                weekdays: "ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை".split("_"),
+                weekdaysShort: "ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி".split("_"),
+                weekdaysMin: "ஞா_தி_செ_பு_வி_வெ_ச".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, HH:mm",
+                    LLLL: "dddd, D MMMM YYYY, HH:mm"
+                },
+                calendar: {
+                    sameDay: "[இன்று] LT",
+                    nextDay: "[நாளை] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[நேற்று] LT",
+                    lastWeek: "[கடந்த வாரம்] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s இல்",
+                    past: "%s முன்",
+                    s: "ஒரு சில விநாடிகள்",
+                    ss: "%d விநாடிகள்",
+                    m: "ஒரு நிமிடம்",
+                    mm: "%d நிமிடங்கள்",
+                    h: "ஒரு மணி நேரம்",
+                    hh: "%d மணி நேரம்",
+                    d: "ஒரு நாள்",
+                    dd: "%d நாட்கள்",
+                    M: "ஒரு மாதம்",
+                    MM: "%d மாதங்கள்",
+                    y: "ஒரு வருடம்",
+                    yy: "%d ஆண்டுகள்"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}வது/,
+                ordinal: function (e) {
+                    return e + "வது"
+                },
+                preparse: function (e) {
+                    return e.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (e) {
+                        return n[e]
+                    })
+                },
+                postformat: function (e) {
+                    return e.replace(/\d/g, function (e) {
+                        return t[e]
+                    })
+                },
+                meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+                meridiem: function (e, t, n) {
+                    if (e < 2) return " யாமம்"; else if (e < 6) return " வைகறை"; else if (e < 10) return " காலை"; else if (e < 14) return " நண்பகல்"; else if (e < 18) return " எற்பாடு"; else if (e < 22) return " மாலை"; else return " யாமம்"
+                },
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "யாமம்") return e < 2 ? e : e + 12; else if (t === "வைகறை" || t === "காலை") return e; else if (t === "நண்பகல்") return e >= 10 ? e : e + 12; else return e + 12
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("te", {
+                months: "జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జులై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్".split("_"),
+                monthsShort: "జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జులై_ఆగ._సెప్._అక్టో._నవ._డిసె.".split("_"),
+                monthsParseExact: true,
+                weekdays: "ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం".split("_"),
+                weekdaysShort: "ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని".split("_"),
+                weekdaysMin: "ఆ_సో_మం_బు_గు_శు_శ".split("_"),
+                longDateFormat: {
+                    LT: "A h:mm",
+                    LTS: "A h:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY, A h:mm",
+                    LLLL: "dddd, D MMMM YYYY, A h:mm"
+                },
+                calendar: {
+                    sameDay: "[నేడు] LT",
+                    nextDay: "[రేపు] LT",
+                    nextWeek: "dddd, LT",
+                    lastDay: "[నిన్న] LT",
+                    lastWeek: "[గత] dddd, LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s లో",
+                    past: "%s క్రితం",
+                    s: "కొన్ని క్షణాలు",
+                    ss: "%d సెకన్లు",
+                    m: "ఒక నిమిషం",
+                    mm: "%d నిమిషాలు",
+                    h: "ఒక గంట",
+                    hh: "%d గంటలు",
+                    d: "ఒక రోజు",
+                    dd: "%d రోజులు",
+                    M: "ఒక నెల",
+                    MM: "%d నెలలు",
+                    y: "ఒక సంవత్సరం",
+                    yy: "%d సంవత్సరాలు"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}వ/,
+                ordinal: "%dవ",
+                meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "రాత్రి") return e < 4 ? e : e + 12; else if (t === "ఉదయం") return e; else if (t === "మధ్యాహ్నం") return e >= 10 ? e : e + 12; else if (t === "సాయంత్రం") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "రాత్రి"; else if (e < 10) return "ఉదయం"; else if (e < 17) return "మధ్యాహ్నం"; else if (e < 20) return "సాయంత్రం"; else return "రాత్రి"
+                },
+                week: {dow: 0, doy: 6}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("tet", {
+                months: "Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru".split("_"),
+                monthsShort: "Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),
+                weekdays: "Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu".split("_"),
+                weekdaysShort: "Dom_Seg_Ters_Kua_Kint_Sest_Sab".split("_"),
+                weekdaysMin: "Do_Seg_Te_Ku_Ki_Ses_Sa".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Ohin iha] LT",
+                    nextDay: "[Aban iha] LT",
+                    nextWeek: "dddd [iha] LT",
+                    lastDay: "[Horiseik iha] LT",
+                    lastWeek: "dddd [semana kotuk] [iha] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "iha %s",
+                    past: "%s liuba",
+                    s: "segundu balun",
+                    ss: "segundu %d",
+                    m: "minutu ida",
+                    mm: "minutu %d",
+                    h: "oras ida",
+                    hh: "oras %d",
+                    d: "loron ida",
+                    dd: "loron %d",
+                    M: "fulan ida",
+                    MM: "fulan %d",
+                    y: "tinan ida",
+                    yy: "tinan %d"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var i = {
+                0: "-ум",
+                1: "-ум",
+                2: "-юм",
+                3: "-юм",
+                4: "-ум",
+                5: "-ум",
+                6: "-ум",
+                7: "-ум",
+                8: "-ум",
+                9: "-ум",
+                10: "-ум",
+                12: "-ум",
+                13: "-ум",
+                20: "-ум",
+                30: "-юм",
+                40: "-ум",
+                50: "-ум",
+                60: "-ум",
+                70: "-ум",
+                80: "-ум",
+                90: "-ум",
+                100: "-ум"
+            }, t;
+            e.defineLocale("tg", {
+                months: {
+                    format: "январи_феврали_марти_апрели_майи_июни_июли_августи_сентябри_октябри_ноябри_декабри".split("_"),
+                    standalone: "январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр".split("_")
+                },
+                monthsShort: "янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),
+                weekdays: "якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе".split("_"),
+                weekdaysShort: "яшб_дшб_сшб_чшб_пшб_ҷум_шнб".split("_"),
+                weekdaysMin: "яш_дш_сш_чш_пш_ҷм_шб".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Имрӯз соати] LT",
+                    nextDay: "[Фардо соати] LT",
+                    lastDay: "[Дирӯз соати] LT",
+                    nextWeek: "dddd[и] [ҳафтаи оянда соати] LT",
+                    lastWeek: "dddd[и] [ҳафтаи гузашта соати] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "баъди %s",
+                    past: "%s пеш",
+                    s: "якчанд сония",
+                    m: "як дақиқа",
+                    mm: "%d дақиқа",
+                    h: "як соат",
+                    hh: "%d соат",
+                    d: "як рӯз",
+                    dd: "%d рӯз",
+                    M: "як моҳ",
+                    MM: "%d моҳ",
+                    y: "як сол",
+                    yy: "%d сол"
+                },
+                meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "шаб") return e < 4 ? e : e + 12; else if (t === "субҳ") return e; else if (t === "рӯз") return e >= 11 ? e : e + 12; else if (t === "бегоҳ") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "шаб"; else if (e < 11) return "субҳ"; else if (e < 16) return "рӯз"; else if (e < 19) return "бегоҳ"; else return "шаб"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(ум|юм)/,
+                ordinal: function (e) {
+                    var t = e % 10, n = e >= 100 ? 100 : null;
+                    return e + (i[e] || i[t] || i[n])
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("th", {
+                months: "มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),
+                monthsShort: "ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.".split("_"),
+                monthsParseExact: true,
+                weekdays: "อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),
+                weekdaysShort: "อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),
+                weekdaysMin: "อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "H:mm",
+                    LTS: "H:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY เวลา H:mm",
+                    LLLL: "วันddddที่ D MMMM YYYY เวลา H:mm"
+                },
+                meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+                isPM: function (e) {
+                    return e === "หลังเที่ยง"
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "ก่อนเที่ยง"; else return "หลังเที่ยง"
+                },
+                calendar: {
+                    sameDay: "[วันนี้ เวลา] LT",
+                    nextDay: "[พรุ่งนี้ เวลา] LT",
+                    nextWeek: "dddd[หน้า เวลา] LT",
+                    lastDay: "[เมื่อวานนี้ เวลา] LT",
+                    lastWeek: "[วัน]dddd[ที่แล้ว เวลา] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "อีก %s",
+                    past: "%sที่แล้ว",
+                    s: "ไม่กี่วินาที",
+                    ss: "%d วินาที",
+                    m: "1 นาที",
+                    mm: "%d นาที",
+                    h: "1 ชั่วโมง",
+                    hh: "%d ชั่วโมง",
+                    d: "1 วัน",
+                    dd: "%d วัน",
+                    w: "1 สัปดาห์",
+                    ww: "%d สัปดาห์",
+                    M: "1 เดือน",
+                    MM: "%d เดือน",
+                    y: "1 ปี",
+                    yy: "%d ปี"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var a = {
+                1: "'inji",
+                5: "'inji",
+                8: "'inji",
+                70: "'inji",
+                80: "'inji",
+                2: "'nji",
+                7: "'nji",
+                20: "'nji",
+                50: "'nji",
+                3: "'ünji",
+                4: "'ünji",
+                100: "'ünji",
+                6: "'njy",
+                9: "'unjy",
+                10: "'unjy",
+                30: "'unjy",
+                60: "'ynjy",
+                90: "'ynjy"
+            }, t;
+            e.defineLocale("tk", {
+                months: "Ýanwar_Fewral_Mart_Aprel_Maý_Iýun_Iýul_Awgust_Sentýabr_Oktýabr_Noýabr_Dekabr".split("_"),
+                monthsShort: "Ýan_Few_Mar_Apr_Maý_Iýn_Iýl_Awg_Sen_Okt_Noý_Dek".split("_"),
+                weekdays: "Ýekşenbe_Duşenbe_Sişenbe_Çarşenbe_Penşenbe_Anna_Şenbe".split("_"),
+                weekdaysShort: "Ýek_Duş_Siş_Çar_Pen_Ann_Şen".split("_"),
+                weekdaysMin: "Ýk_Dş_Sş_Çr_Pn_An_Şn".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[bugün sagat] LT",
+                    nextDay: "[ertir sagat] LT",
+                    nextWeek: "[indiki] dddd [sagat] LT",
+                    lastDay: "[düýn] LT",
+                    lastWeek: "[geçen] dddd [sagat] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s soň",
+                    past: "%s öň",
+                    s: "birnäçe sekunt",
+                    m: "bir minut",
+                    mm: "%d minut",
+                    h: "bir sagat",
+                    hh: "%d sagat",
+                    d: "bir gün",
+                    dd: "%d gün",
+                    M: "bir aý",
+                    MM: "%d aý",
+                    y: "bir ýyl",
+                    yy: "%d ýyl"
+                },
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"Do":
+                        case"DD":
+                            return e;
+                        default:
+                            if (e === 0) return e + "'unjy";
+                            var n = e % 10, i = e % 100 - n, r = e >= 100 ? 100 : null;
+                            return e + (a[n] || a[i] || a[r])
+                    }
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("tl-ph", {
+                months: "Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),
+                monthsShort: "Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),
+                weekdays: "Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),
+                weekdaysShort: "Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),
+                weekdaysMin: "Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "MM/D/YYYY",
+                    LL: "MMMM D, YYYY",
+                    LLL: "MMMM D, YYYY HH:mm",
+                    LLLL: "dddd, MMMM DD, YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "LT [ngayong araw]",
+                    nextDay: "[Bukas ng] LT",
+                    nextWeek: "LT [sa susunod na] dddd",
+                    lastDay: "LT [kahapon]",
+                    lastWeek: "LT [noong nakaraang] dddd",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "sa loob ng %s",
+                    past: "%s ang nakalipas",
+                    s: "ilang segundo",
+                    ss: "%d segundo",
+                    m: "isang minuto",
+                    mm: "%d minuto",
+                    h: "isang oras",
+                    hh: "%d oras",
+                    d: "isang araw",
+                    dd: "%d araw",
+                    M: "isang buwan",
+                    MM: "%d buwan",
+                    y: "isang taon",
+                    yy: "%d taon"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}/,
+                ordinal: function (e) {
+                    return e
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var a = "pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut".split("_"), t;
+
+            function n(e) {
+                var t = e;
+                t = e.indexOf("jaj") !== -1 ? t.slice(0, -3) + "leS" : e.indexOf("jar") !== -1 ? t.slice(0, -3) + "waQ" : e.indexOf("DIS") !== -1 ? t.slice(0, -3) + "nem" : t + " pIq";
+                return t
+            }
+
+            function i(e) {
+                var t = e;
+                t = e.indexOf("jaj") !== -1 ? t.slice(0, -3) + "Hu’" : e.indexOf("jar") !== -1 ? t.slice(0, -3) + "wen" : e.indexOf("DIS") !== -1 ? t.slice(0, -3) + "ben" : t + " ret";
+                return t
+            }
+
+            function r(e, t, n, i) {
+                var r = s(e);
+                switch (n) {
+                    case"ss":
+                        return r + " lup";
+                    case"mm":
+                        return r + " tup";
+                    case"hh":
+                        return r + " rep";
+                    case"dd":
+                        return r + " jaj";
+                    case"MM":
+                        return r + " jar";
+                    case"yy":
+                        return r + " DIS"
+                }
+            }
+
+            function s(e) {
+                var t = Math.floor(e % 1e3 / 100), n = Math.floor(e % 100 / 10), i = e % 10, r = "";
+                if (t > 0) r += a[t] + "vatlh";
+                if (n > 0) r += (r !== "" ? " " : "") + a[n] + "maH";
+                if (i > 0) r += (r !== "" ? " " : "") + a[i];
+                return r === "" ? "pagh" : r
+            }
+
+            e.defineLocale("tlh", {
+                months: "tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’".split("_"),
+                monthsShort: "jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’".split("_"),
+                monthsParseExact: true,
+                weekdays: "lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),
+                weekdaysShort: "lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),
+                weekdaysMin: "lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[DaHjaj] LT",
+                    nextDay: "[wa’leS] LT",
+                    nextWeek: "LLL",
+                    lastDay: "[wa’Hu’] LT",
+                    lastWeek: "LLL",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: n,
+                    past: i,
+                    s: "puS lup",
+                    ss: r,
+                    m: "wa’ tup",
+                    mm: r,
+                    h: "wa’ rep",
+                    hh: r,
+                    d: "wa’ jaj",
+                    dd: r,
+                    M: "wa’ jar",
+                    MM: r,
+                    y: "wa’ DIS",
+                    yy: r
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var a = {
+                1: "'inci",
+                5: "'inci",
+                8: "'inci",
+                70: "'inci",
+                80: "'inci",
+                2: "'nci",
+                7: "'nci",
+                20: "'nci",
+                50: "'nci",
+                3: "'üncü",
+                4: "'üncü",
+                100: "'üncü",
+                6: "'ncı",
+                9: "'uncu",
+                10: "'uncu",
+                30: "'uncu",
+                60: "'ıncı",
+                90: "'ıncı"
+            }, t;
+            e.defineLocale("tr", {
+                months: "Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),
+                monthsShort: "Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),
+                weekdays: "Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),
+                weekdaysShort: "Paz_Pzt_Sal_Çar_Per_Cum_Cmt".split("_"),
+                weekdaysMin: "Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),
+                meridiem: function (e, t, n) {
+                    if (e < 12) return n ? "öö" : "ÖÖ"; else return n ? "ös" : "ÖS"
+                },
+                meridiemParse: /öö|ÖÖ|ös|ÖS/,
+                isPM: function (e) {
+                    return e === "ös" || e === "ÖS"
+                },
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[bugün saat] LT",
+                    nextDay: "[yarın saat] LT",
+                    nextWeek: "[gelecek] dddd [saat] LT",
+                    lastDay: "[dün] LT",
+                    lastWeek: "[geçen] dddd [saat] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s sonra",
+                    past: "%s önce",
+                    s: "birkaç saniye",
+                    ss: "%d saniye",
+                    m: "bir dakika",
+                    mm: "%d dakika",
+                    h: "bir saat",
+                    hh: "%d saat",
+                    d: "bir gün",
+                    dd: "%d gün",
+                    w: "bir hafta",
+                    ww: "%d hafta",
+                    M: "bir ay",
+                    MM: "%d ay",
+                    y: "bir yıl",
+                    yy: "%d yıl"
+                },
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"Do":
+                        case"DD":
+                            return e;
+                        default:
+                            if (e === 0) return e + "'ıncı";
+                            var n = e % 10, i = e % 100 - n, r = e >= 100 ? 100 : null;
+                            return e + (a[n] || a[i] || a[r])
+                    }
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+
+            function n(e, t, n, i) {
+                var r = {
+                    s: ["viensas secunds", "'iensas secunds"],
+                    ss: [e + " secunds", "" + e + " secunds"],
+                    m: ["'n míut", "'iens míut"],
+                    mm: [e + " míuts", "" + e + " míuts"],
+                    h: ["'n þora", "'iensa þora"],
+                    hh: [e + " þoras", "" + e + " þoras"],
+                    d: ["'n ziua", "'iensa ziua"],
+                    dd: [e + " ziuas", "" + e + " ziuas"],
+                    M: ["'n mes", "'iens mes"],
+                    MM: [e + " mesen", "" + e + " mesen"],
+                    y: ["'n ar", "'iens ar"],
+                    yy: [e + " ars", "" + e + " ars"]
+                };
+                return i ? r[n][0] : t ? r[n][0] : r[n][1]
+            }
+
+            e.defineLocale("tzl", {
+                months: "Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar".split("_"),
+                monthsShort: "Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec".split("_"),
+                weekdays: "Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi".split("_"),
+                weekdaysShort: "Súl_Lún_Mai_Már_Xhú_Vié_Sát".split("_"),
+                weekdaysMin: "Sú_Lú_Ma_Má_Xh_Vi_Sá".split("_"),
+                longDateFormat: {
+                    LT: "HH.mm",
+                    LTS: "HH.mm.ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D. MMMM [dallas] YYYY",
+                    LLL: "D. MMMM [dallas] YYYY HH.mm",
+                    LLLL: "dddd, [li] D. MMMM [dallas] YYYY HH.mm"
+                },
+                meridiemParse: /d\'o|d\'a/i,
+                isPM: function (e) {
+                    return "d'o" === e.toLowerCase()
+                },
+                meridiem: function (e, t, n) {
+                    if (e > 11) return n ? "d'o" : "D'O"; else return n ? "d'a" : "D'A"
+                },
+                calendar: {
+                    sameDay: "[oxhi à] LT",
+                    nextDay: "[demà à] LT",
+                    nextWeek: "dddd [à] LT",
+                    lastDay: "[ieiri à] LT",
+                    lastWeek: "[sür el] dddd [lasteu à] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "osprei %s",
+                    past: "ja%s",
+                    s: n,
+                    ss: n,
+                    m: n,
+                    mm: n,
+                    h: n,
+                    hh: n,
+                    d: n,
+                    dd: n,
+                    M: n,
+                    MM: n,
+                    y: n,
+                    yy: n
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}\./,
+                ordinal: "%d.",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("tzm", {
+                months: "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),
+                monthsShort: "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),
+                weekdays: "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
+                weekdaysShort: "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
+                weekdaysMin: "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[ⴰⵙⴷⵅ ⴴ] LT",
+                    nextDay: "[ⴰⵙⴽⴰ ⴴ] LT",
+                    nextWeek: "dddd [ⴴ] LT",
+                    lastDay: "[ⴰⵚⴰⵏⵜ ⴴ] LT",
+                    lastWeek: "dddd [ⴴ] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s",
+                    past: "ⵢⴰⵏ %s",
+                    s: "ⵉⵎⵉⴽ",
+                    ss: "%d ⵉⵎⵉⴽ",
+                    m: "ⵎⵉⵏⵓⴺ",
+                    mm: "%d ⵎⵉⵏⵓⴺ",
+                    h: "ⵙⴰⵄⴰ",
+                    hh: "%d ⵜⴰⵙⵙⴰⵄⵉⵏ",
+                    d: "ⴰⵙⵙ",
+                    dd: "%d oⵙⵙⴰⵏ",
+                    M: "ⴰⵢoⵓⵔ",
+                    MM: "%d ⵉⵢⵢⵉⵔⵏ",
+                    y: "ⴰⵙⴳⴰⵙ",
+                    yy: "%d ⵉⵙⴳⴰⵙⵏ"
+                },
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("tzm-latn", {
+                months: "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),
+                monthsShort: "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),
+                weekdays: "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
+                weekdaysShort: "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
+                weekdaysMin: "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[asdkh g] LT",
+                    nextDay: "[aska g] LT",
+                    nextWeek: "dddd [g] LT",
+                    lastDay: "[assant g] LT",
+                    lastWeek: "dddd [g] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "dadkh s yan %s",
+                    past: "yan %s",
+                    s: "imik",
+                    ss: "%d imik",
+                    m: "minuḍ",
+                    mm: "%d minuḍ",
+                    h: "saɛa",
+                    hh: "%d tassaɛin",
+                    d: "ass",
+                    dd: "%d ossan",
+                    M: "ayowr",
+                    MM: "%d iyyirn",
+                    y: "asgas",
+                    yy: "%d isgasn"
+                },
+                week: {dow: 6, doy: 12}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("ug-cn", {
+                months: "يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر".split("_"),
+                monthsShort: "يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر".split("_"),
+                weekdays: "يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە".split("_"),
+                weekdaysShort: "يە_دۈ_سە_چا_پە_جۈ_شە".split("_"),
+                weekdaysMin: "يە_دۈ_سە_چا_پە_جۈ_شە".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY-MM-DD",
+                    LL: "YYYY-يىلىM-ئاينىڭD-كۈنى",
+                    LLL: "YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm",
+                    LLLL: "dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm"
+                },
+                meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "يېرىم كېچە" || t === "سەھەر" || t === "چۈشتىن بۇرۇن") return e; else if (t === "چۈشتىن كېيىن" || t === "كەچ") return e + 12; else return e >= 11 ? e : e + 12
+                },
+                meridiem: function (e, t, n) {
+                    var i = e * 100 + t;
+                    if (i < 600) return "يېرىم كېچە"; else if (i < 900) return "سەھەر"; else if (i < 1130) return "چۈشتىن بۇرۇن"; else if (i < 1230) return "چۈش"; else if (i < 1800) return "چۈشتىن كېيىن"; else return "كەچ"
+                },
+                calendar: {
+                    sameDay: "[بۈگۈن سائەت] LT",
+                    nextDay: "[ئەتە سائەت] LT",
+                    nextWeek: "[كېلەركى] dddd [سائەت] LT",
+                    lastDay: "[تۆنۈگۈن] LT",
+                    lastWeek: "[ئالدىنقى] dddd [سائەت] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s كېيىن",
+                    past: "%s بۇرۇن",
+                    s: "نەچچە سېكونت",
+                    ss: "%d سېكونت",
+                    m: "بىر مىنۇت",
+                    mm: "%d مىنۇت",
+                    h: "بىر سائەت",
+                    hh: "%d سائەت",
+                    d: "بىر كۈن",
+                    dd: "%d كۈن",
+                    M: "بىر ئاي",
+                    MM: "%d ئاي",
+                    y: "بىر يىل",
+                    yy: "%d يىل"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "-كۈنى";
+                        case"w":
+                        case"W":
+                            return e + "-ھەپتە";
+                        default:
+                            return e
+                    }
+                },
+                preparse: function (e) {
+                    return e.replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/,/g, "،")
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+
+//! moment.js locale configuration
+            function r(e, t) {
+                var n = e.split("_");
+                return t % 10 === 1 && t % 100 !== 11 ? n[0] : t % 10 >= 2 && t % 10 <= 4 && (t % 100 < 10 || t % 100 >= 20) ? n[1] : n[2]
+            }
+
+            function t(e, t, n) {
+                var i = {
+                    ss: t ? "секунда_секунди_секунд" : "секунду_секунди_секунд",
+                    mm: t ? "хвилина_хвилини_хвилин" : "хвилину_хвилини_хвилин",
+                    hh: t ? "година_години_годин" : "годину_години_годин",
+                    dd: "день_дні_днів",
+                    MM: "місяць_місяці_місяців",
+                    yy: "рік_роки_років"
+                };
+                if (n === "m") return t ? "хвилина" : "хвилину"; else if (n === "h") return t ? "година" : "годину"; else return e + " " + r(i[n], +e)
+            }
+
+            function n(e, t) {
+                var n = {
+                    nominative: "неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),
+                    accusative: "неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),
+                    genitive: "неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")
+                }, i;
+                if (e === true) return n["nominative"].slice(1, 7).concat(n["nominative"].slice(0, 1));
+                if (!e) return n["nominative"];
+                i = /(\[[ВвУу]\]) ?dddd/.test(t) ? "accusative" : /\[?(?:минулої|наступної)? ?\] ?dddd/.test(t) ? "genitive" : "nominative";
+                return n[i][e.day()]
+            }
+
+            function i(e) {
+                return function () {
+                    return e + "о" + (this.hours() === 11 ? "б" : "") + "] LT"
+                }
+            }
+
+            var a;
+            e.defineLocale("uk", {
+                months: {
+                    format: "січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_"),
+                    standalone: "січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_")
+                },
+                monthsShort: "січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),
+                weekdays: n,
+                weekdaysShort: "нд_пн_вт_ср_чт_пт_сб".split("_"),
+                weekdaysMin: "нд_пн_вт_ср_чт_пт_сб".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD.MM.YYYY",
+                    LL: "D MMMM YYYY р.",
+                    LLL: "D MMMM YYYY р., HH:mm",
+                    LLLL: "dddd, D MMMM YYYY р., HH:mm"
+                },
+                calendar: {
+                    sameDay: i("[Сьогодні "),
+                    nextDay: i("[Завтра "),
+                    lastDay: i("[Вчора "),
+                    nextWeek: i("[У] dddd ["),
+                    lastWeek: function () {
+                        switch (this.day()) {
+                            case 0:
+                            case 3:
+                            case 5:
+                            case 6:
+                                return i("[Минулої] dddd [").call(this);
+                            case 1:
+                            case 2:
+                            case 4:
+                                return i("[Минулого] dddd [").call(this)
+                        }
+                    },
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "за %s",
+                    past: "%s тому",
+                    s: "декілька секунд",
+                    ss: t,
+                    m: t,
+                    mm: t,
+                    h: "годину",
+                    hh: t,
+                    d: "день",
+                    dd: t,
+                    M: "місяць",
+                    MM: t,
+                    y: "рік",
+                    yy: t
+                },
+                meridiemParse: /ночі|ранку|дня|вечора/,
+                isPM: function (e) {
+                    return /^(дня|вечора)$/.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 4) return "ночі"; else if (e < 12) return "ранку"; else if (e < 17) return "дня"; else return "вечора"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"M":
+                        case"d":
+                        case"DDD":
+                        case"w":
+                        case"W":
+                            return e + "-й";
+                        case"D":
+                            return e + "-го";
+                        default:
+                            return e
+                    }
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t = ["جنوری", "فروری", "مارچ", "اپریل", "مئی", "جون", "جولائی", "اگست", "ستمبر", "اکتوبر", "نومبر", "دسمبر"],
+                n = ["اتوار", "پیر", "منگل", "بدھ", "جمعرات", "جمعہ", "ہفتہ"], i;
+            e.defineLocale("ur", {
+                months: t,
+                monthsShort: t,
+                weekdays: n,
+                weekdaysShort: n,
+                weekdaysMin: n,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd، D MMMM YYYY HH:mm"
+                },
+                meridiemParse: /صبح|شام/,
+                isPM: function (e) {
+                    return "شام" === e
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return "صبح";
+                    return "شام"
+                },
+                calendar: {
+                    sameDay: "[آج بوقت] LT",
+                    nextDay: "[کل بوقت] LT",
+                    nextWeek: "dddd [بوقت] LT",
+                    lastDay: "[گذشتہ روز بوقت] LT",
+                    lastWeek: "[گذشتہ] dddd [بوقت] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s بعد",
+                    past: "%s قبل",
+                    s: "چند سیکنڈ",
+                    ss: "%d سیکنڈ",
+                    m: "ایک منٹ",
+                    mm: "%d منٹ",
+                    h: "ایک گھنٹہ",
+                    hh: "%d گھنٹے",
+                    d: "ایک دن",
+                    dd: "%d دن",
+                    M: "ایک ماہ",
+                    MM: "%d ماہ",
+                    y: "ایک سال",
+                    yy: "%d سال"
+                },
+                preparse: function (e) {
+                    return e.replace(/،/g, ",")
+                },
+                postformat: function (e) {
+                    return e.replace(/,/g, "،")
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("uz", {
+                months: "январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр".split("_"),
+                monthsShort: "янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),
+                weekdays: "Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"),
+                weekdaysShort: "Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"),
+                weekdaysMin: "Як_Ду_Се_Чо_Па_Жу_Ша".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "D MMMM YYYY, dddd HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Бугун соат] LT [да]",
+                    nextDay: "[Эртага] LT [да]",
+                    nextWeek: "dddd [куни соат] LT [да]",
+                    lastDay: "[Кеча соат] LT [да]",
+                    lastWeek: "[Утган] dddd [куни соат] LT [да]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "Якин %s ичида",
+                    past: "Бир неча %s олдин",
+                    s: "фурсат",
+                    ss: "%d фурсат",
+                    m: "бир дакика",
+                    mm: "%d дакика",
+                    h: "бир соат",
+                    hh: "%d соат",
+                    d: "бир кун",
+                    dd: "%d кун",
+                    M: "бир ой",
+                    MM: "%d ой",
+                    y: "бир йил",
+                    yy: "%d йил"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("uz-latn", {
+                months: "Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),
+                monthsShort: "Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),
+                weekdays: "Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),
+                weekdaysShort: "Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),
+                weekdaysMin: "Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "D MMMM YYYY, dddd HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Bugun soat] LT [da]",
+                    nextDay: "[Ertaga] LT [da]",
+                    nextWeek: "dddd [kuni soat] LT [da]",
+                    lastDay: "[Kecha soat] LT [da]",
+                    lastWeek: "[O'tgan] dddd [kuni soat] LT [da]",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "Yaqin %s ichida",
+                    past: "Bir necha %s oldin",
+                    s: "soniya",
+                    ss: "%d soniya",
+                    m: "bir daqiqa",
+                    mm: "%d daqiqa",
+                    h: "bir soat",
+                    hh: "%d soat",
+                    d: "bir kun",
+                    dd: "%d kun",
+                    M: "bir oy",
+                    MM: "%d oy",
+                    y: "bir yil",
+                    yy: "%d yil"
+                },
+                week: {dow: 1, doy: 7}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("vi", {
+                months: "tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),
+                monthsShort: "Thg 01_Thg 02_Thg 03_Thg 04_Thg 05_Thg 06_Thg 07_Thg 08_Thg 09_Thg 10_Thg 11_Thg 12".split("_"),
+                monthsParseExact: true,
+                weekdays: "chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),
+                weekdaysShort: "CN_T2_T3_T4_T5_T6_T7".split("_"),
+                weekdaysMin: "CN_T2_T3_T4_T5_T6_T7".split("_"),
+                weekdaysParseExact: true,
+                meridiemParse: /sa|ch/i,
+                isPM: function (e) {
+                    return /^ch$/i.test(e)
+                },
+                meridiem: function (e, t, n) {
+                    if (e < 12) return n ? "sa" : "SA"; else return n ? "ch" : "CH"
+                },
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM [năm] YYYY",
+                    LLL: "D MMMM [năm] YYYY HH:mm",
+                    LLLL: "dddd, D MMMM [năm] YYYY HH:mm",
+                    l: "DD/M/YYYY",
+                    ll: "D MMM YYYY",
+                    lll: "D MMM YYYY HH:mm",
+                    llll: "ddd, D MMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[Hôm nay lúc] LT",
+                    nextDay: "[Ngày mai lúc] LT",
+                    nextWeek: "dddd [tuần tới lúc] LT",
+                    lastDay: "[Hôm qua lúc] LT",
+                    lastWeek: "dddd [tuần trước lúc] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "%s tới",
+                    past: "%s trước",
+                    s: "vài giây",
+                    ss: "%d giây",
+                    m: "một phút",
+                    mm: "%d phút",
+                    h: "một giờ",
+                    hh: "%d giờ",
+                    d: "một ngày",
+                    dd: "%d ngày",
+                    w: "một tuần",
+                    ww: "%d tuần",
+                    M: "một tháng",
+                    MM: "%d tháng",
+                    y: "một năm",
+                    yy: "%d năm"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}/,
+                ordinal: function (e) {
+                    return e
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("x-pseudo", {
+                months: "J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér".split("_"),
+                monthsShort: "J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc".split("_"),
+                monthsParseExact: true,
+                weekdays: "S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý".split("_"),
+                weekdaysShort: "S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát".split("_"),
+                weekdaysMin: "S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá".split("_"),
+                weekdaysParseExact: true,
+                longDateFormat: {
+                    LT: "HH:mm",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY HH:mm",
+                    LLLL: "dddd, D MMMM YYYY HH:mm"
+                },
+                calendar: {
+                    sameDay: "[T~ódá~ý át] LT",
+                    nextDay: "[T~ómó~rró~w át] LT",
+                    nextWeek: "dddd [át] LT",
+                    lastDay: "[Ý~ést~érdá~ý át] LT",
+                    lastWeek: "[L~ást] dddd [át] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "í~ñ %s",
+                    past: "%s á~gó",
+                    s: "á ~féw ~sécó~ñds",
+                    ss: "%d s~écóñ~ds",
+                    m: "á ~míñ~úté",
+                    mm: "%d m~íñú~tés",
+                    h: "á~ñ hó~úr",
+                    hh: "%d h~óúrs",
+                    d: "á ~dáý",
+                    dd: "%d d~áýs",
+                    M: "á ~móñ~th",
+                    MM: "%d m~óñt~hs",
+                    y: "á ~ýéár",
+                    yy: "%d ý~éárs"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+                ordinal: function (e) {
+                    var t = e % 10,
+                        n = ~~(e % 100 / 10) === 1 ? "th" : t === 1 ? "st" : t === 2 ? "nd" : t === 3 ? "rd" : "th";
+                    return e + n
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("yo", {
+                months: "Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀".split("_"),
+                monthsShort: "Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀".split("_"),
+                weekdays: "Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta".split("_"),
+                weekdaysShort: "Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá".split("_"),
+                weekdaysMin: "Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb".split("_"),
+                longDateFormat: {
+                    LT: "h:mm A",
+                    LTS: "h:mm:ss A",
+                    L: "DD/MM/YYYY",
+                    LL: "D MMMM YYYY",
+                    LLL: "D MMMM YYYY h:mm A",
+                    LLLL: "dddd, D MMMM YYYY h:mm A"
+                },
+                calendar: {
+                    sameDay: "[Ònì ni] LT",
+                    nextDay: "[Ọ̀la ni] LT",
+                    nextWeek: "dddd [Ọsẹ̀ tón'bọ] [ni] LT",
+                    lastDay: "[Àna ni] LT",
+                    lastWeek: "dddd [Ọsẹ̀ tólọ́] [ni] LT",
+                    sameElse: "L"
+                },
+                relativeTime: {
+                    future: "ní %s",
+                    past: "%s kọjá",
+                    s: "ìsẹjú aayá die",
+                    ss: "aayá %d",
+                    m: "ìsẹjú kan",
+                    mm: "ìsẹjú %d",
+                    h: "wákati kan",
+                    hh: "wákati %d",
+                    d: "ọjọ́ kan",
+                    dd: "ọjọ́ %d",
+                    M: "osù kan",
+                    MM: "osù %d",
+                    y: "ọdún kan",
+                    yy: "ọdún %d"
+                },
+                dayOfMonthOrdinalParse: /ọjọ́\s\d{1,2}/,
+                ordinal: "ọjọ́ %d",
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("zh-cn", {
+                months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+                monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
+                weekdaysShort: "周日_周一_周二_周三_周四_周五_周六".split("_"),
+                weekdaysMin: "日_一_二_三_四_五_六".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY/MM/DD",
+                    LL: "YYYY年M月D日",
+                    LLL: "YYYY年M月D日Ah点mm分",
+                    LLLL: "YYYY年M月D日ddddAh点mm分",
+                    l: "YYYY/M/D",
+                    ll: "YYYY年M月D日",
+                    lll: "YYYY年M月D日 HH:mm",
+                    llll: "YYYY年M月D日dddd HH:mm"
+                },
+                meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "凌晨" || t === "早上" || t === "上午") return e; else if (t === "下午" || t === "晚上") return e + 12; else return e >= 11 ? e : e + 12
+                },
+                meridiem: function (e, t, n) {
+                    var i = e * 100 + t;
+                    if (i < 600) return "凌晨"; else if (i < 900) return "早上"; else if (i < 1130) return "上午"; else if (i < 1230) return "中午"; else if (i < 1800) return "下午"; else return "晚上"
+                },
+                calendar: {
+                    sameDay: "[今天]LT", nextDay: "[明天]LT", nextWeek: function (e) {
+                        if (e.week() !== this.week()) return "[下]dddLT"; else return "[本]dddLT"
+                    }, lastDay: "[昨天]LT", lastWeek: function (e) {
+                        if (this.week() !== e.week()) return "[上]dddLT"; else return "[本]dddLT"
+                    }, sameElse: "L"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "日";
+                        case"M":
+                            return e + "月";
+                        case"w":
+                        case"W":
+                            return e + "周";
+                        default:
+                            return e
+                    }
+                },
+                relativeTime: {
+                    future: "%s后",
+                    past: "%s前",
+                    s: "几秒",
+                    ss: "%d 秒",
+                    m: "1 分钟",
+                    mm: "%d 分钟",
+                    h: "1 小时",
+                    hh: "%d 小时",
+                    d: "1 天",
+                    dd: "%d 天",
+                    w: "1 周",
+                    ww: "%d 周",
+                    M: "1 个月",
+                    MM: "%d 个月",
+                    y: "1 年",
+                    yy: "%d 年"
+                },
+                week: {dow: 1, doy: 4}
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("zh-hk", {
+                months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+                monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
+                weekdaysShort: "週日_週一_週二_週三_週四_週五_週六".split("_"),
+                weekdaysMin: "日_一_二_三_四_五_六".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY/MM/DD",
+                    LL: "YYYY年M月D日",
+                    LLL: "YYYY年M月D日 HH:mm",
+                    LLLL: "YYYY年M月D日dddd HH:mm",
+                    l: "YYYY/M/D",
+                    ll: "YYYY年M月D日",
+                    lll: "YYYY年M月D日 HH:mm",
+                    llll: "YYYY年M月D日dddd HH:mm"
+                },
+                meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "凌晨" || t === "早上" || t === "上午") return e; else if (t === "中午") return e >= 11 ? e : e + 12; else if (t === "下午" || t === "晚上") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    var i = e * 100 + t;
+                    if (i < 600) return "凌晨"; else if (i < 900) return "早上"; else if (i < 1200) return "上午"; else if (i === 1200) return "中午"; else if (i < 1800) return "下午"; else return "晚上"
+                },
+                calendar: {
+                    sameDay: "[今天]LT",
+                    nextDay: "[明天]LT",
+                    nextWeek: "[下]ddddLT",
+                    lastDay: "[昨天]LT",
+                    lastWeek: "[上]ddddLT",
+                    sameElse: "L"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "日";
+                        case"M":
+                            return e + "月";
+                        case"w":
+                        case"W":
+                            return e + "週";
+                        default:
+                            return e
+                    }
+                },
+                relativeTime: {
+                    future: "%s後",
+                    past: "%s前",
+                    s: "幾秒",
+                    ss: "%d 秒",
+                    m: "1 分鐘",
+                    mm: "%d 分鐘",
+                    h: "1 小時",
+                    hh: "%d 小時",
+                    d: "1 天",
+                    dd: "%d 天",
+                    M: "1 個月",
+                    MM: "%d 個月",
+                    y: "1 年",
+                    yy: "%d 年"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("zh-mo", {
+                months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+                monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
+                weekdaysShort: "週日_週一_週二_週三_週四_週五_週六".split("_"),
+                weekdaysMin: "日_一_二_三_四_五_六".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "DD/MM/YYYY",
+                    LL: "YYYY年M月D日",
+                    LLL: "YYYY年M月D日 HH:mm",
+                    LLLL: "YYYY年M月D日dddd HH:mm",
+                    l: "D/M/YYYY",
+                    ll: "YYYY年M月D日",
+                    lll: "YYYY年M月D日 HH:mm",
+                    llll: "YYYY年M月D日dddd HH:mm"
+                },
+                meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "凌晨" || t === "早上" || t === "上午") return e; else if (t === "中午") return e >= 11 ? e : e + 12; else if (t === "下午" || t === "晚上") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    var i = e * 100 + t;
+                    if (i < 600) return "凌晨"; else if (i < 900) return "早上"; else if (i < 1130) return "上午"; else if (i < 1230) return "中午"; else if (i < 1800) return "下午"; else return "晚上"
+                },
+                calendar: {
+                    sameDay: "[今天] LT",
+                    nextDay: "[明天] LT",
+                    nextWeek: "[下]dddd LT",
+                    lastDay: "[昨天] LT",
+                    lastWeek: "[上]dddd LT",
+                    sameElse: "L"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "日";
+                        case"M":
+                            return e + "月";
+                        case"w":
+                        case"W":
+                            return e + "週";
+                        default:
+                            return e
+                    }
+                },
+                relativeTime: {
+                    future: "%s內",
+                    past: "%s前",
+                    s: "幾秒",
+                    ss: "%d 秒",
+                    m: "1 分鐘",
+                    mm: "%d 分鐘",
+                    h: "1 小時",
+                    hh: "%d 小時",
+                    d: "1 天",
+                    dd: "%d 天",
+                    M: "1 個月",
+                    MM: "%d 個月",
+                    y: "1 年",
+                    yy: "%d 年"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        !function (e) {
+            "use strict";
+//! moment.js locale configuration
+            var t;
+            e.defineLocale("zh-tw", {
+                months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
+                monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
+                weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
+                weekdaysShort: "週日_週一_週二_週三_週四_週五_週六".split("_"),
+                weekdaysMin: "日_一_二_三_四_五_六".split("_"),
+                longDateFormat: {
+                    LT: "HH:mm",
+                    LTS: "HH:mm:ss",
+                    L: "YYYY/MM/DD",
+                    LL: "YYYY年M月D日",
+                    LLL: "YYYY年M月D日 HH:mm",
+                    LLLL: "YYYY年M月D日dddd HH:mm",
+                    l: "YYYY/M/D",
+                    ll: "YYYY年M月D日",
+                    lll: "YYYY年M月D日 HH:mm",
+                    llll: "YYYY年M月D日dddd HH:mm"
+                },
+                meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+                meridiemHour: function (e, t) {
+                    if (e === 12) e = 0;
+                    if (t === "凌晨" || t === "早上" || t === "上午") return e; else if (t === "中午") return e >= 11 ? e : e + 12; else if (t === "下午" || t === "晚上") return e + 12
+                },
+                meridiem: function (e, t, n) {
+                    var i = e * 100 + t;
+                    if (i < 600) return "凌晨"; else if (i < 900) return "早上"; else if (i < 1130) return "上午"; else if (i < 1230) return "中午"; else if (i < 1800) return "下午"; else return "晚上"
+                },
+                calendar: {
+                    sameDay: "[今天] LT",
+                    nextDay: "[明天] LT",
+                    nextWeek: "[下]dddd LT",
+                    lastDay: "[昨天] LT",
+                    lastWeek: "[上]dddd LT",
+                    sameElse: "L"
+                },
+                dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+                ordinal: function (e, t) {
+                    switch (t) {
+                        case"d":
+                        case"D":
+                        case"DDD":
+                            return e + "日";
+                        case"M":
+                            return e + "月";
+                        case"w":
+                        case"W":
+                            return e + "週";
+                        default:
+                            return e
+                    }
+                },
+                relativeTime: {
+                    future: "%s後",
+                    past: "%s前",
+                    s: "幾秒",
+                    ss: "%d 秒",
+                    m: "1 分鐘",
+                    mm: "%d 分鐘",
+                    h: "1 小時",
+                    hh: "%d 小時",
+                    d: "1 天",
+                    dd: "%d 天",
+                    M: "1 個月",
+                    MM: "%d 個月",
+                    y: "1 年",
+                    yy: "%d 年"
+                }
+            })
+        }(n(0))
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = s(n(20)), r = s(n(38)), a = s(n(1));
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, s(n(2)).default)(u, null, [{
+            key: "install", value: function () {
+                Object.setPrototypeOf = r.default || function (e, t) {
+                    return e.__proto__ = t, e
+                }, Object.assign = i.default || function (e) {
+                    if (null == e) throw new TypeError("Cannot convert undefined or null to object");
+                    for (var t = Object(e), n = 1; n < arguments.length; n++) {
+                        var i = arguments[n];
+                        if (null != i) for (var r in i) i.hasOwnProperty(r) && (t[r] = i[r])
+                    }
+                    return t
+                }, "function" != typeof self.Promise && n(298).polyfill()
+            }
+        }]);
+        var o = u;
+
+        function u() {
+            (0, a.default)(this, u)
+        }
+
+        o.install(), t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = m(n(1)), r = m(n(2)), a = m(n(4)), s = m(n(62)), o = n(15), u = m(n(307)), d = m(n(311)),
+            l = (m(n(312)), m(n(313))), h = m(n(314)), c = m(n(315)), _ = m(n(316)), f = n(5);
+
+        function m(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(p, [{
+            key: "destroy", value: function () {
+                this._loader.isWorking() && this._loader.abort(), this._loader.destroy(), this._loader = null, this._loaderClass = null, this._dataSource = null, this._stashBuffer = null, this._stashUsed = this._stashSize = this._bufferSize = this._stashByteStart = 0, this._currentRange = null, this._speedSampler = null, this._isEarlyEofReconnecting = !1, this._onDataArrival = null, this._onSeeked = null, this._onError = null, this._onComplete = null, this._onRedirect = null, this._onRecoveredEarlyEof = null, this._extraData = null
+            }
+        }, {
+            key: "isWorking", value: function () {
+                return this._loader && this._loader.isWorking() && !this._paused
+            }
+        }, {
+            key: "isPaused", value: function () {
+                return this._paused
+            }
+        }, {
+            key: "_selectSeekHandler", value: function () {
+                var e = this._config;
+                if ("range" === e.seekType) this._seekHandler = new c.default(this._config.rangeLoadZeroStart); else if ("param" === e.seekType) {
+                    var t = e.seekParamStart || "bstart", n = e.seekParamEnd || "bend";
+                    this._seekHandler = new _.default(t, n)
+                } else {
+                    if ("custom" !== e.seekType) throw new f.InvalidArgumentException("Invalid seekType in config: " + e.seekType);
+                    if ("function" != typeof e.customSeekHandler) throw new f.InvalidArgumentException("Custom seekType specified in config but invalid customSeekHandler!");
+                    this._seekHandler = new e.customSeekHandler
+                }
+            }
+        }, {
+            key: "_selectLoader", value: function () {
+                if (null != this._config.customLoader) this._loaderClass = this._config.customLoader; else if (this._isWebSocketURL) this._loaderClass = h.default; else if (u.default.isSupported()) this._loaderClass = u.default; else if (d.default.isSupported()) this._loaderClass = d.default; else {
+                    if (!l.default.isSupported()) throw new f.RuntimeException("Your browser doesn't support xhr with arraybuffer responseType!");
+                    this._loaderClass = l.default
+                }
+            }
+        }, {
+            key: "_createLoader", value: function () {
+                this._loader = new this._loaderClass(this._seekHandler, this._config), !1 === this._loader.needStashBuffer && (this._enableStash = !1), this._loader.onContentLengthKnown = this._onContentLengthKnown.bind(this), this._loader.onURLRedirect = this._onURLRedirect.bind(this), this._loader.onDataArrival = this._onLoaderChunkArrival.bind(this), this._loader.onComplete = this._onLoaderComplete.bind(this), this._loader.onError = this._onLoaderError.bind(this)
+            }
+        }, {
+            key: "open", value: function (e) {
+                this._currentRange = {
+                    from: 0,
+                    to: -1
+                }, e && (this._currentRange.from = e), this._speedSampler.reset(), e || (this._fullRequestFlag = !0)
+            }
+        }, {
+            key: "abort", value: function () {
+                this._loader.abort(), this._paused && (this._paused = !1, this._resumeFrom = 0)
+            }
+        }, {
+            key: "pause", value: function () {
+                this.isWorking() && (this._loader.abort(), 0 !== this._stashUsed ? (this._resumeFrom = this._stashByteStart, this._currentRange.to = this._stashByteStart - 1) : this._resumeFrom = this._currentRange.to + 1, this._stashUsed = 0, this._stashByteStart = 0, this._paused = !0)
+            }
+        }, {
+            key: "resume", value: function () {
+                var e;
+                this._paused && (this._paused = !1, e = this._resumeFrom, this._resumeFrom = 0, this._internalSeek(e, !0))
+            }
+        }, {
+            key: "seek", value: function (e) {
+                this._paused = !1, this._stashUsed = 0, this._stashByteStart = 0, this._internalSeek(e, !0)
+            }
+        }, {
+            key: "_internalSeek", value: function (e, t) {
+                this._loader.isWorking() && this._loader.abort(), this._flushStashBuffer(t), this._loader.destroy(), this._loader = null;
+                t = {from: e, to: -1};
+                this._currentRange = {
+                    from: t.from,
+                    to: -1
+                }, this._speedSampler.reset(), this._stashSize = this._stashInitialSize, this._createLoader(), this._loader.open(this._dataSource, t), this._onSeeked && this._onSeeked()
+            }
+        }, {
+            key: "updateUrl", value: function (e) {
+                if (!e || "string" != typeof e || 0 === e.length) throw new f.InvalidArgumentException("Url must be a non-empty string!");
+                this._dataSource.url = e
+            }
+        }, {
+            key: "_expandBuffer", value: function (e) {
+                for (var t, n, i = this._stashSize; i + 1048576 < e;) i *= 2;
+                (i += 1048576) !== this._bufferSize && (t = new ArrayBuffer(i), 0 < this._stashUsed && (n = new Uint8Array(this._stashBuffer, 0, this._stashUsed), new Uint8Array(t, 0, i).set(n, 0)), this._stashBuffer = t, this._bufferSize = i)
+            }
+        }, {
+            key: "_normalizeSpeed", value: function (e) {
+                var t, n = this._speedNormalizeList, i = n.length - 1, r = 0, a = i;
+                if (e < n[0]) return n[0];
+                for (; r <= a;) {
+                    if ((t = r + Math.floor((a - r) / 2)) === i || e >= n[t] && e < n[t + 1]) return n[t];
+                    n[t] < e ? r = t + 1 : a = t - 1
+                }
+            }
+        }, {
+            key: "_adjustStashSize", value: function (e) {
+                var t = 0,
+                    e = 1024 * (t = 8192 < (t = this._config.isLive || e < 512 ? e : 512 <= e && e <= 1024 ? Math.floor(1.5 * e) : 2 * e) ? 8192 : t) + 1048576;
+                this._bufferSize < e && this._expandBuffer(e), this._stashSize = 1024 * t
+            }
+        }, {
+            key: "_dispatchChunks", value: function (e, t) {
+                return this._currentRange.to = t + e.byteLength - 1, this._onDataArrival(e, t)
+            }
+        }, {
+            key: "_onURLRedirect", value: function (e) {
+                this._redirectedURL = e, this._onRedirect && this._onRedirect(e)
+            }
+        }, {
+            key: "_onContentLengthKnown", value: function (e) {
+                e && this._fullRequestFlag && (this._totalLength = e, this._fullRequestFlag = !1)
+            }
+        }, {
+            key: "_onLoaderChunkArrival", value: function (e, t, n) {
+                if (!this._onDataArrival) throw new f.IllegalStateException("IOController: No existing consumer (onDataArrival) callback!");
+                var i, r, a;
+                this._paused || (this._isEarlyEofReconnecting && (this._isEarlyEofReconnecting = !1, this._onRecoveredEarlyEof && this._onRecoveredEarlyEof()), this._speedSampler.addBytes(e.byteLength), 0 !== (i = this._speedSampler.lastSecondKBps) && (i = this._normalizeSpeed(i), this._speedNormalized !== i && (this._speedNormalized = i, this._adjustStashSize(i))), this._enableStash ? (0 === this._stashUsed && 0 === this._stashByteStart && (this._stashByteStart = t), this._stashUsed + e.byteLength <= this._stashSize ? (new Uint8Array(this._stashBuffer, 0, this._stashSize).set(new Uint8Array(e), this._stashUsed), this._stashUsed += e.byteLength) : (i = new Uint8Array(this._stashBuffer, 0, this._bufferSize), 0 < this._stashUsed ? (r = this._stashBuffer.slice(0, this._stashUsed), (a = this._dispatchChunks(r, this._stashByteStart)) < r.byteLength ? 0 < a && (r = new Uint8Array(r, a), i.set(r, 0), this._stashUsed = r.byteLength, this._stashByteStart += a) : (this._stashUsed = 0, this._stashByteStart += a), this._stashUsed + e.byteLength > this._bufferSize && (this._expandBuffer(this._stashUsed + e.byteLength), i = new Uint8Array(this._stashBuffer, 0, this._bufferSize)), i.set(new Uint8Array(e), this._stashUsed), this._stashUsed += e.byteLength) : (r = this._dispatchChunks(e, t)) < e.byteLength && ((a = e.byteLength - r) > this._bufferSize && (this._expandBuffer(a), i = new Uint8Array(this._stashBuffer, 0, this._bufferSize)), i.set(new Uint8Array(e, r), 0), this._stashUsed += a, this._stashByteStart = t + r))) : 0 === this._stashUsed ? (i = this._dispatchChunks(e, t)) < e.byteLength && ((a = e.byteLength - i) > this._bufferSize && this._expandBuffer(a), new Uint8Array(this._stashBuffer, 0, this._bufferSize).set(new Uint8Array(e, i), 0), this._stashUsed += a, this._stashByteStart = t + i) : (this._stashUsed + e.byteLength > this._bufferSize && this._expandBuffer(this._stashUsed + e.byteLength), (r = new Uint8Array(this._stashBuffer, 0, this._bufferSize)).set(new Uint8Array(e), this._stashUsed), this._stashUsed += e.byteLength, (a = this._dispatchChunks(this._stashBuffer.slice(0, this._stashUsed), this._stashByteStart)) < this._stashUsed && 0 < a && (t = new Uint8Array(this._stashBuffer, a), r.set(t, 0)), this._stashUsed -= a, this._stashByteStart += a))
+            }
+        }, {
+            key: "_flushStashBuffer", value: function (e) {
+                if (0 < this._stashUsed) {
+                    var t = this._stashBuffer.slice(0, this._stashUsed),
+                        n = this._dispatchChunks(t, this._stashByteStart), i = t.byteLength - n;
+                    if (n < t.byteLength) {
+                        if (!e) return 0 < n && (e = new Uint8Array(this._stashBuffer, 0, this._bufferSize), t = new Uint8Array(t, n), e.set(t, 0), this._stashUsed = t.byteLength, this._stashByteStart += n), 0;
+                        a.default.w(this.TAG, i + " bytes unconsumed data remain when flush buffer, dropped")
+                    }
+                    return this._stashUsed = 0, this._stashByteStart = 0, i
+                }
+                return 0
+            }
+        }, {
+            key: "_onLoaderComplete", value: function (e, t) {
+                this._flushStashBuffer(!0), this._onComplete && this._onComplete(this._extraData)
+            }
+        }, {
+            key: "_onLoaderError", value: function (e, t) {
+                switch (a.default.e(this.TAG, "Loader error, code = " + t.code + ", msg = " + t.msg), this._flushStashBuffer(!1), this._isEarlyEofReconnecting && (this._isEarlyEofReconnecting = !1, e = o.LoaderErrors.UNRECOVERABLE_EARLY_EOF), e) {
+                    case o.LoaderErrors.EARLY_EOF:
+                        var n;
+                        if (!this._config.isLive) if (this._totalLength) return void ((n = this._currentRange.to + 1) < this._totalLength && (a.default.w(this.TAG, "Connection lost, trying reconnect..."), this._isEarlyEofReconnecting = !0, this._internalSeek(n, !1)));
+                        e = o.LoaderErrors.UNRECOVERABLE_EARLY_EOF;
+                        break;
+                    case o.LoaderErrors.UNRECOVERABLE_EARLY_EOF:
+                    case o.LoaderErrors.CONNECTING_TIMEOUT:
+                    case o.LoaderErrors.HTTP_STATUS_CODE_INVALID:
+                    case o.LoaderErrors.EXCEPTION:
+                }
+                if (!this._onError) throw new f.RuntimeException("IOException: " + t.msg);
+                this._onError(e, t)
+            }
+        }, {
+            key: "status", get: function () {
+                return this._loader.status
+            }
+        }, {
+            key: "extraData", get: function () {
+                return this._extraData
+            }, set: function (e) {
+                this._extraData = e
+            }
+        }, {
+            key: "onDataArrival", get: function () {
+                return this._onDataArrival
+            }, set: function (e) {
+                this._onDataArrival = e
+            }
+        }, {
+            key: "onSeeked", get: function () {
+                return this._onSeeked
+            }, set: function (e) {
+                this._onSeeked = e
+            }
+        }, {
+            key: "onError", get: function () {
+                return this._onError
+            }, set: function (e) {
+                this._onError = e
+            }
+        }, {
+            key: "onComplete", get: function () {
+                return this._onComplete
+            }, set: function (e) {
+                this._onComplete = e
+            }
+        }, {
+            key: "onRedirect", get: function () {
+                return this._onRedirect
+            }, set: function (e) {
+                this._onRedirect = e
+            }
+        }, {
+            key: "onRecoveredEarlyEof", get: function () {
+                return this._onRecoveredEarlyEof
+            }, set: function (e) {
+                this._onRecoveredEarlyEof = e
+            }
+        }, {
+            key: "currentURL", get: function () {
+                return this._dataSource.url
+            }
+        }, {
+            key: "hasRedirect", get: function () {
+                return null != this._redirectedURL || null != this._dataSource.redirectedURL
+            }
+        }, {
+            key: "currentRedirectedURL", get: function () {
+                return this._redirectedURL || this._dataSource.redirectedURL
+            }
+        }, {
+            key: "currentSpeed", get: function () {
+                return this._loaderClass === l.default ? this._loader.currentSpeed : this._speedSampler.lastSecondKBps
+            }
+        }, {
+            key: "loaderType", get: function () {
+                return this._loader.type
+            }
+        }]);
+        n = p;
+
+        function p(e, t, n) {
+            (0, i.default)(this, p), this.TAG = "IOController", this._config = t, this._extraData = n, this._stashInitialSize = 65536, null != t.stashInitialSize && 0 < t.stashInitialSize && (this._stashInitialSize = t.stashInitialSize), this._stashUsed = 0, this._stashSize = this._stashInitialSize, (this._bufferSize = 3145728) < t.stashInitialSize && (this._bufferSize = t.stashInitialSize), this._stashBuffer = new ArrayBuffer(this._bufferSize), this._stashByteStart = 0, !(this._enableStash = !0) === t.enableStashBuffer && (this._enableStash = !1), this._loader = null, this._loaderClass = null, this._seekHandler = null, this._dataSource = e, this._isWebSocketURL = /wss?:\/\/(.+?)/.test(e.url), this._refTotalLength = e.filesize || null, this._totalLength = this._refTotalLength, this._fullRequestFlag = !1, this._currentRange = null, this._redirectedURL = null, this._speedNormalized = 0, this._speedSampler = new s.default, this._speedNormalizeList = [64, 128, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096], this._isEarlyEofReconnecting = !1, this._paused = !1, this._resumeFrom = 0, this._onDataArrival = null, this._onSeeked = null, this._onError = null, this._onComplete = null, this._onRedirect = null, this._onRecoveredEarlyEof = null, this._selectSeekHandler(), this._selectLoader(), this._createLoader()
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = y(n(38)), r = y(n(20)), a = y(n(11)), s = y(n(1)), o = y(n(2)), u = y(n(10)), d = y(n(4)), l = y(n(33)),
+            h = y(n(65)), c = y(n(319)), _ = y(n(328)), f = y(n(66)), m = y(n(228)), p = y(n(40));
+        n(15);
+
+        function y(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, o.default)(v, [{
+            key: "destroy", value: function () {
+                this._mediaInfo = null, this._mediaDataSource = null, this._statisticsReporter && this._disableStatisticsReporter(), this._ioctl && (this._ioctl.destroy(), this._ioctl = null), this._demuxer && (this._demuxer.destroy(), this._demuxer = null), this._remuxer && (this._remuxer.destroy(), this._remuxer = null), this._emitter.removeAllListeners(), this._emitter = null
+            }
+        }, {
+            key: "on", value: function (e, t) {
+                this._emitter.addListener(e, t)
+            }
+        }, {
+            key: "off", value: function (e, t) {
+                this._emitter.removeListener(e, t)
+            }
+        }, {
+            key: "start", value: function () {
+                this._loadSegment(0), this._enableStatisticsReporter()
+            }
+        }, {
+            key: "_loadSegment", value: function (e, t) {
+                this._currentSegmentIndex = e;
+                var n = this._mediaDataSource.segments[e], n = this._ioctl = new m.default(n, this._config, e);
+                n.onError = this._onIOException.bind(this), n.onSeeked = this._onIOSeeked.bind(this), n.onComplete = this._onIOComplete.bind(this), n.onRedirect = this._onIORedirect.bind(this), n.onRecoveredEarlyEof = this._onIORecoveredEarlyEof.bind(this), t ? this._demuxer.bindDataSource(this._ioctl) : n.onDataArrival = this._onInitChunkArrival.bind(this), n.open(t)
+            }
+        }, {
+            key: "stop", value: function () {
+                this._internalAbort(), this._disableStatisticsReporter()
+            }
+        }, {
+            key: "_internalAbort", value: function () {
+                this._ioctl && (this._ioctl.destroy(), this._ioctl = null)
+            }
+        }, {
+            key: "pause", value: function () {
+                this._ioctl && this._ioctl.isWorking() && (this._ioctl.pause(), this._disableStatisticsReporter())
+            }
+        }, {
+            key: "resume", value: function () {
+                this._ioctl && this._ioctl.isPaused() && (this._ioctl.resume(), this._enableStatisticsReporter())
+            }
+        }, {
+            key: "seek", value: function (e) {
+                var t, n;
+                null != this._mediaInfo && this._mediaInfo.isSeekable() && ((t = this._searchSegmentIndexContains(e)) === this._currentSegmentIndex ? null == (n = this._mediaInfo.segments[t]) ? this._pendingSeekTime = e : (n = n.getNearestKeyframe(e), this._remuxer.seek(n.milliseconds), this._ioctl.seek(n.fileposition), this._pendingResolveSeekPoint = n.milliseconds) : null == (n = this._mediaInfo.segments[t]) ? (this._pendingSeekTime = e, this._internalAbort(), this._remuxer.seek(), this._remuxer.insertDiscontinuity(), this._loadSegment(t)) : (n = n.getNearestKeyframe(e), this._internalAbort(), this._remuxer.seek(e), this._remuxer.insertDiscontinuity(), this._demuxer.resetMediaInfo(), this._demuxer.timestampBase = this._mediaDataSource.segments[t].timestampBase, this._loadSegment(t, n.fileposition), this._pendingResolveSeekPoint = n.milliseconds, this._reportSegmentMediaInfo(t)), this._enableStatisticsReporter())
+            }
+        }, {
+            key: "_searchSegmentIndexContains", value: function (e) {
+                for (var t = this._mediaDataSource.segments, n = t.length - 1, i = 0; i < t.length; i++) if (e < t[i].timestampBase) {
+                    n = i - 1;
+                    break
+                }
+                return n
+            }
+        }, {
+            key: "_onInitChunkArrival", value: function (e, t) {
+                var n, i = this, r = null;
+                return 0 < t ? (this._demuxer.bindDataSource(this._ioctl), this._demuxer.timestampBase = this._mediaDataSource.segments[this._currentSegmentIndex].timestampBase, this._demuxer.parseChunks(e, t)) : (r = c.default.probe(e)).match ? (this._demuxer = new c.default(r, this._config), this._remuxer || (this._remuxer = new _.default(this._config)), null == (n = this._mediaDataSource).duration || isNaN(n.duration) || (this._demuxer.overridedDuration = n.duration), "boolean" == typeof n.hasAudio && (this._demuxer.overridedHasAudio = n.hasAudio), "boolean" == typeof n.hasVideo && (this._demuxer.overridedHasVideo = n.hasVideo), this._demuxer.timestampBase = n.segments[this._currentSegmentIndex].timestampBase, this._demuxer.onError = this._onDemuxException.bind(this), this._demuxer.onMediaInfo = this._onMediaInfo.bind(this), this._demuxer.onMetaDataArrived = this._onMetaDataArrived.bind(this), this._demuxer.onScriptDataArrived = this._onScriptDataArrived.bind(this), this._demuxer.onVideoResolutionChanged = this._onVideoResolutionChanged.bind(this), this._demuxer.onParsedData = this._onParsedData.bind(this), this._remuxer.bindDataSource(this._demuxer.bindDataSource(this._ioctl)), this._remuxer.onInitSegment = this._onRemuxerInitSegmentArrival.bind(this), this._remuxer.onMediaSegment = this._onRemuxerMediaSegmentArrival.bind(this), this._demuxer.parseChunks(e, t)) : (r = null, d.default.e(this.TAG, "Non-FLV, Unsupported media type!"), a.default.resolve().then(function () {
+                    i._internalAbort()
+                }), this._emitter.emit(p.default.DEMUX_ERROR, f.default.FORMAT_UNSUPPORTED, "Non-FLV, Unsupported media type"), 0)
+            }
+        }, {
+            key: "_onMediaInfo", value: function (e) {
+                var t = this,
+                    e = (null == this._mediaInfo && (this._mediaInfo = (0, r.default)({}, e), this._mediaInfo.keyframesIndex = null, this._mediaInfo.segments = [], this._mediaInfo.segmentCount = this._mediaDataSource.segments.length, (0, i.default)(this._mediaInfo, h.default.prototype)), (0, r.default)({}, e));
+                (0, i.default)(e, h.default.prototype), this._mediaInfo.segments[this._currentSegmentIndex] = e, this._reportSegmentMediaInfo(this._currentSegmentIndex), null != this._pendingSeekTime && a.default.resolve().then(function () {
+                    var e = t._pendingSeekTime;
+                    t._pendingSeekTime = null, t.seek(e)
+                })
+            }
+        }, {
+            key: "_onMetaDataArrived", value: function (e) {
+                this._emitter.emit(p.default.METADATA_ARRIVED, e)
+            }
+        }, {
+            key: "_onScriptDataArrived", value: function (e) {
+                this._emitter.emit(p.default.SCRIPTDATA_ARRIVED, e)
+            }
+        }, {
+            key: "_onIOSeeked", value: function () {
+                this._remuxer.insertDiscontinuity()
+            }
+        }, {
+            key: "_onIOComplete", value: function (e) {
+                e += 1;
+                e < this._mediaDataSource.segments.length ? (this._internalAbort(), this._remuxer.flushStashedSamples(), this._loadSegment(e)) : (this._remuxer.flushStashedSamples(), this._emitter.emit(p.default.LOADING_COMPLETE), this._disableStatisticsReporter())
+            }
+        }, {
+            key: "_onIORedirect", value: function (e) {
+                var t = this._ioctl.extraData;
+                this._mediaDataSource.segments[t].redirectedURL = e
+            }
+        }, {
+            key: "_onIORecoveredEarlyEof", value: function () {
+                this._emitter.emit(p.default.RECOVERED_EARLY_EOF)
+            }
+        }, {
+            key: "_onIOException", value: function (e, t) {
+                d.default.e(this.TAG, "IOException: type = " + e + ", code = " + t.code + ", msg = " + t.msg), this._emitter.emit(p.default.IO_ERROR, e, t), this._disableStatisticsReporter()
+            }
+        }, {
+            key: "_onDemuxException", value: function (e, t) {
+                d.default.e(this.TAG, "DemuxException: type = " + e + ", info = " + t), this._emitter.emit(p.default.DEMUX_ERROR, e, t)
+            }
+        }, {
+            key: "_onRemuxerInitSegmentArrival", value: function (e, t) {
+                this._emitter.emit(p.default.INIT_SEGMENT, e, t)
+            }
+        }, {
+            key: "_onRemuxerMediaSegmentArrival", value: function (e, t) {
+                null == this._pendingSeekTime && (this._emitter.emit(p.default.MEDIA_SEGMENT, e, t), null != this._pendingResolveSeekPoint && "video" === e && (e = t.info.syncPoints, t = this._pendingResolveSeekPoint, this._pendingResolveSeekPoint = null, l.default.safari && 0 < e.length && e[0].originalDts === t && (t = e[0].pts), this._emitter.emit(p.default.RECOMMEND_SEEKPOINT, t)))
+            }
+        }, {
+            key: "_enableStatisticsReporter", value: function () {
+                null == this._statisticsReporter && (this._statisticsReporter = self.setInterval(this._reportStatisticsInfo.bind(this), this._config.statisticsInfoReportInterval))
+            }
+        }, {
+            key: "_disableStatisticsReporter", value: function () {
+                this._statisticsReporter && (self.clearInterval(this._statisticsReporter), this._statisticsReporter = null)
+            }
+        }, {
+            key: "_reportSegmentMediaInfo", value: function (e) {
+                e = this._mediaInfo.segments[e], e = (0, r.default)({}, e);
+                e.duration = this._mediaInfo.duration, e.segmentCount = this._mediaInfo.segmentCount, delete e.segments, delete e.keyframesIndex, this._emitter.emit(p.default.MEDIA_INFO, e)
+            }
+        }, {
+            key: "_reportStatisticsInfo", value: function () {
+                var e = {};
+                e.url = this._ioctl.currentURL, e.hasRedirect = this._ioctl.hasRedirect, e.hasRedirect && (e.redirectedURL = this._ioctl.currentRedirectedURL), e.speed = this._ioctl.currentSpeed, e.loaderType = this._ioctl.loaderType, e.currentSegmentIndex = this._currentSegmentIndex, e.totalSegmentCount = this._mediaDataSource.segments.length, e.bps_audio = e.bps_video = 0, this._demuxer && this._demuxer._bpsInfo && (e.bps_video = this._demuxer._bpsInfo.bps_video, e.bps_audio = this._demuxer._bpsInfo.bps_audio), this._emitter.emit(p.default.STATISTICS_INFO, e)
+            }
+        }, {
+            key: "_onVideoResolutionChanged", value: function (e) {
+                this._emitter.emit(p.default.VIDEO_RESOLUTION_CHANGED, e)
+            }
+        }, {
+            key: "_onParsedData", value: function (e, t) {
+                this._emitter.emit(p.default.PARSEDDATA_ARRIVED, e, t)
+            }
+        }]);
+        n = v;
+
+        function v(t, n) {
+            (0, s.default)(this, v), this.TAG = "TransmuxingController", this._emitter = new u.default, this._config = n, t.segments || (t.segments = [{
+                duration: t.duration,
+                filesize: t.filesize,
+                url: t.url
+            }]), "boolean" != typeof t.cors && (t.cors = !0), "boolean" != typeof t.withCredentials && (t.withCredentials = !1), this._mediaDataSource = t;
+            var i = this._currentSegmentIndex = 0;
+            this._mediaDataSource.segments.forEach(function (e) {
+                e.timestampBase = i, i += e.duration, e.cors = t.cors, e.withCredentials = t.withCredentials, n.referrerPolicy && (e.referrerPolicy = n.referrerPolicy)
+            }), isNaN(i) || this._mediaDataSource.duration === i || (this._mediaDataSource.duration = i), this._mediaInfo = null, this._demuxer = null, this._remuxer = null, this._ioctl = null, this._pendingSeekTime = null, this._pendingResolveSeekPoint = null, this._statisticsReporter = null
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.MediaSegmentInfoList = t.IDRSampleList = t.MediaSegmentInfo = t.SampleInfo = void 0;
+        var i = r(n(2)), s = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        t.SampleInfo = function e(t, n, i, r, a) {
+            (0, s.default)(this, e), this.dts = t, this.pts = n, this.duration = i, this.originalDts = r, this.isSyncPoint = a, this.fileposition = null
+        }, t.MediaSegmentInfo = ((0, i.default)(a, [{
+            key: "appendSyncPoint", value: function (e) {
+                e.isSyncPoint = !0, this.syncPoints.push(e)
+            }
+        }]), a);
+
+        function a() {
+            (0, s.default)(this, a), this.beginDts = 0, this.endDts = 0, this.beginPts = 0, this.endPts = 0, this.originalBeginDts = 0, this.originalEndDts = 0, this.syncPoints = [], this.firstSample = null, this.lastSample = null
+        }
+
+        t.IDRSampleList = ((0, i.default)(o, [{
+            key: "clear", value: function () {
+                this._list = []
+            }
+        }, {
+            key: "appendArray", value: function (e) {
+                var t = this._list;
+                0 !== e.length && (0 < t.length && e[0].originalDts < t[t.length - 1].originalDts && this.clear(), Array.prototype.push.apply(t, e))
+            }
+        }, {
+            key: "getLastSyncPointBeforeDts", value: function (e) {
+                if (0 == this._list.length) return null;
+                var t, n = this._list, i = 0, r = n.length - 1, a = 0, s = r;
+                for (e < n[0].dts && (i = 0, a = s + 1); a <= s;) {
+                    if ((t = a + Math.floor((s - a) / 2)) === r || e >= n[t].dts && e < n[t + 1].dts) {
+                        i = t;
+                        break
+                    }
+                    n[t].dts < e ? a = t + 1 : s = t - 1
+                }
+                return this._list[i]
+            }
+        }]), o);
+
+        function o() {
+            (0, s.default)(this, o), this._list = []
+        }
+
+        t.MediaSegmentInfoList = ((0, i.default)(u, [{
+            key: "isEmpty", value: function () {
+                return 0 === this._list.length
+            }
+        }, {
+            key: "clear", value: function () {
+                this._list = [], this._lastAppendLocation = -1
+            }
+        }, {
+            key: "_searchNearestSegmentBefore", value: function (e) {
+                var t = this._list;
+                if (0 === t.length) return -2;
+                var n, i = t.length - 1, r = 0, a = i, s = 0;
+                if (e < t[0].originalBeginDts) return s = -1;
+                for (; r <= a;) {
+                    if ((n = r + Math.floor((a - r) / 2)) === i || e > t[n].lastSample.originalDts && e < t[n + 1].originalBeginDts) {
+                        s = n;
+                        break
+                    }
+                    t[n].originalBeginDts < e ? r = n + 1 : a = n - 1
+                }
+                return s
+            }
+        }, {
+            key: "_searchNearestSegmentAfter", value: function (e) {
+                return this._searchNearestSegmentBefore(e) + 1
+            }
+        }, {
+            key: "append", value: function (e) {
+                var t = this._list, n = this._lastAppendLocation, i = 0;
+                -1 !== n && n < t.length && e.originalBeginDts >= t[n].lastSample.originalDts && (n === t.length - 1 || n < t.length - 1 && e.originalBeginDts < t[n + 1].originalBeginDts) ? i = n + 1 : 0 < t.length && (i = this._searchNearestSegmentBefore(e.originalBeginDts) + 1), this._lastAppendLocation = i, this._list.splice(i, 0, e)
+            }
+        }, {
+            key: "getLastSegmentBefore", value: function (e) {
+                e = this._searchNearestSegmentBefore(e);
+                return 0 <= e ? this._list[e] : null
+            }
+        }, {
+            key: "getLastSampleBefore", value: function (e) {
+                e = this.getLastSegmentBefore(e);
+                return null != e ? e.lastSample : null
+            }
+        }, {
+            key: "getLastSyncPointBefore", value: function (e) {
+                for (var t = this._searchNearestSegmentBefore(e), n = this._list[t].syncPoints; 0 === n.length && 0 < t;) n = this._list[--t].syncPoints;
+                return 0 < n.length ? n[n.length - 1] : null
+            }
+        }, {
+            key: "type", get: function () {
+                return this._type
+            }
+        }, {
+            key: "length", get: function () {
+                return this._list.length
+            }
+        }]), u);
+
+        function u(e) {
+            (0, s.default)(this, u), this._type = e, this._list = [], this._lastAppendLocation = -1
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        r(n(4));
+        var o = r(n(64)), i = r(n(227)), u = r(n(229)), d = r(n(40));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        t.default = function (r) {
+            var a = null, s = function (e, t) {
+                r.postMessage({msg: "logcat_callback", data: {type: e, logcat: t}})
+            }.bind(this);
+            i.default.install(), r.addEventListener("message", function (e) {
+                switch (e.data.cmd) {
+                    case"init":
+                        (a = new u.default(e.data.param[0], e.data.param[1])).on(d.default.IO_ERROR, function (e, t) {
+                            r.postMessage({msg: d.default.IO_ERROR, data: {type: e, info: t}})
+                        }.bind(this)), a.on(d.default.DEMUX_ERROR, function (e, t) {
+                            r.postMessage({msg: d.default.DEMUX_ERROR, data: {type: e, info: t}})
+                        }.bind(this)), a.on(d.default.INIT_SEGMENT, function (e, t) {
+                            e = {msg: d.default.INIT_SEGMENT, data: {type: e, data: t}};
+                            r.postMessage(e, [t.data])
+                        }.bind(this)), a.on(d.default.MEDIA_SEGMENT, function (e, t) {
+                            e = {msg: d.default.MEDIA_SEGMENT, data: {type: e, data: t}};
+                            r.postMessage(e, [t.data])
+                        }.bind(this)), a.on(d.default.LOADING_COMPLETE, function () {
+                            var e = {msg: d.default.LOADING_COMPLETE};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.RECOVERED_EARLY_EOF, function () {
+                            var e = {msg: d.default.RECOVERED_EARLY_EOF};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.MEDIA_INFO, function (e) {
+                            e = {msg: d.default.MEDIA_INFO, data: e};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.METADATA_ARRIVED, function (e) {
+                            e = {msg: d.default.METADATA_ARRIVED, data: e};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.SCRIPTDATA_ARRIVED, function (e) {
+                            e = {msg: d.default.SCRIPTDATA_ARRIVED, data: e};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.STATISTICS_INFO, function (e) {
+                            e = {msg: d.default.STATISTICS_INFO, data: e};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.RECOMMEND_SEEKPOINT, function (e) {
+                            r.postMessage({msg: d.default.RECOMMEND_SEEKPOINT, data: e})
+                        }.bind(this)), a.on(d.default.VIDEO_RESOLUTION_CHANGED, function (e) {
+                            e = {msg: d.default.VIDEO_RESOLUTION_CHANGED, data: e};
+                            r.postMessage(e)
+                        }.bind(this)), a.on(d.default.PARSEDDATA_ARRIVED, function (e, t) {
+                            e = {msg: d.default.PARSEDDATA_ARRIVED, data: {databuf: e, dataType: t}};
+                            r.postMessage(e)
+                        }.bind(this));
+                        break;
+                    case"destroy":
+                        a && (a.destroy(), a = null), r.postMessage({msg: "destroyed"});
+                        break;
+                    case"start":
+                        a.start();
+                        break;
+                    case"stop":
+                        a.stop();
+                        break;
+                    case"seek":
+                        a.seek(e.data.param);
+                        break;
+                    case"pause":
+                        a.pause();
+                        break;
+                    case"resume":
+                        a.resume();
+                        break;
+                    case"logging_config":
+                        var t = e.data.param;
+                        o.default.applyConfig(t), !0 === t.enableCallback ? o.default.addLogListener(s) : o.default.removeLogListener(s);
+                        break;
+                    case"feed":
+                        var t = e.data.feedData, n = t.data, i = t.byteStart, t = t.receivedLength;
+                        a._ioctl._onLoaderChunkArrival(n, i, t);
+                        break;
+                    case"set_record_flag":
+                        a._demuxer.recordFlag = e.data.value
+                }
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        t.default = {
+            ERROR: "error",
+            SOURCE_OPEN: "source_open",
+            UPDATE_END: "update_end",
+            BUFFER_FULL: "buffer_full",
+            SOURCE_END: "source_end",
+            SOURCE_CLOSE: "source_close"
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = o(n(1)), r = o(n(2)), a = o(n(10)), s = function (e) {
+            {
+                if (e && e.__esModule) return e;
+                var t = {};
+                if (null != e) for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
+                return t.default = e, t
+            }
+        }(n(61));
+
+        function o(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var u = "stashbuffer_changed", d = "fileWrite_end",
+            n = (window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem, (0, r.default)(l, [{
+                key: "write",
+                value: function (e) {
+                    this._stash(e)
+                }
+            }, {
+                key: "download", value: function () {
+                    this._fileEntry && this._fileWriter && (1 === this._fileWriter.readyState ? this._emitter.once(d, this.download.apply(this)) : this._fileEntry.file(function (e) {
+                        this._downloadFile(e)
+                    }.bind(this)))
+                }
+            }, {
+                key: "_quota", value: function () {
+                    window.webkitStorageInfo.requestQuota(window.TEMPORARY, this._storageQuota, this._quotaSuccess.bind(this), this._errorHandlerQuta)
+                }
+            }, {
+                key: "_errorHandlerQuota", value: function (e) {
+                    console.error(s.ERR_PLAY_FILESYS_QUOTA, e)
+                }
+            }, {
+                key: "_quotaSuccess", value: function (e) {
+                    window.requestFileSystem(window.TEMPORARY, e, this._initFs.bind(this), this._errorHandlerRequestFileSystem)
+                }
+            }, {
+                key: "_errorHandlerRequestFileSystem", value: function (e) {
+                    console.error(s.ERR_PLAY_FILESYS_REQUEST, e)
+                }
+            }, {
+                key: "_initFs", value: function (e) {
+                    this._fileSystem = e, this._fileSystem.root.getFile(this._fileName, {
+                        create: !0,
+                        exclusive: !0
+                    }, this._getFileSuccess.bind(this), this._errorHandlerGetFile)
+                }
+            }, {
+                key: "_errorHandlerGetFile", value: function (e) {
+                    console.error(s.ERR_PLAY_FILESYS_GETFILE, e)
+                }
+            }, {
+                key: "_getFileSuccess", value: function (e) {
+                    e.isFile && (e.createWriter(this._initFileWriter.bind(this), this._errorHandlerCreateWriter), this._fileEntry = e)
+                }
+            }, {
+                key: "_errorHandlerCreateWriter", value: function (e) {
+                    console.error(s.ERR_PLAY_FILESYS_CREATE, e)
+                }
+            }, {
+                key: "_initFileWriter", value: function (e) {
+                    e.onwriteend = this._fileWriteEnd.bind(this), e.onerror = this._fileWriteError.bind(this), this._fileWriter = e, this._isStart = !0, this._emitter.on(u, this._stashBufferChanged.bind(this))
+                }
+            }, {
+                key: "_stashBufferChanged", value: function () {
+                    var e;
+                    (0 === this._fileWriter.readyState || 2 === this._fileWriter.readyState) && 0 < this._stashUsed && (this._fileWriter.seek(this._fileWriter.length), e = this._stashBuffer.slice(0, this._stashUsed), this._fileWriter.write(new Blob([e])), this._bufferSize = this._defaultBufferSize, this._stashBuffer = new Uint8Array(this._bufferSize), this._stashUsed = 0)
+                }
+            }, {
+                key: "_fileWriteEnd", value: function (e) {
+                    this._emitter.listeners(d) && this._emitter.emit(d)
+                }
+            }, {
+                key: "_fileWriteError", value: function (e) {
+                    console.error(s.ERR_PLAY_FILESYS_WRITE, e)
+                }
+            }, {
+                key: "_errorHandler", value: function (e) {
+                    console.error(e)
+                }
+            }, {
+                key: "_stash", value: function (e) {
+                    this._stashUsed + e.byteLength > this._bufferSize && this._expandBuffer(this._stashUsed + e.byteLength), this._stashBuffer.set(new Uint8Array(e), this._stashUsed), this._stashUsed += e.byteLength, this._emitter.listeners(u) && this._emitter.emit(u)
+                }
+            }, {
+                key: "_expandBuffer", value: function (e) {
+                    this._bufferSize = e;
+                    e = this._stashBuffer.slice(0, this._stashUsed);
+                    this._stashBuffer = new Uint8Array(this._bufferSize), this._stashBuffer.set(e, 0)
+                }
+            }, {
+                key: "_downloadFile", value: function (e) {
+                    var t = e,
+                        e = (e instanceof Blob || e instanceof File || (t = new Blob([e])), window.URL.createObjectURL(t)),
+                        t = window.document.createElement("a"),
+                        e = (t.href = e, t.download = this._fileName, document.createEvent("MouseEvents"));
+                    e.initEvent("click", !0, !0), t.dispatchEvent(e)
+                }
+            }, {
+                key: "onReady", set: function (e) {
+                    this._fileWriterReady = e
+                }
+            }]), l);
+
+        function l(e, t) {
+            (0, i.default)(this, l), this._fileName = e, this._storageQuota = 268435456, this._fileSystem = null, this._fileEntry = null, this._fileWriter = null, this._isStart = !1, this._emitter = new a.default, this._defaultBufferSize = 134217728, this._bufferSize = this._defaultBufferSize, this._stashBuffer = new Uint8Array(this._bufferSize), this._stashUsed = 0, this._stash(t), this._quota()
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.ErrorDetails = t.ErrorTypes = void 0;
+        var i = n(15), n = n(66), n = (n = n) && n.__esModule ? n : {default: n};
+        t.ErrorTypes = {
+            NETWORK_ERROR: "NetworkError",
+            MEDIA_ERROR: "MediaError",
+            OTHER_ERROR: "OtherError"
+        }, t.ErrorDetails = {
+            NETWORK_EXCEPTION: i.LoaderErrors.EXCEPTION,
+            NETWORK_STATUS_CODE_INVALID: i.LoaderErrors.HTTP_STATUS_CODE_INVALID,
+            NETWORK_TIMEOUT: i.LoaderErrors.CONNECTING_TIMEOUT,
+            NETWORK_UNRECOVERABLE_EARLY_EOF: i.LoaderErrors.UNRECOVERABLE_EARLY_EOF,
+            MEDIA_MSE_ERROR: "MediaMSEError",
+            MEDIA_FORMAT_ERROR: n.default.FORMAT_ERROR,
+            MEDIA_FORMAT_UNSUPPORTED: n.default.FORMAT_UNSUPPORTED,
+            MEDIA_CODEC_UNSUPPORTED: n.default.CODEC_UNSUPPORTED
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.JSPlugin = void 0;
+        var m = r(n(11)), p = r(n(85)), y = r(n(53)), v = r(n(54)), a = r(n(1)), i = r(n(2)), g = r(n(55)), f = n(86),
+            s = n(262), u = n(285), d = n(286), o = n(287), l = n(288), h = n(289), c = r(n(290)), _ = r(n(0)),
+            M = r(n(10)), L = function (e) {
+                {
+                    if (e && e.__esModule) return e;
+                    var t = {};
+                    if (null != e) for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
+                    return t.default = e, t
+                }
+            }(n(61)), S = r(n(334)), k = r(n(91)), b = r(n(39)), w = n(335);
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var D, T, E = 4194304, Y = !1, P = null, C = [], n = (window.JSPlayM4_AdditionDataCBFun = function (t, e) {
+            var n, i, r, a, s = C.find(function (e) {
+                return e.port === t
+            }).belongWindowpoint, o = C.find(function (e) {
+                return e.port === t
+            }).belongWindowId, s = s.aWndList[o];
+            s && s.AdditionDataCB && (o = P.HEAP32[e >> 2], n = P.HEAP32[e + 4 >> 2], i = P.HEAP32[e + 8 >> 2], r = P.HEAP32[e + 12 >> 2], e = P.HEAP32[e + 16 >> 2], (a = new Uint8Array(r)).set(P.HEAPU8.subarray(e, e + r)), s.AdditionDataCB(o, n, i, a))
+        }, (0, i.default)(R, [{
+            key: "_getOSDTime", value: function (e, t, n, i, r, a, s) {
+                var o = void 0,
+                    o = "ios" === this._browserInfo._system || f.oTool.isEdge() ? t + "/" + n + "/" + i + " " + r + ":" + a + ":" + s : t + "-" + n + "-" + i + " " + r + ":" + a + ":" + s;
+                this.aWndList[e].iCurentOSDTime = new Date(o).getTime()
+            }
+        }, {
+            key: "_getWndIndexFromPort", value: function (e) {
+                for (var t = this.aWndList.length, n = -1, i = 0; i < t; i++) if (this.aWndList[i].oPlayCtrl && e === this.aWndList[i].oPlayCtrl.iPort) {
+                    n = i;
+                    break
+                }
+                return n
+            }
+        }, {
+            key: "_listenBrowserVisibility", value: function () {
+                document.addEventListener("visibilitychange", this.e.visibilitychange)
+            }
+        }, {
+            key: "_createWindows", value: function () {
+                for (var i = this, e = document.getElementById(this.options.szId), t = e.clientWidth, n = e.clientHeight, t = (t && n || ((0, g.default)(e).width(this.options.iWidth), (0, g.default)(e).height(this.options.iHeight)), 25e4 < t * n && (this.bcloseAntialias = !0), this.options.oStyle), r = t.borderWidth, a = t.border, s = t.borderSelect, o = t.background, u = this.options.iCurrentSplit, d = (e.innerHTML = "", document.createElement("div")), n = (d.className = "parent-wnd", d.style = "width: 100%; height: 100%; position: relative; overflow: hidden;", e.appendChild(d), d.clientWidth), t = d.clientHeight, l = Math.floor((n - 1) / u), h = Math.floor((t - 1) / u), c = l - 2 * r, _ = h - 2 * r, f = 0; f < this.iMaxWndNum; f++) !function (e) {
+                    var t = document.createElement("div"),
+                        n = (t.className = "sub-wnd", t.id = "player-container-" + e, {
+                            "box-sizing": "border-box",
+                            overflow: "hidden",
+                            width: l + "px",
+                            height: h + "px",
+                            border: r + "px solid " + (0 === e ? s : a),
+                            "background-color": o,
+                            position: "relative",
+                            float: "left",
+                            display: e < Math.pow(u, 2) ? "inline-block" : "none"
+                        });
+                    (0, p.default)(n).forEach(function (e) {
+                        t.style.setProperty(e, n[e])
+                    }), t.innerHTML = '\n                <video autoplay muted id="' + i.options.szId + "_playVideo" + e + '" class="play-window" wid="' + e + '" \n                    width="' + c + '" height="' + _ + '" style="object-fit: fill;">\n                </video>\n                <canvas id="' + i.options.szId + "_playCanvas" + e + '" class="play-window" wid="' + e + '" \n                    width="' + (i.bcloseAntialias && 1 === u ? c : 2 * c) + '" height="' + (i.bcloseAntialias && 1 === u ? _ : 2 * _) + '"\n                    style="' + (i.bcloseAntialias && 1 === u ? "transform-origin: 0 0;" : "transform: scale(0.5); transform-origin: 0 0;") + '">\n                </canvas>\n                <canvas id="' + i.options.szId + "_canvas_draw" + e + '" class="draw-window" wid="' + e + '" \n                    width="' + c + '" height="' + _ + '" style="position: absolute; top: 0; left: 0;">\n                </canvas>\n            ', d.appendChild(t)
+                }(f);
+                this.oJSPlugin.find("video.play-window").hide()
+            }
+        }, {
+            key: "_updateWnd", value: function () {
+                for (var e = this.oJSPlugin.find(".parent-wnd").get(0), t = e.clientWidth, n = e.clientHeight, i = (t && n && (this.options.iWidth = t, this.options.iHeight = n), this.options.oStyle.borderWidth), r = this.options.iCurrentSplit, a = Math.floor((t - 1) / r) - 2 * i, s = Math.floor((n - 1) / r) - 2 * i, o = 0; o < this.iMaxWndNum; o++) {
+                    var u = (0, g.default)(e).find(".sub-wnd").get(o),
+                        d = ((0, g.default)(u).width(a).height(s).css("display", o < Math.pow(r, 2) ? "inline-block" : "none").css("border", "1px solid " + this.options.oStyle.border), o === this.currentWindowIndex && (0, g.default)(u).css("border", "1px solid " + this.options.oStyle.borderSelect), (0, g.default)(u).find("video.play-window").attr("width", a).attr("height", s), this.bcloseAntialias && 1 === r ? a : 2 * a),
+                        l = this.bcloseAntialias && 1 === r ? s : 2 * s,
+                        h = this.bcloseAntialias && 1 === r ? "scale(1)" : "scale(0.5)",
+                        h = ((0, g.default)(u).find("canvas.play-window").attr("width", d).attr("height", l).css("transform", h), this.aWndList[o]);
+                    h.bPlay && 0 === h.iMode && h.oPlayCtrl && h.oPlayCtrl.PlayM4_SetCanvasSize && h.oPlayCtrl.PlayM4_SetCanvasSize(d, l), (0, g.default)(u).find("canvas.draw-window").attr("width", a).attr("height", s), this.oDrawCanvas.resizeCanvas()
+                }
+            }
+        }, {
+            key: "_dealWndSelect", value: function (t) {
+                var n = this;
+                this.iCurrentWndIndex = t, (this.aWndList[t].bEZoom || this.aWndList[t].b3DZoom) && (this.oJSPlugin.find(".draw-window").unbind(), this.oDrawCanvas.setDrawStatus(!1), this.oDrawCanvas = null, this.oDrawCanvas = new h.ESCanvas(this.options.szId + "_canvas_draw" + t), this.oDrawCanvas.setShapeType("Rect"), this.oDrawCanvas.setDrawStyle("#ff0000", "", 0), this.aWndList[t].bEZoom ? this.oDrawCanvas.setDrawStatus(!0, function (e) {
+                    e.startPos && e.endPos && (e.startPos[0] > e.endPos[0] ? n.aWndList[t].oPlayCtrl.PlayM4_SetDisplayRegion && n.aWndList[t].oPlayCtrl.PlayM4_SetDisplayRegion(null, !1) : n.aWndList[t].oPlayCtrl.PlayM4_SetDisplayRegion && n.aWndList[t].oPlayCtrl.PlayM4_SetDisplayRegion({
+                        left: e.startPos[0],
+                        top: e.startPos[1],
+                        right: e.endPos[0],
+                        bottom: e.endPos[1]
+                    }, !0))
+                }) : this.aWndList[t].b3DZoom && this.oDrawCanvas.setDrawStatus(!0, function (e) {
+                    n.fDrawCallback(e)
+                }))
+            }
+        }, {
+            key: "_initCallbackEvent", value: function () {
+                this.oEventCallback = {
+                    loadEventHandler: function () {
+                        window.loadEventHandler && window.loadEventHandler()
+                    }, windowEventSelect: function (e) {
+                        window.getSelectWndInfo && window.getSelectWndInfo(e)
+                    }, pluginErrorHandler: function (e, t, n) {
+                        window.pluginEventHandler && window.pluginEventHandler(e, t, n)
+                    }, windowEventOver: function (e) {
+                        window.windowEventOver && window.windowEventOver(e)
+                    }, windowEventOut: function (e) {
+                        window.windowEventOut && window.windowEventOut(e)
+                    }, windowEventUp: function (e) {
+                        window.windowEventUp && window.windowEventUp(e)
+                    }, windowFullCcreenChange: function (e) {
+                        window.windowFullCcreenChange && window.windowFullCcreenChange(e)
+                    }, firstFrameDisplay: function (e, t, n) {
+                        window.firstFrameDisplay && window.firstFrameDisplay(e, t, n)
+                    }, performanceLack: function () {
+                        window.performanceLack && window.performanceLack()
+                    }, StreamEnd: function (e) {
+                        window.StreamEnd && window.StreamEnd(e)
+                    }, mouseEvent: function () {
+                    }
+                }
+            }
+        }, {
+            key: "_initEvent", value: function () {
+                var a = this;
+                this._initCallbackEvent(), this.oJSPlugin.find(".parent-wnd").eq(0).children().each(function (i) {
+                    var r = !1;
+                    (0, g.default)(this).unbind().bind("click", function (e) {
+                        var t, n;
+                        0 === e.button && (t = (e = a.options.oStyle).borderWidth, n = e.border, e = e.borderSelect, a.oJSPlugin.find(".parent-wnd").eq(0).children().css("border", t + "px solid " + n), a.oJSPlugin.find(".parent-wnd").eq(0).children().eq(i).css("border", t + "px solid " + e), a.oEventCallback.windowEventSelect(parseInt(a.oJSPlugin.find(".parent-wnd").eq(0).children().eq(i).find(".play-window").eq(0).attr("wid"), 10)), a._dealWndSelect(parseInt(a.oJSPlugin.find(".parent-wnd").eq(0).children().eq(i).find(".play-window").eq(0).attr("wid"), 10)))
+                    }), (0, g.default)(this).bind("mouseover", function (e) {
+                        a.oEventCallback.windowEventOver(i)
+                    }), (0, g.default)(this).bind("mouseout", function (e) {
+                        a.oEventCallback.windowEventOut(i)
+                    }), (0, g.default)(this).bind("mousemove", function (e) {
+                        var t = e.offsetX / a.oDrawCanvas.m_iCanvasWidth, e = e.offsetY / a.oDrawCanvas.m_iCanvasHeight;
+                        r ? a.oEventCallback.mouseEvent(7, t, e) : a.oEventCallback.mouseEvent(6, t, e)
+                    }), (0, g.default)(this).bind("mousewheel", function (e) {
+                        var t = e.offsetX / a.oDrawCanvas.m_iCanvasWidth, e = e.offsetY / a.oDrawCanvas.m_iCanvasHeight;
+                        a.oEventCallback.mouseEvent(8, t, e)
+                    }), (0, g.default)(this).bind("mouseup", function (e) {
+                        r = !1, a.oEventCallback.windowEventUp(i);
+                        var t = e.offsetX / a.oDrawCanvas.m_iCanvasWidth, n = e.offsetY / a.oDrawCanvas.m_iCanvasHeight;
+                        2 === e.button ? a.oEventCallback.mouseEvent(5, t, n) : 0 === e.button && a.oEventCallback.mouseEvent(3, t, n)
+                    }), (0, g.default)(this).bind("dblclick", function (e) {
+                        var t;
+                        a.options.bSupporDoubleClickFull && ("desktop" === a._browserInfo.platform ? a.JS_FullScreenSingle(i) : a.fullscreenElement ? a._triggerFullscreen(a.fullscreenElement) : a.JS_FullScreenSingle(a.currentWindowIndex), t = e.offsetX / a.oDrawCanvas.m_iCanvasWidth, e = e.offsetX / a.oDrawCanvas.m_iCanvasHeight, a.oEventCallback.mouseEvent(2, t, e))
+                    })
+                }), window.addEventListener("resize", this.e.resize), document.addEventListener("fullscreenchange", this.e.fullscreenchange)
+            }
+        }, {
+            key: "_eventHandlerResize", value: function () {
+                if (!(document.fullscreen || document.webkitIsFullScreen || document.mozFullScreen || !1) && this.fullscreenElement) {
+                    var e = this.fullscreenElement;
+                    if (!(document.fullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled || e.webkitSupportsFullscreen || !1)) return this._triggerFullscreen(e);
+                    this.fullscreenElement = null, this.oEventCallback.windowFullCcreenChange(!1)
+                }
+                this.JS_Resize()
+            }
+        }, {
+            key: "_eventHandlerFullscreenchange", value: function () {
+                if (!(document.fullscreen || document.webkitIsFullScreen || document.mozFullScreen || !1) && this.fullscreenElement) {
+                    var e = this.fullscreenElement;
+                    if (!(document.fullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled || e.webkitSupportsFullscreen || !1)) return this._triggerFullscreen(e);
+                    this.fullscreenElement = null, this.oEventCallback.windowFullCcreenChange(!1)
+                }
+                this.JS_Resize()
+            }
+        }, {
+            key: "_eventHandlerVisibilitychange", value: function () {
+                this.isBrowserVisible = !document.hidden
+            }
+        }, {
+            key: "removeAllListeners", value: function () {
+                window.removeEventListener("resize", this.e.resize), document.removeEventListener("fullscreenchange", this.e.fullscreenchange), document.removeEventListener("visibilitychange", this.e.visibilitychange)
+            }
+        }, {
+            key: "_debounse", value: function (e, t) {
+                var n = this;
+                this._debounseTimer && clearTimeout(this._debounseTimer), this._debounseTimer = setTimeout(function () {
+                    e.apply(n), clearTimeout(n._debounseTimer), n._debounseTimer = null
+                }, t)
+            }
+        }, {
+            key: "_initPlayCtrlOnlyAudio", value: function (e, t) {
+                t = new Uint8Array(t);
+                t[10] = 0, t[11] = 0, this.aWndList[e].oPlayCtrl.PlayM4_OpenStream(t, 40, 2097152), "" !== this.aWndList[e].szSecretKey && (this.aWndList[e].oPlayCtrl.PlayM4_SetSecretKey(1, this.aWndList[e].szSecretKey, 128), this.aWndList[e].szSecretKey = ""), this.aWndList[e].oPlayCtrl.PlayM4_SetStreamOpenMode(0), this.aWndList[e].oPlayCtrl.PlayM4_Play(null)
+            }
+        }, {
+            key: "flvtohikHead", value: function (e) {
+                var t = new Uint8Array(40),
+                    e = (t[0] = 73, t[1] = 77, t[2] = 75, t[3] = 72, t[4] = 3, t[5] = 1, t[6] = 0, t[7] = 0, t[8] = 10, t[9] = 0, t[10] = 0, t[11] = 1, t[12] = 1, t[13] = 32, t[14] = 1, t[15] = 12, this.aWndList[e]._videoInfo.audioSampleRate.toString(16));
+                return t[16] = parseInt(e[2] + e[3], 16), t[17] = parseInt(e[0] + e[1], 16), t
+            }
+        }, {
+            key: "_changeHVAGHead", value: function (e) {
+                var t = new Uint8Array(40);
+                return t[0] = 73, t[1] = 77, t[2] = 75, t[3] = 72, t[4] = 3, t[5] = 1, t[6] = 0, t[7] = 0, 192 === e[8] && 0 === e[9] ? t[8] = 4 : t[8] = 2, t[9] = 0, 100 === e[24] && 97 === e[25] && 104 === e[26] && 117 === e[27] && 97 === e[28] && (t[8] = 1, t[9] = 128), 0 !== e[11] && 1 !== e[11] || 192 !== e[10] ? 2 === e[11] && 192 === e[10] ? t[10] = 3 : 3 === e[11] && 192 === e[10] ? t[10] = 5 : 4 === e[11] && 192 === e[10] ? t[10] = 4 : 5 === e[11] && 192 === e[10] ? t[10] = 2 : 6 === e[11] && 192 === e[10] ? t[10] = 6 : t[10] = 1 : t[10] = 1, t[11] = 0, 1 === e[13] && 192 === e[12] ? (t[12] = 16, t[13] = 113) : 2 === e[13] && 192 === e[12] ? (t[12] = 17, t[13] = 113) : 3 === e[13] && 192 === e[12] ? (t[12] = 33, t[13] = 114) : 4 === e[13] && 192 === e[12] ? (t[12] = 96, t[13] = 114) : 5 === e[13] && 192 === e[12] ? (t[12] = 1, t[13] = 32) : 6 === e[13] && 192 === e[12] ? (t[12] = 0, t[13] = 32) : 7 === e[13] && 192 === e[12] ? (t[12] = 0, t[13] = 112) : (t[12] = 16, t[13] = 113), t
+            }
+        }, {
+            key: "_parseHead", value: function (e, t) {
+                1 === t[8] && 0 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "HIK" : 2 === t[8] && 0 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "PS" : 4 === t[8] && 0 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "RTP" : 8 === t[8] && 0 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "GB" : 16 === t[8] && 0 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "RAW" : 1 === t[8] && 128 === t[9] ? this.aWndList[e]._videoInfo.systemFormt = "DAHUA" : this.aWndList[e]._videoInfo.systemFormt = "unkonw", 1 === t[11] && 0 === t[10] || 0 === t[11] && 1 === t[10] ? (this.aWndList[e]._videoInfo.VideType = "H264", 129 === t[24] && (this.aWndList[e]._videoInfo.VideType = "Smart264")) : 0 === t[11] && 5 === t[10] ? (this.aWndList[e]._videoInfo.VideType = "H265", 129 === t[24] && (this.aWndList[e]._videoInfo.VideType = "Smart265")) : 0 === t[11] && 6 === t[10] ? this.aWndList[e]._videoInfo.VideType = "SAC" : 0 === t[11] && 2 === t[10] ? this.aWndList[e]._videoInfo.VideType = "MPEG2" : 0 === t[11] && 3 === t[10] ? this.aWndList[e]._videoInfo.VideType = "MPEG4" : this.aWndList[e]._videoInfo.VideType = "unkonw", 113 === t[13] && 16 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G711_U" : 113 === t[13] && 17 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G711_A" : 114 === t[13] && 33 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G7221" : 114 === t[13] && 96 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G726_32" : 114 === t[13] && 98 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G726_16" : 114 === t[13] && 144 === t[12] ? this.aWndList[e]._videoInfo.audioType = "G729" : 32 === t[13] && 1 === t[12] ? this.aWndList[e]._videoInfo.audioType = "AAC" : 16 === t[13] && 0 === t[12] ? this.aWndList[e]._videoInfo.audioType = "ADPCM" : 32 === t[13] && 0 === t[12] ? this.aWndList[e]._videoInfo.audioType = "MP2L2" : 0 === t[13] && 0 === t[12] ? this.aWndList[e]._videoInfo.audioType = "without" : this.aWndList[e]._videoInfo.audioType = "unknow"
+            }
+        }, {
+            key: "_stripRtpHead", value: function (e) {
+                var e = new Uint8Array(e), t = 32 & e[0], n = 16 & e[0], i = 15 & e[0], r = 0, a = 0;
+                return 32 == t && (r = e[e.byteLength - 1]), t = 4 * parseInt(i, 10), 16 == n && (a = 4 * new window.DataView(e.buffer, 12 + t, 4).getUint16(2) + 4), e.length <= 12 + t + a ? -1 : e.slice(12 + t + a, e.length - r)
+            }
+        }, {
+            key: "_openStream", value: function (i, a, s, o, u) {
+                var d = this, l = this.aWndList[s];
+                return new m.default(function (t, r) {
+                    var n, e = o && u;
+                    l.szPlayType = e ? "playback" : "realplay", 3 === a.PlayBackMode && e && (l.szPlayType = "reverse"), l._emiter.on("firstframeload", function () {
+                        l.asyncLock = !1, t()
+                    }, {once: !0}), d.oStreamClient.openStream(i, a, (n = (0, v.default)(y.default.mark(function e(t) {
+                        var n, i;
+                        return y.default.wrap(function (e) {
+                            for (; ;) switch (e.prev = e.next) {
+                                case 0:
+                                    if (!t.bHead) {
+                                        e.next = 49;
+                                        break
+                                    }
+                                    if (l.oSdpInfo = t, n = l.aHead = new Uint8Array(t.buf), d._log.I("headData arrive", n), l.isGB = 0 === n[7] && 196 === n[8] && 100 === n[24] && 98 === n[25] && 51 === n[26] && 51 === n[27], 72 === n[0] && 86 === n[1] && 65 === n[2] && 71 === n[3] ? (l.isHVAGHead = !0, l.aHVAGHead = new Uint8Array(t.buf), l.aHead = d._changeHVAGHead(t.buf)) : l.isHVAGHead = !1, l.isHVAGHead && 1 === l.aHead[8] && 128 === l.aHead[9] && "1" === d._decoderVersion) return d._log.E(L.ERR_STREAM_VIDEO_CODING + ":  jsdecoder1.0 unsupport dahua video"), l.asyncLock = !1, d._closeStreamAndDestory(s), d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_VIDEO_CODING), e.abrupt("return", r(L.ERR_STREAM_VIDEO_CODING));
+                                    e.next = 12;
+                                    break;
+                                case 12:
+                                    if (!(70 === n[0] && 76 === n[1] && 86 === n[2])) {
+                                        e.next = 19;
+                                        break
+                                    }
+                                    l.iMode = 1, l.isFlv = !0, d._createFlvPlayer(s), e.next = 47;
+                                    break;
+                                case 19:
+                                    if (!(5 === l.aHead[10] && 0 === l.aHead[11] || 1 === l.aHead[10] && 0 === l.aHead[11] || 0 === l.aHead[10] && 1 === l.aHead[11])) {
+                                        e.next = 22;
+                                        break
+                                    }
+                                    e.next = 24;
+                                    break;
+                                case 22:
+                                    return d._log.E(L.ERR_STREAM_JSDECODER_CODEC_UNSUPPORTED + ":  the stream not h264 h265 smart,unsupport .", l.aHead[10], l.aHead[11]), e.abrupt("return", r(L.ERR_STREAM_JSDECODER_CODEC_UNSUPPORTED));
+                                case 24:
+                                    if (d._parseHead(s, l.aHead), d.aWndList[s]._bpsCalculator || (d.aWndList[s]._bpsCalculator = window.setInterval(d._calculateRealtimeBitrate.bind(d), 1e3, s)), i = 1, d.aWndList[s].asyncLock && "2" === d._decoderVersion) return d._log.E(L.ERR_STREAM_LOCK_ERROR + ":  Multiple call js_play API in a short time, please wait lasttime call over."), e.abrupt("return", r(L.ERR_STREAM_LOCK_ERROR));
+                                    e.next = 30;
+                                    break;
+                                case 30:
+                                    if (d.aWndList[s].asyncLock = !0, l.oPlayCtrl) {
+                                        e.next = 45;
+                                        break
+                                    }
+                                    if (P || "2" !== d._decoderVersion) {
+                                        e.next = 42;
+                                        break
+                                    }
+                                    return e.prev = 33, e.next = 36, d._decoder2Loaded();
+                                case 36:
+                                    i = e.sent, e.next = 42;
+                                    break;
+                                case 39:
+                                    e.prev = 39, e.t0 = e.catch(33), 1 === e.t0 || P || (l.asyncLock = !1, d.oEventCallback.pluginErrorHandler(s, L.ERR_COM_LOAD_JSDECODER_ERROR), d._closeStreamAndDestory(s), d._log.E(L.ERR_COM_LOAD_JSDECODER_ERROR + ":  load jsdecoder faild."), r(L.ERR_COM_LOAD_JSDECODER_ERROR));
+                                case 42:
+                                    d._createPlayCtrl(s), e.next = 47;
+                                    break;
+                                case 45:
+                                    1 !== (i = d._playCtrlLoad(s)) && (l.asyncLock = !1, d._closeStreamAndDestory(s), d.oEventCallback.pluginErrorHandler(s, i), d._log.E(i + ":  jsdecoder open stream faild."), r(i));
+                                case 47:
+                                    e.next = 50;
+                                    break;
+                                case 49:
+                                    t.cmd && "end" === t.cmd ? (d.oEventCallback.StreamEnd(s), l.asyncLock = !1, d.JS_Stop(s)) : "1" !== d._decoderVersion && !l.bPlay || d._feedData(s, t);
+                                case 50:
+                                case"end":
+                                    return e.stop()
+                            }
+                        }, e, d, [[33, 39]])
+                    })), function (e) {
+                        return n.apply(this, arguments)
+                    }), function (e) {
+
+
+                        if (l.asyncLock = !1, d.aWndList[s].bPlay) 1e3 === e.code || 1005 === e.code ? (d._log.E(L.ERR_STREAM_CONNECT_CLOSED + ":  送流异常，被后端关闭连接"), d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_CONNECT_CLOSED, e)) : (d._log.E(L.ERR_STREAM_INTERRUPT + ":  流中断"), d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_INTERRUPT, e)), l.szStreamUUID = "", d._closeStreamAndDestory(s); else {
+                            if (1e3 === e.code || 1005 === e.code) return t();
+                            d.aWndList[s].szStreamUUID ? (d.oEventCallback.pluginErrorHandler(s, L.ERR_COM_RECV_STREAM_TIMEOUT, e), l.szStreamUUID = "", r(L.ERR_COM_RECV_STREAM_TIMEOUT)) : 1006 === e.code && -1 !== i.search("wss://") ? (d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_WSS_ERROR, e), r(L.ERR_STREAM_WSS_ERROR)) : (d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_WS_ERROR, e), r(L.ERR_STREAM_WS_ERROR))
+                        }
+
+
+
+                    }).then(function (e) {
+                        d.aWndList[s].szStreamUUID && (d.oStreamClient.stop(d.aWndList[s].szStreamUUID), d.aWndList[s].szStreamUUID = ""), d.aWndList[s].szStreamUUID = e, d.oStreamClient.startPlay(e, o, u, l.szPlayType).then(function () {
+                        }, function (e) {
+                            l.szStreamUUID = "", l.asyncLock = !1;
+                            var t = "0x0" + e.errorCode.toString(16);
+                            l.bPlay || (d._log.E(t + ":  取流失败，详情根据错误码在运管后台进行查询."), d.oEventCallback.pluginErrorHandler(s, t, e), r(t)), r(L.ERR_STREAM_OPEN_FAILED)
+                        })
+                    }).catch(function (e) {
+                        l.asyncLock = !1, d.oEventCallback.pluginErrorHandler(s, L.ERR_STREAM_WS_TIMEOUT, e), d._closeStreamAndDestory(s), r(L.ERR_STREAM_WS_TIMEOUT)
+                    })
+                })
+            }
+        }, {
+            key: "JS_GetPluginVersion", value: function () {
+                var t = this;
+                return new m.default(function (e) {
+                    e(t.szPluginVersion)
+                })
+            }
+        }, {
+            key: "JS_SetWindowControlCallback", value: function (t) {
+                var n = this;
+                return new m.default(function (e) {
+                    n.oEventCallback = g.default.extend(n.oEventCallback, t), e()
+                })
+            }
+        }, {
+            key: "JS_SetSecretKey", value: function (n, i) {
+                var r = this;
+                return new m.default(function (e, t) {
+                    n < 0 || "" === i || void 0 === i ? t() : (r.aWndList[n].szSecretKey = i, e())
+                })
+            }
+        }, {
+            key: "JS_ArrangeWindow", value: function (i) {
+                var r = this;
+                return new m.default(function (e, t) {
+                    if (i < 1 || "number" != typeof i) return t(L.ERR_COM_PARAM);
+                    if (i < r.options.iMaxSplit ? r.options.iCurrentSplit = i : r.options.iCurrentSplit = r.options.iMaxSplit, f.oTool.isFirefox()) for (var n = 0; n < r.options.iMaxSplit * r.options.iMaxSplit; n++) r.aWndList[n].oPlayCtrl && r.aWndList[n].oPlayCtrl.PlayM4_ClearCanvas && r.aWndList[n].oPlayCtrl.PlayM4_ClearCanvas();
+                    r.iCurrentWndIndex = 0, r.oEventCallback.windowEventSelect(0), r._updateWnd(), r._dealWndSelect(0), e()
+                })
+            }
+        }, {
+            key: "JS_Play", value: function (r, a) {
+                var s = 2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : -1, o = this, u = arguments[3],
+                    d = arguments[4];
+                return (s < 0 || s > this.iMaxWndNum - 1 || "number" != typeof s) && (s = this.iCurrentWndIndex), new m.default(function (e, t) {
+                    if ("string" != typeof r || -1 === r.search("wss://") && -1 === r.search("ws://")) return t(L.ERR_COM_URL_ERROR);
+                    var n = 0, i = (a.mode && (n = a.mode), r),
+                        i = (1 !== n && o._supportInfo.MSE && (i = /\?/g.test(r) ? r + "&streamform=flv" : r + "?streamform=flv"), o.aWndList[s].bopenTraceId && (-1 !== i.search("traceId=") && 0 < i.split("traceId=").pop().split("&").shift().length ? o.aWndList[s].szTraceId = i.split("traceId=").pop().split("&").shift() : (o.aWndList[s].szTraceId = o.uuid2(16, 16), i = "" + i + (/\?/g.test(i) ? "&" : "?") + "traceId=" + o.aWndList[s].szTraceId)), r = i, a.playURL && (a.playURL = r), a.mode = "media", -1 !== i.search("wss://") && -1 !== i.search("/proxy/") && (a.proxy = i.split("/proxy/").pop().split("/").shift(), n = i.split("wss://").pop().split("/").shift(), a.playURL = i.replace("wss:", "ws:").replace(n, "").replace("/proxy/", "")), o.aWndList[s].szUrl = r, o.aWndList[s].oParams = a, o.aWndList[s].szStartTime = u || "", o.aWndList[s].szStopTime = d || "", o.aWndList[s].pointSignNumber = r.split("realplay/").pop().split("/").shift(), u);
+                    i && -1 !== i.search("Z") && (i = i.replace("Z", "+08:00")), o.aWndList[s].iGlobalBaseTime = new Date(i).getTime(), o.aWndList[s].bPlay ? o.JS_Stop(s).then(function () {
+                        o._openStream(r, a, s, u, d).then(function () {
+                            e()
+                        }, function (e) {
+                            t(e)
+                        })
+                    }) : o._openStream(r, a, s, u, d).then(function () {
+                        e()
+                    }, function (e) {
+                        t(e)
+                    })
+                })
+            }
+        }, {
+            key: "JS_Seek", value: function () {
+                var r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, a = this, s = arguments[1],
+                    o = arguments[2];
+                return new m.default(function (t, n) {
+                    if ((r < 0 || r > a.iMaxWndNum - 1 || "number" != typeof r) && (r = a.iCurrentWndIndex), "string" != typeof s || "string" != typeof o) return n(L.ERR_COM_PARAM);
+                    var e = s, i = o;
+                    if (-1 !== s.search("Z") && (e = e.replace("Z", "+08:00")), -1 !== o.search("Z") && (i = i.replace("Z", "+08:00")), e = new Date(e).getTime(), i = new Date(i).getTime(), !e || !i || i <= e || -1 === s.search("T") || -1 === s.search(":") || -1 === s.search("-") || -1 === o.search("T") || -1 === o.search(":") || -1 === o.search("-")) return n(L.ERR_COM_PARAM);
+                    i = a._checkPlayback(r);
+                    0 !== i ? n(i) : a.oStreamClient.seek(a.aWndList[r].szStreamUUID, s, o).then(function () {
+                        var e = s;
+                        e && -1 !== e.search("Z") && (e = e.replace("Z", "+08:00")), a.aWndList[r].iGlobalBaseTime = new Date(e).getTime() - a._osdtimeInfo.flvduration, !0 === a.aWndList[r].isPause && (1 === a.aWndList[r].iMode ? (e = a.oJSPlugin.find("video.play-window").eq(r)).get(0).play && e.get(0).play() : a.aWndList[r].oPlayCtrl && a.aWndList[r].oPlayCtrl.PlayM4_Pause(!1), a.aWndList[r].isPause = !1), t()
+                    }, function (e) {
+                        e = "0x0" + e.errorCode.toString(16);
+                        a._log.E(e + ":  定位失败，可能是定位传的时间异常导致，详情根据错误码在运管后台进行查询."), n(e)
+                    })
+                })
+            }
+        }, {
+            key: "JS_GetSdkVersion", value: function () {
+                return this.aWndList[0].oPlayCtrl.PlayM4_GetSdkVersion()
+            }
+        }, {
+            key: "JS_DestroyWorker", value: function () {
+                var t = this;
+                return new m.default(function (e) {
+                    t.aWndList.forEach(function (e) {
+                        e.oPlayCtrl = null
+                    }), e()
+                })
+            }
+        }, {
+            key: "JS_Stop", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (e, t) {
+                    if ((i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), n.aWndList[i].asyncLock && "2" === n._decoderVersion) return n._log.E(L.ERR_STREAM_LOCK_ERROR + ":  Multiple call js_stop API in a short time, please wait lasttime call over."), t(L.ERR_STREAM_LOCK_ERROR);
+                    n.aWndList[i]._bpsCalculator && (self.clearInterval(n.aWndList[i]._bpsCalculator), n.aWndList[i]._bpsCalculator = null, n.aWndList[i]._bpsInfo = {
+                        lastVideoBytes: 0,
+                        bps_video: 0,
+                        data_updated_time: 0,
+                        time_gap_factor: 1
+                    }), n.aWndList[i].szStorageUUID && n.JS_StopSave(i), n.aWndList[i].bEZoom && n.JS_DisableZoom(i), i === n.iCurrentSoundWnd && (n.JS_CloseSound(), n.aWndList[i].MSEVolume = .5), n._closeStreamAndDestory(i), n.aWndList[i].isPause = !1, n.aWndList[i].bFirstFrame = !1, n.aWndList[i]._emiter.removeAllListeners(), n.aWndList[i]._resetFlvplayer = !1, e()
+                })
+            }
+        }, {
+            key: "JS_Pause", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (t, n) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var e = i._checkPlayback(r);
+                    if (0 === e) return i.aWndList[r].bFrameForward ? (i._log.E(L.ERR_PLAYBACK_FRAMEFORWARD + ":  status singleFrame not support this handle."), void n(L.ERR_PLAYBACK_FRAMEFORWARD)) : !0 === i.aWndList[r].isPause ? t() : void i.oStreamClient.pause(i.aWndList[r].szStreamUUID).then(function () {
+                        var e;
+                        1 === i.aWndList[r].iMode ? (e = i.oJSPlugin.find("video.play-window").eq(r)).get(0).pause && e.get(0).pause() : i.aWndList[r].oPlayCtrl.PlayM4_Pause && i.aWndList[r].oPlayCtrl.PlayM4_Pause(!0), i.aWndList[r].isPause = !0, t()
+                    }, function (e) {
+                        n(e)
+                    });
+                    n(e)
+                })
+            }
+        }, {
+            key: "JS_Resume", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (t, n) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var e = i._checkPlay(r);
+                    return 0 !== e ? n(e) : (i.aWndList[r].bFrameForward && ("2" === i._decoderVersion ? i.aWndList[r].oPlayCtrl.PlayM4_OneByOne_Play && i.aWndList[r].oPlayCtrl.PlayM4_OneByOne_Play() : i.aWndList[r].oPlayCtrl.PlayM4_Play(i.options.szId + "_playCanvas" + r), i.aWndList[r].bFrameForward = !1), !1 === i.aWndList[r].isPause ? t() : void i.oStreamClient.resume(i.aWndList[r].szStreamUUID).then(function () {
+                        var e;
+                        1 === i.aWndList[r].iMode ? (e = i.oJSPlugin.find("video.play-window").eq(r)).get(0).play && e.get(0).play() : (1 !== i.iCurrentPlayRate && (i.aWndList[r].iRate = i.iCurrentPlayRate, i.oStreamClient.setPlayRate(i.aWndList[r].szStreamUUID, i.aWndList[r].iRate), i.aWndList[r].oPlayCtrl.PlayM4_PlayRate && i.aWndList[r].oPlayCtrl.PlayM4_PlayRate(i.aWndList[r].iRate), 1 < i.iCurrentPlayRate ? i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(1) : i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(0)), i.aWndList[r].oPlayCtrl && i.aWndList[r].oPlayCtrl.PlayM4_Pause(!1)), i.aWndList[r].isPause = !1, t()
+                    }, function (e) {
+                        n(e)
+                    }))
+                })
+            }
+        }, {
+            key: "JS_Slow", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (t, n) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var e = i._checkPlayback(r);
+                    return 0 !== e ? n(e) : i.aWndList[r].bFrameForward ? (i._log.E(L.ERR_PLAYBACK_FRAMEFORWARD + ":  status singleFrame not support this handle."), n(L.ERR_PLAYBACK_FRAMEFORWARD)) : -8 === i.aWndList[r].iRate ? (i._log.E(L.ERR_PLAYBACK_MIN_RATE + ":  current rate is the min."), void n(L.ERR_PLAYBACK_MIN_RATE)) : (i.aWndList[r].iRate < 0 && -8 < i.aWndList[r].iRate && (i.aWndList[r].iRate *= 2), 1 === i.aWndList[r].iRate && (i.aWndList[r].iRate *= -2), 1 < i.aWndList[r].iRate && (i.aWndList[r].iRate /= 2), void i.oStreamClient.setPlayRate(i.aWndList[r].szStreamUUID, i.aWndList[r].iRate).then(function () {
+                        var e;
+                        1 === i.aWndList[r].iMode ? (e = i.oJSPlugin.find("video.play-window").eq(r).get(0), i.aWndList[r].iRate < 0 ? e.playbackRate = 1 / Math.abs(i.aWndList[r].iRate) : e.playbackRate = i.aWndList[r].iRate, 1 === i.aWndList[r].iRate && i.aWndList[r].bOpenSound ? i.oJSPlugin.find("video.play-window").eq(r)[0].muted = !1 : i.oJSPlugin.find("video.play-window").eq(r)[0].muted = !0) : (i.aWndList[r].iRate <= 2 && "2" === i._decoderVersion || i.aWndList[r].iRate < 2 && "2" !== i._decoderVersion ? i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(0) : i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(1), i.aWndList[r].oPlayCtrl.PlayM4_PlayRate && i.aWndList[r].oPlayCtrl.PlayM4_PlayRate(i.aWndList[r].iRate), i.aWndList[r].oPlayCtrl.PlayM4_Slow && i.aWndList[r].oPlayCtrl.PlayM4_Slow(i.aWndList[r].iRate)), t(i.aWndList[r].iRate)
+                    }, function (e) {
+                        n(e)
+                    }))
+                })
+            }
+        }, {
+            key: "JS_Fast", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return (r < 0 || r > this.iMaxWndNum - 1 || "number" != typeof r) && (r = this.iCurrentWndIndex), new m.default(function (t, n) {
+                    var e = i._checkPlayback(r);
+                    return 0 !== e ? n(e) : i.aWndList[r].bFrameForward ? (i._log.E(L.ERR_PLAYBACK_FRAMEFORWARD + ":  status singleFrame not support this handle."), n(L.ERR_PLAYBACK_FRAMEFORWARD)) : 8 === i.aWndList[r].iRate ? (i._log.E(L.ERR_PLAYBACK_MAX_RATE + ":  current rate is the max."), n(L.ERR_PLAYBACK_MAX_RATE)) : (-2 === i.aWndList[r].iRate ? i.aWndList[r].iRate = 1 : i.aWndList[r].iRate < -2 ? i.aWndList[r].iRate /= 2 : 0 < i.aWndList[r].iRate && i.aWndList[r].iRate < 8 && (i.aWndList[r].iRate *= 2), void i.oStreamClient.setPlayRate(i.aWndList[r].szStreamUUID, i.aWndList[r].iRate).then(function () {
+                        var e;
+                        1 === i.aWndList[r].iMode ? (i.aWndList[r].oMSE.closeLatencyMonitor(), e = i.oJSPlugin.find("video.play-window").eq(r).get(0), i.aWndList[r].iRate < 0 ? e.playbackRate = 1 / Math.abs(i.aWndList[r].iRate) : e.playbackRate = i.aWndList[r].iRate, 1 === i.aWndList[r].iRate && i.aWndList[r].bOpenSound ? i.oJSPlugin.find("video.play-window").eq(r)[0].muted = !1 : i.oJSPlugin.find("video.play-window").eq(r)[0].muted = !0) : (i.aWndList[r].iRate <= 2 && "2" === i._decoderVersion || i.aWndList[r].iRate < 2 && "2" !== i._decoderVersion ? i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(0) : i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(1), i.aWndList[r].oPlayCtrl.PlayM4_PlayRate && i.aWndList[r].oPlayCtrl.PlayM4_PlayRate(i.aWndList[r].iRate), i.aWndList[r].oPlayCtrl.PlayM4_Fast && i.aWndList[r].oPlayCtrl.PlayM4_Fast(i.aWndList[r].iRate)), t(i.aWndList[r].iRate)
+                    }, function (e) {
+                        n(e)
+                    }))
+                })
+            }
+        }, {
+            key: "JS_Transmission", value: function () {
+                var e = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, r = arguments[1];
+                return new m.default(function (t, n) {
+                    (i < 0 || i > e.iMaxWndNum - 1 || "number" != typeof i) && (i = e.iCurrentWndIndex), e.aWndList[i].szStreamUUID ? e.oStreamClient.transmission(e.aWndList[i].szStreamUUID, r).then(function (e) {
+                        t(e)
+                    }, function (e) {
+                        n(e)
+                    }) : n()
+                })
+            }
+        }, {
+            key: "JS_FrameForward", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1,
+                    a = 1 < arguments.length && void 0 !== arguments[1] ? arguments[1] : 1;
+                return new m.default(function (e, t) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var n = i._checkPlayback(r);
+                    return 0 !== n ? t(n) : 1 === i.aWndList[r].iMode ? (i._log.E(L.ERR_COM_IS_MSE + ": MSE unsupport this function."), t(L.ERR_COM_IS_MSE)) : (1 !== i.aWndList[r].iRate ? (i.aWndList[r].iRate = 1, i.iCurrentPlayRate = i.aWndList[r].iRate, i.oStreamClient.setPlayRate(i.aWndList[r].szStreamUUID, i.aWndList[r].iRate).then(function () {
+                        i.aWndList[r].oPlayCtrl.PlayM4_PlayRate && i.aWndList[r].oPlayCtrl.PlayM4_PlayRate(i.aWndList[r].iRate), i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(0), i.aWndList[r].oPlayCtrl.PlayM4_OneByOne && i.aWndList[r].oPlayCtrl.PlayM4_OneByOne(a), i.aWndList[r].bFrameForward = !0
+                    }, function (e) {
+                        t(e)
+                    })) : (i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType && i.aWndList[r].oPlayCtrl.PlayM4_SetDecodeFrameType(0), i.aWndList[r].oPlayCtrl.PlayM4_OneByOne && i.aWndList[r].oPlayCtrl.PlayM4_OneByOne(a), i.aWndList[r].bFrameForward = !0), void e())
+                })
+            }
+        }, {
+            key: "JS_GetOSDTime", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (n, e) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var t = i._checkPlay(r);
+                    0 !== t ? e(t) : 1 === i.aWndList[r].iMode ? (i.oJSPlugin.find("video.play-window").eq(r).get(0), n(i.aWndList[r].iCurentOSDTime)) : "1" === i._decoderVersion ? i.aWndList[r].oPlayCtrl.PlayM4_GetOSDTime && i.aWndList[r].oPlayCtrl.PlayM4_GetOSDTime(function (e) {
+                        var t = "ios" === i._browserInfo._system || f.oTool.isEdge() ? "/" : " ",
+                            e = Date.parse(e.replace(/-/g, t));
+                        n(e)
+                    }) : (i.aWndList[r].oPlayCtrl.PlayM4_GetFrameInfo && i.aWndList[r].oPlayCtrl.PlayM4_GetFrameInfo(function (e) {
+                        i.aWndList[r].oPlayCtrl.iYUVWidth = e.width, i.aWndList[r].oPlayCtrl.iYUVHeight = e.height, i._getOSDTime(r, e.year, e.month, e.day, e.hour, e.minute, e.second), i.aWndList[r]._videoInfo.height = e.height, i.aWndList[r]._videoInfo.width = e.width, i.aWndList[r]._videoInfo.frameRate = e.frameRate
+                    }), n(i.aWndList[r].iCurentOSDTime))
+                })
+            }
+        }, {
+            key: "JS_SetNormalDecoderAudio", value: function () {
+                var t = this, n = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, i = arguments[1];
+                return new m.default(function (e) {
+                    (n < 0 || n > t.iMaxWndNum - 1 || "number" != typeof n) && (n = t.iCurrentWndIndex), t.aWndList[n].mseDecoderAudio = i, e()
+                })
+            }
+        }, {
+            key: "JS_OpenSound", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return (r < 0 || r > this.iMaxWndNum - 1 || "number" != typeof r) && (r = this.iCurrentWndIndex), new m.default(function (e, t) {
+                    var n = i._checkPlay(r);
+                    if (0 !== n) return t(n);
+                    if (!i.aWndList[r].bFirstFrame) return t(L.ERR_COM_OPENSOUND_ERROR);
+                    n = i.iCurrentSoundWnd;
+                    if (n === r) e(); else {
+                        if (-1 !== n && (1 === i.aWndList[n].iMode ? i.oJSPlugin.find("video.play-window").eq(n)[0].muted = !0 : i.aWndList[n].oPlayCtrl.PlayM4_StopSound && i.aWndList[n].oPlayCtrl.PlayM4_StopSound()), 1 === i.aWndList[r].iMode) {
+                            if ("AAC" !== i.aWndList[r]._videoInfo.audioType) return t(L.ERR_STREAM_SOUND_NOTHAS);
+                            i.aWndList[r].mseDecoderAudio || (i.aWndList[r].bOpenSound = !0, i._streamReset(r));
+                            n = i.oJSPlugin.find("video.play-window").eq(r)[0];
+                            n.volume = i.aWndList[r].MSEVolume, n.muted = !1, n.paused && n.play()
+                        } else if (i.aWndList[r].oPlayCtrl.PlayM4_PlaySound && 1 !== i.aWndList[r].oPlayCtrl.PlayM4_PlaySound(r)) return void t(L.ERR_JSDECODER + i.aWndList[r].oPlayCtrl.PlayM4_GetLastError().toString());
+                        i.iCurrentSoundWnd = r, i.aWndList[r].bOpenSound = !0, e()
+                    }
+                })
+            }
+        }, {
+            key: "JS_GetVolume", value: function () {
+                var t, i = this;
+                return new m.default(function (n, e) {
+                    if (-1 === i.iCurrentSoundWnd) return e(L.ERR_COM_SETORGET_VOLUME_ERROR);
+                    t = i.iCurrentSoundWnd, 1 === i.aWndList[t].iMode ? (e = 100 * i.oJSPlugin.find("video.play-window").eq(t).get(0).volume, n(e)) : i.aWndList[t].oPlayCtrl.PlayM4_GetVolume && i.aWndList[t].oPlayCtrl.PlayM4_GetVolume(function (e) {
+                        var t = e;
+                        "2" === i._decoderVersion && (t = Math.ceil(e / 655)), n(t)
+                    })
+                })
+            }
+        }, {
+            key: "JS_SetVolume", value: function () {
+                var i, r = this, a = arguments[1];
+                return new m.default(function (e, t) {
+                    if (-1 === r.iCurrentSoundWnd) return t(L.ERR_COM_SETORGET_VOLUME_ERROR);
+                    if (i = r.iCurrentSoundWnd, a < 1 || 100 < a || "number" != typeof a) return t(L.ERR_COM_SETVOLUME_ERROR);
+                    if (1 === r.aWndList[i].iMode) {
+                        try {
+                            var n = r.oJSPlugin.find("video.play-window").eq(i).get(0);
+                            n.volume = a / 100, r.aWndList[i].MSEVolume = n.volume
+                        } catch (e) {
+                            t(e)
+                        }
+                        e()
+                    } else {
+                        r.aWndList[i].oPlayCtrl.PlayM4_SetVolume || t();
+                        n = a;
+                        "2" === r._decoderVersion && (n = Math.ceil(655 * a)), 0 === r.aWndList[i].oPlayCtrl.PlayM4_SetVolume(n) ? t(L.ERR_JSDECODER + r.aWndList[i].oPlayCtrl.PlayM4_GetLastError().toString()) : e()
+                    }
+                })
+            }
+        }, {
+            key: "JS_CloseSound", value: function () {
+                var r = this;
+                return new m.default(function (e, t) {
+                    var n, i = r.iCurrentSoundWnd;
+                    i < 0 || i > r.iMaxWndNum - 1 ? e() : 0 !== (n = r._checkPlay(i)) ? t(n) : (1 === r.aWndList[i].iMode ? r.oJSPlugin.find("video.play-window").eq(i)[0].muted = !0 : r.aWndList[i].oPlayCtrl.PlayM4_StopSound && 1 !== r.aWndList[i].oPlayCtrl.PlayM4_StopSound() && t(L.ERR_JSDECODER + r.aWndList[i].oPlayCtrl.PlayM4_GetLastError().toString()), r.iCurrentSoundWnd = -1, r.aWndList[i].bOpenSound = !1, e())
+                })
+            }
+        }, {
+            key: "JS_EnableZoom", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return (r < 0 || r > this.iMaxWndNum - 1 || "number" != typeof r) && (r = this.iCurrentWndIndex), new m.default(function (e, t) {
+                    var n = i._checkPlay(r);
+                    return 0 !== n ? t(n) : 1 === i.aWndList[r].iMode ? (i._log.E(L.ERR_COM_IS_MSE + ": MSE unsupport this function."), t(L.ERR_COM_IS_MSE)) : (i.oJSPlugin.find(".draw-window").unbind(), i.oDrawCanvas = new h.ESCanvas(i.options.szId + "_canvas_draw" + r), i.oDrawCanvas.setShapeType("Rect"), i.oDrawCanvas.setDrawStyle("#ff0000", "", 0), i.oDrawCanvas.setDrawStatus(!0, function (e) {
+                        e.startPos && e.endPos && (e.startPos[0] > e.endPos[0] ? i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion && i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion(null, !1) : i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion && i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion({
+                            left: e.startPos[0],
+                            top: e.startPos[1],
+                            right: e.endPos[0],
+                            bottom: e.endPos[1]
+                        }, !0))
+                    }), i.aWndList[r].bEZoom = !0, void e())
+                })
+            }
+        }, {
+            key: "JS_DisableZoom", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return (r < 0 || r > this.iMaxWndNum - 1 || "number" != typeof r) && (r = this.iCurrentWndIndex), new m.default(function (e, t) {
+                    var n = i._checkPlay(r);
+                    return 0 !== n ? t(n) : 1 === i.aWndList[r].iMode ? (i._log.E(L.ERR_COM_IS_MSE + ": MSE unsupport this function."), t(L.ERR_COM_IS_MSE)) : (i.oDrawCanvas.setDrawStatus(!1), i.oDrawCanvas.clearAllShape(), void (i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion && 1 !== i.aWndList[r].oPlayCtrl.PlayM4_SetDisplayRegion(null, !1) ? t(L.ERR_JSDECODER + i.aWndList[r].oPlayCtrl.PlayM4_GetLastError().toString()) : (i.aWndList[r].bEZoom = !1, e())))
+                })
+            }
+        }, {
+            key: "JS_Enable3DZoom", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, r = arguments[1];
+                return new m.default(function (e, t) {
+                    (i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), n.aWndList[i].bPlay ? (n.oJSPlugin.find(".draw-window").unbind(), n.fDrawCallback = r, n.oDrawCanvas = new h.ESCanvas("canvas_draw" + i), n.oDrawCanvas.setShapeType("Rect"), n.oDrawCanvas.setDrawStyle("#ff0000", "", 0), n.oDrawCanvas.setDrawStatus(!0, function (e) {
+                        r(e)
+                    }), n.aWndList[i].b3DZoom = !0, e()) : t()
+                })
+            }
+        }, {
+            key: "JS_Disable3DZoom", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (e, t) {
+                    (i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), n.aWndList[i].bPlay ? (n.oDrawCanvas.setDrawStatus(!1), n.aWndList[i].b3DZoom = !1, e()) : t()
+                })
+            }
+        }, {
+            key: "JS_CapturePicture", value: (T = (0, v.default)(y.default.mark(function e() {
+                var d = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, l = arguments[1], h = this,
+                    c = arguments[2], _ = arguments[3];
+                return y.default.wrap(function (e) {
+                    for (; ;) switch (e.prev = e.next) {
+                        case 0:
+                            return e.abrupt("return", new m.default(function () {
+                                var n = (0, v.default)(y.default.mark(function e(t, n) {
+                                    var i, r, a, s, o, u;
+                                    return y.default.wrap(function (e) {
+                                        for (; ;) switch (e.prev = e.next) {
+                                            case 0:
+                                                if ((d < 0 || d > h.iMaxWndNum - 1 || "number" != typeof d) && (d = h.iCurrentWndIndex), 0 !== (a = h._checkPlay(d))) return n(a), e.abrupt("return");
+                                                e.next = 5;
+                                                break;
+                                            case 5:
+                                                if (h.aWndList[d].bFirstFrame) {
+                                                    e.next = 7;
+                                                    break
+                                                }
+                                                return e.abrupt("return", n(L.ERR_CAPTURE_NO_PREPARED));
+                                            case 7:
+                                                if (c = "JPEG", i = null, 1 !== (r = h.aWndList[d]).iMode) {
+                                                    e.next = 21;
+                                                    break
+                                                }
+                                                a = h.oJSPlugin.find("video.play-window").eq(d).get(0), s = a.videoWidth, o = a.videoHeight, (u = document.createElement("canvas")).width = s, u.height = o, u.getContext("2d").drawImage(a, 0, 0, s, o), i = u.toDataURL("image/" + c), e.next = 24;
+                                                break;
+                                            case 21:
+                                                return e.next = 23, h._jsdecoderCapture(r, c);
+                                            case 23:
+                                                i = e.sent;
+                                            case 24:
+                                                if (_) return _(i), t(), e.abrupt("return");
+                                                e.next = 28;
+                                                break;
+                                            case 28:
+                                                (s = i.split(";").shift().split("/").pop()) !== c.toLowerCase() && console.warn("Current Browser is not support to capture '" + c + "' image type, auto capture '" + s.toUpperCase() + "' image."), (o = document.createEvent("MouseEvents")).initEvent("click", !1, !1), (u = document.createElement("a")).href = Blob ? URL.createObjectURL(f.oTool.dataURLtoBlob(i)) : i, u.download = l + "." + s, u.dispatchEvent(o), t();
+                                            case 37:
+                                            case"end":
+                                                return e.stop()
+                                        }
+                                    }, e, h)
+                                }));
+                                return function (e, t) {
+                                    return n.apply(this, arguments)
+                                }
+                            }()));
+                        case 1:
+                        case"end":
+                            return e.stop()
+                    }
+                }, e, this)
+            })), function () {
+                return T.apply(this, arguments)
+            })
+        }, {
+            key: "_jsdecoderCapture", value: function (t, o) {
+                var u = this;
+                return new m.default(function (a, s) {
+                    function e(e) {
+                        if (6 === e) return u._log.E(L.ERR_CAPTURE_RAM + ": capture failed, memory not enough."), s(L.ERR_CAPTURE_RAM);
+                        for (var t = "", n = e.byteLength, i = 0; i < n; i++) t += String.fromCharCode(e[i]);
+                        var r = btoa(t), r = "data:image/" + o.toLowerCase() + ";base64," + r;
+                        a(r)
+                    }
+
+                    "JPEG" === o ? t.oPlayCtrl.PlayM4_GetJPEG(e) : "BMP" === o && t.oPlayCtrl.PlayM4_GetBMP(e)
+                })
+            }
+        }, {
+            key: "JS_StopRealPlayAll", value: function () {
+                var n = this;
+                return new m.default(function (e) {
+                    n.aWndList.forEach(function (e, t) {
+                        n.JS_Stop(t)
+                    }), n.iCurrentSoundWnd = -1, e()
+                })
+            }
+        }, {
+            key: "JS_StartSave", value: function () {
+                var a = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, s = this, o = arguments[1],
+                    u = arguments[2];
+                return new m.default(function (t, e) {
+                    (a < 0 || a > s.iMaxWndNum - 1 || "number" != typeof a) && (a = s.iCurrentWndIndex);
+                    var n, i = 0, r = (u && (i = u.iPackage), s._checkPlay(a));
+                    0 !== r ? e(r) : s.aWndList[a].szStorageUUID ? e(L.ERR_PLAY_FILESYS_ALREADY_WRITING) : (o.indexOf(".mp4") < 0 && (o += ".mp4"), r = s.aWndList[a].aHead, n = 0, "realplay" !== s.aWndList[a].szPlayType && (n = 1), s.oStorageManager.startRecord(o, r, 2, n, {
+                        cbEventHandler: function (e) {
+                            s._closeStreamAndDestory(a), s.oEventCallback.pluginErrorHandler(a, e)
+                        }, iPackage: i
+                    }).then(function (e) {
+                        s.aWndList[a].szStorageUUID = e, t()
+                    }, function () {
+                        e()
+                    }))
+                })
+            }
+        }, {
+            key: "JS_StartSaveEx", value: function () {
+                var s = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, o = arguments[1], u = this,
+                    d = arguments[2], l = arguments[3];
+                return new m.default(function (t, e) {
+                    var n, i, r, a;
+                    (s < 0 || s > u.iMaxWndNum - 1 || "number" != typeof s) && (s = u.iCurrentWndIndex), 2 !== d && 5 !== d ? e(L.ERR_PLAY_FILESYS_NOT_SUPPORT_DSTTYPE) : null === o ? e(L.ERR_PLAY_FILESYS_FILENAME_ISNULL) : (n = 1, i = null, l && (n = l.irecordType, i = l.cbStreamCB), 0 !== (r = u._checkPlay(s)) ? e(r) : u.aWndList[s].szStorageUUID ? e(L.ERR_PLAY_FILESYS_ALREADY_WRITING) : (o.indexOf(".mp4") < 0 && (o += ".mp4"), r = u.aWndList[s].aHead, a = 0, "realplay" !== u.aWndList[s].szPlayType && (a = 1), u.aWndList[s].isFlv && (r = u.flvtohikHead(s)), (5 === d && 33 === r[12] && 114 === r[13] || 98 === r[12] && 114 === r[13] || 0 === r[12] && 32 === r[13]) && (r[12] = 0, r[13] = 0), 129 === r[24] && (d = 1), u.oStorageManager.startRecord(o, r, d, a, {
+                        cbEventHandler: function (e) {
+                            u._closeStreamAndDestory(s), u.oEventCallback.pluginErrorHandler(s, e)
+                        }, irecordType: n, cbStreamCB: i
+                    }).then(function (e) {
+                        u.aWndList[s].szStorageUUID = e, u.aWndList[s].isFlv && u.aWndList[s].oMSE.setRecordFlag(!0), t()
+                    }, function () {
+                        e()
+                    })))
+                })
+            }
+        }, {
+            key: "JS_StopSave", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (e, t) {
+                    (i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), n.aWndList[i].szStorageUUID ? (n.aWndList[i].isFlv && n.aWndList[i].oMSE.setRecordFlag(!1), n.oStorageManager.stopRecord(n.aWndList[i].szStorageUUID).then(function () {
+                        n.aWndList[i].szStorageUUID = "", e()
+                    }, function (e) {
+                        t(e)
+                    })) : t(L.ERR_PLAY_FILESYS_NOT_WRITING)
+                })
+            }
+        }, {
+            key: "JS_SetDrawStatus", value: function (n) {
+                var i = this;
+                return new m.default(function (e, t) {
+                    i.oDrawCanvas ? (i.oDrawCanvas.setDrawStatus(n), e()) : t()
+                })
+            }
+        }, {
+            key: "JS_ClearRegion", value: function () {
+                var n = this;
+                return new m.default(function (e, t) {
+                    n.oDrawCanvas ? (n.oDrawCanvas.clearAllShape(), e()) : t()
+                })
+            }
+        }, {
+            key: "JS_SetGridInfo", value: function (n) {
+                var i = this;
+                return new m.default(function (e) {
+                    if (null == n) return -1;
+                    var t = "#ff0000";
+                    n.drawColor && (t = n.drawColor), i.oDrawCanvas.setDrawStyle(t), i.oDrawCanvas.setShapesInfoByType("Grid", [{
+                        szGridMap: n.gridMap,
+                        iGridColNum: n.gridColNum,
+                        iGridRowNum: n.gridRowNum
+                    }]), e()
+                })
+            }
+        }, {
+            key: "JS_GetGridInfo", value: function () {
+                var e, t = null;
+                return t = this.oDrawCanvas ? (e = this.oDrawCanvas.getShapesInfoByType("Grid")[0]) ? {
+                    gridColNum: e.iGridColNum,
+                    gridRowNum: e.iGridRowNum,
+                    gridMap: e.szGridMap
+                } : {iGridRowNum: 18, iGridColNum: 22, szGridMap: ""} : {}, m.default.resolve(t)
+            }
+        }, {
+            key: "JS_SetDrawShapeInfo", value: function (n, i) {
+                var r = this;
+                return new m.default(function (e, t) {
+                    void 0 === n || "" === n ? t() : (r.oDrawCanvas.setShapeType(n), r.oDrawCanvas.setDrawStyle(i.szDrawColor || "", i.szFillColor || "", i.iTranslucent || 0), i.iMaxShapeSupport && 0 < i.iMaxShapeSupport && r.oDrawCanvas.setMaxShapeSupport(i.iMaxShapeSupport), i.iMaxPointSupport && 0 < i.iMaxPointSupport && r.oDrawCanvas.setCurrentShapeInfo({
+                        szId: "",
+                        szTips: "",
+                        iMinClosed: 3,
+                        iMaxPointNum: i.iMaxPointSupport,
+                        iPolygonType: 1,
+                        szDrawColor: i.szDrawColor || "",
+                        szFillColor: i.szFillColor || "",
+                        iTranslucent: i.iTranslucent || 0
+                    }), e())
+                })
+            }
+        }, {
+            key: "JS_SetPolygonInfo", value: function (a) {
+                var s = this;
+                return new m.default(function (e, t) {
+                    if (void 0 !== a && a.length) {
+                        var n = [];
+                        if (0 < a.length) for (var i = 0, r = a.length; i < r; i++) 0 < a[i].aPoint.length && n.push(a[i]);
+                        0 < n.length ? (s.oDrawCanvas.setShapesInfoByType("Polygon", n), e()) : t()
+                    } else t()
+                })
+            }
+        }, {
+            key: "JS_GetPolygonInfo", value: function () {
+                var s = this;
+                return new m.default(function (e) {
+                    for (var t = [], n = s.oDrawCanvas.getShapesInfoByType("Polygon"), i = 0, r = n.length; i < r; i++) {
+                        var a = n[i], a = {aPoint: a.aPoint, bClosed: a.bClosed, szTips: a.szTips};
+                        t.push(a)
+                    }
+                    e(t)
+                })
+            }
+        }, {
+            key: "JS_SetLineInfo", value: function (a) {
+                var s = this;
+                return new m.default(function (e, t) {
+                    if (void 0 !== a && a.length) {
+                        var n = [];
+                        if (0 < a.length) for (var i = 0, r = a.length; i < r; i++) 0 < a[i].aPoint.length && n.push(a[i]);
+                        0 < n.length ? (s.oDrawCanvas.setShapesInfoByType("Line", n), e()) : t()
+                    } else t()
+                })
+            }
+        }, {
+            key: "JS_GetLineInfo", value: function () {
+                var s = this;
+                return new m.default(function (e) {
+                    for (var t = [], n = s.oDrawCanvas.getShapesInfoByType("Line"), i = 0, r = n.length; i < r; i++) {
+                        var a = n[i], a = {iLineType: a.iLineType, aPoint: a.aPoint, szTips: a.szTips};
+                        t.push(a)
+                    }
+                    e(t)
+                })
+            }
+        }, {
+            key: "JS_SetRectInfo", value: function (a) {
+                var s = this;
+                return new m.default(function (e, t) {
+                    if (void 0 !== a && a.length) {
+                        var n = [];
+                        if (0 < a.length) for (var i = 0, r = a.length; i < r; i++) 0 < a[i].aPoint.length && n.push(a[i]);
+                        0 < n.length ? (s.oDrawCanvas.setShapesInfoByType("Rect", n), e()) : t()
+                    } else t()
+                })
+            }
+        }, {
+            key: "JS_GetRectInfo", value: function () {
+                var s = this;
+                return new m.default(function (e) {
+                    for (var t = [], n = s.oDrawCanvas.getShapesInfoByType("Rect"), i = 0, r = n.length; i < r; i++) {
+                        var a = n[i], a = {aPoint: a.aPoint, szTips: a.szTips};
+                        t.push(a)
+                    }
+                    e(t)
+                })
+            }
+        }, {
+            key: "JS_FullScreenDisplay", value: function (e) {
+                var t = document.getElementById(this.options.szId).children[0];
+                return this._triggerFullscreen(t)
+            }
+        }, {
+            key: "JS_FullScreenSingle", value: function () {
+                var e = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1,
+                    t = ((e < 0 || e > this.iMaxWndNum - 1 || "number" != typeof e) && (e = this.iCurrentWndIndex), this.aWndList[e]);
+                if (!t.bPlay) return m.default.reject("window " + e + " is not playing.");
+                var n = null,
+                    n = ("desktop" === this._browserInfo.platform || "ios" === this._browserInfo.system ? this.oJSPlugin.find(".sub-wnd") : 1 === t.iMode ? this.oJSPlugin.find(".sub-wnd video.play-window") : this.oJSPlugin.find(".sub-wnd canvas.play-window")).get(e);
+                return this._triggerFullscreen(n)
+            }
+        }, {
+            key: "_triggerFullscreen", value: function (a, e) {
+                var n, s = this,
+                    o = document.fullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled || a.webkitSupportsFullscreen || !1,
+                    u = document.fullscreen || document.webkitIsFullScreen || document.mozFullScreen || a.webkitDisplayingFullscreen || !1;
+                return a.requestFullscreen = a.requestFullscreen || a.webkitRequestFullScreen || a.mozRequestFullScreen || a.msRequestFullscreen || a.webkitEnterFullScreen || null, document.exitFullscreen = document.exitFullscreen || document.mozCancelFullScreen || document.msExitFullscreen || null, new m.default((n = (0, v.default)(y.default.mark(function e(t, n) {
+                    var i, r;
+                    return y.default.wrap(function (e) {
+                        for (; ;) switch (e.prev = e.next) {
+                            case 0:
+                                if (!o) {
+                                    e.next = 13;
+                                    break
+                                }
+                                if (u && s.fullscreenElement === a) return document.exitFullscreen ? document.exitFullscreen() : a.webkitExitFullScreen(), s.fullscreenElement = null, s.JS_Resize(), s.oEventCallback.windowFullCcreenChange(!1), e.abrupt("return", t());
+                                e.next = 7;
+                                break;
+                            case 7:
+                                return e.next = 9, a.requestFullscreen();
+                            case 9:
+                                return s.fullscreenElement = a, s.JS_Resize(), s.oEventCallback.windowFullCcreenChange(!0), e.abrupt("return", t());
+                            case 13:
+                                return s.fullscreenElement ? (document.body.style.setProperty("overflow", "unset"), i = s.oJSPlugin.width(), r = s.oJSPlugin.height(), (0, g.default)(a).css("width", i).css("height", r).css("z-index", "").css("position", "relative").css("transform", "").css("transform-origin", "").css("top", "").css("left", ""), s.fullscreenElement = null, s.JS_Resize(), s.oEventCallback.windowFullCcreenChange(!1)) : (i = document.body.clientWidth, r = document.body.clientHeight, s.options.openDebug && console.log("iphone fullscreen: body, window", i, r, window.screen.width, window.screen.height), i < r ? (document.body.style.setProperty("overflow", "hidden"), (0, g.default)(a).css("width", r).css("height", i).css("z-index", "1001").css("position", "fixed").css("transform", "rotate(90deg)").css("transform-origin", "0px 0px").css("top", "0px").css("left", i + "px"), (0, g.default)(a).find("video.play-window").attr("width", r).attr("height", i), (0, g.default)(a).find("canvas.play-window").attr("width", r).attr("height", i).css("transform", "scale(1)"), (0, g.default)(a).find("canvas.draw-window").attr("width", r).attr("height", i)) : (0, g.default)(a).css("width", i).css("height", r).css("z-index", "1001").css("position", "fixed"), s.fullscreenElement = a, s.JS_Resize(), s.oEventCallback.windowFullCcreenChange(!0)), e.abrupt("return", m.default.resolve());
+                            case 15:
+                            case"end":
+                                return e.stop()
+                        }
+                    }, e, s)
+                })), function (e, t) {
+                    return n.apply(this, arguments)
+                }))
+            }
+        }, {
+            key: "JS_Resize", value: function (s, o) {
+                var u = this;
+                return new m.default(function (a) {
+                    u._debounse(function () {
+                        var e, t, n, i, r;
+                        s && o && "number" == typeof s && "number" == typeof o && (u.options.iWidth = s, u.options.iHeight = o, u.oJSPlugin.width(s), u.oJSPlugin.height(o)), u.fullscreenElement && "sub-wnd" === u.fullscreenElement.className ? (t = (e = (0, g.default)(u.fullscreenElement)).width(), n = e.height(), r = window.screen.width, i = window.screen.height, u.options.openDebug && console.log("singleFullscreen JS_Resize: ", r, i, t, n), e.css("border", "1px solid " + u.options.oStyle.border), e.find("video.play-window").attr("width", t).attr("height", n), e.find("canvas.play-window").css("transform", "unset").attr("width", t).attr("height", n), (r = u.aWndList[u.currentWindowIndex]).bPlay && 0 === r.iMode && r.oPlayCtrl && r.oPlayCtrl.PlayM4_SetCanvasSize && r.oPlayCtrl.PlayM4_SetCanvasSize(t, n), e.find("canvas.draw-window").attr("width", t).attr("height", n)) : (u.options.iWidth = u.oJSPlugin.width(), u.options.iHeight = u.oJSPlugin.height(), u._updateWnd()), u.oDrawCanvas.resizeCanvas(), u.oDrawCanvas.canvasRedraw(), a()
+                    }, 50)
+                })
+            }
+        }, {
+            key: "JS_SelectWnd", value: function (n) {
+                var i = this;
+                return new m.default(function (e, t) {
+                    if (n < 0 || n > i.iMaxWndNum - 1 || "number" != typeof n) return t(L.ERR_COM_PARAM);
+                    i.oJSPlugin.find(".sub-wnd").get(n).click(), e()
+                })
+            }
+        }, {
+            key: "JS_SetOptions", value: function (t) {
+                var n = this;
+                return new m.default(function (e) {
+                    !1 === t.bSupportSound && (n.options.bSupportSound = t.bSupportSound), !1 === t.bSupporDoubleClickFull && (n.options.bSupporDoubleClickFull = t.bSupporDoubleClickFull), !0 === t.bOnlySupportMSE && (n.options.bOnlySupportMSE = t.bOnlySupportMSE), !0 === t.bOnlySupportJSDecoder && (n.options.bOnlySupportJSDecoder = t.bOnlySupportJSDecoder), e()
+                })
+            }
+        }, {
+            key: "JS_SetLogFlag", value: function (n) {
+                var i = this;
+                return new m.default(function (e) {
+                    for (var t = 0; t < i.iMaxWndNum; t++) i.aWndList[t].oPlayCtrl && i.aWndList[t].oPlayCtrl.PlayM4_OpenPlayerSDKPrintLog(n);
+                    e()
+                })
+            }
+        }, {
+            key: "JS_SetDecodeThreadNum", value: function (n) {
+                var i = this;
+                return new m.default(function (e) {
+                    for (var t = 0; t < i.iMaxWndNum; t++) i.aWndList[t].oPlayCtrl && i.aWndList[t].oPlayCtrl.SetDecodeThreadNum(n);
+                    e()
+                })
+            }
+        }, {
+            key: "JS_RenderPrivateData", value: function (e, t) {
+                var n = this.iCurrentWndIndex, i = this.aWndList[n], r = this._checkPlay(n);
+                if (0 === r) {
+                    if (1 === this.aWndList[n].iMode) return r = L.ERR_COM_IS_MSE, this._log.E(L.ERR_COM_IS_MSE + ": MSE unsupport this function."), r;
+                    1 !== i.oPlayCtrl.PlayM4_RenderPrivateData(e, t) && (r = L.ERR_JSDECODER + i.oPlayCtrl.PlayM4_GetLastError().toString(), this._log.E(r + ": 播放库智能信息接口报错："))
+                }
+                return r
+            }
+        }, {
+            key: "JS_RenderPrivateDataEx", value: function (e, t, n) {
+                var i = this.iCurrentWndIndex, r = this.aWndList[i], a = this._checkPlay(i);
+                return 0 === a && (1 === this.aWndList[i].iMode && (a = L.ERR_COM_IS_MSE, this._log.E(L.ERR_COM_IS_MSE + ": MSE unsupport this function.")), 1 !== r.oPlayCtrl.PlayM4_RenderPrivateDataEx(e, t, n) && (a = L.ERR_JSDECODER + r.oPlayCtrl.PlayM4_GetLastError().toString(), this._log.E(a + ": 播放库智能信息接口报错：", a))), a
+            }
+        }, {
+            key: "JS_RenderALLPrivateData", value: function () {
+                var r = this, a = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, s = arguments[1];
+                return new m.default(function (e, t) {
+                    if ((a < 0 || a > r.iMaxWndNum - 1 || "number" != typeof a) && (a = r.iCurrentWndIndex), "boolean" != typeof s) return t(L.ERR_COM_PARAM);
+                    var n = r.aWndList[a], i = r._checkPlay(a);
+                    if (0 !== i) return t(i);
+                    if (0 !== n.iMode || "2" !== r._decoderVersion) return t(L.ERR_STREAM_INTEL_UNSUPPORT);
+                    [{typeCode: "0x00000001", desc: "智能分析（默认开）", children: []}, {
+                        typeCode: "0x00000002",
+                        desc: "移动侦测（默认开）",
+                        children: []
+                    }, {typeCode: "0x00000004", desc: "pos 信息叠加（默认关）", children: []}, {
+                        typeCode: "0x00000008",
+                        desc: "图片叠加（默认关）",
+                        children: []
+                    }, {
+                        typeCode: "0x00000010",
+                        desc: "火点信息（默认开）",
+                        children: [{typeCode: "0x00000001", desc: "火点框显示"}, {
+                            typeCode: "0x00000002",
+                            desc: "火点最高温显示"
+                        }, {typeCode: "0x00000004", desc: "最高温位置显示"}, {typeCode: "0x00000008", desc: "最高温度距离"}]
+                    }, {
+                        typeCode: "0x00000020",
+                        desc: "温度信息（默认关）",
+                        children: [{typeCode: "0x00000001", desc: "框测温"}, {
+                            typeCode: "0x00000002",
+                            desc: "线测温"
+                        }, {typeCode: "0x00000004", desc: "点测温"}]
+                    }, {
+                        typeCode: "0x00000040",
+                        desc: "轨迹信息（默认关）",
+                        children: [{typeCode: "0x00000001", desc: "人的轨迹信息"}, {typeCode: "0x00000002", desc: "车的轨迹信息"}]
+                    }, {
+                        typeCode: "0x00000080",
+                        desc: "烟火屏蔽和废气监测（默认关）",
+                        children: [{typeCode: "0x00000001", desc: "烟火屏蔽"}, {
+                            typeCode: "0x00000002",
+                            desc: "规则废气检测"
+                        }, {typeCode: "0x00000004", desc: "目标废气检测"}]
+                    }].forEach(function (t) {
+                        1 === n.oPlayCtrl.PlayM4_RenderPrivateData(t.typeCode, s) ? s && t.children && 0 < t.children.length && t.children.forEach(function (e) {
+                            1 !== n.oPlayCtrl.PlayM4_RenderPrivateDataEx(t.typeCode, e.typeCode, s) && (console.warn("trigger intelligence sub " + e.typeCode + " " + (s ? "open" : "close") + " failed"), i = 1)
+                        }) : (console.warn("trigger intelligence main " + t.typeCode + " " + (s ? "open" : "close") + " failed"), i = 1)
+                    }), e()
+                })
+            }
+        }, {
+            key: "_checkPlay", value: function (e) {
+                return e < 0 || e > this.iMaxWndNum - 1 ? (this._log.E(L.ERR_COM_PARAM + ": unexpected window index."), L.ERR_COM_PARAM) : this.aWndList[e].bPlay ? 0 : (this._log.E(L.ERR_COM_NOT_PLAYING + ": this window is not playing."), L.ERR_COM_NOT_PLAYING)
+            }
+        }, {
+            key: "_checkPlayback", value: function (e) {
+                var t = this._checkPlay(e);
+                return 0 === t && "realplay" === this.aWndList[e].szPlayType && (this._log.E(L.ERR_COM_NOT_PLAYBACK + ": this function was only supported by playback."), t = L.ERR_COM_NOT_PLAYBACK), t
+            }
+        }, {
+            key: "_createFlvPlayer", value: function (i) {
+                var r = this, a = this.aWndList[i],
+                    e = (a.oMSE && (a.bPlay = !1, a.oMSE.detachMediaElement(), a.oMSE.destroy(), a.oMSE = null), this.oJSPlugin.find("video.play-window").eq(i)),
+                    t = this.oJSPlugin.find("canvas.play-window").eq(i),
+                    t = (e.show(), t.hide(), {isLive: !0, type: "flv"}),
+                    n = (this.aWndList[i].mseDecoderAudio || (t = {hasAudio: !1, isLive: !0, type: "flv"}), !1), s = 3,
+                    o = 2, t = (0 < a.szBufferSize && (n = !0, s = 5, o = 2), a.oMSE = c.default.createPlayer(t, {
+                        enableWorker: this.options.mseWorkerEnable,
+                        lazyLoadMaxDuration: 180,
+                        seekType: "range",
+                        isLive: !0,
+                        enableStashBuffer: n,
+                        autoCleanupMaxBackwardDuration: 60,
+                        autoCleanupMinBackwardDuration: 30,
+                        statisticsInfoReportInterval: 1e3,
+                        enableDurationMonitor: !0,
+                        lowLatencyThreshold: s,
+                        decreaseDurationStep: o,
+                        enableAudioGain: !1,
+                        stashInitialSize: a.szBufferSize,
+                        WDInfo: {index: i, pointSignNumber: a.pointSignNumber}
+                    })), u = (t.on(b.default.ERROR, function (e, t, n) {
+                        a.bFirstFrame ? (r._streamReset(i), window.console.warn("[iWndNum-" + i + "] PlayerEvents.ERROR mediaElement error,reset decoder:", e, t, n.code, n.message)) : ("MediaError" === e && "CodecUnsupported" === t ? r.oEventCallback.pluginErrorHandler(i, L.ERR_STREAM_CODEC_UNSUPPORTED, n.message) : r.oEventCallback.pluginErrorHandler(i, L.ERR_STREAM_DATA_ERROR, n.message), window.console.error("[iWndNum-" + i + "] PlayerEvents.ERROR mediaElement error,stop decoder:", e, t, n.code, n.message), r.JS_Stop(i))
+                    }), t.on(b.default.MS_BUFFER_FULL, function () {
+                        a.bFirstFrame ? (r._streamReset(i), window.console.warn("[iWndNum-" + i + "] media_source_buffer_full,reset decoder:")) : (r.oEventCallback.pluginErrorHandler(i, L.ERR_STREAM_MSE_DATA_FULL), r.JS_Stop(i), window.console.error("[iWndNum-" + i + "] media_source_buffer_full,stop decoder:"))
+                    }), e.get(0)), d = this;
+                u.addEventListener("loadeddata", function e(t) {
+                    console.info("[debug] [iWndNum-" + i + "] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c 硬解首帧已经加载,分辨率:" + a._videoInfo.width + "*" + a._videoInfo.height, "color: blue", "color: black", u.paused, u.autoplay), u.removeEventListener("loadeddata", e), a._emiter.emit("firstframeload"), u.poster = "", a.bFirstFrame = !0, u.addEventListener("error", function e(t) {
+                        window.console.warn("[iWndNum-" + i + "] mediaElement error,reset decoder:", t.target.error), u.removeEventListener("error", e), d._streamReset(i)
+                    }), d.oEventCallback.firstFrameDisplay(i, a._videoInfo.width, a._videoInfo.height)
+                }), a._receivedLength = 0, t.attachMediaElement(u), t.load(), a.bPlay = !0, a.asyncLock = !1, t.onParsedData = this._onParsedData.bind(this)
+            }
+        }, {
+            key: "_streamReset", value: function (e) {
+                var t = this.aWndList[e];
+                t.bFirstFrame && (t._resetFlvplayer = !1, t.bFirstFrame = !1, this._capturePoster(e), t.isFlv && (this._createFlvPlayer(e), t.oMSE.onLoaderChunkArrival(t.szFlvhead.buffer, t._receivedLength), t._receivedLength += t.szFlvhead.length, t._resetFlvplayer = !0))
+            }
+        }, {
+            key: "_capturePoster", value: function (e) {
+                var e = this.oJSPlugin.find("video.play-window").eq(e).get(0), t = e.videoWidth, n = e.videoHeight,
+                    i = document.createElement("canvas"),
+                    t = (i.width = t, i.height = n, i.getContext("2d").drawImage(e, 0, 0, t, n), i.toDataURL("image/JPEG"));
+                e.poster = t
+            }
+        }, {
+            key: "_createPlayCtrl", value: function (r) {
+                var e, a = this, s = this.aWndList[r],
+                    o = (console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c _createPlayCtrl load start code", "color: blue", "color: black"), this._playCtrlLoad.bind(this));
+                this.oJSPlugin.find("video.play-window").eq(r).hide(), this.oJSPlugin.find("canvas.play-window").eq(r).show(), "2" === this._decoderVersion ? P && (s.oPlayCtrl = new u.JSPlayCtrl(this.options.szId + "_playCanvas" + r, P, function (e) {
+                    e.instance;
+                    var t = e.cmd, e = (e.data, e.errorCode, e.status);
+                    "OnebyOne" === t && (e && s.isPause && (a.oStreamClient.resume(s.szStreamUUID), s.isPause = !1), e || s.isPause || (a.oStreamClient.pause(s.szStreamUUID), s.isPause = !0))
+                }, r), s.bLoad = !0, this._playCtrlLoad(r)) : (s.oPlayCtrl = new d.JSPlayCtrl(this.options.szBasePath + "playctrl1/", function (e) {
+                    e.instance;
+                    var t = e.cmd, n = e.errorCode, i = e.status;
+                    switch (t) {
+                        case"loaded":
+                            console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c new JSDecoder1.0 received loaded message", "color: blue", "color: black"), s.bLoad || o(r), s.bLoad = !0;
+                            break;
+                        case"OnebyOne":
+                            i && s.isPause && (a.oStreamClient.resume(s.szStreamUUID), s.isPause = !1), i || s.isPause || (a.oStreamClient.pause(s.szStreamUUID), s.isPause = !0);
+                            break;
+                        case"GetFrameData":
+                            return void (16 === n && (a._closeStreamAndDestory(r), a.oEventCallback.pluginErrorHandler(r, L.ERR_STREAM_VIDEO_CODING)))
+                    }
+                }, r), e = 4 === s.aHead[8] ? 0 : 1, s.oPlayCtrl.PlayM4_SetStreamOpenMode(e)), console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c _createPlayCtrl load end code", "color: blue", "color: black")
+            }
+        }, {
+            key: "_playCtrlLoad", value: function (e) {
+                var t = this.aWndList[e];
+                if ("2" === this._decoderVersion) {
+                    var n = "realplay" === t.szPlayType ? 0 : 1, i = t.isHVAGHead ? t.aHVAGHead : t.aHead;
+                    if (t.oPlayCtrl && t.oPlayCtrl.PlayM4_SetStreamOpenMode(n), t.oPlayCtrl && t.oPlayCtrl.PlayM4_OpenStream(i, 40, 8388608 + t.szBufferSize), 1 !== t.oPlayCtrl.PlayM4_Play()) return L.ERR_JSDECODER + t.oPlayCtrl.PlayM4_GetLastError().toString();
+                    if ("reverse" === t.szPlayType && 1 !== t.oPlayCtrl.PlayM4_ReversePlay()) return L.ERR_JSDECODER + t.oPlayCtrl.PlayM4_GetLastError().toString();
+                    t.bPlay = !0, t.oPlayCtrl.iBufferValue = t.oPlayCtrl.PlayM4_GetBufferValue(1), this._supportInfo.webGL2 && t.oPlayCtrl.PlayM4_SetAntialias(1)
+                } else {
+                    if (t.oPlayCtrl && t.oPlayCtrl.PlayM4_OpenStream(t.aHead, 40, 2097152), t.oPlayCtrl && t.oPlayCtrl.PlayM4_SetInputBufSize(E), 1 !== t.oPlayCtrl.PlayM4_Play(this.options.szId + "_playCanvas" + e)) return L.ERR_JSDECODER + t.oPlayCtrl.PlayM4_GetLastError().toString();
+                    t.bPlay = !0
+                }
+                return C.push({
+                    port: t.oPlayCtrl.iPort,
+                    belongWindowpoint: this,
+                    belongWindowId: e
+                }), console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c call PlayM4_Play sucessed", "color: blue", "color: black"), 1
+            }
+        }, {
+            key: "sleep", value: function (e) {
+                for (var t = (new Date).getTime(); (new Date).getTime() - t < e;) ;
+            }
+        }, {
+            key: "_feedData", value: function (n, e) {
+                var t, i, r, a, s, o = this, u = e.type, d = e.statusString, e = e.buf, l = this.aWndList[n],
+                    h = this.oEventCallback.pluginErrorHandler.bind(this), e = l.isGB ? this._stripRtpHead(e) : e;
+                l.isFlv ? l._resetFlvplayer ? 9 === new Uint8Array(e)[4] && (l.oMSE.onLoaderChunkArrival(e, l._receivedLength), l._receivedLength += e.byteLength, l._resetFlvplayer = !1) : (l.oMSE.onLoaderChunkArrival(e, l._receivedLength), l._receivedLength += e.byteLength) : "2" === this._decoderVersion ? (t = new Uint8Array(e), 1 === (t = l.oPlayCtrl.PlayM4_InputData(t, t.byteLength)) ? 0 !== l.iDecodeType && l.oPlayCtrl.PlayM4_GetSourceBufferRemain() < l.oPlayCtrl.iBufferValue / 2 && (l.oPlayCtrl.PlayM4_SetDecodeFrameType(0), l.iDecodeType = 0) : 11 === t ? 1 === l.iDecodeType || l.bFrameForward || (l.oPlayCtrl.PlayM4_SetDecodeFrameType(1), l.iDecodeType = 1, this.oEventCallback.performanceLack()) : this.oEventCallback.pluginErrorHandler(n, L.ERR_JSDECODER + l.oPlayCtrl.PlayM4_GetLastError().toString(), "PlayM4_InputData oError"), l.bFirstFrame || l.oPlayCtrl && l.oPlayCtrl.PlayM4_GetFrameInfo(function (e) {
+                    var t = o._getWndIndexFromPort(e.port);
+                    e.width && e.height && t === n && (l.bFirstFrame = !0, l.oPlayCtrl.iYUVWidth = e.width, l.oPlayCtrl.iYUVHeight = e.height, o._getOSDTime(n, e.year, e.month, e.day, e.hour, e.minute, e.second), l._videoInfo.height = e.height, l._videoInfo.width = e.width, l._videoInfo.frameRate = e.frameRate, l._emiter.emit("firstframeload"), o.oEventCallback.firstFrameDisplay(n, l.oPlayCtrl.iYUVWidth, l.oPlayCtrl.iYUVHeight), t = "chrome" === o._browserInfo.supporter && 90 < parseInt(o._browserInfo.supporterVersion.split(".").shift()) ? "3" : "2", console.info("[debug] [iWndNum-" + n + "] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c jsdecoder" + t + ".0软解首帧已经加载,分辨率:" + l._videoInfo.width + "*" + l._videoInfo.height, "color: blue", "color: black"), l.oPlayCtrl.PlayM4_SetDisplayBuf(6))
+                })) : (t = new Uint8Array(e), i = l.oPlayCtrl, 2 !== (s = l.oPlayCtrl && i.PlayM4_GetYUVBufSize()) || l.bFirstFrame || (l.bFirstFrame = !0, l.oPlayCtrl && i.PlayM4_GetFrameResolution(function (e, t) {
+                    l._videoInfo.height = t, l._videoInfo.width = e, l._emiter.emit("firstframeload"), o.oEventCallback.firstFrameDisplay(n, e, t), console.info("[debug] [iWndNum-" + n + "]%c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c jsdecoder1.0软解首帧已经加载,分辨率:" + e + "*" + t, "color: blue", "color: black")
+                })), r = l.oPlayCtrl && i.PlayM4_GetInputBufSize(), a = l.oPlayCtrl && i.PlayM4_GetDecodeFrameType(), .5 * E < r && r < .8 * E && 1 === l.iRate && (1 === a || l.bFrameForward || (l.oPlayCtrl && i.PlayM4_SetDecodeFrameType(1), this.oEventCallback.performanceLack())), 10 < s && s < 15 && (1 === a || l.bFrameForward || (l.oPlayCtrl && i.PlayM4_SetDecodeFrameType(1), this.oEventCallback.performanceLack())), s < 10 && r < .5 * E && 0 !== a && 1 === l.iRate && l.oPlayCtrl && i.PlayM4_SetDecodeFrameType(0), d ? (this._closeStreamAndDestory(n), h(n, L.ERR_STREAM_TRANS, d)) : u && "exception" === u ? (this._closeStreamAndDestory(n), h(n, L.ERR_STREAM_PLAYBACK_END, u)) : l.oPlayCtrl && l.oPlayCtrl.PlayM4_InputData(t, t.byteLength)), l.szStorageUUID && 0 === l.iMode && this.oStorageManager.inputData(l.szStorageUUID, e), this.aWndList[n]._bpsCalculator && this.aWndList[n]._bpsInfo && (this.aWndList[n]._bpsInfo.lastVideoBytes += e.byteLength, 0 !== this.aWndList[n]._bpsInfo.data_updated_time && (s = (s = (Date.now() - this.aWndList[n]._bpsInfo.data_updated_time) / 1e3) < 1 ? 1 : Math.round(s), this.aWndList[n]._bpsInfo.time_gap_factor = s), this.aWndList[n]._bpsInfo.data_updated_time = Date.now())
+            }
+        }, {
+            key: "_closeStreamAndDestory", value: (D = (0, v.default)(y.default.mark(function e(t) {
+                var n, i;
+                return y.default.wrap(function (e) {
+                    for (; ;) switch (e.prev = e.next) {
+                        case 0:
+                            if ((n = this.aWndList[t]).szStreamUUID) return e.prev = 2, e.next = 5, this.oStreamClient.stop(n.szStreamUUID);
+                            e.next = 11;
+                            break;
+                        case 5:
+                            e.next = 10;
+                            break;
+                        case 7:
+                            e.prev = 7, e.t0 = e.catch(2), console.warn(e.t0);
+                        case 10:
+                            n.szStreamUUID = "";
+                        case 11:
+                            n.bPlay = !1, n.iRate = 1, n.isGB = !1, n.bFrameForward = !1, n.iGlobalBaseTime = 0, this.aWndList[t].iCurentOSDTime = -1, n.isFlv && n.oMSE ? (n.oMSE.destroy && n.oMSE.destroy(), n.oMSE = null, n.isFlv = !1, n.iMode = 0, n._receivedLength = 0, this.oJSPlugin.find("video.play-window").eq(t).get(0).poster = "") : n.oPlayCtrl && ("1" === this._decoderVersion ? n.oPlayCtrl.PlayM4_Destroy() : (this._supportInfo.webGL2 && n.oPlayCtrl.PlayM4_SetAntialias(0), n.oPlayCtrl.PlayM4_Stop(), i = C.findIndex(function (e) {
+                                return e.port === n.oPlayCtrl.iPort
+                            }), C.splice(i, 1), n.AdditionDataCB = null), n.oPlayCtrl = null, n.bLoad = !1);
+                        case 18:
+                        case"end":
+                            return e.stop()
+                    }
+                }, e, this, [[2, 7]])
+            })), function (e) {
+                return D.apply(this, arguments)
+            })
+        }, {
+            key: "_onParsedData", value: function (e, t, n) {
+                switch (t) {
+                    case 1:
+                        this.aWndList[n].szStorageUUID && this.oStorageManager.inputData(this.aWndList[n].szStorageUUID, e);
+                        break;
+                    case 2:
+                        var i;
+                        this.aWndList[n]._osdtimeInfo = e, 0 === this.aWndList[n]._osdtimeInfo.globalTime ? this.aWndList[n].iCurentOSDTime = this.aWndList[n]._osdtimeInfo.flvduration + this.aWndList[n].iGlobalBaseTime : (i = "ios" === this._browserInfo._system || f.oTool.isEdge() ? "/" : " ", i = Date.parse(this.aWndList[n]._osdtimeInfo.globalTime.replace(/-/g, i)), this.aWndList[n].iCurentOSDTime = new Date(i).getTime());
+                        break;
+                    case 3:
+                        this.aWndList[n]._videoInfo = e;
+                        break;
+                    case 4:
+                        break;
+                    case 5:
+                        this.aWndList[n].szFlvhead = e.slice(0, e.byteLength - 4);
+                        break;
+                    case 11:
+                        this.aWndList[n].bPlay && this.aWndList[n].bFirstFrame && this._streamReset(n)
+                }
+            }
+        }, {
+            key: "_captureAudio", value: function (e, t, b, w, n) {
+                var i, D = this, r = window.navigator, T = new (window.AudioContext || window.webkitAudioContext);
+                new m.default((i = (0, v.default)(y.default.mark(function e(k, t) {
+                    return y.default.wrap(function (e) {
+                        for (; ;) switch (e.prev = e.next) {
+                            case 0:
+                                void 0 === r.mediaDevices && (r.mediaDevices = {}), void 0 === r.mediaDevices.getUserMedia && (r.mediaDevices.getUserMedia = function (e) {
+                                    if (!(r.getUserMedia || r.webkitGetUserMedia || r.mozGetUserMedia || r.msGetUserMedia)) return m.default.reject(new Error("getUserMedia is not implemented in this browser"))
+                                }), r.mediaDevices.getUserMedia({audio: !0}).then(function (g) {
+                                    if (!D.bTalkLoaded) return g.getTracks().forEach(function (e) {
+                                        e.stop()
+                                    }), k();
+                                    var M = T.createMediaStreamSource(g), e = M.context,
+                                        L = e.createScriptProcessor(512, 1, 1), S = [];
+                                    L.onaudioprocess = function (e) {
+                                        if (!D.bTalkLoaded && !D._audionodeClose) return D._audionodeClose = !0, M.disconnect(L), L.disconnect(T.destination), g.getTracks().forEach(function (e) {
+                                            e.stop()
+                                        }), k();
+                                        for (var t = e.inputBuffer.getChannelData(0), n = 48e3 / b, i = t.length / n, r = new window.Float32Array(i), a = 0, s = 0; a < i;) r[a] = t[s], s += n, a++;
+                                        var e = r.length, o = null;
+                                        if (16 === w) for (var u = new window.ArrayBuffer(2 * e), o = new window.DataView(u), d = 0, l = 0; l < r.length; l++, d += 2) {
+                                            var h = Math.max(-1, Math.min(1, r[l]));
+                                            o.setInt16(d, h < 0 ? 32768 * h : 32767 * h, !0)
+                                        } else if (8 === w) for (var u = new window.ArrayBuffer(e), c = (o = new window.DataView(u), 0), _ = 0; _ < r.length; _++, c++) {
+                                            var f = Math.max(-1, Math.min(1, r[_])), f = f < 0 ? 32768 * f : 32767 * f,
+                                                f = parseInt(255 / (65535 / (32768 + f)), 10);
+                                            o.setInt8(c, f, !0)
+                                        }
+                                        if (D.bTalkLoaded && null !== o.buffer) for (var m = new Uint8Array(o.buffer), p = S.length, y = 0, v = m.byteLength; y < v; y++) S[p++] = m[y], 640 === S.length && (D.bTalkLoaded && D.oTalkPlayCtrl.Talk_InputAudEncodeData(new Uint8Array(S), 640), p = S.length = 0)
+                                    }, M.connect(L), L.connect(e.destination)
+                                }, function (e) {
+                                    return D.oEventCallback.pluginErrorHandler(0, L.ERR_TALK_GETUSERMEDIA_UNDEFINE), D._log.E(L.ERR_TALK_GETUSERMEDIA_UNDEFINE + ":  采集音频接口失败", e), D.JS_StopTalk(), t(L.ERR_TALK_GETUSERMEDIA_UNDEFINE)
+                                });
+                            case 3:
+                            case"end":
+                                return e.stop()
+                        }
+                    }, e, D)
+                })), function (e, t) {
+                    return i.apply(this, arguments)
+                }))
+            }
+        }, {
+            key: "_loadTalk", value: function (a) {
+                var s = this, o = void 0, u = void 0, d = void 0, l = void 0, h = void 0, c = "", _ = "", f = "";
+                return new m.default(function (t, i) {
+                    var e, n, r;
+                    c = -1 !== a.search("wss://") ? (e = a.indexOf("/proxy/") + 7, n = a.indexOf("/", e), _ = a.substring(e, n), a.replace("wss:", "ws:").replace(_, "").replace("/proxy/", "")) : a, s.oStreamClient.openStream(a, {
+                        playURL: c,
+                        proxy: _,
+                        mode: "media"
+                    }, (r = (0, v.default)(y.default.mark(function e(t) {
+                        var n;
+                        return y.default.wrap(function (e) {
+                            for (; ;) switch (e.prev = e.next) {
+                                case 0:
+                                    if (!t.bHead) {
+                                        e.next = 16;
+                                        break
+                                    }
+                                    o = t.oParams.iAudioType, u = t.oParams.iAudioBitRate, d = t.oParams.iAudioSamplingRate, l = t.oParams.iAudioBitWidth, h = t.oParams.iChannel, 6 < o && (s.oEventCallback.pluginErrorHandler(0, L.ERR_TALK_UNSUPPORT_AUDIOTYPE), s._log.E(L.ERR_TALK_UNSUPPORT_AUDIOTYPE + ":  不支持该音频格式"), s.JS_StopTalk(), i(L.ERR_TALK_UNSUPPORT_AUDIOTYPE)), s.oTalkPlayCtrl.Talk_CreateAudEncode(o), s.oTalkPlayCtrl.Talk_SetAudEncodeParam(d, h, u, l), s.oTalkPlayCtrl.Talk_RegisterAudEncodeCB(function (e) {
+                                        s.oStreamClient.transmission(f, e)
+                                    }), s.oTalkPlayCtrl.Talk_CreateAuDecode(), s.oTalkPlayCtrl.Talk_SetAudDecodeParam(d, h, u, l, o), s.oTalkPlayCtrl.Talk_OpenStreamDecodeData(), 1 !== s.oTalkPlayCtrl.Talk_GetLastError() && (n = L.ERR_TALK + s.oTalkPlayCtrl.Talk_GetLastError().toString(), s._log.E(n + ":  对讲库初始化失败", n), s.oEventCallback.pluginErrorHandler(0, n), s.JS_StopTalk(), i(n)), e.next = 19;
+                                    break;
+                                case 16:
+                                    if (t.buf.byteLength < 10) return e.abrupt("return");
+                                    e.next = 18;
+                                    break;
+                                case 18:
+                                    s.oTalkPlayCtrl && s.oTalkPlayCtrl.Talk_InputAudDecodeData(t.buf, t.buf.byteLength);
+                                case 19:
+                                case"end":
+                                    return e.stop()
+                            }
+                        }, e, s)
+                    })), function (e) {
+                        return r.apply(this, arguments)
+                    }), function (e) {
+                        if (s.bTalkLoaded) 1e3 === e.code || 1005 === e.code ? (s._log.E(L.ERR_STREAM_CONNECT_CLOSED + ":  送流异常，被后端关闭连接"), s.oEventCallback.pluginErrorHandler(0, L.ERR_STREAM_CONNECT_CLOSED, e)) : (s._log.E(L.ERR_STREAM_INTERRUPT + ":  流中断"), s.oEventCallback.pluginErrorHandler(0, L.ERR_STREAM_INTERRUPT, e)), s.szTalkStreamId = "", s.JS_StopTalk(); else {
+                            if (1e3 === e.code || 1005 === e.code) return t();
+                            s.szTalkStreamId ? (s.oEventCallback.pluginErrorHandler(0, L.ERR_COM_RECV_STREAM_TIMEOUT, e), s.szTalkStreamId = "", i(L.ERR_COM_RECV_STREAM_TIMEOUT)) : 1006 === e.code && -1 !== c.search("wss://") ? (s.oEventCallback.pluginErrorHandler(0, L.ERR_STREAM_WSS_ERROR, e), i(L.ERR_STREAM_WSS_ERROR)) : (s.oEventCallback.pluginErrorHandler(0, L.ERR_STREAM_WS_ERROR, e), i(L.ERR_STREAM_WS_ERROR))
+                        }
+                    }).then(function (e) {
+                        s.szTalkStreamId = e, f = e, s.oStreamClient.startPlay(e, "", "", "startTalk").then(function () {
+                            s._captureAudio(o, u, d, l, h), t()
+                        }, function (e) {
+                            e = "0x0" + e.errorCode.toString(16);
+                            s._log.E(e + ":  取流失败，详情根据错误码在运管后台进行查询."), s.oEventCallback.pluginErrorHandler(0, e), i(e)
+                        })
+                    }, function (e) {
+                        s._log.E(L.ERR_STREAM_INTERRUPT + ":  对讲通道异常中断."), s.oEventCallback.pluginErrorHandler(0, L.ERR_STREAM_INTERRUPT, e), s.JS_StopTalk()
+                    })
+                })
+            }
+        }, {
+            key: "JS_StartTalk", value: function (r) {
+                var n, a = this;
+                return this._audionodeClose = !1, new m.default((n = (0, v.default)(y.default.mark(function e(n, t) {
+                    var i;
+                    return y.default.wrap(function (e) {
+                        for (; ;) switch (e.prev = e.next) {
+                            case 0:
+                                if ("string" != typeof r || -1 === r.search("wss://") && -1 === r.search("ws://")) return e.abrupt("return", t(L.ERR_COM_URL_ERROR));
+                                e.next = 2;
+                                break;
+                            case 2:
+                                i = "", i = "2" === a._decoderVersion ? a.options.szBasePath + "talkW/AudioInterCom.js" : a.options.szBasePath + "talk/AudioInterCom.js", null === a.oTalkPlayCtrl ? a.oTalkPlayCtrl = new o.JSTalkCtrl(i, function (e) {
+                                    var t = e.cmd;
+                                    e.status, e.errorCode;
+                                    "loaded" === t && (a.bTalkLoaded = !0, a._loadTalk(r), console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c oTalkPlayCtrl load end code", "color: blue", "color: black"), n())
+                                }) : a.JS_StopTalk().then(function () {
+                                    a.oTalkPlayCtrl = new o.JSTalkCtrl(i, function (e) {
+                                        var t = e.cmd;
+                                        e.status, e.errorCode;
+                                        "loaded" === t && (a._loadTalk(r), console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c oTalkPlayCtrl load end code", "color: blue", "color: black"), n())
+                                    })
+                                });
+                            case 5:
+                            case"end":
+                                return e.stop()
+                        }
+                    }, e, a)
+                })), function (e, t) {
+                    return n.apply(this, arguments)
+                }))
+            }
+        }, {
+            key: "JS_StopTalk", value: function () {
+                var n = this;
+                return new m.default(function (e, t) {
+                    n.bTalkLoaded = !1, n.szTalkStreamId && (n.oStreamClient.stop(n.szTalkStreamId), n.szTalkStreamId = ""), n.oTalkPlayCtrl && (n.oTalkPlayCtrl.Talk_DestroyAudEncode(), n.oTalkPlayCtrl.Talk_DestroyAudDecode(), n.oTalkPlayCtrl = null, e())
+                })
+            }
+        }, {
+            key: "JS_TalkSetVolume", value: function (n) {
+                var i = this;
+                return new m.default(function (e, t) {
+                    i.oTalkPlayCtrl && 0 === i.oTalkPlayCtrl.Talk_SetVolume(n / 100) ? t(i.oTalkPlayCtrl.Talk_GetLastError() + L.ERR_TALK) : e()
+                })
+            }
+        }, {
+            key: "JS_TalkGetVolume", value: function () {
+                var e = this;
+                return new m.default(function (t) {
+                    e.oTalkPlayCtrl && e.oTalkPlayCtrl.Talk_GetVolume(function (e) {
+                        e = Math.round(100 * e);
+                        t(e)
+                    })
+                })
+            }
+        }, {
+            key: "JS_SetTalkLogFlag", value: function (t) {
+                var n = this;
+                return new m.default(function (e) {
+                    n.oTalkPlayCtrl && n.oTalkPlayCtrl.Talk_SetTalkLogFlag(t), e()
+                })
+            }
+        }, {
+            key: "JS_GetVideoInfo", value: function () {
+                var i = this, r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (e, t) {
+                    (r < 0 || r > i.iMaxWndNum - 1 || "number" != typeof r) && (r = i.iCurrentWndIndex);
+                    var n = i._checkPlay(r);
+                    0 !== n && t(n), e(i.aWndList[r]._videoInfo)
+                })
+            }
+        }, {
+            key: "JS_SetConnectTimeOut", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, r = arguments[1];
+                return new m.default(function (e, t) {
+                    (i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), n.oStreamClient.setTimeOut(r).then(function () {
+                        e()
+                    }, function (e) {
+                        t(e)
+                    })
+                })
+            }
+        }, {
+            key: "JS_SetAdditionDataCB", value: function () {
+                var n = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, i = this, r = arguments[1],
+                    a = arguments[2];
+                return new m.default(function (e, t) {
+                    (n < 0 || n > i.iMaxWndNum - 1 || "number" != typeof n) && (n = i.iCurrentWndIndex), i.aWndList[n].oPlayCtrl.PlayM4_SetAdditionDataCallBack(r, 1), i.aWndList[n].AdditionDataCB = a, e()
+                })
+            }
+        }, {
+            key: "JS_SetStreamCacheBuf", value: function () {
+                var n = this, i = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, r = arguments[1];
+                return new m.default(function (e, t) {
+                    (i < 0 || i > n.iMaxWndNum - 1 || "number" != typeof i) && (i = n.iCurrentWndIndex), (r < 0 || 5242880 < r) && (r = 5242880, n._log.E(L.ERR_STREAM_BUFER_ERROR + ":  JS_SetStreamCacheBuf size invaild，please set 0-5*1024*1024."), t(L.ERR_STREAM_BUFER_ERROR)), n.aWndList[i].szBufferSize = r, e()
+                })
+            }
+        }, {
+            key: "JS_SetTraceId", value: function () {
+                var t = this, n = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1, i = arguments[1];
+                return new m.default(function (e) {
+                    (n < 0 || n > t.iMaxWndNum - 1 || "number" != typeof n) && (n = t.iCurrentWndIndex), t.aWndList[n].bopenTraceId = i, e()
+                })
+            }
+        }, {
+            key: "JS_GetTraceId", value: function () {
+                var t = this, n = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : -1;
+                return new m.default(function (e) {
+                    (n < 0 || n > t.iMaxWndNum - 1 || "number" != typeof n) && (n = t.iCurrentWndIndex), e(t.aWndList[n].szTraceId)
+                })
+            }
+        }, {
+            key: "_support", value: function () {
+                var e = !!window.MediaSource, t = !!window.WebGLRenderingContext, n = !!window.WebGL2RenderingContext,
+                    i = !!window.SharedArrayBuffer, r = !!window.OffscreenCanvas,
+                    a = !("windows" === this._browserInfo.system && "chrome" === this._browserInfo.supporter && parseInt(this._browserInfo.supporterVersion.split(".").shift()) < 80),
+                    s = "android" !== this._browserInfo.system && "ios" !== this._browserInfo.system;
+                return {
+                    MSE: e,
+                    webGL1: t,
+                    webGL2: n,
+                    SharedArrayBuffer: i,
+                    OffscreenCanvas: r,
+                    "decoder1.0": t,
+                    "decoder2.0": t && i && r && a && s
+                }
+            }
+        }, {
+            key: "_decoder2Loaded", value: function () {
+                return new m.default(function (e, t) {
+                    var n = 0, i = window.setInterval(function () {
+                        4e3 <= n && (clearInterval(i), t(L.ERR_COM_LOAD_JSDECODER_ERROR)), P && (clearInterval(i), console.log("clearInterval"), e(1)), n += 100
+                    }, 100)
+                })
+            }
+        }, {
+            key: "_calculateRealtimeBitrate", value: function (e) {
+                this.aWndList[e]._bpsInfo && (this.aWndList[e]._bpsInfo.time_gap_factor < 1 && (this._bpsInfo.time_gap_factor = 1), 0 !== this.aWndList[e]._bpsInfo.lastVideoBytes && (this.aWndList[e]._bpsInfo.bps_video = 8 * this.aWndList[e]._bpsInfo.lastVideoBytes / 1024 / this.aWndList[e]._bpsInfo.time_gap_factor, this.aWndList[e]._bpsInfo.lastVideoBytes = 0), this.aWndList[e]._videoInfo.bitRate = this.aWndList[e]._bpsInfo.bps_video)
+            }
+        }, {
+            key: "_loadScript", value: function (n) {
+                return new m.default(function (e) {
+                    var t = document.createElement("script");
+                    t.type = "text/javascript", t.src = n, t.onload = function () {
+                        e()
+                    }, document.body.appendChild(t)
+                })
+            }
+        }, {
+            key: "_playerlocalFile", value: function (e, t) {
+                var n = this.aWndList[e];
+                n.iMode = 1, n.isFlv = !0, n.bPlay || this._createFlvPlayer(e), n.oMSE.onLoaderChunkArrival(t, n._receivedLength), n._receivedLength += t.byteLength
+            }
+        }, {
+            key: "uuid2", value: function (e, t) {
+                var n, i, r = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split(""), a = [];
+                if (t = t || r.length, e) for (n = 0; n < e; n++) a[n] = r[0 | Math.random() * t]; else for (a[8] = a[13] = a[18] = a[23] = "-", a[14] = "4", n = 0; n < 36; n++) a[n] || (i = 0 | 16 * Math.random(), a[n] = r[19 === n ? 3 & i | 8 : i]);
+                return a.join("")
+            }
+        }, {
+            key: "currentWindowIndex", get: function () {
+                return this.iCurrentWndIndex
+            }
+        }, {
+            key: "fileSysSwitch", set: function (e) {
+                if ("boolean" != typeof e) return console.error("fileSysSwitch set should get a Boolean");
+                this._fileSysSwitch = e
+            }
+        }]), R);
+
+        function R(e) {
+            var t = this, n = ((0, a.default)(this, R), this.TAG = "H5player", this.options = g.default.extend({
+                    szId: "playWnd",
+                    iWidth: 400,
+                    iHeight: 300,
+                    iMaxSplit: 1,
+                    iCurrentSplit: 1,
+                    szBasePath: "./",
+                    bSupporDoubleClickFull: !0,
+                    openDebug: !0,
+                    mseWorkerEnable: !1
+                }, e), {borderWidth: 1, border: "#343434", borderSelect: "#FFCC00", background: "#000"}),
+                n = g.default.extend(n, e.oStyle);
+            this.options.oStyle = n, this._log = new k.default(this), this.e = {
+                resize: this._eventHandlerResize.bind(this),
+                fullscreenchange: this._eventHandlerFullscreenchange.bind(this),
+                visibilitychange: this._eventHandlerVisibilitychange.bind(this)
+            }, this.options.iCurrentSplit > this.options.iMaxSplit && (this.options.iCurrentSplit = this.options.iMaxSplit), this.iCurrentPlayRate = 1, this.iCurrentSoundWnd = -1, this.iMaxWndNum = this.options.iMaxSplit * this.options.iMaxSplit, this.bPluginFull = !1, this.oVideoWindow = null, this.fullscreenElement = null, this.iCurrentWndIndex = -1, this.fDrawCallback = null, this.szPluginVersion = w.version, this.isBrowserVisible = !0, this._decoderVersion = "1", "/" !== this.options.szBasePath.charAt(this.options.szBasePath.length - 1) && (this.options.szBasePath = this.options.szBasePath + "/"), this.oStorageManager = new l.StorageManager(this.options.szBasePath + "transform/"), this.oStreamClient = new s.StreamClient(this.options), this.oJSPlugin = (0, g.default)("#" + this.options.szId), this.bcloseAntialias = !1, this._listenBrowserVisibility(), this._createWindows(), this.aWndList = [];
+            for (var i, r = 0; r < this.iMaxWndNum; r++) this.aWndList[r] = {}, this.aWndList[r].bPlay = !1, this.aWndList[r].bLoad = !1, this.aWndList[r].stashArray = [], this.aWndList[r].stashFeeding = !1, this.aWndList[r].szPlayType = "", this.aWndList[r].szStorageUUID = "", this.aWndList[r].szStreamUUID = "", this.aWndList[r].aHead = [], this.aWndList[r].isGB = !1, this.aWndList[r].isHVAGHead = !1, this.aWndList[r].aHVAGHead = [], this.aWndList[r].iRate = 1, this.aWndList[r].bEZoom = !1, this.aWndList[r].b3DZoom = !1, this.aWndList[r].szSecretKey = "", this.aWndList[r].bFrameForward = !1, this.aWndList[r].aSamples = [], this.aWndList[r].iRevBufferTimes = 0, this.aWndList[r].nalPackage = [0, 0, 0, 1, 97], this.aWndList[r].iMode = 0, this.aWndList[r].iCurentOSDTime = -1, this.aWndList[r].oSdpInfo = {}, this.aWndList[r].iLastDuaration = -1, this.aWndList[r].iCurDuaration = -1, this.aWndList[r].iTimeInterval = -1, this.aWndList[r].isPause = !1, this.aWndList[r].MSEVolume = .5, this.aWndList[r].iBufferValue = 0, this.aWndList[r]._videoInfo = {
+                VideType: "H264",
+                audioType: "without",
+                width: 0,
+                height: 0,
+                frameRate: 25,
+                bitRate: 0,
+                systemFormt: "ps",
+                audioSampleRate: 0
+            }, this.aWndList[r].asyncLock = !1, this.aWndList[r].AdditionDataCB = null, this.aWndList[r].bFirstFrame = !1, this.aWndList[r].iDecodeType = 0, this.aWndList[r]._bpsCalculator = null, this.aWndList[r]._bpsInfo = {
+                lastVideoBytes: 0,
+                bps_video: 0,
+                data_updated_time: 0,
+                time_gap_factor: 1
+            }, this.aWndList[r]._emiter = new M.default, this.aWndList[r].bOpenSound = !1, this.aWndList[r].szFlvhead = "", this.aWndList[r]._resetFlvplayer = !1, this.aWndList[r]._osdtimeInfo = {
+                flvstartTime: 0,
+                globalTime: 0,
+                flvduration: 0
+            }, this.aWndList[r].szBufferSize = 0, this.aWndList[r].iGlobalBaseTime = 0, this.aWndList[r].mseDecoderAudio = !0, this.aWndList[r].szTraceId = "", this.aWndList[r].bopenTraceId = !1;
+            this.oTalkPlayCtrl = null, this.szTalkStreamId = "", this.bTalkLoaded = !1, this.szAudioStorageUUID = "", this.szEncodeAudioStorageUUID = "", this.szAudiorecvStorageUUID = "", this._audionodeClose = !1, this._browserInfo = new S.default, this._supportInfo = this._support(), console.log("H5player" + w.version + " Support: ", this._supportInfo, this._browserInfo), this._decoderVersion = this._supportInfo["decoder2.0"] ? "2" : "1", "2" !== this._decoderVersion || P || Y || (i = "chrome" === this._browserInfo.supporter && 90 < parseInt(this._browserInfo.supporterVersion.split(".").shift()) ? "3" : "2", e = this.options.szBasePath + "playctrl" + i + "/Decoder.js", Y = !0, this._loadScript(e).then((0, v.default)(y.default.mark(function e() {
+                return y.default.wrap(function (e) {
+                    for (; ;) switch (e.prev = e.next) {
+                        case 0:
+                            return Y = !1, e.next = 3, window.JSPlayerModule();
+                        case 3:
+                            P = e.sent, console.info("[debug] %c" + (0, _.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c JSDecoder" + i + " load end ", "color: blue", "color: black");
+                        case 5:
+                        case"end":
+                            return e.stop()
+                    }
+                }, e, t)
+            })))), this.oDrawCanvas = new h.ESCanvas(this.options.szId + "_canvas_draw0"), this._initEvent(), this.oEventCallback.windowEventSelect(0), this._dealWndSelect(0)
+        }
+
+        n.version = w.version, t.JSPlugin = n
+    }, function (e, t, n) {
+        n(67), n(41), n(75), n(245), n(253), n(254), e.exports = n(3).Promise
+    }, function (e, t, n) {
+        var a = n(42), s = n(43);
+        e.exports = function (r) {
+            return function (e, t) {
+                var n, e = String(s(e)), t = a(t), i = e.length;
+                return t < 0 || i <= t ? r ? "" : void 0 : (n = e.charCodeAt(t)) < 55296 || 56319 < n || t + 1 === i || (i = e.charCodeAt(t + 1)) < 56320 || 57343 < i ? r ? e.charAt(t) : n : r ? e.slice(t, t + 2) : i - 56320 + (n - 55296 << 10) + 65536
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(46), r = n(28), a = n(36), s = {};
+        n(17)(s, n(7)("iterator"), function () {
+            return this
+        }), e.exports = function (e, t, n) {
+            e.prototype = i(s, {next: r(1, n)}), a(e, t + " Iterator")
+        }
+    }, function (e, t, n) {
+        var s = n(12), o = n(13), u = n(30);
+        e.exports = n(14) ? Object.defineProperties : function (e, t) {
+            o(e);
+            for (var n, i = u(t), r = i.length, a = 0; a < r;) s.f(e, n = i[a++], t[n]);
+            return e
+        }
+    }, function (e, t, n) {
+        var u = n(19), d = n(47), l = n(241);
+        e.exports = function (o) {
+            return function (e, t, n) {
+                var i, r = u(e), a = d(r.length), s = l(n, a);
+                if (o && t != t) {
+                    for (; s < a;) if ((i = r[s++]) != i) return !0
+                } else for (; s < a; s++) if ((o || s in r) && r[s] === t) return o || s || 0;
+                return !o && -1
+            }
+        }
+    }, function (e, t, n) {
+        var i = n(42), r = Math.max, a = Math.min;
+        e.exports = function (e, t) {
+            return (e = i(e)) < 0 ? r(e + t, 0) : a(e, t)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(243), r = n(244), a = n(29), s = n(19);
+        e.exports = n(68)(Array, "Array", function (e, t) {
+            this._t = s(e), this._i = 0, this._k = t
+        }, function () {
+            var e = this._t, t = this._k, n = this._i++;
+            return !e || n >= e.length ? (this._t = void 0, r(1)) : r(0, "keys" == t ? n : "values" == t ? e[n] : [n, e[n]])
+        }, "values"), a.Arguments = a.Array, i("keys"), i("values"), i("entries")
+    }, function (e, t) {
+        e.exports = function () {
+        }
+    }, function (e, t) {
+        e.exports = function (e, t) {
+            return {value: t, done: !!e}
+        }
+    }, function (O, I, n) {
+        "use strict";
+
+        function i() {
+        }
+
+        var t, r, a, s, o = n(27), c = n(6), u = n(22), e = n(76), d = n(8), l = n(16), h = n(34), _ = n(246),
+            f = n(247), m = n(80), p = n(81).set, y = n(249)(), v = n(51), g = n(82), M = n(250), L = n(83),
+            S = "Promise", k = c.TypeError, b = c.process, w = b && b.versions, D = w && w.v8 || "", T = c[S],
+            E = "process" == e(b), Y = r = v.f, w = !!function () {
+                try {
+                    var e = T.resolve(1), t = (e.constructor = {})[n(7)("species")] = function (e) {
+                        e(i, i)
+                    };
+                    return (E || "function" == typeof PromiseRejectionEvent) && e.then(i) instanceof t && 0 !== D.indexOf("6.6") && -1 === M.indexOf("Chrome/66")
+                } catch (e) {
+                }
+            }(), P = function (e) {
+                var t;
+                return !(!l(e) || "function" != typeof (t = e.then)) && t
+            }, C = function (h, n) {
+                var i;
+                h._n || (h._n = !0, i = h._c, y(function () {
+                    for (var r, d = h._v, l = 1 == h._s, e = 0, t = function (e) {
+                        var t, n, i, r, a = l ? e.ok : e.fail, s = e.resolve, o = e.reject, u = e.domain;
+                        try {
+                            a ? (l || (2 == h._h && (r = h, p.call(c, function () {
+                                var e;
+                                E ? b.emit("rejectionHandled", r) : (e = c.onrejectionhandled) && e({
+                                    promise: r,
+                                    reason: r._v
+                                })
+                            })), h._h = 1), !0 === a ? t = d : (u && u.enter(), t = a(d), u && (u.exit(), i = !0)), t === e.promise ? o(k("Promise-chain cycle")) : (n = P(t)) ? n.call(t, s, o) : s(t)) : o(d)
+                        } catch (e) {
+                            u && !i && u.exit(), o(e)
+                        }
+                    }; i.length > e;) t(i[e++]);
+                    h._c = [], h._n = !1, n && !h._h && (r = h, p.call(c, function () {
+                        var e, t, n = r._v, i = R(r);
+                        if (i && (e = g(function () {
+                            E ? b.emit("unhandledRejection", n, r) : (t = c.onunhandledrejection) ? t({
+                                promise: r,
+                                reason: n
+                            }) : (t = c.console) && t.error && t.error("Unhandled promise rejection", n)
+                        }), r._h = E || R(r) ? 2 : 1), r._a = void 0, i && e.e) throw e.v
+                    }))
+                }))
+            }, R = function (e) {
+                return 1 !== e._h && 0 === (e._a || e._c).length
+            }, A = function (e) {
+                var t = this;
+                t._d || (t._d = !0, (t = t._w || t)._v = e, t._s = 2, t._a || (t._a = t._c.slice()), C(t, !0))
+            }, x = function (e) {
+                var n, i = this;
+                if (!i._d) {
+                    i._d = !0, i = i._w || i;
+                    try {
+                        if (i === e) throw k("Promise can't be resolved itself");
+                        (n = P(e)) ? y(function () {
+                            var t = {_w: i, _d: !1};
+                            try {
+                                n.call(e, u(x, t, 1), u(A, t, 1))
+                            } catch (e) {
+                                A.call(t, e)
+                            }
+                        }) : (i._v = e, i._s = 1, C(i, !1))
+                    } catch (e) {
+                        A.call({_w: i, _d: !1}, e)
+                    }
+                }
+            };
+        w || (T = function (e) {
+            _(this, T, S, "_h"), h(e), t.call(this);
+            try {
+                e(u(x, this, 1), u(A, this, 1))
+            } catch (e) {
+                A.call(this, e)
+            }
+        }, (t = function (e) {
+            this._c = [], this._a = void 0, this._s = 0, this._d = !1, this._v = void 0, this._h = 0, this._n = !1
+        }).prototype = n(251)(T.prototype, {
+            then: function (e, t) {
+                var n = Y(m(this, T));
+                return n.ok = "function" != typeof e || e, n.fail = "function" == typeof t && t, n.domain = E ? b.domain : void 0, this._c.push(n), this._a && this._a.push(n), this._s && C(this, !1), n.promise
+            }, catch: function (e) {
+                return this.then(void 0, e)
+            }
+        }), a = function () {
+            var e = new t;
+            this.promise = e, this.resolve = u(x, e, 1), this.reject = u(A, e, 1)
+        }, v.f = Y = function (e) {
+            return e === T || e === s ? new a : r(e)
+        }), d(d.G + d.W + d.F * !w, {Promise: T}), n(36)(T, S), n(252)(S), s = n(3)[S], d(d.S + d.F * !w, S, {
+            reject: function (e) {
+                var t = Y(this);
+                return (0, t.reject)(e), t.promise
+            }
+        }), d(d.S + d.F * (o || !w), S, {
+            resolve: function (e) {
+                return L(o && this === s ? T : this, e)
+            }
+        }), d(d.S + d.F * !(w && n(84)(function (e) {
+            T.all(e).catch(i)
+        })), S, {
+            all: function (e) {
+                var s = this, t = Y(s), o = t.resolve, u = t.reject, n = g(function () {
+                    var i = [], r = 0, a = 1;
+                    f(e, !1, function (e) {
+                        var t = r++, n = !1;
+                        i.push(void 0), a++, s.resolve(e).then(function (e) {
+                            n || (n = !0, i[t] = e, --a || o(i))
+                        }, u)
+                    }), --a || o(i)
+                });
+                return n.e && u(n.v), t.promise
+            }, race: function (e) {
+                var t = this, n = Y(t), i = n.reject, r = g(function () {
+                    f(e, !1, function (e) {
+                        t.resolve(e).then(n.resolve, i)
+                    })
+                });
+                return r.e && i(r.v), n.promise
+            }
+        })
+    }, function (e, t) {
+        e.exports = function (e, t, n, i) {
+            if (!(e instanceof t) || void 0 !== i && i in e) throw TypeError(n + ": incorrect invocation!");
+            return e
+        }
+    }, function (e, t, n) {
+        var h = n(22), c = n(77), _ = n(78), f = n(13), m = n(47), p = n(79), y = {}, v = {};
+        (t = e.exports = function (e, t, n, i, r) {
+            var a, s, o, u, r = r ? function () {
+                return e
+            } : p(e), d = h(n, i, t ? 2 : 1), l = 0;
+            if ("function" != typeof r) throw TypeError(e + " is not iterable!");
+            if (_(r)) {
+                for (a = m(e.length); l < a; l++) if ((u = t ? d(f(s = e[l])[0], s[1]) : d(e[l])) === y || u === v) return u
+            } else for (o = r.call(e); !(s = o.next()).done;) if ((u = c(o, d, s.value, t)) === y || u === v) return u
+        }).BREAK = y, t.RETURN = v
+    }, function (e, t) {
+        e.exports = function (e, t, n) {
+            var i = void 0 === n;
+            switch (t.length) {
+                case 0:
+                    return i ? e() : e.call(n);
+                case 1:
+                    return i ? e(t[0]) : e.call(n, t[0]);
+                case 2:
+                    return i ? e(t[0], t[1]) : e.call(n, t[0], t[1]);
+                case 3:
+                    return i ? e(t[0], t[1], t[2]) : e.call(n, t[0], t[1], t[2]);
+                case 4:
+                    return i ? e(t[0], t[1], t[2], t[3]) : e.call(n, t[0], t[1], t[2], t[3])
+            }
+            return e.apply(n, t)
+        }
+    }, function (e, t, n) {
+        var o = n(6), u = n(81).set, d = o.MutationObserver || o.WebKitMutationObserver, l = o.process, h = o.Promise,
+            c = "process" == n(31)(l);
+        e.exports = function () {
+            function e() {
+                var e, t;
+                for (c && (e = l.domain) && e.exit(); n;) {
+                    t = n.fn, n = n.next;
+                    try {
+                        t()
+                    } catch (e) {
+                        throw n ? r() : i = void 0, e
+                    }
+                }
+                i = void 0, e && e.enter()
+            }
+
+            var n, i, t, r, a, s;
+            return r = c ? function () {
+                l.nextTick(e)
+            } : !d || o.navigator && o.navigator.standalone ? h && h.resolve ? (t = h.resolve(void 0), function () {
+                t.then(e)
+            }) : function () {
+                u.call(o, e)
+            } : (a = !0, s = document.createTextNode(""), new d(e).observe(s, {characterData: !0}), function () {
+                s.data = a = !a
+            }), function (e) {
+                e = {fn: e, next: void 0};
+                i && (i.next = e), n || (n = e, r()), i = e
+            }
+        }
+    }, function (e, t, n) {
+        n = n(6).navigator;
+        e.exports = n && n.userAgent || ""
+    }, function (e, t, n) {
+        var r = n(17);
+        e.exports = function (e, t, n) {
+            for (var i in t) n && e[i] ? e[i] = t[i] : r(e, i, t[i]);
+            return e
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(6), r = n(3), a = n(12), s = n(14), o = n(7)("species");
+        e.exports = function (e) {
+            e = ("function" == typeof r[e] ? r : i)[e];
+            s && e && !e[o] && a.f(e, o, {
+                configurable: !0, get: function () {
+                    return this
+                }
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(8), r = n(3), a = n(6), s = n(80), o = n(83);
+        i(i.P + i.R, "Promise", {
+            finally: function (t) {
+                var n = s(this, r.Promise || a.Promise), e = "function" == typeof t;
+                return this.then(e ? function (e) {
+                    return o(n, t()).then(function () {
+                        return e
+                    })
+                } : t, e ? function (e) {
+                    return o(n, t()).then(function () {
+                        throw e
+                    })
+                } : t)
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(8), r = n(51), a = n(82);
+        i(i.S, "Promise", {
+            try: function (e) {
+                var t = r.f(this), e = a(e);
+                return (e.e ? t.reject : t.resolve)(e.v), t.promise
+            }
+        })
+    }, function (e, t, n) {
+        n(256), e.exports = n(3).Object.keys
+    }, function (e, t, n) {
+        var i = n(24), r = n(30);
+        n(52)("keys", function () {
+            return function (e) {
+                return r(i(e))
+            }
+        })
+    }, function (e, t, n) {
+        var i = function () {
+                return this
+            }() || Function("return this")(),
+            r = i.regeneratorRuntime && 0 <= Object.getOwnPropertyNames(i).indexOf("regeneratorRuntime"),
+            a = r && i.regeneratorRuntime;
+        if (i.regeneratorRuntime = void 0, e.exports = n(258), r) i.regeneratorRuntime = a; else try {
+            delete i.regeneratorRuntime
+        } catch (e) {
+            i.regeneratorRuntime = void 0
+        }
+    }, function (T, e) {
+        !function (e) {
+            "use strict";
+            var u, d, l, h, c, _, t, n = Object.prototype, f = n.hasOwnProperty,
+                i = "function" == typeof Symbol ? Symbol : {}, r = i.iterator || "@@iterator",
+                a = i.asyncIterator || "@@asyncIterator", s = i.toStringTag || "@@toStringTag",
+                i = "object" == typeof T, o = e.regeneratorRuntime;
+
+            function m(e, t, n, i) {
+                var r, a, s, o, t = t && t.prototype instanceof y ? t : y, t = Object.create(t.prototype),
+                    i = new b(i || []);
+                return t._invoke = (r = e, a = n, s = i, o = d, function (e, t) {
+                    if (o === h) throw new Error("Generator is already running");
+                    if (o === c) {
+                        if ("throw" === e) throw t;
+                        return D()
+                    }
+                    for (s.method = e, s.arg = t; ;) {
+                        var n = s.delegate;
+                        if (n) {
+                            n = function e(t, n) {
+                                var i = t.iterator[n.method];
+                                if (i === u) {
+                                    if (n.delegate = null, "throw" === n.method) {
+                                        if (t.iterator.return && (n.method = "return", n.arg = u, e(t, n), "throw" === n.method)) return _;
+                                        n.method = "throw", n.arg = new TypeError("The iterator does not provide a 'throw' method")
+                                    }
+                                    return _
+                                }
+                                i = p(i, t.iterator, n.arg);
+                                if ("throw" === i.type) return n.method = "throw", n.arg = i.arg, n.delegate = null, _;
+                                i = i.arg;
+                                if (!i) return n.method = "throw", n.arg = new TypeError("iterator result is not an object"), n.delegate = null, _;
+                                {
+                                    if (!i.done) return i;
+                                    n[t.resultName] = i.value, n.next = t.nextLoc, "return" !== n.method && (n.method = "next", n.arg = u)
+                                }
+                                n.delegate = null;
+                                return _
+                            }(n, s);
+                            if (n) {
+                                if (n === _) continue;
+                                return n
+                            }
+                        }
+                        if ("next" === s.method) s.sent = s._sent = s.arg; else if ("throw" === s.method) {
+                            if (o === d) throw o = c, s.arg;
+                            s.dispatchException(s.arg)
+                        } else "return" === s.method && s.abrupt("return", s.arg);
+                        o = h;
+                        n = p(r, a, s);
+                        if ("normal" === n.type) {
+                            if (o = s.done ? c : l, n.arg !== _) return {value: n.arg, done: s.done}
+                        } else "throw" === n.type && (o = c, s.method = "throw", s.arg = n.arg)
+                    }
+                }), t
+            }
+
+            function p(e, t, n) {
+                try {
+                    return {type: "normal", arg: e.call(t, n)}
+                } catch (e) {
+                    return {type: "throw", arg: e}
+                }
+            }
+
+            function y() {
+            }
+
+            function v() {
+            }
+
+            function g() {
+            }
+
+            function M(e) {
+                ["next", "throw", "return"].forEach(function (t) {
+                    e[t] = function (e) {
+                        return this._invoke(t, e)
+                    }
+                })
+            }
+
+            function L(s) {
+                var t;
+                this._invoke = function (n, i) {
+                    function e() {
+                        return new Promise(function (e, t) {
+                            !function t(e, n, i, r) {
+                                e = p(s[e], s, n);
+                                if ("throw" === e.type) r(e.arg); else {
+                                    var a = e.arg;
+                                    if ((n = a.value) && "object" == typeof n && f.call(n, "__await")) return Promise.resolve(n.__await).then(function (e) {
+                                        t("next", e, i, r)
+                                    }, function (e) {
+                                        t("throw", e, i, r)
+                                    });
+                                    Promise.resolve(n).then(function (e) {
+                                        a.value = e, i(a)
+                                    }, r)
+                                }
+                            }(n, i, e, t)
+                        })
+                    }
+
+                    return t = t ? t.then(e, e) : e()
+                }
+            }
+
+            function S(e) {
+                var t = {tryLoc: e[0]};
+                1 in e && (t.catchLoc = e[1]), 2 in e && (t.finallyLoc = e[2], t.afterLoc = e[3]), this.tryEntries.push(t)
+            }
+
+            function k(e) {
+                var t = e.completion || {};
+                t.type = "normal", delete t.arg, e.completion = t
+            }
+
+            function b(e) {
+                this.tryEntries = [{tryLoc: "root"}], e.forEach(S, this), this.reset(!0)
+            }
+
+            function w(t) {
+                if (t) {
+                    var n, e = t[r];
+                    if (e) return e.call(t);
+                    if ("function" == typeof t.next) return t;
+                    if (!isNaN(t.length)) return n = -1, (e = function e() {
+                        for (; ++n < t.length;) if (f.call(t, n)) return e.value = t[n], e.done = !1, e;
+                        return e.value = u, e.done = !0, e
+                    }).next = e
+                }
+                return {next: D}
+            }
+
+            function D() {
+                return {value: u, done: !0}
+            }
+
+            o ? i && (T.exports = o) : ((o = e.regeneratorRuntime = i ? T.exports : {}).wrap = m, d = "suspendedStart", l = "suspendedYield", h = "executing", c = "completed", _ = {}, (e = {})[r] = function () {
+                return this
+            }, i = (i = Object.getPrototypeOf) && i(i(w([]))), i && i !== n && f.call(i, r) && (e = i), t = g.prototype = y.prototype = Object.create(e), (v.prototype = t.constructor = g).constructor = v, g[s] = v.displayName = "GeneratorFunction", o.isGeneratorFunction = function (e) {
+                e = "function" == typeof e && e.constructor;
+                return !!e && (e === v || "GeneratorFunction" === (e.displayName || e.name))
+            }, o.mark = function (e) {
+                return Object.setPrototypeOf ? Object.setPrototypeOf(e, g) : (e.__proto__ = g, s in e || (e[s] = "GeneratorFunction")), e.prototype = Object.create(t), e
+            }, o.awrap = function (e) {
+                return {__await: e}
+            }, M(L.prototype), L.prototype[a] = function () {
+                return this
+            }, o.AsyncIterator = L, o.async = function (e, t, n, i) {
+                var r = new L(m(e, t, n, i));
+                return o.isGeneratorFunction(t) ? r : r.next().then(function (e) {
+                    return e.done ? e.value : r.next()
+                })
+            }, M(t), t[s] = "Generator", t[r] = function () {
+                return this
+            }, t.toString = function () {
+                return "[object Generator]"
+            }, o.keys = function (n) {
+                var e, i = [];
+                for (e in n) i.push(e);
+                return i.reverse(), function e() {
+                    for (; i.length;) {
+                        var t = i.pop();
+                        if (t in n) return e.value = t, e.done = !1, e
+                    }
+                    return e.done = !0, e
+                }
+            }, o.values = w, b.prototype = {
+                constructor: b, reset: function (e) {
+                    if (this.prev = 0, this.next = 0, this.sent = this._sent = u, this.done = !1, this.delegate = null, this.method = "next", this.arg = u, this.tryEntries.forEach(k), !e) for (var t in this) "t" === t.charAt(0) && f.call(this, t) && !isNaN(+t.slice(1)) && (this[t] = u)
+                }, stop: function () {
+                    this.done = !0;
+                    var e = this.tryEntries[0].completion;
+                    if ("throw" === e.type) throw e.arg;
+                    return this.rval
+                }, dispatchException: function (n) {
+                    if (this.done) throw n;
+                    var i = this;
+
+                    function e(e, t) {
+                        return a.type = "throw", a.arg = n, i.next = e, t && (i.method = "next", i.arg = u), !!t
+                    }
+
+                    for (var t = this.tryEntries.length - 1; 0 <= t; --t) {
+                        var r = this.tryEntries[t], a = r.completion;
+                        if ("root" === r.tryLoc) return e("end");
+                        if (r.tryLoc <= this.prev) {
+                            var s = f.call(r, "catchLoc"), o = f.call(r, "finallyLoc");
+                            if (s && o) {
+                                if (this.prev < r.catchLoc) return e(r.catchLoc, !0);
+                                if (this.prev < r.finallyLoc) return e(r.finallyLoc)
+                            } else if (s) {
+                                if (this.prev < r.catchLoc) return e(r.catchLoc, !0)
+                            } else {
+                                if (!o) throw new Error("try statement without catch or finally");
+                                if (this.prev < r.finallyLoc) return e(r.finallyLoc)
+                            }
+                        }
+                    }
+                }, abrupt: function (e, t) {
+                    for (var n = this.tryEntries.length - 1; 0 <= n; --n) {
+                        var i = this.tryEntries[n];
+                        if (i.tryLoc <= this.prev && f.call(i, "finallyLoc") && this.prev < i.finallyLoc) {
+                            var r = i;
+                            break
+                        }
+                    }
+                    var a = (r = r && ("break" === e || "continue" === e) && r.tryLoc <= t && t <= r.finallyLoc ? null : r) ? r.completion : {};
+                    return a.type = e, a.arg = t, r ? (this.method = "next", this.next = r.finallyLoc, _) : this.complete(a)
+                }, complete: function (e, t) {
+                    if ("throw" === e.type) throw e.arg;
+                    return "break" === e.type || "continue" === e.type ? this.next = e.arg : "return" === e.type ? (this.rval = this.arg = e.arg, this.method = "return", this.next = "end") : "normal" === e.type && t && (this.next = t), _
+                }, finish: function (e) {
+                    for (var t = this.tryEntries.length - 1; 0 <= t; --t) {
+                        var n = this.tryEntries[t];
+                        if (n.finallyLoc === e) return this.complete(n.completion, n.afterLoc), k(n), _
+                    }
+                }, catch: function (e) {
+                    for (var t = this.tryEntries.length - 1; 0 <= t; --t) {
+                        var n, i, r = this.tryEntries[t];
+                        if (r.tryLoc === e) return "throw" === (n = r.completion).type && (i = n.arg, k(r)), i
+                    }
+                    throw new Error("illegal catch attempt")
+                }, delegateYield: function (e, t, n) {
+                    return this.delegate = {
+                        iterator: w(e),
+                        resultName: t,
+                        nextLoc: n
+                    }, "next" === this.method && (this.arg = u), _
+                }
+            })
+        }(function () {
+            return this
+        }() || Function("return this")())
+    }, function (e, t, n) {
+        e.exports = {default: n(260), __esModule: !0}
+    }, function (e, t, n) {
+        n(261);
+        var i = n(3).Object;
+        e.exports = function (e, t, n) {
+            return i.defineProperty(e, t, n)
+        }
+    }, function (e, t, n) {
+        var i = n(8);
+        i(i.S + i.F * !n(14), "Object", {defineProperty: n(12).f})
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.StreamClient = void 0;
+        var d = a(n(11)), i = a(n(1)), r = a(n(2)), s = a(n(87)), o = n(265), l = n(266), h = n(268), c = n(282),
+            _ = a(n(10)), f = function (e) {
+                {
+                    if (e && e.__esModule) return e;
+                    var t = {};
+                    if (null != e) for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
+                    return t.default = e, t
+                }
+            }(n(61)), m = a(n(91));
+
+        function a(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = function () {
+            var u = new o.DirectDeviceCustom, L = new l.DirectDevice, S = new h.LiveMedia, k = new c.LocalService,
+                a = 6e3;
+
+            function t(e) {
+                var r = this;
+                (0, i.default)(this, t), this.TAG = "StreamClient", this._config = e, this._log = new m.default(this), this._emiter = new _.default, this.szProtocolVersion = "0.1", this.iCiphersuites = 0, this.aWebsocket = [], this.getIndex = function (e) {
+                    for (var t = -1, n = 0, i = r.aWebsocket.length; n < i; n++) if (r.aWebsocket[n].id === e) {
+                        t = n;
+                        break
+                    }
+                    return t
+                }, this.autoCloseTime = 1e4, this.heartbeatTime = 2e3
+            }
+
+            return (0, r.default)(t, [{
+                key: "openStream", value: function (e, l, h, n) {
+                    var c = this, _ = !1, t = !1, e = (-1 < e.indexOf("[") && (t = !0), e.split("://")), i = e[0],
+                        f = "", m = 7681, p = 1, y = 0, v = !1, r = !1,
+                        y = t ? (f = e[1].split("]:")[0] + "]", m = Math.floor(e[1].split("]:")[1].split("/")[0]), p = Math.floor(e[1].split("]:")[1].split("/")[1] / 100), Math.floor(e[1].split("]:")[1].split("/")[1] % 100) - 1) : (f = e[1].split(":")[0], m = Math.floor(e[1].split(":")[1].split("/")[0]), p = Math.floor(e[1].split(":")[1].split("/")[1] / 100), Math.floor(e[1].split(":")[1].split("/")[1] % 100) - 1),
+                        t = (0 === p && (y = 0), "&sessionID="),
+                        e = ((l = l || {}).token && !l.playURL && (t = "&token="), l.sessionID || l.session || (l.playURL ? "" : l.token) || ""),
+                        g = new window.WebSocket(i + "://" + f + ":" + m + (l.mode ? "/" + l.mode : "") + "?version=" + this.szProtocolVersion + "&cipherSuites=" + this.iCiphersuites + t + e + (l.proxy ? "&proxy=" + l.proxy : "")),
+                        M = (g.binaryType = "arraybuffer", s.default.v4());
+                    return new d.default(function (u, d) {
+                        setTimeout(function () {
+                            v || r || !g || (g.onopen = null, g.onmessage = null, g.close(1e3, "CLOSE"), g.close = null, c._log.W(c.TAG, "recv stream timeout."), d())
+                        }, a), g.onopen = function () {
+                            c._log.I("websocket onopen")
+                        }, g.onmessage = function (e) {
+                            var t, n;
+                            if ("string" == typeof e.data) return i = c.getIndex(M), (t = JSON.parse(e.data)) && t.hasOwnProperty("statusCode") && (0 === t.statusCode ? -1 === i ? u() : c.aWebsocket[i].resolve() : -1 === i ? d(t) : c.aWebsocket[i].reject(t)), !_ && t.cmd && "end" === t.cmd ? (_ = !0, c._log.I("回放结束，媒体流关闭"), void h({cmd: "end"})) : t && t.version && t.cipherSuite ? (c._log.D("websocket onmessage: PKD", t), c.szProtocolVersion = t.version, c.iCiphersuites = parseInt(t.cipherSuite, 10), t && t.PKD && t.rand ? c.aWebsocket.push(S.createClientObject(g, M, t.PKD, t.rand, l)) : (i = "live://" + f + ":" + m + "/" + p + "/" + y, -1 === c.iCiphersuites ? c.aWebsocket.push(k.createClientObject(g, M, i, l)) : c.aWebsocket.push(L.createClientObject(g, M, i))), void u(M)) : void (t && t.sdp && (c._log.I("websocket onmessage: sdp", t), i = L.getMediaFromSdp(t.sdp), n = L.getSdpParams(t.sdp), t = L.getSDPInfo(t.sdp), h({
+                                bHead: !0,
+                                oParams: n,
+                                buf: i,
+                                iClockFrequency: t.iClockFrequency,
+                                iCurrentTime: t.iCurrentTime
+                            }), -1 !== (n = c.aWebsocket.findIndex(function (e) {
+                                return e.id === M
+                            })) && c.aWebsocket[n].resolve()));
+                            var i = {}, r = e.data;
+                            if (64 === r.byteLength || 40 === r.byteLength) {
+                                for (var a = -1, s = r.byteLength, o = 0; o < s; o++) if (73 === r[o] && 77 === r[o + 1] && 75 === r[o + 2] && 72 === r[o + 3]) {
+                                    a = o;
+                                    break
+                                }
+                                i = -1 !== a ? {bHead: !0, buf: r.slice(a, a + 40)} : {bHead: !1, buf: r}
+                            } else i = {bHead: !1, buf: r};
+                            h(i), v = !(e = i = r = null)
+                        }, g.onclose = function (e) {
+                            var t;
+                            1e3 !== e.code && 1005 !== e.code || -1 === (t = c.aWebsocket.findIndex(function (e) {
+                                return e.id === M
+                            })) || (c._log.I("Stream closed", e), c.aWebsocket[t].resolve(), c.aWebsocket.splice(t, 1)), n(e), r = !0
+                        }
+                    })
+                }
+            }, {
+                key: "startPlay", value: function (e, i, r, a) {
+                    var s = this, o = this.getIndex(e);
+                    return i && r && "0.1" === this.szProtocolVersion && (i = i.replace("-", "").replace(":", ""), r = r.replace("-", "").replace(":", "")), new d.default(function (e, t) {
+                        if (-1 < o) {
+                            s.aWebsocket[o].resolve = e, s.aWebsocket[o].reject = t;
+                            var n = null;
+                            i && r ? "0.1" !== s.szProtocolVersion ? 0 === s.iCiphersuites ? n = S.playbackCmd(s.aWebsocket[o], i, r, a) : 1 === s.iCiphersuites ? n = L.playbackCmd(i, r, s.aWebsocket[o].playURL) : -1 === s.iCiphersuites && (n = k.playbackCmd(s.aWebsocket[o], i, r)) : n = u.playbackCmd(i, r, s.aWebsocket[o].iCurChannel, s.aWebsocket[o].iCurStream) : 0 === s.aWebsocket[o].iCurChannel && "0.1" === s.szProtocolVersion ? n = u.zeroPlayCmd(s.aWebsocket[o].iCurChannel, s.aWebsocket[o].iCurStream) : "0.1" !== s.szProtocolVersion ? 0 === s.iCiphersuites ? n = S.playCmd(s.aWebsocket[o], a) : 1 === s.iCiphersuites ? n = L.playCmd(s.aWebsocket[o].playURL) : -1 === s.iCiphersuites && (n = k.playCmd(s.aWebsocket[o])) : n = u.playCmd(s.aWebsocket[o].iCurChannel, s.aWebsocket[o].iCurStream);
+                            try {
+                                s.aWebsocket[o].socket.send(n)
+                            } catch (e) {
+                                s._log.E(f.ERR_STREAM_CMD_FAILED), t(e)
+                            }
+                            "0.1" === s.szProtocolVersion && e()
+                        } else "0.1" === s.szProtocolVersion && t()
+                    })
+                }
+            }, {
+                key: "singleFrame", value: function () {
+                }
+            }, {
+                key: "setPlayRate", value: function (a, s) {
+                    var o = this;
+                    return new d.default(function (e, t) {
+                        for (var n = 0, i = o.aWebsocket.length; n < i; n++) if (o.aWebsocket[n].id === a) {
+                            if ("0.1" === o.szProtocolVersion) {
+                                var r = u.playRateCmd(s);
+                                o.aWebsocket[n].socket.send(r), e();
+                                break
+                            }
+                            o.aWebsocket[n].resolve = e, o.aWebsocket[n].reject = t;
+                            r = L.playRateCmd(s);
+                            o.aWebsocket[n].socket.send(r)
+                        }
+                    })
+                }
+            }, {
+                key: "seek", value: function (a, s, o) {
+                    var u = this;
+                    return new d.default(function (e, t) {
+                        for (var n, i = 0, r = u.aWebsocket.length; i < r; i++) u.aWebsocket[i].id === a && (u.aWebsocket[i].resolve = e, u.aWebsocket[i].reject = t, n = S.seekCmd(s, o), u.aWebsocket[i].socket.send(n))
+                    })
+                }
+            }, {
+                key: "pause", value: function (a) {
+                    var s = this;
+                    return new d.default(function (e, t) {
+                        for (var n = 0, i = s.aWebsocket.length; n < i; n++) if (s.aWebsocket[n].id === a) {
+                            if ("0.1" === s.szProtocolVersion) {
+                                var r = u.pauseCmd();
+                                s.aWebsocket[n].socket.send(r), e();
+                                break
+                            }
+                            s.aWebsocket[n].resolve = e, s.aWebsocket[n].reject = t;
+                            r = L.pauseCmd();
+                            s.aWebsocket[n].socket.send(r)
+                        }
+                    })
+                }
+            }, {
+                key: "transmission", value: function (r, a) {
+                    var s = this;
+                    return new d.default(function (e, t) {
+                        for (var n = 0, i = s.aWebsocket.length; n < i; n++) s.aWebsocket[n].id === r && (s.aWebsocket[n].resolve = e, s.aWebsocket[n].reject = t, s.aWebsocket[n].socket.send(a))
+                    })
+                }
+            }, {
+                key: "resume", value: function (a) {
+                    var s = this;
+                    return new d.default(function (e, t) {
+                        for (var n = 0, i = s.aWebsocket.length; n < i; n++) if (s.aWebsocket[n].id === a) {
+                            if ("0.1" === s.szProtocolVersion) {
+                                var r = u.resumeCmd();
+                                s.aWebsocket[n].socket.send(r), e();
+                                break
+                            }
+                            s.aWebsocket[n].resolve = e, s.aWebsocket[n].reject = t;
+                            r = L.resumeCmd();
+                            s.aWebsocket[n].socket.send(r)
+                        }
+                    })
+                }
+            }, {
+                key: "stop", value: function (r) {
+                    var a = this;
+                    return new d.default(function (e, t) {
+                        var n = a.aWebsocket.find(function (e) {
+                            return e.id === r
+                        });
+                        if (!n) return a._log.E(f.ERR_STREAM_WS_UNFIND + ": can't find related websocket, check the index."), t(f.ERR_STREAM_WS_UNFIND);
+                        if (0 === n.socket.readyState) return n.stoping = !0, n.socket.onopen = null, n.socket.onmessage = null, n.socket.onclose = null, n.socket = null, a._log.E(f.ERR_STREAM_WS_UNCONNECT + ": websocket is not connect, check the index."), t(f.ERR_STREAM_WS_UNCONNECT);
+                        try {
+                            n.resolve = e;
+                            var i = S.stopCmd();
+                            n.socket.send(i), n.stoping = !0, n.socket.onopen = null, n.socket.onmessage = null, n.socket.onclose = null, n.socket = null, e()
+                        } catch (e) {
+                            a._log.E(f.ERR_STREAM_CMD_FAILED + ": send signalCmd to websocket failed."), t(f.ERR_STREAM_CMD_FAILED)
+                        }
+                    })
+                }
+            }, {
+                key: "stopAll", value: function () {
+                    for (var e = 0, t = this.aWebsocket.length; e < t; e++) this.aWebsocket[e].socket.close(1e3, "CLOSE"), this.aWebsocket[e].stoping = !0
+                }
+            }, {
+                key: "setTimeOut", value: function (n) {
+                    return new d.default(function (e, t) {
+                        a = 1e3 * n, e()
+                    })
+                }
+            }]), t
+        }();
+        t.StreamClient = n
+    }, function (e, t, n) {
+        var l, h, c = n(88), _ = n(89), f = 0, m = 0;
+        e.exports = function (e, t, n) {
+            var i = t && n || 0, r = t || [], a = (e = e || {}).node || l, n = void 0 !== e.clockseq ? e.clockseq : h,
+                s = (null != a && null != n || (s = c(), null == a && (a = l = [1 | s[0], s[1], s[2], s[3], s[4], s[5]]), null == n && (n = h = 16383 & (s[6] << 8 | s[7]))), void 0 !== e.msecs ? e.msecs : (new Date).getTime()),
+                o = void 0 !== e.nsecs ? e.nsecs : m + 1, u = s - f + (o - m) / 1e4;
+            if (u < 0 && void 0 === e.clockseq && (n = n + 1 & 16383), 1e4 <= (o = (u < 0 || f < s) && void 0 === e.nsecs ? 0 : o)) throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
+            f = s, h = n, u = (1e4 * (268435455 & (s += 122192928e5)) + (m = o)) % 4294967296, r[i++] = u >>> 24 & 255, r[i++] = u >>> 16 & 255, r[i++] = u >>> 8 & 255, r[i++] = 255 & u, e = s / 4294967296 * 1e4 & 268435455, r[i++] = e >>> 8 & 255, r[i++] = 255 & e, r[i++] = e >>> 24 & 15 | 16, r[i++] = e >>> 16 & 255, r[i++] = n >>> 8 | 128, r[i++] = 255 & n;
+            for (var d = 0; d < 6; ++d) r[i + d] = a[d];
+            return t || _(r)
+        }
+    }, function (e, t, n) {
+        var s = n(88), o = n(89);
+        e.exports = function (e, t, n) {
+            var i = t && n || 0,
+                r = ("string" == typeof e && (t = "binary" === e ? new Array(16) : null, e = null), (e = e || {}).random || (e.rng || s)());
+            if (r[6] = 15 & r[6] | 64, r[8] = 63 & r[8] | 128, t) for (var a = 0; a < 16; ++a) t[i + a] = r[a];
+            return t || o(r)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.DirectDeviceCustom = void 0;
+        var i = a(n(1)), r = a(n(2));
+
+        function a(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = function () {
+            function e() {
+                (0, i.default)(this, e)
+            }
+
+            return (0, r.default)(e, [{
+                key: "createClientObject", value: function (e, t, n, i) {
+                    return {socket: e, id: t, iCurChannel: n, iCurStream: i, resolve: null, reject: null, stoping: !1}
+                }
+            }, {
+                key: "zeroPlayCmd", value: function (e, t) {
+                    return new Uint8Array([0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, e + 1, 0, 0, 0, t, 0, 0, 4, 0])
+                }
+            }, {
+                key: "playCmd", value: function (e, t) {
+                    return new Uint8Array([0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, e, 0, 0, 0, t, 0, 0, 4, 0])
+                }
+            }, {
+                key: "playbackCmd", value: function (e, t, n, i) {
+                    var r = e.split("T")[0], e = e.split("T")[1],
+                        a = "0" + parseInt(r.substring(0, 4), 10).toString(16), s = parseInt(r.substring(4, 6), 10),
+                        r = parseInt(r.substring(6), 10), o = parseInt(e.substring(0, 2), 10),
+                        u = parseInt(e.substring(2, 4), 10), e = parseInt(e.substring(4, 6), 10), d = t.split("T")[0],
+                        t = t.split("T")[1], l = "0" + parseInt(d.substring(0, 4), 10).toString(16),
+                        d = parseInt(d.substring(4, 6), 10), h = parseInt(t.substring(0, 2), 10),
+                        c = parseInt(t.substring(2, 4), 10), t = parseInt(t.substring(4, 6), 10),
+                        n = [0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, n, 0, 0, parseInt(a.substring(0, 2), 16), parseInt(a.substring(2, 4), 16), 0, 0, 0, s, 0, 0, 0, r, 0, 0, 0, o, 0, 0, 0, u, 0, 0, 0, e, 0, 0, parseInt(l.substring(0, 2), 16), parseInt(l.substring(2, 4), 16), 0, 0, 0, d, 0, 0, 0, r, 0, 0, 0, h, 0, 0, 0, c, 0, 0, 0, t, 0, 0, 0, 0, 0, 0, 0, 0, i, 0, 0, 0];
+                    return new Uint8Array(n)
+                }
+            }, {
+                key: "playRateCmd", value: function (e) {
+                    for (var t = (parseInt(e, 10) >>> 0).toString(16).toLocaleUpperCase().toString(16), n = t.length; n < 8; n++) t = "0" + t;
+                    for (var i = [0, 0, 0, 0], r = 0, a = t.length; r < a; r += 2) i[Math.floor(r / 2)] = parseInt(t.substring(r, r + 2), 16);
+                    e = [0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, i[0], i[1], i[2], i[3]];
+                    return new Uint8Array(e)
+                }
+            }, {
+                key: "pauseCmd", value: function () {
+                    return new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+                }
+            }, {
+                key: "resumeCmd", value: function () {
+                    return new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+                }
+            }]), e
+        }();
+        t.DirectDeviceCustom = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.DirectDevice = void 0;
+        var i = s(n(56)), r = s(n(1)), a = s(n(2));
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = function () {
+            function e() {
+                (0, r.default)(this, e)
+            }
+
+            return (0, a.default)(e, [{
+                key: "createClientObject", value: function (e, t, n) {
+                    return {socket: e, id: t, playURL: n, resolve: null, reject: null, stoping: !1}
+                }
+            }, {
+                key: "getMediaFromSdp", value: function (e) {
+                    for (var t = e.indexOf("MEDIAINFO=") + 10, n = e.slice(t, t + 80), i = [], r = 0, a = n.length / 2; r < a; r++) i[r] = parseInt(n.slice(2 * r, 2 * r + 2), 16);
+                    return new Uint8Array(i)
+                }
+            }, {
+                key: "sdpParamsReverse", value: function (e) {
+                    for (var t = [], n = 0, i = e.length / 2; n < i; n++) t[n] = e.slice(2 * n, 2 * n + 2);
+                    return t = parseInt(t.reverse().join(""), 16)
+                }
+            }, {
+                key: "getSdpParams", value: function (e) {
+                    var t = e.indexOf("MEDIAINFO=") + 10, e = e.slice(t, t + 80),
+                        n = this.sdpParamsReverse(e.slice(24, 28)), i = this.sdpParamsReverse(e.slice(40, 48)),
+                        r = this.sdpParamsReverse(e.slice(32, 40)), a = parseInt(e.slice(30, 32), 16),
+                        s = parseInt(e.slice(29, 30), 16);
+                    switch (n) {
+                        case 1984:
+                            (n = 0) === i && (i = 32e3), 0 === r && (r = 8e3), 0 === a && (a = 16), 0 === s && (s = 1);
+                            break;
+                        case 28945:
+                        case 49154:
+                            n = 1, 0 === i && (i = 64e3), 0 === r && (r = 8e3), 0 === a && (a = 16), 0 === s && (s = 1);
+                            break;
+                        case 28944:
+                        case 49153:
+                            n = 2, 0 === i && (i = 64e3), 0 === r && (r = 8e3), 0 === a && (a = 16), 0 === s && (s = 1);
+                            break;
+                        case 29217:
+                        case 49155:
+                            n = 3, 0 === i && (i = 16e3), 0 === r && (r = 16e3), 0 === a && (a = 16), 0 === s && (s = 1);
+                            break;
+                        case 29280:
+                        case 29282:
+                        case 49156:
+                            n = 4, 0 === i && (i = 16e3), 0 === r && (r = 8e3), 0 === a && (a = 16), 0 === s && (s = 1);
+                            break;
+                        case 8193:
+                        case 49157:
+                            n = 6, 0 === i && (i = 32e3), 0 === r && (r = 16e3), 0 === a && (a = 16), 0 === s && (s = 1)
+                    }
+                    return {iAudioType: n, iAudioBitRate: i, iAudioSamplingRate: r, iAudioBitWidth: a, iChannel: s}
+                }
+            }, {
+                key: "getSDPInfo", value: function (e) {
+                    var t = e.indexOf("rtpmap:96 H264/") + 15, t = e.slice(t, t + 5), t = parseInt(t, 10),
+                        n = e.indexOf("o=- ") + 4, e = e.slice(n, n + 16), n = parseInt(e, 10) / 1e3,
+                        e = 60 * (new Date).getTimezoneOffset() * 1e3;
+                    return {iClockFrequency: t, iCurrentTime: Math.floor(n + e)}
+                }
+            }, {
+                key: "playCmd", value: function (e) {
+                    return (0, i.default)({sequence: 0, cmd: "realplay", url: e})
+                }
+            }, {
+                key: "playbackCmd", value: function (e, t, n) {
+                    return (0, i.default)({sequence: 0, cmd: "playback", url: n, startTime: e, endTime: t})
+                }
+            }, {
+                key: "playRateCmd", value: function (e) {
+                    return (0, i.default)({sequence: 0, cmd: "speed", rate: e})
+                }
+            }, {
+                key: "pauseCmd", value: function () {
+                    return (0, i.default)({sequence: 0, cmd: "pause"})
+                }
+            }, {
+                key: "resumeCmd", value: function () {
+                    return (0, i.default)({sequence: 0, cmd: "resume"})
+                }
+            }]), e
+        }();
+        t.DirectDevice = n
+    }, function (e, t, n) {
+        var n = n(3), i = n.JSON || (n.JSON = {stringify: JSON.stringify});
+        e.exports = function (e) {
+            return i.stringify.apply(i, arguments)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.LiveMedia = void 0;
+        var r = u(n(56)), i = u(n(1)), a = u(n(2)), s = u(n(269)), o = u(n(281));
+
+        function u(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = function () {
+            function e() {
+                (0, i.default)(this, e)
+            }
+
+            return (0, a.default)(e, [{
+                key: "createClientObject", value: function (e, t, n, i, r) {
+                    var a = o.default.AES.encrypt((new Date).getTime().toString(), o.default.enc.Hex.parse("1234567891234567123456789123456712345678912345671234567891234567"), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse("12345678912345671234567891234567"),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString(),
+                        s = (a.length < 64 && (a += a), o.default.AES.encrypt((new Date).getTime().toString(), o.default.enc.Hex.parse("12345678912345671234567891234567"), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse("12345678912345671234567891234567"),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString());
+                    return {
+                        socket: e,
+                        id: t,
+                        PKD: n,
+                        rand: i,
+                        playURL: r.playURL || "",
+                        auth: r.auth || "",
+                        token: r.token || "",
+                        key: a,
+                        iv: s,
+                        resolve: null,
+                        reject: null,
+                        stoping: !1
+                    }
+                }
+            }, {
+                key: "playCmd", value: function (e, t) {
+                    t = {
+                        sequence: 0,
+                        cmd: t || "realplay",
+                        url: e.playURL,
+                        key: s.default.encrypt(e.iv + ":" + e.key, e.PKD).cipher.split("?")[0],
+                        authorization: o.default.AES.encrypt(e.rand + ":" + e.auth, o.default.enc.Hex.parse(e.key), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse(e.iv),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString(),
+                        token: o.default.AES.encrypt(e.token, o.default.enc.Hex.parse(e.key), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse(e.iv),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString()
+                    };
+                    return (0, r.default)(t)
+                }
+            }, {
+                key: "playbackCmd", value: function (e, t, n, i) {
+                    i = {
+                        sequence: 0,
+                        cmd: i || "playback",
+                        url: e.playURL,
+                        key: s.default.encrypt(e.iv + ":" + e.key, e.PKD).cipher.split("?")[0],
+                        authorization: o.default.AES.encrypt(e.rand + ":" + e.auth, o.default.enc.Hex.parse(e.key), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse(e.iv),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString(),
+                        token: o.default.AES.encrypt(e.token, o.default.enc.Hex.parse(e.key), {
+                            mode: o.default.mode.CBC,
+                            iv: o.default.enc.Hex.parse(e.iv),
+                            padding: o.default.pad.Pkcs7
+                        }).ciphertext.toString(),
+                        startTime: t,
+                        endTime: n
+                    };
+                    return (0, r.default)(i)
+                }
+            }, {
+                key: "seekCmd", value: function (e, t) {
+                    return (0, r.default)({sequence: 0, cmd: "seek", startTime: e, endTime: t})
+                }
+            }, {
+                key: "stopCmd", value: function () {
+                    return (0, r.default)({sequence: 0, cmd: "stop"})
+                }
+            }]), e
+        }();
+        t.LiveMedia = n
+    }, function (H, j, e) {
+        "use strict";
+        var e = e(9), F = (e = e) && e.__esModule ? e : {default: e};
+        var e = "Netscape", B = 40;
+
+        function m(e, t, n) {
+            null != e && ("number" == typeof e ? this.fromNumber(e, t, n) : null == t && "string" != typeof e ? this.fromString(e, 256) : this.fromString(e, t))
+        }
+
+        function p() {
+            return new m(null)
+        }
+
+        Y = "Microsoft Internet Explorer" == e ? (m.prototype.am = function (e, t, n, i, r, a) {
+            var s = 32767 & t;
+            for (t >>= 15; 0 <= --a;) {
+                var o = 32767 & this[e], u = this[e++] >> 15, d = t * o + u * s,
+                    r = ((o = s * o + ((32767 & d) << 15) + n[i] + (1073741823 & r)) >>> 30) + (d >>> 15) + t * u + (r >>> 30);
+                n[i++] = 1073741823 & o
+            }
+            return r
+        }, 30) : "Netscape" != e ? (m.prototype.am = function (e, t, n, i, r, a) {
+            for (; 0 <= --a;) {
+                var s = t * this[e++] + n[i] + r, r = Math.floor(s / 67108864);
+                n[i++] = 67108863 & s
+            }
+            return r
+        }, 26) : (m.prototype.am = function (e, t, n, i, r, a) {
+            var s = 16383 & t;
+            for (t >>= 14; 0 <= --a;) {
+                var o = 16383 & this[e], u = this[e++] >> 14, d = t * o + u * s,
+                    r = ((o = s * o + ((16383 & d) << 14) + n[i] + r) >> 28) + (d >> 14) + t * u;
+                n[i++] = 268435455 & o
+            }
+            return r
+        }, 28), m.prototype.DB = Y, m.prototype.DM = (1 << Y) - 1, m.prototype.DV = 1 << Y;
+        m.prototype.FV = Math.pow(2, 52), m.prototype.F1 = 52 - Y, m.prototype.F2 = 2 * Y - 52;
+        for (var N = "0123456789abcdefghijklmnopqrstuvwxyz", n = [], t = "0".charCodeAt(0), r = 0; r <= 9; ++r) n[t++] = r;
+        for (t = "a".charCodeAt(0), r = 10; r < 36; ++r) n[t++] = r;
+        for (t = "A".charCodeAt(0), r = 10; r < 36; ++r) n[t++] = r;
+
+        function o(e) {
+            return N.charAt(e)
+        }
+
+        function d(e, t) {
+            e = n[e.charCodeAt(t)];
+            return null == e ? -1 : e
+        }
+
+        function f(e) {
+            var t = p();
+            return t.fromInt(e), t
+        }
+
+        function y(e) {
+            var t, n = 1;
+            return 0 != (t = e >>> 16) && (e = t, n += 16), 0 != (t = e >> 8) && (e = t, n += 8), 0 != (t = e >> 4) && (e = t, n += 4), 0 != (t = e >> 2) && (e = t, n += 2), e >> 1 != 0 && (n += 1), n
+        }
+
+        function g(e) {
+            this.m = e
+        }
+
+        function M(e) {
+            this.m = e, this.mp = e.invDigit(), this.mpl = 32767 & this.mp, this.mph = this.mp >> 15, this.um = (1 << e.DB - 15) - 1, this.mt2 = 2 * e.t
+        }
+
+        function z(e, t) {
+            return e & t
+        }
+
+        function a(e, t) {
+            return e | t
+        }
+
+        function U(e, t) {
+            return e ^ t
+        }
+
+        function V(e, t) {
+            return e & ~t
+        }
+
+        function s() {
+        }
+
+        function G(e) {
+            return e
+        }
+
+        function L(e) {
+            this.r2 = p(), this.q3 = p(), m.ONE.dlShiftTo(2 * e.t, this.r2), this.mu = this.r2.divide(e), this.m = e
+        }
+
+        g.prototype.convert = function (e) {
+            return e.s < 0 || 0 <= e.compareTo(this.m) ? e.mod(this.m) : e
+        }, g.prototype.revert = function (e) {
+            return e
+        }, g.prototype.reduce = function (e) {
+            e.divRemTo(this.m, null, e)
+        }, g.prototype.mulTo = function (e, t, n) {
+            e.multiplyTo(t, n), this.reduce(n)
+        }, g.prototype.sqrTo = function (e, t) {
+            e.squareTo(t), this.reduce(t)
+        }, M.prototype.convert = function (e) {
+            var t = p();
+            return e.abs().dlShiftTo(this.m.t, t), t.divRemTo(this.m, null, t), e.s < 0 && 0 < t.compareTo(m.ZERO) && this.m.subTo(t, t), t
+        }, M.prototype.revert = function (e) {
+            var t = p();
+            return e.copyTo(t), this.reduce(t), t
+        }, M.prototype.reduce = function (e) {
+            for (; e.t <= this.mt2;) e[e.t++] = 0;
+            for (var t = 0; t < this.m.t; ++t) {
+                var n = 32767 & e[t],
+                    i = n * this.mpl + ((n * this.mph + (e[t] >> 15) * this.mpl & this.um) << 15) & e.DM;
+                for (e[n = t + this.m.t] += this.m.am(0, i, e, t, 0, this.m.t); e[n] >= e.DV;) e[n] -= e.DV, e[++n]++
+            }
+            e.clamp(), e.drShiftTo(this.m.t, e), 0 <= e.compareTo(this.m) && e.subTo(this.m, e)
+        }, M.prototype.mulTo = function (e, t, n) {
+            e.multiplyTo(t, n), this.reduce(n)
+        }, M.prototype.sqrTo = function (e, t) {
+            e.squareTo(t), this.reduce(t)
+        }, m.prototype.copyTo = function (e) {
+            for (var t = this.t - 1; 0 <= t; --t) e[t] = this[t];
+            e.t = this.t, e.s = this.s
+        }, m.prototype.fromInt = function (e) {
+            this.t = 1, this.s = e < 0 ? -1 : 0, 0 < e ? this[0] = e : e < -1 ? this[0] = e + DV : this.t = 0
+        }, m.prototype.fromString = function (e, t) {
+            var n;
+            if (16 == t) n = 4; else if (8 == t) n = 3; else if (256 == t) n = 8; else if (2 == t) n = 1; else if (32 == t) n = 5; else {
+                if (4 != t) return void this.fromRadix(e, t);
+                n = 2
+            }
+            this.s = this.t = 0;
+            for (var i = e.length, r = !1, a = 0; 0 <= --i;) {
+                var s = 8 == n ? 255 & e[i] : d(e, i);
+                s < 0 ? "-" == e.charAt(i) && (r = !0) : (r = !1, 0 == a ? this[this.t++] = s : a + n > this.DB ? (this[this.t - 1] |= (s & (1 << this.DB - a) - 1) << a, this[this.t++] = s >> this.DB - a) : this[this.t - 1] |= s << a, (a += n) >= this.DB && (a -= this.DB))
+            }
+            8 == n && 0 != (128 & e[0]) && (this.s = -1, 0 < a && (this[this.t - 1] |= (1 << this.DB - a) - 1 << a)), this.clamp(), r && m.ZERO.subTo(this, this)
+        }, m.prototype.clamp = function () {
+            for (var e = this.s & this.DM; 0 < this.t && this[this.t - 1] == e;) --this.t
+        }, m.prototype.dlShiftTo = function (e, t) {
+            for (var n = this.t - 1; 0 <= n; --n) t[n + e] = this[n];
+            for (n = e - 1; 0 <= n; --n) t[n] = 0;
+            t.t = this.t + e, t.s = this.s
+        }, m.prototype.drShiftTo = function (e, t) {
+            for (var n = e; n < this.t; ++n) t[n - e] = this[n];
+            t.t = Math.max(this.t - e, 0), t.s = this.s
+        }, m.prototype.lShiftTo = function (e, t) {
+            for (var n = e % this.DB, i = this.DB - n, r = (1 << i) - 1, a = Math.floor(e / this.DB), s = this.s << n & this.DM, o = this.t - 1; 0 <= o; --o) t[o + a + 1] = this[o] >> i | s, s = (this[o] & r) << n;
+            for (o = a - 1; 0 <= o; --o) t[o] = 0;
+            t[a] = s, t.t = this.t + a + 1, t.s = this.s, t.clamp()
+        }, m.prototype.rShiftTo = function (e, t) {
+            t.s = this.s;
+            var n = Math.floor(e / this.DB);
+            if (n >= this.t) t.t = 0; else {
+                var i = e % this.DB, r = this.DB - i, a = (1 << i) - 1;
+                t[0] = this[n] >> i;
+                for (var s = n + 1; s < this.t; ++s) t[s - n - 1] |= (this[s] & a) << r, t[s - n] = this[s] >> i;
+                0 < i && (t[this.t - n - 1] |= (this.s & a) << r), t.t = this.t - n, t.clamp()
+            }
+        }, m.prototype.subTo = function (e, t) {
+            for (var n = 0, i = 0, r = Math.min(e.t, this.t); n < r;) i += this[n] - e[n], t[n++] = i & this.DM, i >>= this.DB;
+            if (e.t < this.t) {
+                for (i -= e.s; n < this.t;) i += this[n], t[n++] = i & this.DM, i >>= this.DB;
+                i += this.s
+            } else {
+                for (i += this.s; n < e.t;) i -= e[n], t[n++] = i & this.DM, i >>= this.DB;
+                i -= e.s
+            }
+            t.s = i < 0 ? -1 : 0, i < -1 ? t[n++] = this.DV + i : 0 < i && (t[n++] = i), t.t = n, t.clamp()
+        }, m.prototype.multiplyTo = function (e, t) {
+            var n = this.abs(), i = e.abs(), r = n.t;
+            for (t.t = r + i.t; 0 <= --r;) t[r] = 0;
+            for (r = 0; r < i.t; ++r) t[r + n.t] = n.am(0, i[r], t, r, 0, n.t);
+            t.s = 0, t.clamp(), this.s != e.s && m.ZERO.subTo(t, t)
+        }, m.prototype.squareTo = function (e) {
+            for (var t = this.abs(), n = e.t = 2 * t.t; 0 <= --n;) e[n] = 0;
+            for (n = 0; n < t.t - 1; ++n) {
+                var i = t.am(n, t[n], e, 2 * n, 0, 1);
+                (e[n + t.t] += t.am(n + 1, 2 * t[n], e, 2 * n + 1, i, t.t - n - 1)) >= t.DV && (e[n + t.t] -= t.DV, e[n + t.t + 1] = 1)
+            }
+            0 < e.t && (e[e.t - 1] += t.am(n, t[n], e, 2 * n, 0, 1)), e.s = 0, e.clamp()
+        }, m.prototype.divRemTo = function (e, t, n) {
+            var i = e.abs();
+            if (!(i.t <= 0)) {
+                var r = this.abs();
+                if (r.t < i.t) null != t && t.fromInt(0), null != n && this.copyTo(n); else {
+                    null == n && (n = p());
+                    var a = p(), s = this.s, e = e.s, o = this.DB - y(i[i.t - 1]);
+                    if (0 < o ? (i.lShiftTo(o, a), r.lShiftTo(o, n)) : (i.copyTo(a), r.copyTo(n)), 0 != (r = a[(i = a.t) - 1])) {
+                        var u = r * (1 << this.F1) + (1 < i ? a[i - 2] >> this.F2 : 0), d = this.FV / u,
+                            u = (1 << this.F1) / u, l = 1 << this.F2, h = n.t, c = h - i, _ = null == t ? p() : t;
+                        for (a.dlShiftTo(c, _), 0 <= n.compareTo(_) && (n[n.t++] = 1, n.subTo(_, n)), m.ONE.dlShiftTo(i, _), _.subTo(a, a); a.t < i;) a[a.t++] = 0;
+                        for (; 0 <= --c;) {
+                            var f = n[--h] == r ? this.DM : Math.floor(n[h] * d + (n[h - 1] + l) * u);
+                            if ((n[h] += a.am(0, f, n, c, 0, i)) < f) for (a.dlShiftTo(c, _), n.subTo(_, n); n[h] < --f;) n.subTo(_, n)
+                        }
+                        null != t && (n.drShiftTo(i, t), s != e && m.ZERO.subTo(t, t)), n.t = i, n.clamp(), 0 < o && n.rShiftTo(o, n), s < 0 && m.ZERO.subTo(n, n)
+                    }
+                }
+            }
+        }, m.prototype.invDigit = function () {
+            if (this.t < 1) return 0;
+            var e = this[0];
+            if (0 == (1 & e)) return 0;
+            var t = 3 & e;
+            return 0 < (t = (t = (t = (t = t * (2 - (15 & e) * t) & 15) * (2 - (255 & e) * t) & 255) * (2 - ((65535 & e) * t & 65535)) & 65535) * (2 - e * t % this.DV) % this.DV) ? this.DV - t : -t
+        }, m.prototype.isEven = function () {
+            return 0 == (0 < this.t ? 1 & this[0] : this.s)
+        }, m.prototype.exp = function (e, t) {
+            if (4294967295 < e || e < 1) return m.ONE;
+            var n, i = p(), r = p(), a = t.convert(this), s = y(e) - 1;
+            for (a.copyTo(i); 0 <= --s;) t.sqrTo(i, r), 0 < (e & 1 << s) ? t.mulTo(r, a, i) : (n = i, i = r, r = n);
+            return t.revert(i)
+        }, m.prototype.toString = function (e) {
+            if (this.s < 0) return "-" + this.negate().toString(e);
+            if (16 == e) e = 4; else if (8 == e) e = 3; else if (2 == e) e = 1; else if (32 == e) e = 5; else if (64 == e) e = 6; else {
+                if (4 != e) return this.toRadix(e);
+                e = 2
+            }
+            var t, n = (1 << e) - 1, i = !1, r = "", a = this.t, s = this.DB - a * this.DB % e;
+            if (0 < a--) for (s < this.DB && 0 < (t = this[a] >> s) && (i = !0, r = o(t)); 0 <= a;) s < e ? (t = (this[a] & (1 << s) - 1) << e - s, t |= this[--a] >> (s += this.DB - e)) : (t = this[a] >> (s -= e) & n, s <= 0 && (s += this.DB, --a)), (i = 0 < t ? !0 : i) && (r += o(t));
+            return i ? r : "0"
+        }, m.prototype.negate = function () {
+            var e = p();
+            return m.ZERO.subTo(this, e), e
+        }, m.prototype.abs = function () {
+            return this.s < 0 ? this.negate() : this
+        }, m.prototype.compareTo = function (e) {
+            var t = this.s - e.s;
+            if (0 != t) return t;
+            var n = this.t;
+            if (0 != (t = n - e.t)) return t;
+            for (; 0 <= --n;) if (0 != (t = this[n] - e[n])) return t;
+            return 0
+        }, m.prototype.bitLength = function () {
+            return this.t <= 0 ? 0 : this.DB * (this.t - 1) + y(this[this.t - 1] ^ this.s & this.DM)
+        }, m.prototype.mod = function (e) {
+            var t = p();
+            return this.abs().divRemTo(e, null, t), this.s < 0 && 0 < t.compareTo(m.ZERO) && e.subTo(t, t), t
+        }, m.prototype.modPowInt = function (e, t) {
+            return t = new (e < 256 || t.isEven() ? g : M)(t), this.exp(e, t)
+        }, m.ZERO = f(0), m.ONE = f(1), s.prototype.convert = G, s.prototype.revert = G, s.prototype.mulTo = function (e, t, n) {
+            e.multiplyTo(t, n)
+        }, s.prototype.sqrTo = function (e, t) {
+            e.squareTo(t)
+        }, L.prototype.convert = function (e) {
+            var t;
+            return e.s < 0 || e.t > 2 * this.m.t ? e.mod(this.m) : e.compareTo(this.m) < 0 ? e : (t = p(), e.copyTo(t), this.reduce(t), t)
+        }, L.prototype.revert = function (e) {
+            return e
+        }, L.prototype.reduce = function (e) {
+            for (e.drShiftTo(this.m.t - 1, this.r2), e.t > this.m.t + 1 && (e.t = this.m.t + 1, e.clamp()), this.mu.multiplyUpperTo(this.r2, this.m.t + 1, this.q3), this.m.multiplyLowerTo(this.q3, this.m.t + 1, this.r2); e.compareTo(this.r2) < 0;) e.dAddOffset(1, this.m.t + 1);
+            for (e.subTo(this.r2, e); 0 <= e.compareTo(this.m);) e.subTo(this.m, e)
+        }, L.prototype.mulTo = function (e, t, n) {
+            e.multiplyTo(t, n), this.reduce(n)
+        }, L.prototype.sqrTo = function (e, t) {
+            e.squareTo(t), this.reduce(t)
+        };
+        var u, l, h, J, q,
+            c = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997],
+            K = 67108864 / c[c.length - 1];
+
+        function X(e) {
+            var t, n, o = this, i = e.length, r = 0, a = o.i = o.j = o.m = 0;
+            for (o.S = [], o.c = [], i || (e = [i++]); r < 256;) o.S[r] = r++;
+            for (r = 0; r < 256; r++) a = a + (t = o.S[r]) + e[r % i] & 255, n = o.S[a], o.S[r] = n, o.S[a] = t;
+            o.g = function (e) {
+                var t = o.S, n = o.i + 1 & 255, i = t[n], r = o.j + i & 255, a = t[r];
+                t[n] = a, t[r] = i;
+                for (var s = t[i + a & 255]; --e;) a = t[r = r + (i = t[n = n + 1 & 255]) & 255], t[n] = a, t[r] = i, s = 256 * s + t[i + a & 255];
+                return o.i = n, o.j = r, s
+            }, o.g(256)
+        }
+
+        function _(e, t, n, i) {
+            for (e += "", i = n = 0; i < e.length; i++) {
+                var r = t, a = 255 & i, s = (n ^= 19 * t[255 & i]) + e.charCodeAt(i);
+                r[a] = 255 & s
+            }
+            for (i in e = "", t) e += String.fromCharCode(t[i]);
+            return e
+        }
+
+        function Z() {
+        }
+
+        function S() {
+            this.j = this.i = 0, this.S = []
+        }
+
+        m.prototype.chunkSize = function (e) {
+            return Math.floor(Math.LN2 * this.DB / Math.log(e))
+        }, m.prototype.toRadix = function (e) {
+            if (null == e && (e = 10), 0 == this.signum() || e < 2 || 36 < e) return "0";
+            var t = this.chunkSize(e), n = f(t = Math.pow(e, t)), i = p(), r = p(), a = "";
+            for (this.divRemTo(n, i, r); 0 < i.signum();) a = (t + r.intValue()).toString(e).substr(1) + a, i.divRemTo(n, i, r);
+            return r.intValue().toString(e) + a
+        }, m.prototype.fromRadix = function (e, t) {
+            this.fromInt(0);
+            for (var n = this.chunkSize(t = null == t ? 10 : t), i = Math.pow(t, n), r = !1, a = 0, s = 0, o = 0; o < e.length; ++o) {
+                var u = d(e, o);
+                u < 0 ? "-" == e.charAt(o) && 0 == this.signum() && (r = !0) : (s = t * s + u, ++a >= n && (this.dMultiply(i), this.dAddOffset(s, 0), s = a = 0))
+            }
+            0 < a && (this.dMultiply(Math.pow(t, a)), this.dAddOffset(s, 0)), r && m.ZERO.subTo(this, this)
+        }, m.prototype.fromNumber = function (e, t, n) {
+            if ("number" == typeof t) if (e < 2) this.fromInt(1); else for (this.fromNumber(e, n), this.testBit(e - 1) || this.bitwiseTo(m.ONE.shiftLeft(e - 1), a, this), this.isEven() && this.dAddOffset(1, 0); !this.isProbablePrime(t);) this.dAddOffset(2, 0), this.bitLength() > e && this.subTo(m.ONE.shiftLeft(e - 1), this); else {
+                var i = 7 & e;
+                (n = []).length = 1 + (e >> 3), t.nextBytes(n), 0 < i ? n[0] &= (1 << i) - 1 : n[0] = 0, this.fromString(n, 256)
+            }
+        }, m.prototype.bitwiseTo = function (e, t, n) {
+            for (var i, r = Math.min(e.t, this.t), a = 0; a < r; ++a) n[a] = t(this[a], e[a]);
+            if (e.t < this.t) {
+                for (i = e.s & this.DM, a = r; a < this.t; ++a) n[a] = t(this[a], i);
+                n.t = this.t
+            } else {
+                for (i = this.s & this.DM, a = r; a < e.t; ++a) n[a] = t(i, e[a]);
+                n.t = e.t
+            }
+            n.s = t(this.s, e.s), n.clamp()
+        }, m.prototype.changeBit = function (e, t) {
+            return e = m.ONE.shiftLeft(e), this.bitwiseTo(e, t, e), e
+        }, m.prototype.addTo = function (e, t) {
+            for (var n = 0, i = 0, r = Math.min(e.t, this.t); n < r;) i += this[n] + e[n], t[n++] = i & this.DM, i >>= this.DB;
+            if (e.t < this.t) {
+                for (i += e.s; n < this.t;) i += this[n], t[n++] = i & this.DM, i >>= this.DB;
+                i += this.s
+            } else {
+                for (i += this.s; n < e.t;) i += e[n], t[n++] = i & this.DM, i >>= this.DB;
+                i += e.s
+            }
+            t.s = i < 0 ? -1 : 0, 0 < i ? t[n++] = i : i < -1 && (t[n++] = this.DV + i), t.t = n, t.clamp()
+        }, m.prototype.dMultiply = function (e) {
+            this[this.t] = this.am(0, e - 1, this, 0, 0, this.t), ++this.t, this.clamp()
+        }, m.prototype.dAddOffset = function (e, t) {
+            if (0 != e) {
+                for (; this.t <= t;) this[this.t++] = 0;
+                for (this[t] += e; this[t] >= this.DV;) this[t] -= this.DV, ++t >= this.t && (this[this.t++] = 0), ++this[t]
+            }
+        }, m.prototype.multiplyLowerTo = function (e, t, n) {
+            var i, r = Math.min(this.t + e.t, t);
+            for (n.s = 0, n.t = r; 0 < r;) n[--r] = 0;
+            for (i = n.t - this.t; r < i; ++r) n[r + this.t] = this.am(0, e[r], n, r, 0, this.t);
+            for (i = Math.min(e.t, t); r < i; ++r) this.am(0, e[r], n, r, 0, t - r);
+            n.clamp()
+        }, m.prototype.multiplyUpperTo = function (e, t, n) {
+            var i = n.t = this.t + e.t - --t;
+            for (n.s = 0; 0 <= --i;) n[i] = 0;
+            for (i = Math.max(t - this.t, 0); i < e.t; ++i) n[this.t + i - t] = this.am(t - i, e[i], n, 0, 0, this.t + i - t);
+            n.clamp(), n.drShiftTo(1, n)
+        }, m.prototype.modInt = function (e) {
+            if (e <= 0) return 0;
+            var t = this.DV % e, n = this.s < 0 ? e - 1 : 0;
+            if (0 < this.t) if (0 == t) n = this[0] % e; else for (var i = this.t - 1; 0 <= i; --i) n = (t * n + this[i]) % e;
+            return n
+        }, m.prototype.millerRabin = function (e) {
+            var t = this.subtract(m.ONE), n = t.getLowestSetBit();
+            if (n <= 0) return !1;
+            var i = t.shiftRight(n), e = e + 1 >> 1;
+            c.length < e && (e = c.length);
+            for (var r = p(), a = 0; a < e; ++a) {
+                r.fromInt(c[Math.floor(Math.random() * c.length)]);
+                var s = r.modPow(i, this);
+                if (0 != s.compareTo(m.ONE) && 0 != s.compareTo(t)) {
+                    for (var o = 1; o++ < n && 0 != s.compareTo(t);) if (0 == (s = s.modPowInt(2, this)).compareTo(m.ONE)) return !1;
+                    if (0 != s.compareTo(t)) return !1
+                }
+            }
+            return !0
+        }, m.prototype.clone = function () {
+            var e = p();
+            return this.copyTo(e), e
+        }, m.prototype.intValue = function () {
+            if (this.s < 0) {
+                if (1 == this.t) return this[0] - this.DV;
+                if (0 == this.t) return -1
+            } else {
+                if (1 == this.t) return this[0];
+                if (0 == this.t) return 0
+            }
+            return (this[1] & (1 << 32 - this.DB) - 1) << this.DB | this[0]
+        }, m.prototype.byteValue = function () {
+            return 0 == this.t ? this.s : this[0] << 24 >> 24
+        }, m.prototype.shortValue = function () {
+            return 0 == this.t ? this.s : this[0] << 16 >> 16
+        }, m.prototype.signum = function () {
+            return this.s < 0 ? -1 : this.t <= 0 || 1 == this.t && this[0] <= 0 ? 0 : 1
+        }, m.prototype.toByteArray = function () {
+            var e, t = this.t, n = [], i = (n[0] = this.s, this.DB - t * this.DB % 8), r = 0;
+            if (0 < t--) for (i < this.DB && (e = this[t] >> i) != (this.s & this.DM) >> i && (n[r++] = e | this.s << this.DB - i); 0 <= t;) i < 8 ? (e = (this[t] & (1 << i) - 1) << 8 - i, e |= this[--t] >> (i += this.DB - 8)) : (e = this[t] >> (i -= 8) & 255, i <= 0 && (i += this.DB, --t)), 0 != (128 & e) && (e |= -256), 0 == r && (128 & this.s) != (128 & e) && ++r, (0 < r || e != this.s) && (n[r++] = e);
+            return n
+        }, m.prototype.equals = function (e) {
+            return 0 == this.compareTo(e)
+        }, m.prototype.min = function (e) {
+            return this.compareTo(e) < 0 ? this : e
+        }, m.prototype.max = function (e) {
+            return 0 < this.compareTo(e) ? this : e
+        }, m.prototype.and = function (e) {
+            var t = p();
+            return this.bitwiseTo(e, z, t), t
+        }, m.prototype.or = function (e) {
+            var t = p();
+            return this.bitwiseTo(e, a, t), t
+        }, m.prototype.xor = function (e) {
+            var t = p();
+            return this.bitwiseTo(e, U, t), t
+        }, m.prototype.andNot = function (e) {
+            var t = p();
+            return this.bitwiseTo(e, V, t), t
+        }, m.prototype.not = function () {
+            for (var e = p(), t = 0; t < this.t; ++t) e[t] = this.DM & ~this[t];
+            return e.t = this.t, e.s = ~this.s, e
+        }, m.prototype.shiftLeft = function (e) {
+            var t = p();
+            return e < 0 ? this.rShiftTo(-e, t) : this.lShiftTo(e, t), t
+        }, m.prototype.shiftRight = function (e) {
+            var t = p();
+            return e < 0 ? this.lShiftTo(-e, t) : this.rShiftTo(e, t), t
+        }, m.prototype.getLowestSetBit = function () {
+            for (var e = 0; e < this.t; ++e) if (0 != this[e]) return e * this.DB + function (e) {
+                if (0 == e) return -1;
+                var t = 0;
+                return 0 == (65535 & e) && (e >>= 16, t += 16), 0 == (255 & e) && (e >>= 8, t += 8), 0 == (15 & e) && (e >>= 4, t += 4), 0 == (3 & e) && (e >>= 2, t += 2), 0 == (1 & e) && ++t, t
+            }(this[e]);
+            return this.s < 0 ? this.t * this.DB : -1
+        }, m.prototype.bitCount = function () {
+            for (var e = 0, t = this.s & this.DM, n = 0; n < this.t; ++n) e += function (e) {
+                for (var t = 0; 0 != e;) e &= e - 1, ++t;
+                return t
+            }(this[n] ^ t);
+            return e
+        }, m.prototype.testBit = function (e) {
+            var t = Math.floor(e / this.DB);
+            return t >= this.t ? 0 != this.s : 0 != (this[t] & 1 << e % this.DB)
+        }, m.prototype.setBit = function (e) {
+            return this.changeBit(e, a)
+        }, m.prototype.clearBit = function (e) {
+            return this.changeBit(e, V)
+        }, m.prototype.flipBit = function (e) {
+            return this.changeBit(e, U)
+        }, m.prototype.add = function (e) {
+            var t = p();
+            return this.addTo(e, t), t
+        }, m.prototype.subtract = function (e) {
+            var t = p();
+            return this.subTo(e, t), t
+        }, m.prototype.multiply = function (e) {
+            var t = p();
+            return this.multiplyTo(e, t), t
+        }, m.prototype.divide = function (e) {
+            var t = p();
+            return this.divRemTo(e, t, null), t
+        }, m.prototype.remainder = function (e) {
+            var t = p();
+            return this.divRemTo(e, null, t), t
+        }, m.prototype.divideAndRemainder = function (e) {
+            var t = p(), n = p();
+            return this.divRemTo(e, t, n), [t, n]
+        }, m.prototype.modPow = function (e, t) {
+            var n = e.bitLength(), i = f(1);
+            if (n <= 0) return i;
+            var r = n < 18 ? 1 : n < 48 ? 3 : n < 144 ? 4 : n < 768 ? 5 : 6,
+                a = new (n < 8 ? g : t.isEven() ? L : M)(t), s = [], o = 3, u = r - 1, d = (1 << r) - 1;
+            if (s[1] = a.convert(this), 1 < r) for (n = p(), a.sqrTo(s[1], n); o <= d;) s[o] = p(), a.mulTo(n, s[o - 2], s[o]), o += 2;
+            for (var l, h = e.t - 1, c = !0, _ = p(), n = y(e[h]) - 1; 0 <= h;) {
+                for (u <= n ? l = e[h] >> n - u & d : (l = (e[h] & (1 << n + 1) - 1) << u - n, 0 < h && (l |= e[h - 1] >> this.DB + n - u)), o = r; 0 == (1 & l);) l >>= 1, --o;
+                if ((n -= o) < 0 && (n += this.DB, --h), c) s[l].copyTo(i), c = !1; else {
+                    for (; 1 < o;) a.sqrTo(i, _), a.sqrTo(_, i), o -= 2;
+                    0 < o ? a.sqrTo(i, _) : (o = i, i = _, _ = o), a.mulTo(_, s[l], i)
+                }
+                for (; 0 <= h && 0 == (e[h] & 1 << n);) a.sqrTo(i, _), o = i, i = _, _ = o, --n < 0 && (n = this.DB - 1, --h)
+            }
+            return a.revert(i)
+        }, m.prototype.modInverse = function (e) {
+            var t = e.isEven();
+            if (this.isEven() && t || 0 == e.signum()) return m.ZERO;
+            for (var n = e.clone(), i = this.clone(), r = f(1), a = f(0), s = f(0), o = f(1); 0 != n.signum();) {
+                for (; n.isEven();) n.rShiftTo(1, n), t ? (r.isEven() && a.isEven() || (r.addTo(this, r), a.subTo(e, a)), r.rShiftTo(1, r)) : a.isEven() || a.subTo(e, a), a.rShiftTo(1, a);
+                for (; i.isEven();) i.rShiftTo(1, i), t ? (s.isEven() && o.isEven() || (s.addTo(this, s), o.subTo(e, o)), s.rShiftTo(1, s)) : o.isEven() || o.subTo(e, o), o.rShiftTo(1, o);
+                0 <= n.compareTo(i) ? (n.subTo(i, n), t && r.subTo(s, r), a.subTo(o, a)) : (i.subTo(n, i), t && s.subTo(r, s), o.subTo(a, o))
+            }
+            return 0 != i.compareTo(m.ONE) ? m.ZERO : 0 <= o.compareTo(e) ? o.subtract(e) : o.signum() < 0 ? (o.addTo(e, o), o.signum() < 0 ? o.add(e) : o) : o
+        }, m.prototype.pow = function (e) {
+            return this.exp(e, new s)
+        }, m.prototype.gcd = function (e) {
+            var t = this.s < 0 ? this.negate() : this.clone(), e = e.s < 0 ? e.negate() : e.clone(),
+                n = (t.compareTo(e) < 0 && (n = t, t = e, e = n), t.getLowestSetBit()), i = e.getLowestSetBit();
+            if (i < 0) return t;
+            for (0 < (i = n < i ? n : i) && (t.rShiftTo(i, t), e.rShiftTo(i, e)); 0 < t.signum();) 0 < (n = t.getLowestSetBit()) && t.rShiftTo(n, t), 0 < (n = e.getLowestSetBit()) && e.rShiftTo(n, e), 0 <= t.compareTo(e) ? (t.subTo(e, t), t.rShiftTo(1, t)) : (e.subTo(t, e), e.rShiftTo(1, e));
+            return 0 < i && e.lShiftTo(i, e), e
+        }, m.prototype.isProbablePrime = function (e) {
+            var t, n = this.abs();
+            if (1 == n.t && n[0] <= c[c.length - 1]) {
+                for (t = 0; t < c.length; ++t) if (n[0] == c[t]) return !0;
+                return !1
+            }
+            if (n.isEven()) return !1;
+            for (t = 1; t < c.length;) {
+                for (var i = c[t], r = t + 1; r < c.length && i < K;) i *= c[r++];
+                for (i = n.modInt(i); t < r;) if (i % c[t++] == 0) return !1
+            }
+            return n.millerRabin(e)
+        }, m.prototype.square = function () {
+            var e = p();
+            return this.squareTo(e), e
+        }, u = [], l = Math, h = 52, l.seedrandom = function (e, t) {
+            var n = [], e = _(function e(t, n, i, r, a) {
+                if (i = [], a = void 0 === t ? "undefined" : (0, F.default)(t), n && "object" == a) for (r in t) if (r.indexOf("S") < 5) try {
+                    i.push(e(t[r], n - 1))
+                } catch (e) {
+                }
+                return i.length ? i : t + ("string" != a ? "\0" : "")
+            }(t ? [e, u] : arguments.length ? e : [(new Date).getTime(), u, window], 3), n), i = new X(n);
+            return _(i.S, u), l.random = function () {
+                for (var e = i.g(6), t = q, n = 0; e < h;) e = 256 * (e + n), t *= 256, n = i.g(1);
+                for (; J <= e;) e /= 2, t /= 2, n >>>= 1;
+                return (e + n) / t
+            }, e
+        }, q = l.pow(256, 6), h = l.pow(2, h), J = 2 * h, _(l.random(), u), Z.prototype.nextBytes = function (e) {
+            for (var t = 0; t < e.length; t++) e[t] = Math.floor(256 * Math.random())
+        }, S.prototype.init = function (e) {
+            for (var t, n, i = 0; i < 256; ++i) this.S[i] = i;
+            for (i = t = 0; i < 256; ++i) t = t + this.S[i] + e[i % e.length] & 255, n = this.S[i], this.S[i] = this.S[t], this.S[t] = n;
+            this.j = this.i = 0
+        }, S.prototype.next = function () {
+            var e;
+            return this.i = this.i + 1 & 255, this.j = this.j + this.S[this.i] & 255, e = this.S[this.i], this.S[this.i] = this.S[this.j], this.S[this.j] = e, this.S[e + this.S[this.i] & 255]
+        };
+        var k, b = 256;
+
+        function $() {
+            var e;
+            e = (new Date).getTime(), w[D++] ^= 255 & e, w[D++] ^= e >> 8 & 255, w[D++] ^= e >> 16 & 255, w[D++] ^= e >> 24 & 255, b <= D && (D -= b)
+        }
+
+        var w = [], D = 0;
+        if ("Netscape" == e && B < "5" && window.crypto) for (var Q = window.crypto.random(32), T = 0; T < Q.length; ++T) w[D++] = 255 & Q.charCodeAt(T);
+        for (; D < b;) T = Math.floor(65536 * Math.random()), w[D++] = T >>> 8, w[D++] = 255 & T;
+
+        function ee() {
+            if (null == k) {
+                for ($(), (k = new S).init(w), D = 0; D < w.length; ++D) w[D] = 0;
+                D = 0
+            }
+            return k.next()
+        }
+
+        function E() {
+        }
+
+        D = 0, $(), E.prototype.nextBytes = function (e) {
+            for (var t = 0; t < e.length; ++t) e[t] = ee()
+        };
+        var te = function (e) {
+            function y(e, t) {
+                var n = (65535 & e) + (65535 & t);
+                return (e >> 16) + (t >> 16) + (n >> 16) << 16 | 65535 & n
+            }
+
+            function v(e, t) {
+                return e >>> t | e << 32 - t
+            }
+
+            for (var t = function (e, t) {
+                var n, i, r, a, s, o, u, d, l, h, c, _,
+                    f = [1116352408, 1899447441, 3049323471, 3921009573, 961987163, 1508970993, 2453635748, 2870763221, 3624381080, 310598401, 607225278, 1426881987, 1925078388, 2162078206, 2614888103, 3248222580, 3835390401, 4022224774, 264347078, 604807628, 770255983, 1249150122, 1555081692, 1996064986, 2554220882, 2821834349, 2952996808, 3210313671, 3336571891, 3584528711, 113926993, 338241895, 666307205, 773529912, 1294757372, 1396182291, 1695183700, 1986661051, 2177026350, 2456956037, 2730485921, 2820302411, 3259730800, 3345764771, 3516065817, 3600352804, 4094571909, 275423344, 430227734, 506948616, 659060556, 883997877, 958139571, 1322822218, 1537002063, 1747873779, 1955562222, 2024104815, 2227730452, 2361852424, 2428436474, 2756734187, 3204031479, 3329325298],
+                    m = [1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225],
+                    p = Array(64);
+                for (e[t >> 5] |= 128 << 24 - t % 32, e[15 + (64 + t >> 9 << 4)] = t, l = 0; l < e.length; l += 16) {
+                    for (n = m[0], i = m[1], r = m[2], a = m[3], s = m[4], o = m[5], u = m[6], d = m[7], h = 0; h < 64; h++) p[h] = h < 16 ? e[h + l] : y(y(y(v(p[h - 2], 17) ^ v(p[h - 2], 19) ^ p[h - 2] >>> 10, p[h - 7]), v(p[h - 15], 7) ^ v(p[h - 15], 18) ^ p[h - 15] >>> 3), p[h - 16]), c = y(y(y(y(d, v(s, 6) ^ v(s, 11) ^ v(s, 25)), s & o ^ ~s & u), f[h]), p[h]), _ = y(v(n, 2) ^ v(n, 13) ^ v(n, 22), n & i ^ n & r ^ i & r), d = u, u = o, o = s, s = y(a, c), a = r, r = i, i = n, n = y(c, _);
+                    m[0] = y(n, m[0]), m[1] = y(i, m[1]), m[2] = y(r, m[2]), m[3] = y(a, m[3]), m[4] = y(s, m[4]), m[5] = y(o, m[5]), m[6] = y(u, m[6]), m[7] = y(d, m[7])
+                }
+                return m
+            }(function (e) {
+                for (var t = [], n = 0; n < 8 * e.length; n += 8) t[n >> 5] |= (255 & e.charCodeAt(n / 8)) << 24 - n % 32;
+                return t
+            }(e = function (e) {
+                for (var e = e.replace(/\r\n/g, "\n"), t = "", n = 0; n < e.length; n++) {
+                    var i = e.charCodeAt(n);
+                    i < 128 ? t += String.fromCharCode(i) : (127 < i && i < 2048 ? t += String.fromCharCode(i >> 6 | 192) : t = (t += String.fromCharCode(i >> 12 | 224)) + String.fromCharCode(i >> 6 & 63 | 128), t += String.fromCharCode(63 & i | 128))
+                }
+                return t
+            }(e)), 8 * e.length), n = "", i = 0; i < 4 * t.length; i++) n += "0123456789abcdef".charAt(t[i >> 2] >> 8 * (3 - i % 4) + 4 & 15) + "0123456789abcdef".charAt(t[i >> 2] >> 8 * (3 - i % 4) & 15);
+            return n
+        };
+        var Y = function (e) {
+            var t = e;
+
+            function n(e, t) {
+                return e << t | e >>> 32 - t
+            }
+
+            function i(e) {
+                for (var t = "", n = 7; 0 <= n; n--) t += (e >>> 4 * n & 15).toString(16);
+                return t
+            }
+
+            for (var r, a, s, o, u, d = Array(80), l = 1732584193, h = 4023233417, c = 2562383102, _ = 271733878, f = 3285377520, m = (t = function (e) {
+                for (var e = e.replace(/\r\n/g, "\n"), t = "", n = 0; n < e.length; n++) {
+                    var i = e.charCodeAt(n);
+                    i < 128 ? t += String.fromCharCode(i) : (127 < i && i < 2048 ? t += String.fromCharCode(i >> 6 | 192) : t = (t += String.fromCharCode(i >> 12 | 224)) + String.fromCharCode(i >> 6 & 63 | 128), t += String.fromCharCode(63 & i | 128))
+                }
+                return t
+            }(t)).length, p = [], y = 0; y < m - 3; y += 4) r = t.charCodeAt(y) << 24 | t.charCodeAt(y + 1) << 16 | t.charCodeAt(y + 2) << 8 | t.charCodeAt(y + 3), p.push(r);
+            switch (m % 4) {
+                case 0:
+                    y = 2147483648;
+                    break;
+                case 1:
+                    y = t.charCodeAt(m - 1) << 24 | 8388608;
+                    break;
+                case 2:
+                    y = t.charCodeAt(m - 2) << 24 | t.charCodeAt(m - 1) << 16 | 32768;
+                    break;
+                case 3:
+                    y = t.charCodeAt(m - 3) << 24 | t.charCodeAt(m - 2) << 16 | t.charCodeAt(m - 1) << 8 | 128
+            }
+            for (p.push(y); p.length % 16 != 14;) p.push(0);
+            for (p.push(m >>> 29), p.push(m << 3 & 4294967295), t = 0; t < p.length; t += 16) {
+                for (y = 0; y < 16; y++) d[y] = p[t + y];
+                for (y = 16; y <= 79; y++) d[y] = n(d[y - 3] ^ d[y - 8] ^ d[y - 14] ^ d[y - 16], 1);
+                for (r = l, m = h, a = c, s = _, o = f, y = 0; y <= 19; y++) u = n(r, 5) + (m & a | ~m & s) + o + d[y] + 1518500249 & 4294967295, o = s, s = a, a = n(m, 30), m = r, r = u;
+                for (y = 20; y <= 39; y++) u = n(r, 5) + (m ^ a ^ s) + o + d[y] + 1859775393 & 4294967295, o = s, s = a, a = n(m, 30), m = r, r = u;
+                for (y = 40; y <= 59; y++) u = n(r, 5) + (m & a | m & s | a & s) + o + d[y] + 2400959708 & 4294967295, o = s, s = a, a = n(m, 30), m = r, r = u;
+                for (y = 60; y <= 79; y++) u = n(r, 5) + (m ^ a ^ s) + o + d[y] + 3395469782 & 4294967295, o = s, s = a, a = n(m, 30), m = r, r = u;
+                l = l + r & 4294967295, h = h + m & 4294967295, c = c + a & 4294967295, _ = _ + s & 4294967295, f = f + o & 4294967295
+            }
+            return (u = i(l) + i(h) + i(c) + i(_) + i(f)).toLowerCase()
+        };
+
+        function P(e, t) {
+            return new m(e, t)
+        }
+
+        function C() {
+            this.n = null, this.e = 0, this.coeff = this.dmq1 = this.dmp1 = this.q = this.p = this.d = null
+        }
+
+        C.prototype.doPublic = function (e) {
+            return e.modPowInt(this.e, this.n)
+        }, C.prototype.setPublic = function (e, t) {
+            null != e && null != t && 0 < e.length && 0 < t.length ? (this.n = P(e, 16), this.e = parseInt(t, 16)) : alert("Invalid RSA public key")
+        }, C.prototype.encrypt = function (e) {
+            return null == (e = function (e, t) {
+                if (t < e.length + 11) throw"Message too long for RSA (n=" + t + ", l=" + e.length + ")";
+                for (var n = [], i = e.length - 1; 0 <= i && 0 < t;) {
+                    var r = e.charCodeAt(i--);
+                    r < 128 ? n[--t] = r : 127 < r && r < 2048 ? (n[--t] = 63 & r | 128, n[--t] = r >> 6 | 192) : (n[--t] = 63 & r | 128, n[--t] = r >> 6 & 63 | 128, n[--t] = r >> 12 | 224)
+                }
+                for (n[--t] = 0, i = new E, r = []; 2 < t;) {
+                    for (r[0] = 0; 0 == r[0];) i.nextBytes(r);
+                    n[--t] = r[0]
+                }
+                return n[--t] = 2, n[--t] = 0, new m(n)
+            }(e, this.n.bitLength() + 7 >> 3)) || null == (e = this.doPublic(e)) ? null : 0 == (1 & (e = e.toString(16)).length) ? e : "0" + e
+        }, C.prototype.doPrivate = function (e) {
+            if (null == this.p || null == this.q) return e.modPow(this.d, this.n);
+            for (var t = e.mod(this.p).modPow(this.dmp1, this.p), e = e.mod(this.q).modPow(this.dmq1, this.q); t.compareTo(e) < 0;) t = t.add(this.p);
+            return t.subtract(e).multiply(this.coeff).mod(this.p).multiply(this.q).add(e)
+        }, C.prototype.setPrivate = function (e, t, n) {
+            null != e && null != t && 0 < e.length && 0 < t.length ? (this.n = P(e, 16), this.e = parseInt(t, 16), this.d = P(n, 16)) : alert("Invalid RSA private key")
+        }, C.prototype.setPrivateEx = function (e, t, n, i, r, a, s, o) {
+            null != e && null != t && 0 < e.length && 0 < t.length ? (this.n = P(e, 16), this.e = parseInt(t, 16), this.d = P(n, 16), this.p = P(i, 16), this.q = P(r, 16), this.dmp1 = P(a, 16), this.dmq1 = P(s, 16), this.coeff = P(o, 16)) : alert("Invalid RSA private key")
+        }, C.prototype.generate = function (e, t) {
+            var n = new Z, i = e >> 1;
+            this.e = parseInt(t, 16);
+            for (var r = new m(t, 16); ;) {
+                for (; this.p = new m(e - i, 1, n), 0 != this.p.subtract(m.ONE).gcd(r).compareTo(m.ONE) || !this.p.isProbablePrime(10);) ;
+                for (; this.q = new m(i, 1, n), 0 != this.q.subtract(m.ONE).gcd(r).compareTo(m.ONE) || !this.q.isProbablePrime(10);) ;
+                this.p.compareTo(this.q) <= 0 && (a = this.p, this.p = this.q, this.q = a);
+                var a = this.p.subtract(m.ONE), s = this.q.subtract(m.ONE), o = a.multiply(s);
+                if (0 == o.gcd(r).compareTo(m.ONE)) {
+                    this.n = this.p.multiply(this.q), this.d = r.modInverse(o), this.dmp1 = this.d.mod(a), this.dmq1 = this.d.mod(s), this.coeff = this.q.modInverse(this.p);
+                    break
+                }
+            }
+        }, C.prototype.decrypt = function (e) {
+            if (null == (e = this.doPrivate(P(e, 16)))) return null;
+            for (var t = this.n.bitLength() + 7 >> 3, n = e.toByteArray(), i = 0; i < n.length && 0 == n[i];) ++i;
+            if (n.length - i != t - 1 || 2 != n[i]) return null;
+            for (++i; 0 != n[i];) if (++i >= n.length) return null;
+            for (var r = ""; ++i < n.length;) {
+                var a = 255 & n[i];
+                a < 128 ? r += String.fromCharCode(a) : 191 < a && a < 224 ? (r += String.fromCharCode((31 & a) << 6 | 63 & n[i + 1]), ++i) : (r += String.fromCharCode((15 & a) << 12 | (63 & n[i + 1]) << 6 | 63 & n[i + 2]), i += 2)
+            }
+            return r
+        };
+        var R = [],
+            A = (R.sha1 = "3021300906052b0e03021a05000414", R.sha256 = "3031300d060960864801650304020105000420", []);
+
+        function x(e, t, n) {
+            t /= 4;
+            for (var e = (0, A[n])(e), n = "00" + R[n] + e, e = "", t = t - 4 - n.length, i = 0; i < t; i += 2) e += "ff";
+            return sPaddedMessageHex = "0001" + e + n
+        }
+
+        function ne(e, t, n) {
+            return e = e, t = t, n = n, (i = new C).setPublic(t, n), i.doPublic(e).toString(16).replace(/^1f+00/, "");
+            var i
+        }
+
+        function ie(e) {
+            for (var t in R) {
+                var n = R[t], i = n.length;
+                if (e.substring(0, i) == n) return [t, e.substring(i)]
+            }
+            return []
+        }
+
+        A.sha1 = Y, A.sha256 = te, C.prototype.signString = function (e, t) {
+            return e = x(e, this.n.bitLength(), t), this.doPrivate(P(e, 16)).toString(16)
+        }, C.prototype.signStringWithSHA1 = function (e) {
+            return e = x(e, this.n.bitLength(), "sha1"), this.doPrivate(P(e, 16)).toString(16)
+        }, C.prototype.signStringWithSHA256 = function (e) {
+            return e = x(e, this.n.bitLength(), "sha256"), this.doPrivate(P(e, 16)).toString(16)
+        }, C.prototype.verifyString = function (e, t) {
+            return t = t.replace(/[ \n]+/g, ""), 0 != (t = ie(this.doPublic(P(t, 16)).toString(16).replace(/^1f+00/, ""))).length && t[1] == (0, A[t[0]])(e)
+        }, C.prototype.verifyHexSignatureForMessage = function (e, t) {
+            var n, i, e = P(e, 16);
+            return t = t, e = e, n = this.n.toString(16), i = this.e.toString(16), 0 != (n = ie(e = ne(e, n, i))).length && (e = n[1]) == (t = (0, A[n[0]])(t))
+        };
+        var O, I, W = I = {
+            Sbox: [99, 124, 119, 123, 242, 107, 111, 197, 48, 1, 103, 43, 254, 215, 171, 118, 202, 130, 201, 125, 250, 89, 71, 240, 173, 212, 162, 175, 156, 164, 114, 192, 183, 253, 147, 38, 54, 63, 247, 204, 52, 165, 229, 241, 113, 216, 49, 21, 4, 199, 35, 195, 24, 150, 5, 154, 7, 18, 128, 226, 235, 39, 178, 117, 9, 131, 44, 26, 27, 110, 90, 160, 82, 59, 214, 179, 41, 227, 47, 132, 83, 209, 0, 237, 32, 252, 177, 91, 106, 203, 190, 57, 74, 76, 88, 207, 208, 239, 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168, 81, 163, 64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255, 243, 210, 205, 12, 19, 236, 95, 151, 68, 23, 196, 167, 126, 61, 100, 93, 25, 115, 96, 129, 79, 220, 34, 42, 144, 136, 70, 238, 184, 20, 222, 94, 11, 219, 224, 50, 58, 10, 73, 6, 36, 92, 194, 211, 172, 98, 145, 149, 228, 121, 231, 200, 55, 109, 141, 213, 78, 169, 108, 86, 244, 234, 101, 122, 174, 8, 186, 120, 37, 46, 28, 166, 180, 198, 232, 221, 116, 31, 75, 189, 139, 138, 112, 62, 181, 102, 72, 3, 246, 14, 97, 53, 87, 185, 134, 193, 29, 158, 225, 248, 152, 17, 105, 217, 142, 148, 155, 30, 135, 233, 206, 85, 40, 223, 140, 161, 137, 13, 191, 230, 66, 104, 65, 153, 45, 15, 176, 84, 187, 22],
+            ShiftRowTab: [0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, 1, 6, 11],
+            Init: function () {
+                I.Sbox_Inv = Array(256);
+                for (var e = 0; e < 256; e++) I.Sbox_Inv[I.Sbox[e]] = e;
+                for (I.ShiftRowTab_Inv = Array(16), e = 0; e < 16; e++) I.ShiftRowTab_Inv[I.ShiftRowTab[e]] = e;
+                for (I.xtime = Array(256), e = 0; e < 128; e++) I.xtime[e] = e << 1, I.xtime[128 + e] = e << 1 ^ 27
+            },
+            Done: function () {
+                delete I.Sbox_Inv, delete I.ShiftRowTab_Inv, delete I.xtime
+            },
+            ExpandKey: function (e) {
+                var t, n = e.length, i = 1;
+                switch (n) {
+                    case 16:
+                        t = 176;
+                        break;
+                    case 24:
+                        t = 208;
+                        break;
+                    case 32:
+                        t = 240;
+                        break;
+                    default:
+                        alert("my.ExpandKey: Only key lengths of 16, 24 or 32 bytes allowed!")
+                }
+                for (var r = n; r < t; r += 4) {
+                    var a = e.slice(r - 4, r);
+                    r % n == 0 ? (a = [I.Sbox[a[1]] ^ i, I.Sbox[a[2]], I.Sbox[a[3]], I.Sbox[a[0]]], 256 <= (i <<= 1) && (i ^= 283)) : 24 < n && r % n == 16 && (a = [I.Sbox[a[0]], I.Sbox[a[1]], I.Sbox[a[2]], I.Sbox[a[3]]]);
+                    for (var s = 0; s < 4; s++) e[r + s] = e[r + s - n] ^ a[s]
+                }
+            },
+            Encrypt: function (e, t) {
+                var n = t.length;
+                I.AddRoundKey(e, t.slice(0, 16));
+                for (var i = 16; i < n - 16; i += 16) I.SubBytes(e, I.Sbox), I.ShiftRows(e, I.ShiftRowTab), I.MixColumns(e), I.AddRoundKey(e, t.slice(i, i + 16));
+                I.SubBytes(e, I.Sbox), I.ShiftRows(e, I.ShiftRowTab), I.AddRoundKey(e, t.slice(i, n))
+            },
+            Decrypt: function (e, t) {
+                var n = t.length;
+                for (I.AddRoundKey(e, t.slice(n - 16, n)), I.ShiftRows(e, I.ShiftRowTab_Inv), I.SubBytes(e, I.Sbox_Inv), n -= 32; 16 <= n; n -= 16) I.AddRoundKey(e, t.slice(n, n + 16)), I.MixColumns_Inv(e), I.ShiftRows(e, I.ShiftRowTab_Inv), I.SubBytes(e, I.Sbox_Inv);
+                I.AddRoundKey(e, t.slice(0, 16))
+            },
+            SubBytes: function (e, t) {
+                for (var n = 0; n < 16; n++) e[n] = t[e[n]]
+            },
+            AddRoundKey: function (e, t) {
+                for (var n = 0; n < 16; n++) e[n] ^= t[n]
+            },
+            ShiftRows: function (e, t) {
+                for (var n = [].concat(e), i = 0; i < 16; i++) e[i] = n[t[i]]
+            },
+            MixColumns: function (e) {
+                for (var t = 0; t < 16; t += 4) {
+                    var n = e[t + 0], i = e[t + 1], r = e[t + 2], a = e[t + 3], s = n ^ i ^ r ^ a;
+                    e[t + 0] ^= s ^ I.xtime[n ^ i], e[t + 1] ^= s ^ I.xtime[i ^ r], e[t + 2] ^= s ^ I.xtime[r ^ a], e[t + 3] ^= s ^ I.xtime[a ^ n]
+                }
+            },
+            MixColumns_Inv: function (e) {
+                for (var t = 0; t < 16; t += 4) {
+                    var n = e[t + 0], i = e[t + 1], r = e[t + 2], a = e[t + 3], s = n ^ i ^ r ^ a, o = I.xtime[s],
+                        u = I.xtime[I.xtime[o ^ n ^ r]] ^ s;
+                    s ^= I.xtime[I.xtime[o ^ i ^ a]], e[t + 0] ^= u ^ I.xtime[n ^ i], e[t + 1] ^= s ^ I.xtime[i ^ r], e[t + 2] ^= u ^ I.xtime[r ^ a], e[t + 3] ^= s ^ I.xtime[a ^ n]
+                }
+            }
+        }, e = (O = {}, W.Init(), O.b256to64 = function (e) {
+            for (var t, n, i = "", r = 0, a = e.length, s = 0; s < a; s++) n = e.charCodeAt(s), 0 == r ? (i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(n >> 2 & 63), t = (3 & n) << 4) : 1 == r ? (i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(t | n >> 4 & 15), t = (15 & n) << 2) : 2 == r && (i = (i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(t | n >> 6 & 3)) + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(63 & n)), 3 == (r += 1) && (r = 0);
+            return 0 < r && (i = i + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(t) + "="), 1 == r && (i += "="), i
+        }, O.b64to256 = function (e) {
+            for (var t, n = "", i = 0, r = 0, a = e.length, s = 0; s < a; s++) 0 <= (t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e.charAt(s))) && (i && (n += String.fromCharCode(r | t >> 6 - i & 255)), r = t << (i = i + 2 & 7) & 255);
+            return n
+        }, O.b16to64 = function (e) {
+            var t, n, i = "";
+            for (e.length % 2 == 1 && (e = "0" + e), t = 0; t + 3 <= e.length; t += 3) n = parseInt(e.substring(t, t + 3), 16), i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(n >> 6) + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(63 & n);
+            for (t + 1 == e.length ? (n = parseInt(e.substring(t, t + 1), 16), i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(n << 2)) : t + 2 == e.length && (n = parseInt(e.substring(t, t + 2), 16), i += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(n >> 2) + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt((3 & n) << 4)); 0 < (3 & i.length);) i += "=";
+            return i
+        }, O.b64to16 = function (e) {
+            for (var t, n = "", i = 0, r = 0; r < e.length && "=" != e.charAt(r); ++r) (v = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e.charAt(r))) < 0 || (i = 0 == i ? (n += o(v >> 2), t = 3 & v, 1) : 1 == i ? (n += o(t << 2 | v >> 4), t = 15 & v, 2) : 2 == i ? (n = (n += o(t)) + o(v >> 2), t = 3 & v, 3) : (n = (n += o(t << 2 | v >> 4)) + o(15 & v), 0));
+            return 1 == i && (n += o(t << 2)), n
+        }, O.string2bytes = function (e) {
+            for (var t = [], n = 0; n < e.length; n++) t.push(e.charCodeAt(n));
+            return t
+        }, O.bytes2string = function (e) {
+            for (var t = "", n = 0; n < e.length; n++) t += String.fromCharCode(e[n]);
+            return t
+        }, O.blockXOR = function (e, t) {
+            for (var n = Array(16), i = 0; i < 16; i++) n[i] = e[i] ^ t[i];
+            return n
+        }, O.blockIV = function () {
+            var e = new E, t = Array(16);
+            return e.nextBytes(t), t
+        }, O.pad16 = function (e) {
+            var t = e.slice(0), n = (16 - e.length % 16) % 16;
+            for (i = e.length; i < e.length + n; i++) t.push(0);
+            return t
+        }, O.depad = function (e) {
+            for (e = e.slice(0); 0 == e[e.length - 1];) e = e.slice(0, e.length - 1);
+            return e
+        }, O.encryptAESCBC = function (e, t) {
+            var n = t.slice(0);
+            W.ExpandKey(n);
+            for (var i = O.string2bytes(e), i = O.pad16(i), r = O.blockIV(), a = 0; a < i.length / 16; a++) {
+                var s = i.slice(16 * a, 16 * a + 16), o = r.slice(16 * a, 16 * a + 16), s = O.blockXOR(o, s);
+                W.Encrypt(s, n), r = r.concat(s)
+            }
+            return n = O.bytes2string(r), O.b256to64(n)
+        }, O.decryptAESCBC = function (e, t) {
+            var n = t.slice(0);
+            W.ExpandKey(n);
+            for (var e = O.b64to256(e), i = O.string2bytes(e), r = [], a = 1; a < i.length / 16; a++) {
+                var s = i.slice(16 * a, 16 * a + 16), o = i.slice(16 * (a - 1), 16 * (a - 1) + 16);
+                W.Decrypt(s, n), s = O.blockXOR(o, s), r = r.concat(s)
+            }
+            return r = O.depad(r), O.bytes2string(r)
+        }, O.wrap60 = function (e) {
+            for (var t = "", n = 0; n < e.length; n++) n % 60 == 0 && 0 != n && (t += "\n"), t += e[n];
+            return t
+        }, O.generateAESKey = function () {
+            var e = Array(16);
+            return (new E).nextBytes(e), e
+        }, O.generateRSAKey = function (e, t) {
+            Math.seedrandom(te(e));
+            e = new C;
+            return e.generate(t, "10001"), e
+        }, O.publicKeyString = function (e) {
+            return pubkey = e.n.toString(16)
+        }, O.publicKeyID = function (e) {
+            var t = e;
+
+            function o(e, t) {
+                var n = 2147483648 & e, i = 2147483648 & t, r = 1073741824 & e, a = 1073741824 & t,
+                    e = (1073741823 & e) + (1073741823 & t);
+                return r & a ? 2147483648 ^ e ^ n ^ i : r | a ? 1073741824 & e ? 3221225472 ^ e ^ n ^ i : 1073741824 ^ e ^ n ^ i : e ^ n ^ i
+            }
+
+            function n(e, t, n, i, r, a, s) {
+                return e = o(e, o(o(t & n | ~t & i, r), s)), o(e << a | e >>> 32 - a, t)
+            }
+
+            function i(e, t, n, i, r, a, s) {
+                return e = o(e, o(o(t & i | n & ~i, r), s)), o(e << a | e >>> 32 - a, t)
+            }
+
+            function r(e, t, n, i, r, a, s) {
+                return e = o(e, o(o(t ^ n ^ i, r), s)), o(e << a | e >>> 32 - a, t)
+            }
+
+            function a(e, t, n, i, r, a, s) {
+                return e = o(e, o(o(n ^ (t | ~i), r), s)), o(e << a | e >>> 32 - a, t)
+            }
+
+            function s(e) {
+                for (var t = "", n = "", i = 0; i <= 3; i++) t += (n = "0" + (n = e >>> 8 * i & 255).toString(16)).substr(n.length - 2, 2);
+                return t
+            }
+
+            var u, d, l, h, c = function (e) {
+                for (var t, n = e.length, i = n + 8, i = 16 * ((i - i % 64) / 64 + 1), r = Array(i - 1), a = 0; a < n;) t = a % 4 * 8, r[(a - a % 4) / 4] |= e.charCodeAt(a) << t, a++;
+                return r[(a - a % 4) / 4] |= 128 << a % 4 * 8, r[i - 2] = n << 3, r[i - 1] = n >>> 29, r
+            }(t = function (e) {
+                for (var e = e.replace(/\r\n/g, "\n"), t = "", n = 0; n < e.length; n++) {
+                    var i = e.charCodeAt(n);
+                    i < 128 ? t += String.fromCharCode(i) : (127 < i && i < 2048 ? t += String.fromCharCode(i >> 6 | 192) : t = (t += String.fromCharCode(i >> 12 | 224)) + String.fromCharCode(i >> 6 & 63 | 128), t += String.fromCharCode(63 & i | 128))
+                }
+                return t
+            }(t)), _ = 1732584193, f = 4023233417, m = 2562383102, p = 271733878;
+            for (t = 0; t < c.length; t += 16) _ = n(u = _, d = f, l = m, h = p, c[t + 0], 7, 3614090360), p = n(p, _, f, m, c[t + 1], 12, 3905402710), m = n(m, p, _, f, c[t + 2], 17, 606105819), f = n(f, m, p, _, c[t + 3], 22, 3250441966), _ = n(_, f, m, p, c[t + 4], 7, 4118548399), p = n(p, _, f, m, c[t + 5], 12, 1200080426), m = n(m, p, _, f, c[t + 6], 17, 2821735955), f = n(f, m, p, _, c[t + 7], 22, 4249261313), _ = n(_, f, m, p, c[t + 8], 7, 1770035416), p = n(p, _, f, m, c[t + 9], 12, 2336552879), m = n(m, p, _, f, c[t + 10], 17, 4294925233), f = n(f, m, p, _, c[t + 11], 22, 2304563134), _ = n(_, f, m, p, c[t + 12], 7, 1804603682), p = n(p, _, f, m, c[t + 13], 12, 4254626195), m = n(m, p, _, f, c[t + 14], 17, 2792965006), _ = i(_, f = n(f, m, p, _, c[t + 15], 22, 1236535329), m, p, c[t + 1], 5, 4129170786), p = i(p, _, f, m, c[t + 6], 9, 3225465664), m = i(m, p, _, f, c[t + 11], 14, 643717713), f = i(f, m, p, _, c[t + 0], 20, 3921069994), _ = i(_, f, m, p, c[t + 5], 5, 3593408605), p = i(p, _, f, m, c[t + 10], 9, 38016083), m = i(m, p, _, f, c[t + 15], 14, 3634488961), f = i(f, m, p, _, c[t + 4], 20, 3889429448), _ = i(_, f, m, p, c[t + 9], 5, 568446438), p = i(p, _, f, m, c[t + 14], 9, 3275163606), m = i(m, p, _, f, c[t + 3], 14, 4107603335), f = i(f, m, p, _, c[t + 8], 20, 1163531501), _ = i(_, f, m, p, c[t + 13], 5, 2850285829), p = i(p, _, f, m, c[t + 2], 9, 4243563512), m = i(m, p, _, f, c[t + 7], 14, 1735328473), _ = r(_, f = i(f, m, p, _, c[t + 12], 20, 2368359562), m, p, c[t + 5], 4, 4294588738), p = r(p, _, f, m, c[t + 8], 11, 2272392833), m = r(m, p, _, f, c[t + 11], 16, 1839030562), f = r(f, m, p, _, c[t + 14], 23, 4259657740), _ = r(_, f, m, p, c[t + 1], 4, 2763975236), p = r(p, _, f, m, c[t + 4], 11, 1272893353), m = r(m, p, _, f, c[t + 7], 16, 4139469664), f = r(f, m, p, _, c[t + 10], 23, 3200236656), _ = r(_, f, m, p, c[t + 13], 4, 681279174), p = r(p, _, f, m, c[t + 0], 11, 3936430074), m = r(m, p, _, f, c[t + 3], 16, 3572445317), f = r(f, m, p, _, c[t + 6], 23, 76029189), _ = r(_, f, m, p, c[t + 9], 4, 3654602809), p = r(p, _, f, m, c[t + 12], 11, 3873151461), m = r(m, p, _, f, c[t + 15], 16, 530742520), _ = a(_, f = r(f, m, p, _, c[t + 2], 23, 3299628645), m, p, c[t + 0], 6, 4096336452), p = a(p, _, f, m, c[t + 7], 10, 1126891415), m = a(m, p, _, f, c[t + 14], 15, 2878612391), f = a(f, m, p, _, c[t + 5], 21, 4237533241), _ = a(_, f, m, p, c[t + 12], 6, 1700485571), p = a(p, _, f, m, c[t + 3], 10, 2399980690), m = a(m, p, _, f, c[t + 10], 15, 4293915773), f = a(f, m, p, _, c[t + 1], 21, 2240044497), _ = a(_, f, m, p, c[t + 8], 6, 1873313359), p = a(p, _, f, m, c[t + 15], 10, 4264355552), m = a(m, p, _, f, c[t + 6], 15, 2734768916), f = a(f, m, p, _, c[t + 13], 21, 1309151649), _ = a(_, f, m, p, c[t + 4], 6, 4149444226), p = a(p, _, f, m, c[t + 11], 10, 3174756917), m = a(m, p, _, f, c[t + 2], 15, 718787259), f = a(f, m, p, _, c[t + 9], 21, 3951481745), _ = o(_, u), f = o(f, d), m = o(m, l), p = o(p, h);
+            return (s(_) + s(f) + s(m) + s(p)).toLowerCase()
+        }, O.publicKeyFromString = function (e) {
+            var e = e.split("|")[0], t = new C;
+            return t.setPublic(e, "10001"), t
+        }, O.encrypt = function (e, t, n) {
+            var i = "";
+            try {
+                i += O.publicKeyFromString(t).encrypt(e) + "?"
+            } catch (e) {
+                return {status: "Invalid public key"}
+            }
+            return {status: "success", cipher: i}
+        }, O.decrypt = function (e, t) {
+            e = e.split("?");
+            return {status: "success", plaintext: t.decrypt(e[0]), signature: "unsigned"}
+        }, O);
+        H.exports = e
+    }, function (e, t, n) {
+        e.exports = {default: n(271), __esModule: !0}
+    }, function (e, t, n) {
+        n(41), n(75), e.exports = n(57).f("iterator")
+    }, function (e, t, n) {
+        e.exports = {default: n(273), __esModule: !0}
+    }, function (e, t, n) {
+        n(274), n(67), n(279), n(280), e.exports = n(3).Symbol
+    }, function (I, W, e) {
+        "use strict";
+
+        function i(e) {
+            var t = E[e] = g(S[w]);
+            return t._k = e, t
+        }
+
+        function n(e, t) {
+            m(e);
+            for (var n, i = z(t = p(t)), r = 0, a = i.length; r < a;) O(e, n = i[r++], t[n]);
+            return e
+        }
+
+        function t(e) {
+            var t = ee.call(this, e = y(e, !0));
+            return !(this === P && u(E, e) && !u(Y, e)) && (!(t || !u(this, e) || !u(E, e) || u(this, D) && this[D][e]) || t)
+        }
+
+        function r(e, t) {
+            var n;
+            if (e = p(e), t = y(t, !0), e !== P || !u(E, t) || u(Y, t)) return !(n = Z(e, t)) || !u(E, t) || u(e, D) && e[D][t] || (n.enumerable = !0), n
+        }
+
+        function a(e) {
+            for (var t, n = $(p(e)), i = [], r = 0; n.length > r;) u(E, t = n[r++]) || t == D || t == j || i.push(t);
+            return i
+        }
+
+        function s(e) {
+            for (var t, n = e === P, i = $(n ? Y : p(e)), r = [], a = 0; i.length > a;) !u(E, t = i[a++]) || n && !u(P, t) || r.push(E[t]);
+            return r
+        }
+
+        var o = e(6), u = e(18), d = e(14), l = e(8), H = e(70), j = e(275).KEY, h = e(23), c = e(49), _ = e(36),
+            F = e(35), f = e(7), B = e(57), N = e(58), z = e(276), U = e(277), m = e(13), V = e(16), G = e(24),
+            p = e(19), y = e(45), v = e(28), g = e(46), J = e(278), q = e(60), M = e(59), K = e(12), X = e(30), Z = q.f,
+            L = K.f, $ = J.f, S = o.Symbol, k = o.JSON, b = k && k.stringify, w = "prototype", D = f("_hidden"),
+            Q = f("toPrimitive"), ee = {}.propertyIsEnumerable, T = c("symbol-registry"), E = c("symbols"),
+            Y = c("op-symbols"), P = Object[w], c = "function" == typeof S && !!M.f, C = o.QObject,
+            R = !C || !C[w] || !C[w].findChild, A = d && h(function () {
+                return 7 != g(L({}, "a", {
+                    get: function () {
+                        return L(this, "a", {value: 7}).a
+                    }
+                })).a
+            }) ? function (e, t, n) {
+                var i = Z(P, t);
+                i && delete P[t], L(e, t, n), i && e !== P && L(P, t, i)
+            } : L, x = c && "symbol" == typeof S.iterator ? function (e) {
+                return "symbol" == typeof e
+            } : function (e) {
+                return e instanceof S
+            }, O = function (e, t, n) {
+                return e === P && O(Y, t, n), m(e), t = y(t, !0), m(n), u(E, t) ? (n.enumerable ? (u(e, D) && e[D][t] && (e[D][t] = !1), n = g(n, {enumerable: v(0, !1)})) : (u(e, D) || L(e, D, v(1, {})), e[D][t] = !0), A(e, t, n)) : L(e, t, n)
+            };
+        c || (H((S = function () {
+            if (this instanceof S) throw TypeError("Symbol is not a constructor!");
+            var t = F(0 < arguments.length ? arguments[0] : void 0), n = function (e) {
+                this === P && n.call(Y, e), u(this, D) && u(this[D], t) && (this[D][t] = !1), A(this, t, v(1, e))
+            };
+            return d && R && A(P, t, {configurable: !0, set: n}), i(t)
+        })[w], "toString", function () {
+            return this._k
+        }), q.f = r, K.f = O, e(90).f = J.f = a, e(37).f = t, M.f = s, d && !e(27) && H(P, "propertyIsEnumerable", t, !0), B.f = function (e) {
+            return i(f(e))
+        }), l(l.G + l.W + l.F * !c, {Symbol: S});
+        for (var te = "hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","), ne = 0; te.length > ne;) f(te[ne++]);
+        for (var ie = X(f.store), re = 0; ie.length > re;) N(ie[re++]);
+        l(l.S + l.F * !c, "Symbol", {
+            for: function (e) {
+                return u(T, e += "") ? T[e] : T[e] = S(e)
+            }, keyFor: function (e) {
+                if (!x(e)) throw TypeError(e + " is not a symbol!");
+                for (var t in T) if (T[t] === e) return t
+            }, useSetter: function () {
+                R = !0
+            }, useSimple: function () {
+                R = !1
+            }
+        }), l(l.S + l.F * !c, "Object", {
+            create: function (e, t) {
+                return void 0 === t ? g(e) : n(g(e), t)
+            },
+            defineProperty: O,
+            defineProperties: n,
+            getOwnPropertyDescriptor: r,
+            getOwnPropertyNames: a,
+            getOwnPropertySymbols: s
+        });
+        C = h(function () {
+            M.f(1)
+        });
+        l(l.S + l.F * C, "Object", {
+            getOwnPropertySymbols: function (e) {
+                return M.f(G(e))
+            }
+        }), k && l(l.S + l.F * (!c || h(function () {
+            var e = S();
+            return "[null]" != b([e]) || "{}" != b({a: e}) || "{}" != b(Object(e))
+        })), "JSON", {
+            stringify: function (e) {
+                for (var t, n, i = [e], r = 1; r < arguments.length;) i.push(arguments[r++]);
+                if (n = t = i[1], (V(t) || void 0 !== e) && !x(e)) return U(t) || (t = function (e, t) {
+                    if ("function" == typeof n && (t = n.call(this, e, t)), !x(t)) return t
+                }), i[1] = t, b.apply(k, i)
+            }
+        }), S[w][Q] || e(17)(S[w], Q, S[w].valueOf), _(S, "Symbol"), _(Math, "Math", !0), _(o.JSON, "JSON", !0)
+    }, function (e, t, n) {
+        function i(e) {
+            o(e, r, {value: {i: "O" + ++u, w: {}}})
+        }
+
+        var r = n(35)("meta"), a = n(16), s = n(18), o = n(12).f, u = 0, d = Object.isExtensible || function () {
+            return !0
+        }, l = !n(23)(function () {
+            return d(Object.preventExtensions({}))
+        }), h = e.exports = {
+            KEY: r, NEED: !1, fastKey: function (e, t) {
+                if (!a(e)) return "symbol" == typeof e ? e : ("string" == typeof e ? "S" : "P") + e;
+                if (!s(e, r)) {
+                    if (!d(e)) return "F";
+                    if (!t) return "E";
+                    i(e)
+                }
+                return e[r].i
+            }, getWeak: function (e, t) {
+                if (!s(e, r)) {
+                    if (!d(e)) return !0;
+                    if (!t) return !1;
+                    i(e)
+                }
+                return e[r].w
+            }, onFreeze: function (e) {
+                return l && h.NEED && d(e) && !s(e, r) && i(e), e
+            }
+        }
+    }, function (e, t, n) {
+        var o = n(30), u = n(59), d = n(37);
+        e.exports = function (e) {
+            var t = o(e), n = u.f;
+            if (n) for (var i, r = n(e), a = d.f, s = 0; r.length > s;) a.call(e, i = r[s++]) && t.push(i);
+            return t
+        }
+    }, function (e, t, n) {
+        var i = n(31);
+        e.exports = Array.isArray || function (e) {
+            return "Array" == i(e)
+        }
+    }, function (e, t, n) {
+        var i = n(19), r = n(90).f, a = {}.toString,
+            s = "object" == typeof window && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+        e.exports.f = function (e) {
+            if (!s || "[object Window]" != a.call(e)) return r(i(e));
+            try {
+                return r(e)
+            } catch (e) {
+                return s.slice()
+            }
+        }
+    }, function (e, t, n) {
+        n(58)("asyncIterator")
+    }, function (e, t, n) {
+        n(58)("observable")
+    }, function (I, W, H) {
+        "use strict";
+        Object.defineProperty(W, "__esModule", {value: !0});
+        o = Math, m = (y = {}).lib = {}, t = m.Base = {
+            extend: function (e) {
+                G.prototype = this;
+                var t = new G;
+                return e && t.mixIn(e), t.hasOwnProperty("init") || (t.init = function () {
+                    t.$super.init.apply(this, arguments)
+                }), (t.init.prototype = t).$super = this, t
+            }, create: function () {
+                var e = this.extend();
+                return e.init.apply(e, arguments), e
+            }, init: function () {
+            }, mixIn: function (e) {
+                for (var t in e) e.hasOwnProperty(t) && (this[t] = e[t]);
+                e.hasOwnProperty("toString") && (this.toString = e.toString)
+            }, clone: function () {
+                return this.init.prototype.extend(this)
+            }
+        }, u = m.WordArray = t.extend({
+            init: function (e, t) {
+                e = this.words = e || [], this.sigBytes = null != t ? t : 4 * e.length
+            }, toString: function (e) {
+                return (e || j).stringify(this)
+            }, concat: function (e) {
+                var t = this.words, n = e.words, i = this.sigBytes;
+                if (e = e.sigBytes, this.clamp(), i % 4) for (var r = 0; r < e; r++) t[i + r >>> 2] |= (n[r >>> 2] >>> 24 - r % 4 * 8 & 255) << 24 - (i + r) % 4 * 8; else if (65535 < n.length) for (r = 0; r < e; r += 4) t[i + r >>> 2] = n[r >>> 2]; else t.push.apply(t, n);
+                return this.sigBytes += e, this
+            }, clamp: function () {
+                var e = this.words, t = this.sigBytes;
+                e[t >>> 2] &= 4294967295 << 32 - t % 4 * 8, e.length = o.ceil(t / 4)
+            }, clone: function () {
+                var e = t.clone.call(this);
+                return e.words = this.words.slice(0), e
+            }, random: function (e) {
+                for (var t = [], n = 0; n < e; n += 4) t.push(4294967296 * o.random() | 0);
+                return new u.init(t, e)
+            }
+        }), _ = y.enc = {}, j = _.Hex = {
+            stringify: function (e) {
+                var t = e.words;
+                e = e.sigBytes;
+                for (var n = [], i = 0; i < e; i++) {
+                    var r = t[i >>> 2] >>> 24 - i % 4 * 8 & 255;
+                    n.push((r >>> 4).toString(16)), n.push((15 & r).toString(16))
+                }
+                return n.join("")
+            }, parse: function (e) {
+                for (var t = e.length, n = [], i = 0; i < t; i += 2) n[i >>> 3] |= parseInt(e.substr(i, 2), 16) << 24 - i % 8 * 4;
+                return new u.init(n, t / 2)
+            }
+        }, n = _.Latin1 = {
+            stringify: function (e) {
+                var t = e.words;
+                e = e.sigBytes;
+                for (var n = [], i = 0; i < e; i++) n.push(String.fromCharCode(t[i >>> 2] >>> 24 - i % 4 * 8 & 255));
+                return n.join("")
+            }, parse: function (e) {
+                for (var t = e.length, n = [], i = 0; i < t; i++) n[i >>> 2] |= (255 & e.charCodeAt(i)) << 24 - i % 4 * 8;
+                return new u.init(n, t)
+            }
+        }, F = _.Utf8 = {
+            stringify: function (e) {
+                try {
+                    return decodeURIComponent(escape(n.stringify(e)))
+                } catch (e) {
+                    throw Error("Malformed UTF-8 data")
+                }
+            }, parse: function (e) {
+                return n.parse(unescape(encodeURIComponent(e)))
+            }
+        }, e = m.BufferedBlockAlgorithm = t.extend({
+            reset: function () {
+                this._data = new u.init, this._nDataBytes = 0
+            }, _append: function (e) {
+                "string" == typeof e && (e = F.parse(e)), this._data.concat(e), this._nDataBytes += e.sigBytes
+            }, _process: function (e) {
+                var t = this._data, n = t.words, i = t.sigBytes, r = this.blockSize, a = i / (4 * r),
+                    a = e ? o.ceil(a) : o.max((0 | a) - this._minBufferSize, 0), i = o.min(4 * (e = a * r), i);
+                if (e) {
+                    for (var s = 0; s < e; s += r) this._doProcessBlock(n, s);
+                    s = n.splice(0, e), t.sigBytes -= i
+                }
+                return new u.init(s, i)
+            }, clone: function () {
+                var e = t.clone.call(this);
+                return e._data = this._data.clone(), e
+            }, _minBufferSize: 0
+        }), m.Hasher = e.extend({
+            cfg: t.extend(), init: function (e) {
+                this.cfg = this.cfg.extend(e), this.reset()
+            }, reset: function () {
+                e.reset.call(this), this._doReset()
+            }, update: function (e) {
+                return this._append(e), this._process(), this
+            }, finalize: function (e) {
+                return e && this._append(e), this._doFinalize()
+            }, blockSize: 16, _createHelper: function (n) {
+                return function (e, t) {
+                    return new n.init(t).finalize(e)
+                }
+            }, _createHmacHelper: function (n) {
+                return function (e, t) {
+                    return new B.HMAC.init(n, t).finalize(e)
+                }
+            }
+        }), B = y.algo = {};
+        var o, t, u, j, n, F, e, B, N, z, U, s, i, r, V, a, d, l, h, c, _ = y;
+
+        function G() {
+        }
+
+        N = _.lib.WordArray, _.enc.Base64 = {
+            stringify: function (e) {
+                var t = e.words, n = e.sigBytes, i = this._map;
+                e.clamp(), e = [];
+                for (var r = 0; r < n; r += 3) for (var a = (t[r >>> 2] >>> 24 - r % 4 * 8 & 255) << 16 | (t[r + 1 >>> 2] >>> 24 - (r + 1) % 4 * 8 & 255) << 8 | t[r + 2 >>> 2] >>> 24 - (r + 2) % 4 * 8 & 255, s = 0; s < 4 && r + .75 * s < n; s++) e.push(i.charAt(a >>> 6 * (3 - s) & 63));
+                if (t = i.charAt(64)) for (; e.length % 4;) e.push(t);
+                return e.join("")
+            }, parse: function (e) {
+                var t = e.length, n = this._map;
+                !(a = n.charAt(64)) || -1 != (a = e.indexOf(a)) && (t = a);
+                for (var i, r, a = [], s = 0, o = 0; o < t; o++) o % 4 && (i = n.indexOf(e.charAt(o - 1)) << o % 4 * 2, r = n.indexOf(e.charAt(o)) >>> 6 - o % 4 * 2, a[s >>> 2] |= (i | r) << 24 - s % 4 * 8, s++);
+                return N.create(a, s)
+            }, _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+        };
+        var f = Math;
+
+        function k(e, t, n, i, r, a, s) {
+            return ((e = e + (t & n | ~t & i) + r + s) << a | e >>> 32 - a) + t
+        }
+
+        function b(e, t, n, i, r, a, s) {
+            return ((e = e + (t & i | n & ~i) + r + s) << a | e >>> 32 - a) + t
+        }
+
+        function w(e, t, n, i, r, a, s) {
+            return ((e = e + (t ^ n ^ i) + r + s) << a | e >>> 32 - a) + t
+        }
+
+        function D(e, t, n, i, r, a, s) {
+            return ((e = e + (n ^ (t | ~i)) + r + s) << a | e >>> 32 - a) + t
+        }
+
+        for (var m = _, J = (y = m.lib).WordArray, p = y.Hasher, y = m.algo, T = [], v = 0; v < 64; v++) T[v] = 4294967296 * f.abs(f.sin(v + 1)) | 0;
+
+        function q(e, t, n) {
+            var i = this._iv;
+            i ? this._iv = void 0 : i = this._prevBlock;
+            for (var r = 0; r < n; r++) e[t + r] ^= i[r]
+        }
+
+        y = y.MD5 = p.extend({
+            _doReset: function () {
+                this._hash = new J.init([1732584193, 4023233417, 2562383102, 271733878])
+            }, _doProcessBlock: function (e, t) {
+                for (var n = 0; n < 16; n++) {
+                    var i = e[r = t + n];
+                    e[r] = 16711935 & (i << 8 | i >>> 24) | 4278255360 & (i << 24 | i >>> 8)
+                }
+                var n = this._hash.words, r = e[t + 0], i = e[t + 1], a = e[t + 2], s = e[t + 3], o = e[t + 4],
+                    u = e[t + 5], d = e[t + 6], l = e[t + 7], h = e[t + 8], c = e[t + 9], _ = e[t + 10], f = e[t + 11],
+                    m = e[t + 12], p = e[t + 13], y = e[t + 14], v = e[t + 15],
+                    g = k(n[0], S = n[1], L = n[2], M = n[3], r, 7, T[0]), M = k(M, g, S, L, i, 12, T[1]),
+                    L = k(L, M, g, S, a, 17, T[2]), S = k(S, L, M, g, s, 22, T[3]), g = k(g, S, L, M, o, 7, T[4]),
+                    M = k(M, g, S, L, u, 12, T[5]), L = k(L, M, g, S, d, 17, T[6]), S = k(S, L, M, g, l, 22, T[7]),
+                    g = k(g, S, L, M, h, 7, T[8]), M = k(M, g, S, L, c, 12, T[9]), L = k(L, M, g, S, _, 17, T[10]),
+                    S = k(S, L, M, g, f, 22, T[11]), g = k(g, S, L, M, m, 7, T[12]), M = k(M, g, S, L, p, 12, T[13]),
+                    L = k(L, M, g, S, y, 17, T[14]), g = b(g, S = k(S, L, M, g, v, 22, T[15]), L, M, i, 5, T[16]),
+                    M = b(M, g, S, L, d, 9, T[17]), L = b(L, M, g, S, f, 14, T[18]), S = b(S, L, M, g, r, 20, T[19]),
+                    g = b(g, S, L, M, u, 5, T[20]), M = b(M, g, S, L, _, 9, T[21]), L = b(L, M, g, S, v, 14, T[22]),
+                    S = b(S, L, M, g, o, 20, T[23]), g = b(g, S, L, M, c, 5, T[24]), M = b(M, g, S, L, y, 9, T[25]),
+                    L = b(L, M, g, S, s, 14, T[26]), S = b(S, L, M, g, h, 20, T[27]), g = b(g, S, L, M, p, 5, T[28]),
+                    M = b(M, g, S, L, a, 9, T[29]), L = b(L, M, g, S, l, 14, T[30]),
+                    g = w(g, S = b(S, L, M, g, m, 20, T[31]), L, M, u, 4, T[32]), M = w(M, g, S, L, h, 11, T[33]),
+                    L = w(L, M, g, S, f, 16, T[34]), S = w(S, L, M, g, y, 23, T[35]), g = w(g, S, L, M, i, 4, T[36]),
+                    M = w(M, g, S, L, o, 11, T[37]), L = w(L, M, g, S, l, 16, T[38]), S = w(S, L, M, g, _, 23, T[39]),
+                    g = w(g, S, L, M, p, 4, T[40]), M = w(M, g, S, L, r, 11, T[41]), L = w(L, M, g, S, s, 16, T[42]),
+                    S = w(S, L, M, g, d, 23, T[43]), g = w(g, S, L, M, c, 4, T[44]), M = w(M, g, S, L, m, 11, T[45]),
+                    L = w(L, M, g, S, v, 16, T[46]), g = D(g, S = w(S, L, M, g, a, 23, T[47]), L, M, r, 6, T[48]),
+                    M = D(M, g, S, L, l, 10, T[49]), L = D(L, M, g, S, y, 15, T[50]), S = D(S, L, M, g, u, 21, T[51]),
+                    g = D(g, S, L, M, m, 6, T[52]), M = D(M, g, S, L, s, 10, T[53]), L = D(L, M, g, S, _, 15, T[54]),
+                    S = D(S, L, M, g, i, 21, T[55]), g = D(g, S, L, M, h, 6, T[56]), M = D(M, g, S, L, v, 10, T[57]),
+                    L = D(L, M, g, S, d, 15, T[58]), S = D(S, L, M, g, p, 21, T[59]), g = D(g, S, L, M, o, 6, T[60]),
+                    M = D(M, g, S, L, f, 10, T[61]), L = D(L, M, g, S, a, 15, T[62]), S = D(S, L, M, g, c, 21, T[63]);
+                n[0] = n[0] + g | 0, n[1] = n[1] + S | 0, n[2] = n[2] + L | 0, n[3] = n[3] + M | 0
+            }, _doFinalize: function () {
+                var e = this._data, t = e.words, n = 8 * this._nDataBytes, i = 8 * e.sigBytes,
+                    r = (t[i >>> 5] |= 128 << 24 - i % 32, f.floor(n / 4294967296));
+                for (t[15 + (64 + i >>> 9 << 4)] = 16711935 & (r << 8 | r >>> 24) | 4278255360 & (r << 24 | r >>> 8), t[14 + (64 + i >>> 9 << 4)] = 16711935 & (n << 8 | n >>> 24) | 4278255360 & (n << 24 | n >>> 8), e.sigBytes = 4 * (t.length + 1), this._process(), t = (e = this._hash).words, n = 0; n < 4; n++) i = t[n], t[n] = 16711935 & (i << 8 | i >>> 24) | 4278255360 & (i << 24 | i >>> 8);
+                return e
+            }, clone: function () {
+                var e = p.clone.call(this);
+                return e._hash = this._hash.clone(), e
+            }
+        }), m.MD5 = p._createHelper(y), m.HmacMD5 = p._createHmacHelper(y), y = (m = _).lib, h = y.Base, z = y.WordArray, U = (y = m.algo).EvpKDF = h.extend({
+            cfg: h.extend({
+                keySize: 4,
+                hasher: y.MD5,
+                iterations: 1
+            }), init: function (e) {
+                this.cfg = this.cfg.extend(e)
+            }, compute: function (e, t) {
+                for (var n = (s = this.cfg).hasher.create(), i = z.create(), r = i.words, a = s.keySize, s = s.iterations; r.length < a;) {
+                    o && n.update(o);
+                    var o = n.update(e).finalize(t);
+                    n.reset();
+                    for (var u = 1; u < s; u++) o = n.finalize(o), n.reset();
+                    i.concat(o)
+                }
+                return i.sigBytes = 4 * a, i
+            }
+        }), m.EvpKDF = function (e, t, n) {
+            return U.create(n).compute(e, t)
+        }, _.lib.Cipher || (y = (h = _).lib, m = y.Base, s = y.WordArray, i = y.BufferedBlockAlgorithm, r = h.enc.Base64, V = h.algo.EvpKDF, a = y.Cipher = i.extend({
+            cfg: m.extend(),
+            createEncryptor: function (e, t) {
+                return this.create(this._ENC_XFORM_MODE, e, t)
+            },
+            createDecryptor: function (e, t) {
+                return this.create(this._DEC_XFORM_MODE, e, t)
+            },
+            init: function (e, t, n) {
+                this.cfg = this.cfg.extend(n), this._xformMode = e, this._key = t, this.reset()
+            },
+            reset: function () {
+                i.reset.call(this), this._doReset()
+            },
+            process: function (e) {
+                return this._append(e), this._process()
+            },
+            finalize: function (e) {
+                return e && this._append(e), this._doFinalize()
+            },
+            keySize: 4,
+            ivSize: 4,
+            _ENC_XFORM_MODE: 1,
+            _DEC_XFORM_MODE: 2,
+            _createHelper: function (i) {
+                return {
+                    encrypt: function (e, t, n) {
+                        return ("string" == typeof t ? c : l).encrypt(i, e, t, n)
+                    }, decrypt: function (e, t, n) {
+                        return ("string" == typeof t ? c : l).decrypt(i, e, t, n)
+                    }
+                }
+            }
+        }), y.StreamCipher = a.extend({
+            _doFinalize: function () {
+                return this._process(!0)
+            }, blockSize: 1
+        }), M = h.mode = {}, (g = (y.BlockCipherMode = m.extend({
+            createEncryptor: function (e, t) {
+                return this.Encryptor.create(e, t)
+            }, createDecryptor: function (e, t) {
+                return this.Decryptor.create(e, t)
+            }, init: function (e, t) {
+                this._cipher = e, this._iv = t
+            }
+        })).extend()).Encryptor = g.extend({
+            processBlock: function (e, t) {
+                var n = this._cipher, i = n.blockSize;
+                q.call(this, e, t, i), n.encryptBlock(e, t), this._prevBlock = e.slice(t, t + i)
+            }
+        }), g.Decryptor = g.extend({
+            processBlock: function (e, t) {
+                var n = this._cipher, i = n.blockSize, r = e.slice(t, t + i);
+                n.decryptBlock(e, t), q.call(this, e, t, i), this._prevBlock = r
+            }
+        }), M = M.CBC = g, g = (h.pad = {}).Pkcs7 = {
+            pad: function (e, t) {
+                for (var n = 4 * t, i = (n = n - e.sigBytes % n) << 24 | n << 16 | n << 8 | n, r = [], a = 0; a < n; a += 4) r.push(i);
+                n = s.create(r, n), e.concat(n)
+            }, unpad: function (e) {
+                e.sigBytes -= 255 & e.words[e.sigBytes - 1 >>> 2]
+            }
+        }, y.BlockCipher = a.extend({
+            cfg: a.cfg.extend({mode: M, padding: g}), reset: function () {
+                a.reset.call(this);
+                var e, t = (n = this.cfg).iv, n = n.mode;
+                this._xformMode == this._ENC_XFORM_MODE ? e = n.createEncryptor : (e = n.createDecryptor, this._minBufferSize = 1), this._mode = e.call(n, this, t && t.words)
+            }, _doProcessBlock: function (e, t) {
+                this._mode.processBlock(e, t)
+            }, _doFinalize: function () {
+                var e, t = this.cfg.padding;
+                return this._xformMode == this._ENC_XFORM_MODE ? (t.pad(this._data, this.blockSize), e = this._process(!0)) : (e = this._process(!0), t.unpad(e)), e
+            }, blockSize: 4
+        }), d = y.CipherParams = m.extend({
+            init: function (e) {
+                this.mixIn(e)
+            }, toString: function (e) {
+                return (e || this.formatter).stringify(this)
+            }
+        }), M = (h.format = {}).OpenSSL = {
+            stringify: function (e) {
+                var t = e.ciphertext;
+                return ((e = e.salt) ? s.create([1398893684, 1701076831]).concat(e).concat(t) : t).toString(r)
+            }, parse: function (e) {
+                var t, n = (e = r.parse(e)).words;
+                return 1398893684 == n[0] && 1701076831 == n[1] && (t = s.create(n.slice(2, 4)), n.splice(0, 4), e.sigBytes -= 16), d.create({
+                    ciphertext: e,
+                    salt: t
+                })
+            }
+        }, l = y.SerializableCipher = m.extend({
+            cfg: m.extend({format: M}), encrypt: function (e, t, n, i) {
+                i = this.cfg.extend(i);
+                var r = e.createEncryptor(n, i);
+                return t = r.finalize(t), r = r.cfg, d.create({
+                    ciphertext: t,
+                    key: n,
+                    iv: r.iv,
+                    algorithm: e,
+                    mode: r.mode,
+                    padding: r.padding,
+                    blockSize: e.blockSize,
+                    formatter: i.format
+                })
+            }, decrypt: function (e, t, n, i) {
+                return i = this.cfg.extend(i), t = this._parse(t, i.format), e.createDecryptor(n, i).finalize(t.ciphertext)
+            }, _parse: function (e, t) {
+                return "string" == typeof e ? t.parse(e, this) : e
+            }
+        }), h = (h.kdf = {}).OpenSSL = {
+            execute: function (e, t, n, i) {
+                return i = i || s.random(8), e = V.create({keySize: t + n}).compute(e, i), n = s.create(e.words.slice(t), 4 * n), e.sigBytes = 4 * t, d.create({
+                    key: e,
+                    iv: n,
+                    salt: i
+                })
+            }
+        }, c = y.PasswordBasedCipher = l.extend({
+            cfg: l.cfg.extend({kdf: h}), encrypt: function (e, t, n, i) {
+                return n = (i = this.cfg.extend(i)).kdf.execute(n, e.keySize, e.ivSize), i.iv = n.iv, (e = l.encrypt.call(this, e, t, n.key, i)).mixIn(n), e
+            }, decrypt: function (e, t, n, i) {
+                return i = this.cfg.extend(i), t = this._parse(t, i.format), n = i.kdf.execute(n, e.keySize, e.ivSize, t.salt), i.iv = n.iv, l.decrypt.call(this, e, t, n.key, i)
+            }
+        }));
+        for (var g = _, m = g.lib.BlockCipher, M = g.algo, L = [], K = [], X = [], Z = [], $ = [], Q = [], S = [], E = [], ee = [], te = [], Y = [], P = 0; P < 256; P++) Y[P] = P < 128 ? P << 1 : P << 1 ^ 283;
+        for (var C = 0, R = 0, P = 0; P < 256; P++) {
+            var A = R ^ R << 1 ^ R << 2 ^ R << 3 ^ R << 4, x = (L[C] = A = A >>> 8 ^ 255 & A ^ 99, Y[K[A] = C]),
+                ne = Y[x], ie = Y[ne], O = 257 * Y[A] ^ 16843008 * A;
+            X[C] = O << 24 | O >>> 8, Z[C] = O << 16 | O >>> 16, $[C] = O << 8 | O >>> 24, Q[C] = O, S[A] = (O = 16843009 * ie ^ 65537 * ne ^ 257 * x ^ 16843008 * C) << 24 | O >>> 8, E[A] = O << 16 | O >>> 16, ee[A] = O << 8 | O >>> 24, te[A] = O, C ? (C = x ^ Y[Y[Y[ie ^ x]]], R ^= Y[Y[R]]) : C = R = 1
+        }
+        var re = [0, 1, 2, 4, 8, 16, 32, 64, 128, 27, 54], M = M.AES = m.extend({
+            _doReset: function () {
+                for (var e, t = (i = this._key).words, n = i.sigBytes / 4, i = 4 * ((this._nRounds = n + 6) + 1), r = this._keySchedule = [], a = 0; a < i; a++) a < n ? r[a] = t[a] : (e = r[a - 1], a % n ? 6 < n && 4 == a % n && (e = L[e >>> 24] << 24 | L[e >>> 16 & 255] << 16 | L[e >>> 8 & 255] << 8 | L[255 & e]) : (e = L[(e = e << 8 | e >>> 24) >>> 24] << 24 | L[e >>> 16 & 255] << 16 | L[e >>> 8 & 255] << 8 | L[255 & e], e ^= re[a / n | 0] << 24), r[a] = r[a - n] ^ e);
+                for (t = this._invKeySchedule = [], n = 0; n < i; n++) a = i - n, e = n % 4 ? r[a] : r[a - 4], t[n] = n < 4 || a <= 4 ? e : S[L[e >>> 24]] ^ E[L[e >>> 16 & 255]] ^ ee[L[e >>> 8 & 255]] ^ te[L[255 & e]]
+            }, encryptBlock: function (e, t) {
+                this._doCryptBlock(e, t, this._keySchedule, X, Z, $, Q, L)
+            }, decryptBlock: function (e, t) {
+                var n = e[t + 1];
+                e[t + 1] = e[t + 3], e[t + 3] = n, this._doCryptBlock(e, t, this._invKeySchedule, S, E, ee, te, K), n = e[t + 1], e[t + 1] = e[t + 3], e[t + 3] = n
+            }, _doCryptBlock: function (e, t, n, i, r, a, s, o) {
+                for (var u = this._nRounds, d = e[t] ^ n[0], l = e[t + 1] ^ n[1], h = e[t + 2] ^ n[2], c = e[t + 3] ^ n[3], _ = 4, f = 1; f < u; f++) var m = i[d >>> 24] ^ r[l >>> 16 & 255] ^ a[h >>> 8 & 255] ^ s[255 & c] ^ n[_++], p = i[l >>> 24] ^ r[h >>> 16 & 255] ^ a[c >>> 8 & 255] ^ s[255 & d] ^ n[_++], y = i[h >>> 24] ^ r[c >>> 16 & 255] ^ a[d >>> 8 & 255] ^ s[255 & l] ^ n[_++], c = i[c >>> 24] ^ r[d >>> 16 & 255] ^ a[l >>> 8 & 255] ^ s[255 & h] ^ n[_++], d = m, l = p, h = y;
+                m = (o[d >>> 24] << 24 | o[l >>> 16 & 255] << 16 | o[h >>> 8 & 255] << 8 | o[255 & c]) ^ n[_++], p = (o[l >>> 24] << 24 | o[h >>> 16 & 255] << 16 | o[c >>> 8 & 255] << 8 | o[255 & d]) ^ n[_++], y = (o[h >>> 24] << 24 | o[c >>> 16 & 255] << 16 | o[d >>> 8 & 255] << 8 | o[255 & l]) ^ n[_++], c = (o[c >>> 24] << 24 | o[d >>> 16 & 255] << 16 | o[l >>> 8 & 255] << 8 | o[255 & h]) ^ n[_++], e[t] = m, e[t + 1] = p, e[t + 2] = y, e[t + 3] = c
+            }, keySize: 8
+        });
+        g.AES = m._createHelper(M), W.default = _
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.LocalService = void 0;
+        var i = s(n(56)), r = s(n(1)), a = s(n(2));
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = function () {
+            function e() {
+                (0, r.default)(this, e)
+            }
+
+            return (0, a.default)(e, [{
+                key: "createClientObject", value: function (e, t, n, i) {
+                    return {
+                        socket: e,
+                        id: t,
+                        playURL: n,
+                        deviceSerial: i.deviceSerial || "",
+                        verificationCode: i.verificationCode || "",
+                        resolve: null,
+                        reject: null,
+                        stoping: !1
+                    }
+                }
+            }, {
+                key: "playCmd", value: function (e) {
+                    e = {
+                        sequence: 0,
+                        cmd: "realplay",
+                        deviceSerial: e.deviceSerial,
+                        verificationCode: e.verificationCode,
+                        url: e.playURL
+                    };
+                    return (0, i.default)(e)
+                }
+            }, {
+                key: "playbackCmd", value: function (e, t, n) {
+                    e = {
+                        sequence: 0,
+                        cmd: "playback",
+                        deviceSerial: e.deviceSerial,
+                        verificationCode: e.verificationCode,
+                        url: e.playURL,
+                        startTime: t,
+                        endTime: n
+                    };
+                    return (0, i.default)(e)
+                }
+            }]), e
+        }();
+        t.LocalService = n
+    }, function (e, t) {
+        e.exports = function (e) {
+            return e.webpackPolyfill || (e.deprecate = function () {
+            }, e.paths = [], e.children || (e.children = []), Object.defineProperty(e, "loaded", {
+                enumerable: !0,
+                get: function () {
+                    return e.l
+                }
+            }), Object.defineProperty(e, "id", {
+                enumerable: !0, get: function () {
+                    return e.i
+                }
+            }), e.webpackPolyfill = 1), e
+        }
+    }, function (e, t, n) {
+        var i = {
+            "./af": 92,
+            "./af.js": 92,
+            "./ar": 93,
+            "./ar-dz": 94,
+            "./ar-dz.js": 94,
+            "./ar-kw": 95,
+            "./ar-kw.js": 95,
+            "./ar-ly": 96,
+            "./ar-ly.js": 96,
+            "./ar-ma": 97,
+            "./ar-ma.js": 97,
+            "./ar-sa": 98,
+            "./ar-sa.js": 98,
+            "./ar-tn": 99,
+            "./ar-tn.js": 99,
+            "./ar.js": 93,
+            "./az": 100,
+            "./az.js": 100,
+            "./be": 101,
+            "./be.js": 101,
+            "./bg": 102,
+            "./bg.js": 102,
+            "./bm": 103,
+            "./bm.js": 103,
+            "./bn": 104,
+            "./bn-bd": 105,
+            "./bn-bd.js": 105,
+            "./bn.js": 104,
+            "./bo": 106,
+            "./bo.js": 106,
+            "./br": 107,
+            "./br.js": 107,
+            "./bs": 108,
+            "./bs.js": 108,
+            "./ca": 109,
+            "./ca.js": 109,
+            "./cs": 110,
+            "./cs.js": 110,
+            "./cv": 111,
+            "./cv.js": 111,
+            "./cy": 112,
+            "./cy.js": 112,
+            "./da": 113,
+            "./da.js": 113,
+            "./de": 114,
+            "./de-at": 115,
+            "./de-at.js": 115,
+            "./de-ch": 116,
+            "./de-ch.js": 116,
+            "./de.js": 114,
+            "./dv": 117,
+            "./dv.js": 117,
+            "./el": 118,
+            "./el.js": 118,
+            "./en-au": 119,
+            "./en-au.js": 119,
+            "./en-ca": 120,
+            "./en-ca.js": 120,
+            "./en-gb": 121,
+            "./en-gb.js": 121,
+            "./en-ie": 122,
+            "./en-ie.js": 122,
+            "./en-il": 123,
+            "./en-il.js": 123,
+            "./en-in": 124,
+            "./en-in.js": 124,
+            "./en-nz": 125,
+            "./en-nz.js": 125,
+            "./en-sg": 126,
+            "./en-sg.js": 126,
+            "./eo": 127,
+            "./eo.js": 127,
+            "./es": 128,
+            "./es-do": 129,
+            "./es-do.js": 129,
+            "./es-mx": 130,
+            "./es-mx.js": 130,
+            "./es-us": 131,
+            "./es-us.js": 131,
+            "./es.js": 128,
+            "./et": 132,
+            "./et.js": 132,
+            "./eu": 133,
+            "./eu.js": 133,
+            "./fa": 134,
+            "./fa.js": 134,
+            "./fi": 135,
+            "./fi.js": 135,
+            "./fil": 136,
+            "./fil.js": 136,
+            "./fo": 137,
+            "./fo.js": 137,
+            "./fr": 138,
+            "./fr-ca": 139,
+            "./fr-ca.js": 139,
+            "./fr-ch": 140,
+            "./fr-ch.js": 140,
+            "./fr.js": 138,
+            "./fy": 141,
+            "./fy.js": 141,
+            "./ga": 142,
+            "./ga.js": 142,
+            "./gd": 143,
+            "./gd.js": 143,
+            "./gl": 144,
+            "./gl.js": 144,
+            "./gom-deva": 145,
+            "./gom-deva.js": 145,
+            "./gom-latn": 146,
+            "./gom-latn.js": 146,
+            "./gu": 147,
+            "./gu.js": 147,
+            "./he": 148,
+            "./he.js": 148,
+            "./hi": 149,
+            "./hi.js": 149,
+            "./hr": 150,
+            "./hr.js": 150,
+            "./hu": 151,
+            "./hu.js": 151,
+            "./hy-am": 152,
+            "./hy-am.js": 152,
+            "./id": 153,
+            "./id.js": 153,
+            "./is": 154,
+            "./is.js": 154,
+            "./it": 155,
+            "./it-ch": 156,
+            "./it-ch.js": 156,
+            "./it.js": 155,
+            "./ja": 157,
+            "./ja.js": 157,
+            "./jv": 158,
+            "./jv.js": 158,
+            "./ka": 159,
+            "./ka.js": 159,
+            "./kk": 160,
+            "./kk.js": 160,
+            "./km": 161,
+            "./km.js": 161,
+            "./kn": 162,
+            "./kn.js": 162,
+            "./ko": 163,
+            "./ko.js": 163,
+            "./ku": 164,
+            "./ku.js": 164,
+            "./ky": 165,
+            "./ky.js": 165,
+            "./lb": 166,
+            "./lb.js": 166,
+            "./lo": 167,
+            "./lo.js": 167,
+            "./lt": 168,
+            "./lt.js": 168,
+            "./lv": 169,
+            "./lv.js": 169,
+            "./me": 170,
+            "./me.js": 170,
+            "./mi": 171,
+            "./mi.js": 171,
+            "./mk": 172,
+            "./mk.js": 172,
+            "./ml": 173,
+            "./ml.js": 173,
+            "./mn": 174,
+            "./mn.js": 174,
+            "./mr": 175,
+            "./mr.js": 175,
+            "./ms": 176,
+            "./ms-my": 177,
+            "./ms-my.js": 177,
+            "./ms.js": 176,
+            "./mt": 178,
+            "./mt.js": 178,
+            "./my": 179,
+            "./my.js": 179,
+            "./nb": 180,
+            "./nb.js": 180,
+            "./ne": 181,
+            "./ne.js": 181,
+            "./nl": 182,
+            "./nl-be": 183,
+            "./nl-be.js": 183,
+            "./nl.js": 182,
+            "./nn": 184,
+            "./nn.js": 184,
+            "./oc-lnc": 185,
+            "./oc-lnc.js": 185,
+            "./pa-in": 186,
+            "./pa-in.js": 186,
+            "./pl": 187,
+            "./pl.js": 187,
+            "./pt": 188,
+            "./pt-br": 189,
+            "./pt-br.js": 189,
+            "./pt.js": 188,
+            "./ro": 190,
+            "./ro.js": 190,
+            "./ru": 191,
+            "./ru.js": 191,
+            "./sd": 192,
+            "./sd.js": 192,
+            "./se": 193,
+            "./se.js": 193,
+            "./si": 194,
+            "./si.js": 194,
+            "./sk": 195,
+            "./sk.js": 195,
+            "./sl": 196,
+            "./sl.js": 196,
+            "./sq": 197,
+            "./sq.js": 197,
+            "./sr": 198,
+            "./sr-cyrl": 199,
+            "./sr-cyrl.js": 199,
+            "./sr.js": 198,
+            "./ss": 200,
+            "./ss.js": 200,
+            "./sv": 201,
+            "./sv.js": 201,
+            "./sw": 202,
+            "./sw.js": 202,
+            "./ta": 203,
+            "./ta.js": 203,
+            "./te": 204,
+            "./te.js": 204,
+            "./tet": 205,
+            "./tet.js": 205,
+            "./tg": 206,
+            "./tg.js": 206,
+            "./th": 207,
+            "./th.js": 207,
+            "./tk": 208,
+            "./tk.js": 208,
+            "./tl-ph": 209,
+            "./tl-ph.js": 209,
+            "./tlh": 210,
+            "./tlh.js": 210,
+            "./tr": 211,
+            "./tr.js": 211,
+            "./tzl": 212,
+            "./tzl.js": 212,
+            "./tzm": 213,
+            "./tzm-latn": 214,
+            "./tzm-latn.js": 214,
+            "./tzm.js": 213,
+            "./ug-cn": 215,
+            "./ug-cn.js": 215,
+            "./uk": 216,
+            "./uk.js": 216,
+            "./ur": 217,
+            "./ur.js": 217,
+            "./uz": 218,
+            "./uz-latn": 219,
+            "./uz-latn.js": 219,
+            "./uz.js": 218,
+            "./vi": 220,
+            "./vi.js": 220,
+            "./x-pseudo": 221,
+            "./x-pseudo.js": 221,
+            "./yo": 222,
+            "./yo.js": 222,
+            "./zh-cn": 223,
+            "./zh-cn.js": 223,
+            "./zh-hk": 224,
+            "./zh-hk.js": 224,
+            "./zh-mo": 225,
+            "./zh-mo.js": 225,
+            "./zh-tw": 226,
+            "./zh-tw.js": 226
+        };
+
+        function r(e) {
+            e = a(e);
+            return n(e)
+        }
+
+        function a(e) {
+            if (n.o(i, e)) return i[e];
+            throw(e = new Error("Cannot find module '" + e + "'")).code = "MODULE_NOT_FOUND", e
+        }
+
+        r.keys = function () {
+            return Object.keys(i)
+        }, r.resolve = a, (e.exports = r).id = 284
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.JSPlayCtrl = void 0;
+        var i = r(n(1)), n = r(n(2));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var o = {id: null, cmd: null, data: null, errorCode: 0, status: null}, n = ((0, n.default)(a, [{
+            key: "PlayM4_SetStreamOpenMode", value: function (e) {
+                return this.iPort = this.oWASM._JSPlayM4_GetPort(), 1 !== this.oWASM._JSPlayM4_SetStreamOpenMode(this.iPort, e) ? 0 : 1
+            }
+        }, {
+            key: "PlayM4_OpenStream", value: function (e, t, n) {
+                if (this.iPort < 0) return 0;
+                if (!e || t <= 0 || n <= 0) return 0;
+                this.bPlay = !1, this.bPause = !1, this.bOnebyOne = !1, this.bIsFirstFrame = !0, this.bIsGetYUV = !1, this.bIsInput = !1;
+                var i = this.oWASM._malloc(t);
+                return i ? (this.oWASM.writeArrayToMemory(e, i), 1 !== this.oWASM._JSPlayM4_OpenStream(this.iPort, i, t, n) ? (this.oWASM._free(i), i = null, this.oWASM._JSPlayM4_FreePort(this.iPort), this.iPort = -1, 0) : (this.oWASM._JSPlayM4_SetDisplayBuf(this.iPort, 1), this.oWASM._free(i), i = null, 1)) : 0
+            }
+        }, {
+            key: "PlayM4_SetDisplayBuf", value: function (e) {
+                this.oWASM._JSPlayM4_SetDisplayBuf(this.iPort, e)
+            }
+        }, {
+            key: "PlayM4_OpenPlayerSDKPrintLog", value: function (e) {
+                e ? (console.log("JSPlaySDKInterface.js bFlag:" + e), this.oWASM._JSPlayM4_SetPrintLogFlag(this.iPort, 2)) : this.oWASM._JSPlayM4_SetPrintLogFlag(this.iPort, 0)
+            }
+        }, {
+            key: "SetDecodeThreadNum", value: function (e) {
+                this.oWASM._JSPlayM4_SetDecodeThreadNum(this.iPort, e)
+            }
+        }, {
+            key: "PlayM4_SetSecretKey", value: function () {
+                return 1
+            }
+        }, {
+            key: "PlayM4_RenderPrivateData", value: function (e, t) {
+                return this.oWASM._JSPlayM4_RenderPrivateData(this.iPort, e, t)
+            }
+        }, {
+            key: "PlayM4_RenderPrivateDataEx", value: function (e, t, n) {
+                return this.oWASM._JSPlayM4_RenderPrivateDataEx(this.iPort, e, t, n)
+            }
+        }, {
+            key: "stringToBytes", value: function (e) {
+                for (var t = void 0, n = void 0, i = [], r = 0; r < e.length; r++) {
+                    for (t = e.charCodeAt(r), n = []; n.push(255 & t), t >>= 8;) ;
+                    i = i.concat(n.reverse())
+                }
+                return i
+            }
+        }, {
+            key: "PlayM4_Play", value: function () {
+                if (this.pCanvasData = this.oWASM._malloc(128), null === this.pCanvasData) return 0;
+                this.bOnebyOne && (this.bPlayRateChange = !1, this.bOnebyOne = !1, this.bPause = !1);
+                !document.getElementById(this.szCanvasID) && this.clonedCanvas && this.clonedCanvasParentNode && this.clonedCanvasParentNode.appendChild(this.clonedCanvas), 0 < this.iCanvasWidth && 0 < this.iCanvasHeight && this.PlayM4_SetCanvasSize(this.iCanvasWidth, this.iCanvasHeight);
+                var e = this.stringToBytes("#" + this.szCanvasID),
+                    t = this.oWASM.HEAPU8.subarray(this.pCanvasData, this.pCanvasData + 128), n = new Uint8Array(128);
+                t.set(n, 0), t.set(new Uint8Array(e));
+                return 1 !== this.oWASM._JSPlayM4_Play(this.iPort, this.pCanvasData) ? 0 : (this.oWASM._JSPlayM4_SetFrameInfoCallBack(this.iPort, 1), this.bPlay = !0, this.bPause = !1, this.bOnebyOne = !1, this.bPlaySound = !1, this.bPlayRateChange = !1, this.bOnlyPlaySound = !1, 1)
+            }
+        }, {
+            key: "PlayM4_OneByOne_Play", value: function () {
+                this.oWASM._JSPlayM4_Play(this.iPort, this.pCanvasData), this.bPlayRateChange = !1, this.bOnebyOne = !1, this.bPause = !1
+            }
+        }, {
+            key: "Sleep", value: function (e) {
+                for (var t = (new Date).getTime(); (new Date).getTime() - t < e;) ;
+            }
+        }, {
+            key: "PlayM4_InputData", value: function (e, t) {
+                var n = 1;
+                if (0 < t) {
+                    var i = this.oWASM._malloc(t);
+                    if (null === i) return 0;
+                    var r = new Uint8Array(e.buffer);
+                    this.oWASM.writeArrayToMemory(r, i), this.bIsFirstFrame && this.inputDataFun(), this.bOnebyOne ? 1 !== this.oWASM._JSPlayM4_InputData(this.iPort, i, t) && (11 === (n = this.oWASM._JSPlayM4_GetLastError(this.iPort)) && (this.setCallBack(this, "OnebyOne", 0, 0, !1), this.bIsFirstFrame = !0), this.aInputDataBuffer.push(e)) : 1 !== this.oWASM._JSPlayM4_InputData(this.iPort, i, t) && (n = this.oWASM._JSPlayM4_GetLastError(this.iPort)), this.oWASM._free(i), i = null
+                }
+                return n
+            }
+        }, {
+            key: "inputDataFun", value: function () {
+                if (this.bIsGetYUV = !1, this.bPlay && (!this.bPause || this.bOnebyOne) || this.bOnlyPlaySound) for (; 0 < this.aInputDataBuffer.length;) {
+                    var e = this.aInputDataBuffer.shift(),
+                        t = this.oWASM._JSPlayM4_InputData(this.iPort, e, e.byteLength);
+                    if (1 !== t) if (11 === this.oWASM._JSPlayM4_GetLastError(this.iPort)) {
+                        this.bIsFirstFrame = !0, this.aInputDataBuffer.unshift(e);
+                        break
+                    }
+                }
+                this.bIsFirstFrame = !1
+            }
+        }, {
+            key: "PlayM4_Stop", value: function () {
+                this.bPlaySound && (this.PlayM4_StopSound(), this.bPlaySound = !1), this.bPlay = !1, this.bOnebyOne = !1, this.bPause = !1, this.oWASM._JSPlayM4_SetFrameInfoCallBack(this.iPort, 0), this.PlayM4_SetDisplayRegion(null, !1), this.oWASM._JSPlayM4_Stop(this.iPort), this.oWASM._JSPlayM4_CloseStream(this.iPort), this.oWASM._JSPlayM4_FreePort(this.iPort), this.iPort = -1;
+                var e = document.getElementById(this.szCanvasID);
+                e && (this.clonedCanvas = e.cloneNode(!0), this.clonedCanvasParentNode = e.parentNode, this.clonedCanvasParentNode.replaceChild(this.clonedCanvas, e)), null !== this.pCanvasData && (this.oWASM._free(this.pCanvasData), this.pCanvasData = null)
+            }
+        }, {
+            key: "PlayM4_PlayRate", value: function (e) {
+                return this.bPlayRateChange = 1 !== e, this.iInputDataLen = 5e3 * e, 1
+            }
+        }, {
+            key: "PlayM4_Fast", value: function (e) {
+                this.bPlayRateChange = 1 !== e, this.oWASM._JSPlayM4_Fast(this.iPort)
+            }
+        }, {
+            key: "PlayM4_Slow", value: function (e) {
+                this.bPlayRateChange = 1 !== e, this.oWASM._JSPlayM4_Slow(this.iPort)
+            }
+        }, {
+            key: "PlayM4_Pause", value: function (e) {
+                return !this.bPlay || this.bOnebyOne ? 2 : ("boolean" == typeof e && (this.bPause = e, this.bIsFirstFrame = !0, e ? (this.bPlaySound && (this.PlayM4_StopSound(), this.bPlaySound = !0), this.oWASM._JSPlayM4_Pause(this.iPort, 1)) : (this.bPlaySound && this.PlayM4_PlaySound(), this.oWASM._JSPlayM4_Pause(this.iPort, 0))), 1)
+            }
+        }, {
+            key: "PlayM4_OneByOne", value: function () {
+                return this.bPlay ? (this.oWASM._JSPlayM4_GetSourceBufferRemain(this.iPort) < this.oWASM._JSPlayM4_GetBufferValue(this.iPort, 1) / 2 && (this.bIsInputBufOver = !1, this.setCallBack(this, "OnebyOne", 0, 31, !0)), this.iInputDataLen = 5e3, this.oWASM._JSPlayM4_OneByOne(this.iPort), this.bPause = !0, this.bOnebyOne = !0, this.bPlayRateChange = !0, 1) : 2
+            }
+        }, {
+            key: "PlayM4_PlaySound", value: function (e) {
+                return e < 0 || 16 < e || 1 === this.oWASM._JSPlayM4_PlaySound(this.iPort) && (this.bPlaySound = !0, this.oWASM._JSPlayM4_SetANRParam(3)), 1
+            }
+        }, {
+            key: "PlayM4_StopSound", value: function () {
+                return this.bPlaySound ? (1 === this.oWASM._JSPlayM4_StopSound(this.iPort) && (this.bPlaySound = !1), 1) : 2
+            }
+        }, {
+            key: "PlayM4_SetSecretKey", value: function () {
+            }
+        }, {
+            key: "PlayM4_SetDecodeFrameType", value: function (e) {
+                return 0 !== e && 1 !== e || (this.nDecFrameType = e, this.oWASM._JSPlayM4_SetDecodeFrameType(this.iPort, e)), 1
+            }
+        }, {
+            key: "PlayM4_SetIFrameDecInterval", value: function (e) {
+                return 1 !== this.nDecFrameType ? 2 : (e < 0 || (this.oWASM._JSPlayM4_SetDecodeFrameType(this.iPort, 1), this.oWASM._JSPlayM4_SetIFrameDecInterval(this.iPort, e)), 1)
+            }
+        }, {
+            key: "PlayM4_SetDisplayRegion", value: function (e, t) {
+                if (null === this.szCanvasID) return 2;
+                if (!0 !== t) return 1 === this.oWASM._JSPlayM4_SetDisplayRegion(this.iPort, this.pCanvasData, 0, this.iYUVWidth, 0, this.iYUVHeight) ? (this.iZoomNum = 0, this.bDisRect = !1, 1) : this.PlayM4_GetLastError();
+                if (null == e) return 1;
+                if ("number" != typeof e.left || "number" != typeof e.top || "number" != typeof e.right || "number" != typeof e.bottom) return 1;
+                if (e.right < 0 || e.left < 0 || e.top < 0 || e.bottom < 0) return 1;
+                var n, t = e.left, i = e.right, r = e.top, e = e.bottom,
+                    a = document.getElementById(this.szCanvasID).getBoundingClientRect();
+                if (this.iCanvasWidth = a.width, this.iCanvasHeight = a.height, i - t < 16 || e - r < 16 || i - t > this.iCanvasWidth || e - r > this.iCanvasHeight) return 1;
+                e = 0 !== this.iZoomNum ? (t = Math.round(t / this.iRatio_x) + this.stDisplayRect.left, r = Math.round(r / this.iRatio_y) + this.stDisplayRect.top, i = Math.round(i / this.iRatio_x) + this.stDisplayRect.left, Math.round(e / this.iRatio_y) + this.stDisplayRect.top) : (a = this.iYUVWidth / this.iCanvasWidth, n = this.iYUVHeight / this.iCanvasHeight, t = Math.round(t * a), r = Math.round(r * n), i = Math.round(i * a), Math.round(e * n)), this.stDisplayRect = {
+                    top: r,
+                    left: t,
+                    right: i,
+                    bottom: e
+                }, this.bDisRect = !0;
+                a = e - r;
+                return this.iRatio_x = this.iCanvasWidth / (i - t), this.iRatio_y = this.iCanvasHeight / a, this.iZoomNum++, this.oWASM._JSPlayM4_SetDisplayRegion(this.iPort, this.pCanvasData, this.stDisplayRect.left, this.stDisplayRect.right, this.stDisplayRect.top, this.stDisplayRect.bottom)
+            }
+        }, {
+            key: "PlayM4_GetJPEG", value: function (e) {
+                var t, n = this.iYUVWidth * this.iYUVHeight * 4 + 60, i = this.oWASM._malloc(n),
+                    r = this.oWASM._malloc(4);
+                null !== i && (this.oWASM._JSPlayM4_GetJPEG(this.iPort, i, n, r), 0 < (n = this.oWASM.getValue(r, "i32")) ? ((t = new Uint8Array(n)).set(this.oWASM.HEAPU8.subarray(i, i + n)), e(t)) : e(6), this.oWASM._free(i), this.oWASM._free(r), i = null)
+            }
+        }, {
+            key: "PlayM4_GetBMP", value: function (e) {
+                var t, n = this.iYUVWidth * this.iYUVHeight * 4 + 60, i = this.oWASM._malloc(n),
+                    r = this.oWASM._malloc(4);
+                null !== i && (this.oWASM._JSPlayM4_GetBMP(this.iPort, i, n, r), 0 < (n = this.oWASM.getValue(r, "i32")) ? ((t = new Uint8Array(n)).set(this.oWASM.HEAPU8.subarray(i, i + n)), e(t)) : e(6), this.oWASM._free(i), this.oWASM._free(r), i = null)
+            }
+        }, {
+            key: "PlayM4_SetVolume", value: function (e) {
+                return this.oWASM._JSPlayM4_SetVolume(this.iPort, e)
+            }
+        }, {
+            key: "PlayM4_GetVolume", value: function (e) {
+                var t;
+                return e && "function" == typeof e ? null === (t = this.oWASM._JSPlayM4_GetVolume(this.iPort)) ? 63 : (e(Math.round(t)), 1) : 1
+            }
+        }, {
+            key: "PlayM4_GetDecodeFrameType", value: function () {
+                return this.nDecFrameType
+            }
+        }, {
+            key: "PlayM4_GetSdkVersion", value: function () {
+                return this.oWASM.JSPlayM4_GetSDKVersion()
+            }
+        }, {
+            key: "PlayM4_SetCanvasSize", value: function (e, t) {
+                !document.getElementById(this.szCanvasID) && this.clonedCanvas && (this.iCanvasWidth = e, this.iCanvasHeight = t, this.clonedCanvas.width = e, this.clonedCanvas.height = t), -1 < this.iPort && this.oWASM._JSPlayM4_SetCanvasSize(this.iPort, e, t)
+            }
+        }, {
+            key: "PlayM4_SetAntialias", value: function (e) {
+                return this.oWASM._JSPlayM4_SetAntialias(this.iPort, e)
+            }
+        }, {
+            key: "PlayM4_GetSourceBufferRemain", value: function () {
+                return this.oWASM._JSPlayM4_GetSourceBufferRemain(this.iPort)
+            }
+        }, {
+            key: "PlayM4_GetBufferValue", value: function (e) {
+                return this.oWASM._JSPlayM4_GetBufferValue(this.iPort, e)
+            }
+        }, {
+            key: "PlayM4_GetLastError", value: function () {
+                return this.oWASM._JSPlayM4_GetLastError(this.iPort)
+            }
+        }, {
+            key: "PlayM4_GetFrameInfo", value: function (e) {
+                var t, n;
+                e && "function" == typeof e && (t = {
+                    port: 0,
+                    frameType: 0,
+                    frameSize: 0,
+                    width: 0,
+                    height: 0,
+                    timeStamp: 0,
+                    frameRate: 0,
+                    bitPerSample: 0,
+                    samplesPerSec: 0,
+                    channel: 0,
+                    frameNum: 0,
+                    cropLeft: 0,
+                    cropRight: 0,
+                    cropTop: 0,
+                    cropBottom: 0,
+                    year: 0,
+                    month: 0,
+                    week: 0,
+                    day: 0,
+                    hour: 0,
+                    minute: 0,
+                    second: 0,
+                    milliseconds: 0
+                }, n = this.oWASM._JSPlayM4_GetFrameInfo(this.iPort), t.port = this.oWASM.HEAP32[n >> 2], t.frameType = this.oWASM.HEAP32[n + 4 >> 2], t.frameSize = this.oWASM.HEAP32[n + 8 >> 2], t.width = this.oWASM.HEAP32[n + 12 >> 2], t.height = this.oWASM.HEAP32[n + 16 >> 2], t.timeStamp = this.oWASM.HEAP32[n + 20 >> 2], t.frameRate = this.oWASM.HEAP32[n + 24 >> 2], t.bitPerSample = this.oWASM.HEAP32[n + 28 >> 2], t.samplesPerSec = this.oWASM.HEAP32[n + 32 >> 2], t.channel = this.oWASM.HEAP32[n + 36 >> 2], t.frameNum = this.oWASM.HEAP32[n + 40 >> 2], t.cropLeft = this.oWASM.HEAP32[n + 44 >> 2], t.cropRight = this.oWASM.HEAP32[n + 48 >> 2], t.cropTop = this.oWASM.HEAP32[n + 52 >> 2], t.cropBottom = this.oWASM.HEAP32[n + 56 >> 2], t.year = this.oWASM.HEAP16[n + 60 >> 1], t.month = this.oWASM.HEAP16[n + 62 >> 1], t.week = this.oWASM.HEAP16[n + 64 >> 1], t.day = this.oWASM.HEAP16[n + 66 >> 1], t.hour = this.oWASM.HEAP16[n + 68 >> 1], t.minute = this.oWASM.HEAP16[n + 70 >> 1], t.second = this.oWASM.HEAP16[n + 72 >> 1], t.milliseconds = this.oWASM.HEAP16[n + 74 >> 1], e(t))
+            }
+        }, {
+            key: "PlayM4_ReversePlay", value: function () {
+                return this.oWASM._JSPlayM4_ReversePlay(this.iPort)
+            }
+        }, {
+            key: "PlayM4_SetAdditionDataCallBack", value: function (e, t) {
+                return this.oWASM._JSPlayM4_SetAdditionDataCallBack(this.iPort, e, t)
+            }
+        }]), a);
+
+        function a(e, t, n, s) {
+            (0, i.default)(this, a), this.szCanvasID = e, this.clonedCanvas = null, this.oWASM = null, this.iPort = -1, this.pCanvasData = null, this.iYUVWidth = 0, this.iYUVHeight = 0, this.bPlay = !1, this.bPause = !1, this.bOnebyOne = !1, this.bIsFirstFrame = !0, this.bIsGetYUV = !1, this.bIsInput = !1, this.iZoomNum = 0, this.iCanvasWidth = 0, this.iCanvasHeight = 0, this.nDecFrameType = 0, n && "function" == typeof n && (this.fnCallBack = n), this.aInputDataBuffer = [], this.setCallBack = function (e, t, n, i, r) {
+                var a = o;
+                a.id = s, a.cmd = t, a.data = n, a.errorCode = i, a.status = r, (a.instance = e).fnCallBack(a)
+            }, this.aInputDataLens = [], this.aInputDataBuffer = [], this.bIsGetYUV = !1, this.bIsFirstFrame = !0, this.iInputMaxBufSize = 5242880, this.bIsInput = !1, this.bIsInputBufOver = !1, this.iInputDataLen = 5e3, t && (this.oWASM = t)
+        }
+
+        t.JSPlayCtrl = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.JSPlayCtrl = void 0;
+        var i = u(n(53)), r = u(n(54)), a = u(n(1)), s = u(n(2)), o = u(n(11));
+
+        function u(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var d = 28944, l = 28945, h = 29217, c = 29280, f = 29281, m = 29282, p = 8193, y = 8192, v = 4096,
+            g = {width: 0, height: 0, frameNum: 0, yuvData: null},
+            M = {width: 0, height: 0, frameNum: 0, yuvData: null},
+            L = {sampleRate: 0, channel: 0, bitsPerSample: 0, length: 0, pcmData: null}, _ = !1, S = !1, k = !1,
+            b = {id: null, cmd: null, data: null, errorCode: 0, status: null};
+
+        function w(n) {
+            return new o.default(function (e) {
+                var t = document.createElement("script");
+                t.type = "text/javascript", t.src = n, t.onload = function () {
+                    e()
+                }, document.body.appendChild(t)
+            })
+        }
+
+        var D;
+        t.JSPlayCtrl = ((0, s.default)(T, [{
+            key: "_loadRenderFiles",
+            value: (D = (0, r.default)(i.default.mark(function e() {
+                return i.default.wrap(function (e) {
+                    for (; ;) switch (e.prev = e.next) {
+                        case 0:
+                            if (S && _) {
+                                e.next = 5;
+                                break
+                            }
+                            return e.next = 3, o.default.all([w(this.szBasePath + "AudioRenderer.js"), w(this.szBasePath + "SuperRender_10.js")]);
+                        case 3:
+                            _ = S = !0;
+                        case 5:
+                        case"end":
+                            return e.stop()
+                    }
+                }, e, this)
+            })), function () {
+                return D.apply(this, arguments)
+            })
+        }, {
+            key: "PlayM4_SetCurrentFrameNum", value: function (e, t) {
+                return null != this.decodeWorker && null != this.oSuperRender && this.bPlay ? e < 0 || 0 !== t && 1 !== t ? this.iLastErrorCode = 0 : this.PlayM4_SetPlayPosition(0, e, t) : this.iLastErrorCode = 2
+            }
+        }, {
+            key: "PlayM4_SetPlayPosition", value: function (e, t, n) {
+                return null != this.decodeWorker && null != this.oSuperRender && this.bPlay ? 0 !== e && 1 !== e || t < 0 || 0 !== n && 1 !== n ? this.iLastErrorCode = 0 : (this.SetPlayPositionFlag = !0, this.iFrameNumOrTime = t, this.bSetPlayPositionType = n, this.decodeWorker.postMessage({
+                    command: "SetPlayPosition",
+                    data: this.iFrameNumOrTime,
+                    type: e
+                }), this.aAudioBuffer.splice(0, this.aAudioBuffer.length), this.iAudioBufferSize = 0, this.aVideoFrameBuffer.splice(0, this.aVideoFrameBuffer.length), this.aInputDataBuffer.splice(0, this.aInputDataBuffer.length), this.aInputDataLens.splice(0, this.aInputDataLens.length), this.bIsFirstFrame = !0, this.bIsInputBufOver = !1, this.iLastErrorCode = 1) : this.iLastErrorCode = 2
+            }
+        }, {
+            key: "PlayM4_OpenPlayerSDKPrintLog", value: function (e) {
+                return k = !0 === e, this.decodeWorker.postMessage({
+                    command: "printLog",
+                    data: e
+                }), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_DownloadYUVdata", value: function () {
+                return this.bWriteYUVData = !0, this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_DownloadPCMdata", value: function () {
+                return this.bWritePCMData = !0, this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_SetDecCallBack", value: function (e) {
+                return k && console.log(">>>JS MainThread-PlayM4_SetDecCallBack"), e && "function" == typeof e ? (this.DecCallBackFun = e, this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_SetDisplayCallBack", value: function (e) {
+                return k && console.log(">>>JS MainThread-PlayM4_SetDisplayCallBack"), e && "function" == typeof e ? (this.DisplayCallBackFun = e, this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_SetPCMCallBack", value: function (e) {
+                return k && console.log(">>>JS MainThread-PlayM4_SetDisplayCallBack"), e && "function" == typeof e ? (this.PCMCallBackFun = e, this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_SetStreamOpenMode", value: function (e) {
+                return null == e || void 0 === e || 0 !== e && 1 !== e ? this.iLastErrorCode = 0 : (this.streamOpenMode = e, k && console.log(">>>JS PlayM4_SetStreamOpenMode nMode:" + e), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_DownloadRTPData", value: function (e) {
+                this.downloadRTP = e
+            }
+        }, {
+            key: "PlayM4_OpenStream", value: function (e, t, n) {
+                if (k && console.log(">>>JS PlayM4_OpenStream 1 nSysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), null == this.decodeWorker) return this.iLastErrorCode = 2;
+                if (this.downloadRTP && (i = new Uint8Array(e.buffer), this.DownloadRTPData(i), console.log("write 40 hik head")), null == e || t <= 0 || n <= 0) return this.iLastErrorCode = 0;
+                this.bPlay = !1, this.bPause = !1, this.bOnebyOne = !1, this.bIsFirstFrame = !0, this.bIsGetYUV = !1, this.bIsInput = !1;
+                var i = this.checkAudioType(e);
+                return this.bAudioTypeSupport = 1 === i, this.decodeWorker.postMessage({
+                    command: "SetStreamOpenMode",
+                    data: this.streamOpenMode
+                }), k && console.log(">>>JS PlayM4_OpenStream 2 nSysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), this.decodeWorker.postMessage({
+                    command: "OpenStream",
+                    data: e,
+                    dataSize: t,
+                    bufPoolSize: n
+                }), k && console.log(">>>JS PlayM4_OpenStream 3 nSysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), this.bOpenStream = !0, this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_CloseStream", value: function () {
+                return k && console.log(">>>JS PlayM4_CloseStream 1 nSysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), null === this.decodeWorker || !1 === this.bOpenStream ? this.iLastErrorCode = 2 : (this.bOnlyPlaySound = !1, this.PlayM4_Stop(), this.decodeWorker.postMessage({command: "CloseStream"}), null !== this.oSuperRender && (this.oSuperRender.SR_Destroy(), this.oSuperRender = null), null !== this.audioRenderer && (this.audioRenderer.Stop(), this.audioRenderer = null), this.aAudioBuffer.splice(0, this.aAudioBuffer.length), this.aVideoFrameBuffer.splice(0, this.aVideoFrameBuffer.length), this.aInputDataBuffer.splice(0, this.aInputDataBuffer.length), this.aInputDataLens.splice(0, this.aInputDataLens.length), this.aAudioEncBuffer.splice(0, this.aAudioEncBuffer.length), this.aVideoYUVBuffer.splice(0, this.aVideoYUVBuffer.length), this.aAudioPCMBuffer.splice(0, this.aAudioPCMBuffer.length), this.aRawDataBuffer.splice(0, this.aRawDataBuffer.length), this.bOpenStream = !1, this.iAudioBufferSize = 0, this.szOSDTime = null, this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_Destroy", value: function () {
+                return k && console.log(">>>JS PlayM4_Destroy 1 nSysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), null === this.decodeWorker || (this.PlayM4_CloseStream(), this.decodeWorker.terminate(), this.decodeWorker = null), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_InputData", value: function (e, t) {
+                var n = this.aInputDataBuffer.length;
+                if (4 === t) {
+                    var i = new Uint8Array(e.buffer);
+                    if (1 === i[0] && 2 === i[1] && 3 === i[2] && 4 === i[3]) return k && console.log(">>>JS PlaySDKInterface PlayM4_InputData:intput end"), this.bIsFirstFrame ? (k && console.log(">>>JS inputData FirstTime"), this.inputDataFun()) : this.bIsGetYUV ? this.inputDataFun() : this.bIsInput = !0, i = null, this.iLastErrorCode = 1
+                }
+                if (n + t > this.iInputMaxBufSize) return console.log("input over"), this.inputDataFun(), this.iLastErrorCode = 11;
+                var r = null, a = t;
+                switch (this.streamOpenMode) {
+                    case 1:
+                        r = new Uint8Array(e.buffer), this.downloadRTP && (this.DownloadRTPData(r), this.rtpNum++, console.log("rtpNUm:" + this.rtpNum)), this.aInputDataLens.push(t);
+                        break;
+                    case 0:
+                        var a = t + 4, s = new Uint32Array([t]), s = new Uint8Array(s.buffer);
+                        (r = new Uint8Array(a)).set(s, 0), r.set(e, 4), this.downloadRTP && (this.DownloadRTPData(r), this.rtpNum++, console.log("rtpNUm:" + this.rtpNum)), 0, this.aInputDataLens.push(t + 4);
+                        break;
+                    default:
+                        return this.iLastErrorCode = 16
+                }
+                for (var o = 0; o < a; o++) this.aInputDataBuffer[n + o] = r[o];
+                return this.bPlay && null !== this.decodeWorker && !1 !== this.bOpenStream && (r = null, k && console.log(">>>JS PlayM4_InputData 1： nSize:%d, iInputBufLen:%d, iInputMaxBufSize;%d", t, this.aInputDataBuffer.length, this.iInputMaxBufSize), this.bOnlyPlaySound ? (k && console.log(">>>JS PlayM4_InputData: OnlyPlaySound"), this.inputDataFun()) : this.bIsFirstFrame ? (k && console.log(">>>JS PlayM4_InputData is firstFrame"), this.inputDataFun()) : this.bIsGetYUV ? (k && console.log(">>>JS PlayM4_InputData is GetYUV"), this.inputDataFun()) : (k && console.log(">>>JS PlayM4_InputData 1-3 sysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), this.bIsInput = !0), this.iLastErrorCode = 1), 1
+            }
+        }, {
+            key: "DownloadRTPData", value: function (e) {
+                if (this.bWriteRTPData) {
+                    for (var t = new Uint8Array(e), n = this.aRTPDataBuffer.length, i = 0, r = t.length; i < r; i++) this.aRTPDataBuffer[n + i] = t[i];
+                    this.iRTPDataSize++, t = null
+                }
+                this.bWriteRTPData && 200 <= this.iRTPDataSize && (console.log("download200RTPdata"), e = new Uint8Array(this.aRTPDataBuffer), this.downloadFile(e, "RTP.data"), this.aRTPDataBuffer.splice(0, this.aRTPDataBuffer.length), this.bWriteRTPData = !1, this.iRTPDataSize = 0, this.rtpNum = 0, this.downloadRTP = !1)
+            }
+        }, {
+            key: "PlayM4_Play", value: function (e) {
+                if (null === this.decodeWorker) return this.iLastErrorCode = 2;
+                if (k && console.log(">>>JS PlayM4_Play canvasID: " + e), null === e) this.bOnlyPlaySound = !0, this.sCanvasId = null; else {
+                    if ("string" != typeof e) return this.iLastErrorCode = 0;
+                    if (this.bOnebyOne && (this.bPlayRateChange = !1, this.bOnebyOne = !1, this.bPause = !1, this.draw()), this.bPlay) return this.iLastErrorCode = 1;
+                    if (null == this.oSuperRender && (this.oSuperRender = new SuperRender(e, this.szBasePath), null == this.oSuperRender)) return this.iLastErrorCode = 61;
+                    this.sCanvasId = e, this.bPlay = !0, this.bPause = !1, this.bOnebyOne = !1, this.bPlaySound = !1, this.bPlayRateChange = !1, this.bOnlyPlaySound = !1, this.draw()
+                }
+                return null == this.audioRenderer && (this.audioRenderer = new AudioRenderer, null == this.audioRenderer) ? this.iLastErrorCode = 61 : this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_Stop", value: function () {
+                if (k && console.log(">>>JS PlayM4_Stop 1"), null == this.decodeWorker || null == this.oSuperRender) return this.iLastErrorCode = 2;
+                if (!this.bPlay) return this.iLastErrorCode = 2;
+                this.bPlaySound && (this.PlayM4_StopSound(), this.bPlaySound = !0), this.bPlay = !1, this.bOnebyOne = !1, this.bPause = !1, this.oSuperRender.SR_SetDisplayRect(null), this.iZoomNum = 0, this.bDisRect = !1, this.oSuperRender.SR_DisplayFrameData(this.nWidth, this.nHeight, null);
+                var e = document.getElementById(this.sCanvasId);
+                return e && (this.clonedCanvas = e.cloneNode(!0), this.clonedCanvasParentNode = e.parentNode, this.clonedCanvasParentNode.replaceChild(this.clonedCanvas, e)), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_PlayRate", value: function (e) {
+                return null == this.decodeWorker ? this.iLastErrorCode = 2 : (this.bPlayRateChange = 1 !== e, this.iInputDataLen = 20480 * (e = e < 1 ? 1 : e), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_Pause", value: function (e) {
+                return null == this.decodeWorker || null == this.oSuperRender || !this.bPlay || this.bOnebyOne ? this.iLastErrorCode = 2 : "boolean" != typeof e ? this.iLastErrorCode = 0 : (this.bPause = e, this.bIsFirstFrame = !0, k && console.log(">>>JS PlayM4_Pause:" + e), e ? this.bPlaySound && (this.PlayM4_StopSound(), this.bPlaySound = !0) : (this.bPlaySound && this.PlayM4_PlaySound(), this.draw()), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_OneByOne", value: function (e) {
+                return null != this.decodeWorker && null != this.oSuperRender && this.bPlay ? 10 < e || e <= 0 ? this.iLastErrorCode = 0 : (e = e || 1, this.iInputDataLen = 20480, this.FrameForwardLen = e, this.bPause = !0, this.bOnebyOne = !0, this.bIsFirstFrame = !0, this.draw(), this.iLastErrorCode = 1) : this.iLastErrorCode = 2
+            }
+        }, {
+            key: "PlayM4_PlaySound", value: function (e) {
+                return null === this.decodeWorker || !1 === this.bOpenStream ? this.iLastErrorCode = 2 : this.bAudioTypeSupport ? e < 0 || 16 < e ? this.iLastErrorCode = 0 : null == this.audioRenderer && (this.audioRenderer = new AudioRenderer, null == this.audioRenderer) ? this.iLastErrorCode = 61 : (this.audioRenderer.SetWndNum(e), this.audioRenderer.oAudioContext.resume(), this.bPlaySound = !0, this.iLastErrorCode = 1) : this.iLastErrorCode = 16
+            }
+        }, {
+            key: "PlayM4_StopSound", value: function () {
+                return null != this.decodeWorker && null != this.audioRenderer && this.bPlaySound ? (this.bPlaySound = !1, this.iLastErrorCode = 1) : this.iLastErrorCode = 2
+            }
+        }, {
+            key: "PlayM4_SetDisplayBuf", value: function (e) {
+                return null == this.decodeWorker ? this.iLastErrorCode = 2 : e <= 0 ? this.iLastErrorCode = 0 : (this.YUVBufferSize = e, this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_SetSecretKey", value: function (e, t, n) {
+                if (null == this.decodeWorker || !1 === this.bOpenStream) return this.iLastErrorCode = 2;
+                if (null == t) return this.iLastErrorCode = 0;
+                if (1 === e) {
+                    if (128 !== n) return this.iLastErrorCode = 0;
+                    if (null == t || void 0 === t) return this.iLastErrorCode = 0
+                } else if (0 !== e) return this.iLastErrorCode = 0;
+                return this.decodeWorker.postMessage({
+                    command: "SetSecretKey",
+                    data: t,
+                    nKeyType: e,
+                    nKeyLen: n
+                }), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_SetDecodeFrameType", value: function (e) {
+                return null == this.decodeWorker || null == this.oSuperRender ? this.iLastErrorCode = 2 : 0 !== e && 1 !== e ? this.iLastErrorCode = 0 : (k && (console.log(">>>JS PlayM4_SetDecodeFrameType"), console.log(e)), this.nDecFrameType = e, this.decodeWorker.postMessage({
+                    command: "SetDecodeFrameType",
+                    data: e
+                }), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_SetIFrameDecInterval", value: function (e) {
+                return 1 !== this.nDecFrameType ? this.iLastErrorCode = 2 : e < 0 ? this.iLastErrorCode = 0 : (this.decodeWorker.postMessage({
+                    command: "SetIFrameDecInterval",
+                    data: e
+                }), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_SetLostFrameMode", value: function (e) {
+                return e < 0 || 1 < e ? 0 : (this.decodeWorker.postMessage({command: "SetLostFrameMode", data: e}), 1)
+            }
+        }, {
+            key: "PlayM4_SetDisplayRegion", value: function (e, t) {
+                if (k && console.log("PlayM4_SetDisplayRegion "), null === this.decodeWorker || !1 === this.bPlay || null === this.oSuperRender || null === this.canvasId) return this.iLastErrorCode = 2;
+                if (!0 === t) {
+                    if (null == e) return k && console.log("PlayM4_SetDisplayRegion: dipalyRect is null"), this.iLastErrorCode = 0;
+                    if ("number" != typeof e.left || "number" != typeof e.top || "number" != typeof e.right || "number" != typeof e.bottom) return this.iLastErrorCode = 0;
+                    if (e.right < 0 || e.left < 0 || e.top < 0 || e.bottom < 0) return k && console.log("PlayM4_SetDisplayRegion: dipalyRect rectParameter is wrong"), this.iLastErrorCode = 0;
+                    var t = e.left, n = e.right, i = e.top, e = e.bottom,
+                        r = document.getElementById(this.sCanvasId).getBoundingClientRect();
+                    if (this.iCanvasWidth = r.width, this.iCanvasHeight = r.height, n - t < 16 || e - i < 16 || n - t > this.iCanvasWidth || e - i > this.iCanvasHeight) return this.iLastErrorCode = 0;
+                    0 !== this.iZoomNum && (t = Math.round(t / this.iRatio_x) + this.stDisplayRect.left, i = Math.round(i / this.iRatio_y) + this.stDisplayRect.top, n = Math.round(n / this.iRatio_x) + this.stDisplayRect.left, e = Math.round(e / this.iRatio_y) + this.stDisplayRect.top), this.stDisplayRect = {
+                        top: i,
+                        left: t,
+                        right: n,
+                        bottom: e
+                    }, this.oSuperRender.SR_SetDisplayRect(this.stDisplayRect), this.bDisRect = !0;
+                    r = e - i;
+                    this.iRatio_x = this.iCanvasWidth / (n - t), this.iRatio_y = this.iCanvasHeight / r, this.iZoomNum++
+                } else this.oSuperRender.SR_SetDisplayRect(null), this.iZoomNum = 0, this.bDisRect = !1;
+                return (this.bPause || this.bOnebyOne || this.bPlayRateChange) && this.oSuperRender.SR_DisplayFrameData(this.nWidth, this.nHeight, new Uint8Array(this.aDisplayBuf)), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_GetBMP", value: function (e) {
+                return this.getPic(e, "GetBMP")
+            }
+        }, {
+            key: "PlayM4_GetJPEG", value: function (e) {
+                return this.getPic(e, "GetJPEG")
+            }
+        }, {
+            key: "PlayM4_SetVolume", value: function (e) {
+                return null == this.decodeWorker || null == this.audioRenderer ? this.iLastErrorCode = 2 : e < 0 || 100 < e ? this.iLastErrorCode = 0 : (this.audioRenderer.SetVolume(e / 100), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_GetVolume", value: function (e) {
+                return null == this.decodeWorker || null == this.audioRenderer ? this.iLastErrorCode = 2 : e && "function" == typeof e ? null === (t = this.audioRenderer.GetVolume()) ? 63 : (e(10 * Math.round(10 * t)), this.iLastErrorCode = 1) : this.iLastErrorCode = 0;
+                var t
+            }
+        }, {
+            key: "PlayM4_GetOSDTime", value: function (e) {
+                return null != this.decodeWorker && this.bPlay ? e && "function" == typeof e ? (e(this.szOSDTime), this.iLastErrorCode = 1) : this.iLastErrorCode = 0 : this.iLastErrorCode = 2
+            }
+        }, {
+            key: "PlayM4_IsVisible", value: function (e) {
+                return this.bVisibility = e, k && console.log(">>>JS PlayM4_IsVisible visibility:" + e), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_GetSdkVersion", value: function () {
+                return "20211104"
+            }
+        }, {
+            key: "PlayM4_GetBuildDate", value: function () {
+                return "20210923"
+            }
+        }, {
+            key: "PlayM4_GetInputBufSize", value: function () {
+                return this.aInputDataBuffer.length
+            }
+        }, {
+            key: "PlayM4_SetInputBufSize", value: function (e) {
+                return 0 < e ? (this.iInputMaxBufSize = e, this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_GetYUVBufSize", value: function () {
+                return this.aVideoFrameBuffer.length
+            }
+        }, {
+            key: "PlayM4_GetFrameResolution", value: function (e) {
+                return null == this.decodeWorker ? this.iLastErrorCode = 2 : e && "function" == typeof e ? (e(this.nWidth, this.nHeight), this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_RegisterYUVBufSizeCB", value: function (e) {
+                return e && "function" == typeof e ? (this.YUVBufSizeCBFun = e, this.iLastErrorCode = 1) : this.iLastErrorCode = 0
+            }
+        }, {
+            key: "PlayM4_UnRegisterYUVBufSizeCB", value: function () {
+                return null != this.YUVBufSizeCBFun && (this.YUVBufSizeCBFun = null), this.iLastErrorCode = 1
+            }
+        }, {
+            key: "PlayM4_ClearCanvas", value: function () {
+                return null == this.oSuperRender ? this.iLastErrorCode = 2 : (this.oSuperRender.SR_DisplayFrameData(this.nWidth, this.nHeight, null), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_ReleaseInputBuffer", value: function () {
+                return null === this.aInputDataBuffer ? this.iLastErrorCode = 2 : (this.aInputDataBuffer.splice(0, this.aInputDataBuffer.length), this.aInputDataLens.splice(0, this.aInputDataLens.length), this.iLastErrorCode = 1)
+            }
+        }, {
+            key: "PlayM4_GetDecodeFrameType", value: function () {
+                return this.nDecFrameType
+            }
+        }, {
+            key: "PlayM4_CreateAudEncode", value: function (e) {
+                return k && console.log(">>>JS PlayM4_CreateAudEncode 1 nEncoderType:" + e), null == this.decodeWorker ? 79 : e < 1 || 6 < e || 5 === e ? 71 : (this.decodeWorker.postMessage({
+                    command: "CreateAudEncode",
+                    encodertype: e
+                }), k && console.log(">>>JS PlayM4_CreateAudEncode 2 nEncoderType:" + e), 1)
+            }
+        }, {
+            key: "PlayM4_SetAudEncodeParam", value: function (e, t, n, i) {
+                return k && console.log(">>>JS PlayM4_SetAudEncodeParam 1 nSampleRate:" + e + ",nChannel:" + t + " ,nBitRate:" + n + " ,nBitWidth:" + i), null == this.decodeWorker ? 79 : 1 != t || 16 != i ? 71 : (this.decodeWorker.postMessage({
+                    command: "SetAudEncodeParam",
+                    samplerate: e,
+                    channel: t,
+                    bitrate: n,
+                    bitwidth: i
+                }), k && console.log(">>>JS PlayM4_SetAudEncodeParam 2 nSampleRate:" + e + ",nChannel:" + t + " ,nBitRate:" + n + " ,nBitWidth:" + i), 1)
+            }
+        }, {
+            key: "PlayM4_InputAudEncodeData", value: function (e, t) {
+                return k && console.log(">>>JS PlayM4_InputAudEncodeData 1 dataSize:" + t), null == this.decodeWorker ? 79 : (k && console.log(">>>JS  PlayM4_InputAudEncodeData 2 dataSize:" + t + ", nSysTime:" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), this.decodeWorker.postMessage({
+                    command: "InputAudEncodeData",
+                    data: e,
+                    dataSize: t
+                }), 1)
+            }
+        }, {
+            key: "PlayM4_DestroyAudEncode", value: function () {
+                return k && console.log(">>>JS MainThread-PlayM4_DestroyAudEncode 1 "), null == this.decodeWorker ? 79 : (this.aAudioEncBuffer.splice(0, this.aAudioEncBuffer.length), this.iAudioEncBufferSize = 0, this.decodeWorker.postMessage({command: "DestroyAudEncode"}), 1)
+            }
+        }, {
+            key: "PlayM4_GetAudioEmcBuf", value: function () {
+                return this.aAudioEncBuffer
+            }
+        }, {
+            key: "PlayM4_RegisterAudEncodeCB", value: function (e) {
+                return k && console.log(">>>JS PlayM4_RegisterAudEncodeCB 1 callback:" + e), e && "function" == typeof e ? (this.AudEncodeDataCBFun = e, k && console.log(">>>JS PlayM4_RegisterAudEncodeCB 2 callback:" + e), 1) : 0
+            }
+        }, {
+            key: "downloadFile", value: function (e, t) {
+                var n = e,
+                    e = (e instanceof Blob || e instanceof File || (n = new Blob([e])), window.URL.createObjectURL(n)),
+                    n = window.document.createElement("a"),
+                    e = (n.href = e, n.download = t, document.createEvent("MouseEvents"));
+                e.initEvent("click", !0, !0), n.dispatchEvent(e)
+            }
+        }, {
+            key: "PlayM4_GetLastError", value: function () {
+                return this.iLastErrorCode
+            }
+        }]), T);
+
+        function T(e, t, s) {
+            if ((0, a.default)(this, T), null == e || void 0 === e || "string" != typeof e) return 0;
+            if (this.szBasePath = e, !t || "function" != typeof t) return 0;
+            this.fnCallBack = t, this.decodeWorker = null, this.streamOpenMode = null, this.bOpenStream = !1, this.iFrameNumOrTime = 0, this.bSetPlayPositionType = 0, this.audioRenderer = null, this.aAudioBuffer = [], this.iAudioBufferSize = 0, this.bWriteAudEnc = !1, this.iAudioEncBufferSize = 0, this.aAudioEncBuffer = [], this.oSuperRender = null, this.aVideoFrameBuffer = [], this.YUVBufferSize = 1, this.szOSDTime = null, this.bWriteYUVData = !1, this.iYUV10size = 0, this.aVideoYUVBuffer = [], this.bWritePCMData = !1, this.iAudioBuffer500Size = 0, this.aAudioPCMBuffer = [], this.bWriteRawData = !1, this.iRawDataSize = 0, this.aRawDataBuffer = [], this.bWriteRTPData = !0, this.iRTPDataSize = 0, this.aRTPDataBuffer = [], this.downloadRTP = !1, this.rtpNum = 0, this.bPlaySound = !1, this.bPlay = !1, this.bPause = !1, this.bOnebyOne = !1, this.bPlayRateChange = !1, this.bAudioTypeSupport = !0, this.audioNum = 0, this.videoNum = 0, this.SetPlayPositionFlag = !1, this.FrameForwardLen = 1, this.bOnlyPlaySound = !1, this.dataCallBackFun = null, this.YUVBufSizeCBFun = null, this.AudEncodeDataCBFun = null, this.DecCallBackFun = null, this.DisplayCallBackFun = null, this.PCMCallBackFun = null, this.DecInfoYUV = g, this.DisplayInfoYUV = M, this.DecInfoPCM = L, this.nWidth = 0, this.nHeight = 0, this.nSPSCropLeft = 0, this.nSPSCropRight = 0, this.nSPSCropTop = 0, this.nSPSCropBottom = 0, this.sCanvasId = null, this.aDisplayBuf = null, this.bVisibility = !0, this.nDecFrameType = 0, this.iCanvasWidth = 0, this.iCanvasHeight = 0, this.iZoomNum = 0, this.iRatio_x = 1, this.iRatio_y = 1, this.stDisplayRect = {
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0
+            }, this.bDisRect = !1, this.stYUVRect = {
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0
+            }, this.aInputDataLens = [], this.aInputDataBuffer = [], this.bIsGetYUV = !1, this.bIsFirstFrame = !0, this.iInputMaxBufSize = 5242880, this.bIsInput = !1, this.bIsInputBufOver = !1, this.iInputDataLen = 20480;
+            var _ = this;
+            this.iLastErrorCode = 1, this.setCallBack = function (e, t, n, i, r) {
+                var a = b;
+                a.id = s, a.cmd = t, a.data = n, a.errorCode = i, a.status = r, e.fnCallBack(a)
+            }, this._loadRenderFiles(), this.convertErrorCode = function (e) {
+                switch (e) {
+                    case 1:
+                        return this.iLastErrorCode = 1;
+                    case 98:
+                        return this.iLastErrorCode = 0;
+                    default:
+                        return this.iLastErrorCode = e
+                }
+            }, this.arrayBufferCopy = function (e) {
+                for (var t = e.byteLength, n = new Uint8Array(t), i = new Uint8Array(e), r = 0, r = 0; r < t; r++) n[r] = i[r];
+                return n
+            }, this.inputDataFun = function () {
+                var e = 0;
+                if (_.bIsGetYUV = !1, _.bIsInputBufOver) {
+                    k && console.log(">>>JS inputDataFun over!");
+                    var t = new Uint8Array(1), n = {command: "InputData", data: new Uint8Array(t).buffer, dataSize: 0};
+                    _.decodeWorker.postMessage(n, [n.data])
+                } else if (_.bPlay && (!_.bPause || _.bOnebyOne) || this.bOnlyPlaySound) {
+                    for (; 0 < _.aInputDataLens.length && !((e += _.aInputDataLens.shift()) > _.iInputDataLen);) ;
+                    k && console.log(">>>JS inputDataFun-len:%d,totalSize:%d", e, _.aInputDataBuffer.length), t = _.aInputDataBuffer.splice(0, e);
+                    n = {command: "InputData", data: new Uint8Array(t).buffer, dataSize: e};
+                    _.decodeWorker.postMessage(n, [n.data])
+                }
+                t = null
+            }, this.getPic = function (e, t) {
+                if (null == this.decodeWorker || null == this.oSuperRender) return this.iLastErrorCode = 2;
+                if (!this.bPlay) return this.iLastErrorCode = 2;
+                if (!e || "function" != typeof e) return this.iLastErrorCode = 0;
+                var n;
+                if (this.dataCallBackFun = e, 0 === this.iZoomNum) this.stYUVRect.left = 0, this.stYUVRect.top = 0, this.stYUVRect.right = 0, this.stYUVRect.bottom = 0; else if (0 === this.iCanvasWidth || 0 === this.iCanvasHeight ? (this.stYUVRect.left = 0, this.stYUVRect.top = 0, this.stYUVRect.right = 0, this.stYUVRect.bottom = 0) : (e = this.nWidth / this.iCanvasWidth, n = this.nHeight / this.iCanvasHeight, this.stYUVRect.left = Math.round(this.stDisplayRect.left * e), this.stYUVRect.top = Math.round(this.stDisplayRect.top * n), this.stYUVRect.right = Math.round(this.stDisplayRect.right * e), this.stYUVRect.bottom = Math.round(this.stDisplayRect.bottom * n)), this.stYUVRect.right - this.stYUVRect.left < 32 || this.stYUVRect.bottom - this.stYUVRect.top < 32) return this.iLastErrorCode = 0;
+                if (null == this.aDisplayBuf) return this.iLastErrorCode = 2;
+                e = {
+                    command: t,
+                    data: this.arrayBufferCopy(this.aDisplayBuf).buffer,
+                    width: this.nWidth,
+                    height: this.nHeight,
+                    rect: this.stYUVRect
+                };
+                return k && console.log(">>>JS capture nWidth = %d,nWidth = %d", this.nWidth, this.nHeight), this.decodeWorker.postMessage(e), this.iLastErrorCode = 1
+            }, this.createWorker = function (c) {
+                if (window.Worker) {
+                    if (null == this.decodeWorker && (this.decodeWorker = new Worker(_.szBasePath + "DecodeWorker.js"), k && console.log(">>>JS  createWorker success!!!!!!!!!!!!!!!!!!!!!!!!!"), null == this.decodeWorker)) return this.iLastErrorCode = 60;
+                    this.decodeWorker.onmessage = function (e) {
+                        var t = null, n = e.data;
+                        switch (n.function) {
+                            case"printLog":
+                                console.log("print JSPlayerSDK log failed");
+                                break;
+                            case"loaded":
+                                c.setCallBack(c, t = "loaded", 0, 0, !0);
+                                break;
+                            case"SetStreamOpenMode":
+                                t = "SetStreamOpenMode";
+                                break;
+                            case"OpenStream":
+                                if (t = "OpenStream", 1 === n.errorCode) return void (_.bOpenStream = !0);
+                                break;
+                            case"InputData":
+                                t = "InputData", 11 === n.errorCode && (_.bIsInputBufOver = !0, _.inputDataFun(), k && console.log(">>>JS InputData PLAYM4_BUF_OVER")), 31 === n.errorCode && (_.bIsInputBufOver = !1, k && console.log(">>>JS InputData PLAYM4_NEED_MORE_DATA"));
+                                break;
+                            case"GetFrameData":
+                                if (t = "GetFrameData", !_.bOnlyPlaySound) {
+                                    if (k && console.log(">>>JS mainthread display GetFrameData 1-1"), null != n.data && null != n.frameInfo && (n.frameInfo.width, n.frameInfo.height), !_.bPlay) return;
+                                    if (!_.bIsFirstFrame && 31 === n.errorCode) {
+                                        _.bIsInputBufOver = !1, setTimeout(_.inputDataFun(), 5);
+                                        break
+                                    }
+                                    _.bIsInputBufOver ? _.inputDataFun() : "videoType" === n.type && (0 < _.aInputDataLens.length && _.bIsInput ? (_.inputDataFun(), _.bIsInput = !1) : _.bIsGetYUV = !0, _.bIsFirstFrame = !1)
+                                }
+                                if (k && console.log(">>>JS mainthread display GetFrameData bVisibility:" + _.bVisibility), _.bVisibility) if (1 === n.errorCode) switch (n.type) {
+                                    case"videoType":
+                                        if (k && console.log(">>>JS mainthread display GetFrameData type:" + n.type), null == n.data || null == n.frameInfo) return this.iLastErrorCode = 0;
+                                        if (null != _.DecCallBackFun && (k && console.log(">>>JS MainThread-GetYUVData"), _.DecInfoYUV.height = n.frameInfo.height, _.DecInfoYUV.width = n.frameInfo.width, _.DecInfoYUV.frameNum = n.frameInfo.frameNum, _.DecInfoYUV.yuvData = new Uint8Array(n.data), _.DecCallBackFun(_.DecInfoYUV)), _.bIsFirstFrame = !1, c.nWidth = n.frameInfo.width, c.nHeight = n.frameInfo.height, c.nSPSCropLeft = n.frameInfo.cropLeft, c.nSPSCropRight = n.frameInfo.cropRight, c.nSPSCropTop = n.frameInfo.cropTop, c.nSPSCropBottom = n.frameInfo.cropBottom, (o = new Object).data = n.data, o.osdTime = n.osd, o.nWidth = n.frameInfo.width, o.nHeight = n.frameInfo.height, o.frameNum = n.frameInfo.frameNum, o.timeStamp = n.frameInfo.timeStamp, c.bWriteYUVData) {
+                                            for (var i = new Uint8Array(n.data), r = c.aVideoYUVBuffer.length, a = 0, s = i.length; a < s; a++) c.aVideoYUVBuffer[r + a] = i[a];
+                                            c.iYUV10size++, i = null
+                                        }
+                                        c.bWriteYUVData && 20 <= c.iYUV10size && (u = new Uint8Array(c.aVideoYUVBuffer), c.downloadFile(u, "videoYUV.data"), c.aVideoYUVBuffer.splice(0, c.aVideoYUVBuffer.length), c.bWriteYUVData = !1, c.iYUV10size = 0, u = null), k && console.log(">>>JS mainthread getVideoInfo Width:" + o.nWidth + ",height:" + o.nHeight + ",frameNum:" + o.frameNum), c.aVideoFrameBuffer.push(o);
+                                        var o = null, u = c.aVideoFrameBuffer.length;
+                                        if (5 < u && (k && console.log(">>>JS render loose frame iYUVNum:%d", u), c.bOnebyOne || c.aVideoFrameBuffer.splice(0, 2)), c.SetPlayPositionFlag && 1 === c.bSetPlayPositionType && (n.frameInfo.frameNum === c.iFrameNumOrTime || n.frameInfo.timeStamp === c.iFrameNumOrTime)) {
+                                            c.setCallBack(c, "SetFrameNum", 0, 0, !1), c.bIsFirstFrame = !0;
+                                            break
+                                        }
+                                        if (c.bOnebyOne && 15 <= c.aVideoFrameBuffer.length) {
+                                            c.setCallBack(c, "OnebyOne", 0, 0, !1), c.bIsFirstFrame = !0;
+                                            break
+                                        }
+                                        break;
+                                    case"audioType":
+                                        if (k && console.log(">>>JS mainthread display GetFrameData 2-3 type:" + n.type + ",bPlaySound:" + c.bPlaySound + ",!bPlayRateChange:" + !c.bPlayRateChange + ",bOnlyPlaySound:" + _.bOnlyPlaySound), c.bPlaySound && !c.bPlayRateChange || _.bOnlyPlaySound) {
+                                            k && console.log(">>>JS mainthread display GetFrameData 2-4 type" + n.type + "bOnlyPlaySound:" + _.bOnlyPlaySound), null != _.PCMCallBackFun && (k && console.log(">>>JS MainThread-GetYUVData"), _.DecInfoPCM.sampleRate = n.frameInfo.samplesPerSec, _.DecInfoPCM.channel = n.frameInfo.channels, _.DecInfoPCM.bitsPerSample = n.frameInfo.bitsPerSample, _.DecInfoPCM.pcmData = new Uint8Array(n.data), _.DecInfoPCM.length = _.DecInfoPCM.pcmData.length, _.PCMCallBackFun(_.DecInfoPCM));
+                                            for (var i = new Uint8Array(n.data), r = c.aAudioBuffer.length, a = 0, s = i.length; a < s; a++) c.aAudioBuffer[r + a] = i[a];
+                                            if (c.iAudioBufferSize++, i = null, k && console.log(">>>JS play sound 1 iAudioBufferNum:%d, BufferLen:%d", c.iAudioBufferSize, c.aAudioBuffer.length), c.bWritePCMData) {
+                                                for (i = new Uint8Array(n.data), r = c.aAudioPCMBuffer.length, a = 0, s = i.length; a < s; a++) c.aAudioPCMBuffer[r + a] = i[a];
+                                                console.log("audio_type num:" + c.iAudioBuffer500Size + ", len:" + i.length), c.iAudioBuffer500Size++, i = null
+                                            }
+                                            c.bWritePCMData && 100 <= c.iAudioBuffer500Size && (o = new Uint8Array(c.aAudioPCMBuffer), c.downloadFile(o, "audioPCM.data"), c.aAudioPCMBuffer.splice(0, c.aAudioPCMBuffer.length), c.bWritePCMData = !1, c.iAudioBuffer500Size = 0, o = null), 25 <= c.iAudioBufferSize && (k && console.log(">>>JS play sound 2 iAudioBufferNum:%d, BufferLen:%d", c.iAudioBufferSize, c.aAudioBuffer.length), c.audioRenderer.Play(c.aAudioBuffer, c.aAudioBuffer.length, n.frameInfo), k && console.log(">>>JS mainthread display Audio push 3 sysTime:" + ((new Date).getMonth() + 1) + "-" + (new Date).getDate() + " " + (new Date).getHours() + ":" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), c.aAudioBuffer.splice(0, c.aAudioBuffer.length), c.aAudioBuffer.length = 0, c.iAudioBufferSize = 0)
+                                        }
+                                        break;
+                                    case"privateType":
+                                        k && console.log(">>>JS mainthread display GetFrameData 2-5 type" + n.type + "bOnlyPlaySound:" + _.bOnlyPlaySound);
+                                        break;
+                                    default:
+                                        k && console.log(">>>JS mainthread display GetFrameData 2-6 type:" + n.type + ",bOnlyPlaySound:" + _.bOnlyPlaySound)
+                                } else k && console.log(">>>JS mainthread GetFrameData is not Ok,errorCode:" + n.errorCode);
+                                break;
+                            case"GetRawData":
+                                if (t = "GetRawData", c.bWriteRawData) {
+                                    for (var d = new Uint8Array(n.data), l = c.aRawDataBuffer.length, a = 0, s = d.length; a < s; a++) c.aRawDataBuffer[l + a] = d[a];
+                                    c.iRawDataSize++, d = null
+                                }
+                                c.bWriteRawData && 100 <= c.iRawDataSize && (h = new Uint8Array(c.aRawDataBuffer), c.downloadFile(h, "rawBuffer.data"), c.aRawDataBuffer.splice(0, c.aRawDataBuffer.length), c.bWriteRawData = !1, c.iRawDataSize = 0, h = null);
+                                break;
+                            case"PlaySound":
+                                t = "PlaySound";
+                                break;
+                            case"SetPlayPosition":
+                                console.log(">>>JS mainthread SetPlayPosition error,errorCode:" + n.errorCode);
+                                break;
+                            case"GetJPEG":
+                                var t = "GetJPEG", h = n.data;
+                                c.dataCallBackFun(h);
+                                break;
+                            case"GetBMP":
+                                t = "GetBMP";
+                                var h = n.data;
+                                c.dataCallBackFun(h);
+                                break;
+                            case"GetAudEncodeData":
+                                if (k && console.log(">>>JS MainThread-GetAudEncodeData 1"), t = "GetAudEncodeData", 1 === n.errorCode) {
+                                    if (null != _.AudEncodeDataCBFun && (k && console.log(">>>JS  GetAudEncodeData 1 dataSize" + n.dataSize + ", nSysTime:" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds()), _.AudEncodeDataCBFun(new Uint8Array(n.data)), k && console.log(">>>JS  GetAudEncodeData 2 dataSize" + n.dataSize + ", nSysTime:" + (new Date).getMinutes() + ":" + (new Date).getSeconds() + "." + (new Date).getMilliseconds())), c.bWriteAudEnc) {
+                                        for (i = new Uint8Array(n.data), r = c.aAudioEncBuffer.length, a = 0, s = i.length; a < s; a++) c.aAudioEncBuffer[r + a] = i[a];
+                                        c.iAudioEncBufferSize++, i = null
+                                    }
+                                    c.bWriteAudEnc && 200 <= c.iAudioEncBufferSize && (h = new Uint8Array(c.aAudioEncBuffer), c.downloadFile(h, "Enc.AAC"), c.aAudioEncBuffer.splice(0, c.aAudioEncBuffer.length), c.bWriteAudEnc = !1, c.iAudioEncBufferSize = 0, h = null)
+                                } else k && console.log(">>>JS MainThread-GetAudEncodeData 2 err")
+                        }
+                        "GetFrameData" === t && "GetAudEncodeData" === t && 16 !== n.errorCode && 101 !== n.errorCode && 100 !== n.errorCode && 48 !== n.errorCode || c.setCallBack(c, t, 0, c.convertErrorCode(n.errorCode), !0)
+                    }
+                }
+            }, this.createWorker(_), this.draw = function () {
+                if (_.bPlay) {
+                    if (!_.bPause || _.bOnebyOne) {
+                        requestAnimationFrame(_.draw);
+                        var e = _.aVideoFrameBuffer.length;
+                        if (null != _.YUVBufSizeCBFun && _.YUVBufSizeCBFun(e), _.bOnebyOne) {
+                            if (e <= 8 && _.setCallBack(_, "OnebyOne", 0, 31, !0), e <= _.FrameForwardLen + 1) return void _.setCallBack(_, "OnebyOne", 0, 31, !0);
+                            for (var t = _.FrameForwardLen; 1 < t;) {
+                                _.aVideoFrameBuffer.shift();
+                                t--
+                            }
+                            _.bOnebyOne = !1
+                        }
+                        if (k && console.log(">>>JS Draw aVideoFrameBuffer.length == " + e), e > _.YUVBufferSize) {
+                            e = _.aVideoFrameBuffer.shift();
+                            if (_.SetPlayPositionFlag) {
+                                if (k && console.log(">>>JS SetPlayPositionFlag frameNumOrTime:" + _.iFrameNumOrTime + ",currentFrameNum:" + e.frameNum), e.frameNum != _.iFrameNumOrTime) return void (k && console.log(">>>JS frameNum!= frameNumOrTime:" + e.frameNum));
+                                1 === _.bSetPlayPositionType && (_.bPause = !0), _.SetPlayPositionFlag = !1
+                            }
+                            k && console.log(">>>after display frameNum:" + e.frameNum), _.aDisplayBuf = e.data;
+                            var n = new Uint8Array(_.aDisplayBuf);
+                            k && console.log(">>>JS SR_DisplayFrameData 1 nWidth:%d, nHeight:%d, nWidth1:%d, nHeight1:%d", e.nWidth, e.nHeight, _.nWidth, _.nHeight), _.oSuperRender.SR_DisplayFrameData(e.nWidth, e.nHeight, n, e.nWidth - _.nSPSCropLeft - _.nSPSCropRight, e.nHeight - _.nSPSCropTop - _.nSPSCropBottom), null != _.DisplayCallBackFun && (k && console.log(">>>JS MainThread-DisplayCallBackFun"), _.DisplayInfoYUV.height = e.nHeight, _.DisplayInfoYUV.width = e.nWidth, _.DisplayInfoYUV.frameNum = e.frameNum, _.DisplayInfoYUV.yuvData = new Uint8Array(n), _.DisplayCallBackFun(_.DisplayInfoYUV)), k && _.bOnebyOne && console.log("OneByOne frameNum:" + e.frameNum), k && console.log(">>>JS SR_DisplayFrameData 2 nWidth:%d, nHeight:%d, nWidth1:%d, nHeight1:%d", e.nWidth, e.nHeight, _.nWidth, _.nHeight), n = null, _.szOSDTime = e.osdTime
+                        } else _.setCallBack(_, "Play", 0, 31, !0)
+                    }
+                } else _.bPlay || (k && console.log(">>>JS mainThread stop play jsplaySDKInterface"), _.aVideoFrameBuffer.splice(0, _.aVideoFrameBuffer.length), _.aAudioBuffer.splice(0, _.aAudioBuffer.length))
+            }, this.checkAudioType = function (e) {
+                var t, e = [e[12], e[13], 0, 0];
+                switch (255 & e[t = 0] | (255 & e[t + 1]) << 8 | (255 & e[t + 2]) << 16 | (255 & e[t + 3]) << 24) {
+                    case l:
+                    case d:
+                    case h:
+                    case m:
+                    case f:
+                    case c:
+                    case p:
+                    case y:
+                    case v:
+                        return this.iLastErrorCode = 1;
+                    default:
+                        return this.iLastErrorCode = 16
+                }
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.JSTalkCtrl = void 0;
+        var i = r(n(1)), n = r(n(2));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var s = {id: null, cmd: null, data: null, errorCode: 0, status: null}, a = null,
+            n = (window.JSAUDIOCOM_EncodeDataCBFun = function (e, t, n, i) {
+                a && null != a.AudEncodeDataCBFun && a.AudEncodeDataCBFun(new Uint8Array(t))
+            }, (0, n.default)(o, [{
+                key: "Talk_CreateAudEncode", value: function (e) {
+                    this.iTalkEncodePort = this.oTalkWASM._JSAUDIOCOM_CreateEncodeHandle(e), console.log("_JSAUDIOCOM_CreateEncodeHandle port :" + this.iTalkEncodePort)
+                }
+            }, {
+                key: "Talk_SetAudEncodeParam", value: function (e, t, n, i) {
+                    0 == this.oTalkWASM._JSAUDIOCOM_RegisterEncodeDataCallBack(this.iTalkEncodePort, t, i, e, n) && (t = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkEncodePort), console.log("resEncodeDataCallBack resError :" + t)), 1 !== this.oTalkWASM._JSAUDIOCOM_StartEncode(this.iTalkEncodePort) && (i = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkEncodePort), console.log("_JSAUDIOCOM_StartEncode resError :" + i))
+                }
+            }, {
+                key: "Talk_RegisterAudEncodeCB", value: function (e) {
+                    return e && "function" == typeof e ? (this.AudEncodeDataCBFun = e, 1) : 0
+                }
+            }, {
+                key: "Talk_InputAudEncodeData", value: function (e, t) {
+                    var n = this.oTalkWASM._malloc(t);
+                    if (null === n) return console.log("inputdata malloc failed!!!"), -1;
+                    e = new Uint8Array(e), e = void this.oTalkWASM.writeArrayToMemory(e, n);
+                    try {
+                        e = this.oTalkWASM._JSAUDIOCOM_InputEncodeData(this.iTalkEncodePort, n, t)
+                    } catch (e) {
+                        console.error(e)
+                    }
+                    return 1 !== e && (t = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkEncodePort), console.log("_JSAUDIOCOM_InputEncodeData resError :" + t)), null !== n && (this.oTalkWASM._free(n), n = null), 1
+                }
+            }, {
+                key: "Talk_DestroyAudEncode", value: function () {
+                    return this.oTalkWASM._JSAUDIOCOM_StopEncode(this.iTalkEncodePort), this.oTalkWASM._JSAUDIOCOM_ReleaseEncodeHandle(this.iTalkEncodePort), this.iTalkEncodePort = -1, 1
+                }
+            }, {
+                key: "Talk_CreateAuDecode", value: function () {
+                    this.oTalkWASM._JSAUDIOCOM_LoadLibrary(), this.oTalkWASM._JSAUDIOCOM_GetPlayDeviceNum();
+                    var e = this.oTalkWASM._JSAUDIOCOM_GetOnePlayDeviceName(0);
+                    this.iTalkDecodePort = this.oTalkWASM._JSAUDIOCOM_CreatePlayHandle(), console.log("JSAUDIOCOM getNameRes:" + e + ", port:" + this.iTalkDecodePort)
+                }
+            }, {
+                key: "Talk_SetAudDecodeParam", value: function (e, t, n, i, r) {
+                    1 !== this.oTalkWASM._JSAUDIOCOM_OpenStream(this.iTalkDecodePort, t, i, e, n, r) && (t = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkDecodePort), console.log("_JSAUDIOCOM_OpenStream resError :" + t))
+                }
+            }, {
+                key: "Talk_OpenStreamDecodeData", value: function () {
+                    var e;
+                    1 !== this.oTalkWASM._JSAUDIOCOM_StartPlay(this.iTalkDecodePort) && (e = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkDecodePort), console.log("_JSAUDIOCOM_StartPlay resError :" + e))
+                }
+            }, {
+                key: "Talk_InputAudDecodeData", value: function (e, t) {
+                    var n = this.oTalkWASM._malloc(t);
+                    if (null === n) return console.log("inputdata malloc failed!!!"), -1;
+                    var e = new Uint8Array(e);
+                    return this.oTalkWASM.writeArrayToMemory(e, n), 1 !== this.oTalkWASM._JSAUDIOCOM_InputStreamData(this.iTalkDecodePort, n, t) && (e = this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkDecodePort), console.log("_JSAUDIOCOM_InputStreamData resError :" + e)), null !== n && (this.oTalkWASM._free(n), 0), 1
+                }
+            }, {
+                key: "Talk_DestroyAudDecode", value: function () {
+                    this.oTalkWASM._JSAUDIOCOM_StopPlay(this.iTalkDecodePort), this.oTalkWASM._JSAUDIOCOM_ReleasePlayHandle(this.iTalkDecodePort), this.iTalkDecodePort = -1
+                }
+            }, {
+                key: "Talk_SetTalkLogFlag", value: function (e) {
+                    this.oTalkWASM._JSAUDIOCOM_SetPrintLogFlag(this.iTalkDecodePort, e), this.oTalkWASM._JSAUDIOCOM_SetPrintLogFlag(this.iTalkEncodePort, e)
+                }
+            }, {
+                key: "Talk_SetVolume", value: function (e) {
+                    return this.oTalkWASM._JSAUDIOCOM_SetVolume(this.iTalkDecodePort, e)
+                }
+            }, {
+                key: "Talk_GetVolume", value: function (e) {
+                    if (e && "function" == typeof e) return e(this.oTalkWASM._JSAUDIOCOM_GetVolume(this.iTalkDecodePort)), RETURN_OK
+                }
+            }, {
+                key: "Talk_GetLastError", value: function () {
+                    return this.oTalkWASM._JSAUDIOCOM_GetLastError(this.iTalkDecodePort)
+                }
+            }]), o);
+
+        function o(e, t) {
+            var n = this,
+                t = ((0, i.default)(this, o), a = this, t && "function" == typeof t && (this.fnCallBack = t), this.setCallBack = function (e, t, n, i, r) {
+                    var a = s;
+                    a.cmd = t, a.data = n, a.errorCode = i, a.status = r, e.fnCallBack(a)
+                }, this.iTalkEncodePort = -1, this.iTalkDecodePort = -1, this.AudEncodeDataCBFun = null, this.oTalkWASM = null, e),
+                e = document.createElement("script");
+            e.type = "text/javascript", e.src = t, e.onload = function () {
+                JSAudioInterComModule().then(function (e) {
+                    n.oTalkWASM = e, n.setCallBack(n, "loaded")
+                })
+            }, document.body.appendChild(e)
+        }
+
+        t.JSTalkCtrl = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.StorageManager = void 0;
+        var i = h(n(53)), r = h(n(54)), u = h(n(11)), o = h(n(1)), a = h(n(2)), d = h(n(87)), s = n(86), l = h(n(55));
+
+        function h(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        var c = new Uint8Array([1, 2, 3, 4]);
+        window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem, window.URL = window.URL || window.webkitURL;
+        (0, a.default)(f, [{
+            key: "init", value: function () {
+                var n = this,
+                    i = (0 === this.iStreamType ? this.szPath = "Web/RecordFiles/" : 1 === this.iStreamType && (this.szPath = "Web/PlaybackFiles/"), this.szPath += this.getDateDir(), this.szPath.split("/"));
+                return new u.default(function (t) {
+                    window.requestFileSystem(window.TEMPORARY, n.options.iFileSize, function (e) {
+                        n.createDir(e.root, i, function () {
+                            t()
+                        })
+                    }, n.errorHandler)
+                })
+            }
+        }, {
+            key: "getDateDir", value: function () {
+                return s.oTool.dateFormat(new Date, "yyyy-MM-dd")
+            }
+        }, {
+            key: "createDir", value: function (e, t, n) {
+                var i = this;
+                t.length ? e.getDirectory(t[0], {create: !0}, function (e) {
+                    i.createDir(e, t.slice(1), n)
+                }, this.errorHandler) : n()
+            }
+        }, {
+            key: "errorHandler", value: function () {
+            }
+        }, {
+            key: "openFile", value: function () {
+                var t = this;
+                window.requestFileSystem(window.TEMPORARY, this.options.iFileSize, function (e) {
+                    e.root.getFile(t.szPath + "/" + t.szFileName, {create: !0}, function (e) {
+                        e.createWriter(function (e) {
+                            e.onwriteend = function () {
+                                t.writeFile(e)
+                            }, e.onerror = function () {
+                            }
+                        }, t.errorHandler)
+                    }, t.errorHandler)
+                }, this.errorHandler)
+            }
+        }, {
+            key: "writeFileHeader", value: function (n) {
+                var i = this;
+                window.requestFileSystem(window.TEMPORARY, this.options.iFileSize, function (e) {
+                    e.root.getFile(i.szFileName, {create: !0}, function (e) {
+                        e.createWriter(function (e) {
+                            i.bStart = !0, e.onwriteend = function () {
+                                i.writeFile(e)
+                            }, e.onerror = function () {
+                            }, e.seek(e.length);
+                            var t = new Blob([n]);
+                            e.write(t)
+                        }, i.errorHandler)
+                    }, function (e) {
+                        console.log("getFile error:", e.message)
+                    })
+                }, this.errorHandler)
+            }
+        }, {
+            key: "writeFileContent", value: function (e) {
+                this.aStreamList.push(e)
+            }
+        }, {
+            key: "writeFile", value: function (e) {
+                var t = this;
+                if (0 < this.aStreamList.length) {
+                    var n = this.aStreamList.shift();
+                    if (e.seek(e.length), e.length >= this.options.iFileSize) return void (this.options.cbEventHandler && this.options.cbEventHandler(3001, this.szUUID));
+                    n = new Blob([n]);
+                    e.write(n)
+                } else !1 === this.bStop && setTimeout(function () {
+                    t.writeFile(e)
+                }, 500);
+                5 !== this.iPackType && 0 === this.aStreamList.length && !0 === this.bStop && this.bStart && (this.bStart = !1, this.stopWriteFile()), this.getStopData && 0 === this.aStreamList.length && (this.bStart = !1, this.stopWriteFile(), this.getStopData = !1)
+            }
+        }, {
+            key: "stopWriteFile", value: function () {
+                var t, a = this;
+                return new u.default((t = (0, r.default)(i.default.mark(function e(r) {
+                    return i.default.wrap(function (e) {
+                        for (; ;) switch (e.prev = e.next) {
+                            case 0:
+                                if (a.bStop) {
+                                    e.next = 2;
+                                    break
+                                }
+                                return e.abrupt("return", r());
+                            case 2:
+                                if ((!a.getStopData || 0 < a.aStreamList.length) && 5 === a.iPackType) return e.abrupt("return", r());
+                                e.next = 4;
+                                break;
+                            case 4:
+                                if (0 < a.aStreamList.length && 5 !== a.iPackType) return e.abrupt("return", r());
+                                e.next = 6;
+                                break;
+                            case 6:
+                                return a.options.cbStreamCB && a.options.cbStreamCB(c), a.options.cbStreamCB = null, e.next = 10, window.requestFileSystem(window.TEMPORARY, a.options.iFileSize, function (e) {
+                                    e.root.getFile(a.szFileName, {create: !1}, function (i) {
+                                        i.file(function (e) {
+                                            var t, n;
+                                            r(), t = i.toURL(), e = e.name, (n = window.document.createElement("a")).href = t, n.download = e, (t = document.createEvent("MouseEvents")).initEvent("click", !0, !0), n.dispatchEvent(t), a.bStop = !1
+                                        })
+                                    }, a.errorHandler)
+                                }, a.errorHandler);
+                            case 10:
+                            case"end":
+                                return e.stop()
+                        }
+                    }, e, a)
+                })), function (e) {
+                    return t.apply(this, arguments)
+                }))
+            }
+        }]);
+        var _ = f;
+
+        function f(e, t, n, i, r) {
+            (0, o.default)(this, f), this.szUUID = e, this.szFileName = t, this.iStreamType = n, this.szPath = "", this.bStart = !1, this.getStopData = !1, this.aStreamList = [], this.options = r, this.iPackType = i, this.bStop = !1
+        }
+
+        (0, a.default)(p, [{
+            key: "init", value: function () {
+                var n = this;
+                return new u.default(function (e, t) {
+                    n.initFileSystem().then(function () {
+                        !0 === n.isTranse ? n.initWorker().then(function () {
+                            e(n.szUUID)
+                        }, function (e) {
+                            t(e)
+                        }) : e(n.szUUID)
+                    }, function (e) {
+                        t(e)
+                    })
+                })
+            }
+        }, {
+            key: "initFileSystem", value: function () {
+                var n = this;
+                return new u.default(function (e, t) {
+                    2 !== n.options.irecordType && (n.oFileSystem = new _(n.szUUID, n.szFileName, n.iStreamType, n.iPackType, n.options), n.oFileSystem.init().then(function () {
+                        e()
+                    }, function (e) {
+                        t(e)
+                    })), e()
+                })
+            }
+        }, {
+            key: "initWorker", value: function () {
+                var i = this;
+                return new u.default(function (n) {
+                    i.oWorker = new Worker(i.szBasePath + "systemTransform-worker.js"), i.oWorker.onmessage = function (e) {
+                        var e = e.data, t = i.iPackType;
+                        1 === i.options.iPackage && (t = 12), "loaded" === e.type ? i.oWorker.postMessage({
+                            type: "create",
+                            buf: i.aHeadBuf.buffer,
+                            len: 40,
+                            packType: t
+                        }) : "created" === e.type ? n() : "outputData" === e.type && (t = new Uint8Array(e.buf), 2 !== i.options.irecordType && (1 === e.dType ? i.oFileSystem.writeFileHeader(t) : i.oFileSystem.writeFileContent(t), 6 === e.dType && (i.oFileSystem.getStopData = !0)), 1 !== i.options.irecordType && (i.options.cbStreamCB && i.options.cbStreamCB(t), 6 === e.dType && 2 === i.options.irecordType && (i.options.cbStreamCB && i.options.cbStreamCB(c), i.options.cbStreamCB = null)))
+                    }
+                })
+            }
+        }, {
+            key: "inputData", value: function (e) {
+                var t;
+                !0 === this.isTranse ? this.oWorker && (t = new Uint8Array(e), this.oWorker.postMessage({
+                    type: "inputData",
+                    buf: t.buffer,
+                    len: t.length
+                })) : (2 !== this.options.irecordType && (!0 === this.bHead ? (1 === this.iPackType ? (this.oFileSystem.writeFileHeader(this.aHeadBuf), this.oFileSystem.writeFileContent(e)) : this.oFileSystem.writeFileHeader(e), this.bHead = !1) : this.oFileSystem.writeFileContent(e)), 1 !== this.options.irecordType && (!0 === this.bHead && (this.options.cbStreamCB && this.options.cbStreamCB(this.aHeadBuf), this.bHead = !1), this.options.cbStreamCB && this.options.cbStreamCB(e)))
+            }
+        }, {
+            key: "stopRecord", value: function () {
+                var n = this;
+                return new u.default(function (e, t) {
+                    !0 === n.isTranse && (n.oWorker ? n.oWorker.postMessage({type: "release"}) : t()), n.oFileSystem ? (n.oFileSystem.bStop = !0, n.oFileSystem.stopWriteFile().then(function () {
+                        n.bHead = !0, e()
+                    }, function () {
+                        t()
+                    })) : (5 !== n.iPackType && (n.options.cbStreamCB && n.options.cbStreamCB(c), n.options.cbStreamCB = null), e())
+                })
+            }
+        }]);
+        var m = p;
+
+        function p(e, t, n, i, r, a, s) {
+            (0, o.default)(this, p), this.szBasePath = e, this.szUUID = t, this.szFileName = n, this.aHeadBuf = new Uint8Array(i), this.iPackType = r, this.iStreamType = a, this.oWorker = null, this.oFileSystem = null, this.options = s, this.bHead = !0, this.isTranse = !0, (2 === i[8] && 0 === i[9] && 2 === r || "audio" === i || 1 === r) && (this.isTranse = !1)
+        }
+
+        n = function () {
+            function n(e, t) {
+                (0, o.default)(this, n), this.szBasePath = e, this.oStorageList = {}, this.options = {
+                    iFileSize: 1073741824,
+                    irecordType: 1,
+                    cbStreamCB: null
+                }
+            }
+
+            return (0, a.default)(n, [{
+                key: "startRecord", value: function (e, t, n, i, r) {
+                    var a = this, s = d.default.v4(), r = l.default.extend(this.options, r),
+                        o = new m(this.szBasePath, s, e, t, n, i, r);
+                    return new u.default(function (t, n) {
+                        o.init().then(function (e) {
+                            a.oStorageList[e] = o, t(e)
+                        }, function (e) {
+                            n(e)
+                        })
+                    })
+                }
+            }, {
+                key: "inputData", value: function (e, t) {
+                    e = this.oStorageList[e];
+                    e && e.inputData(t)
+                }
+            }, {
+                key: "stopRecord", value: function (i) {
+                    var r = this;
+                    return new u.default(function (e, t) {
+                        var n = r.oStorageList[i];
+                        n ? n.stopRecord().then(function () {
+                            delete r.oStorageList[i], e()
+                        }, function () {
+                            t()
+                        }) : t()
+                    })
+                }
+            }]), n
+        }();
+        t.StorageManager = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0}), t.ESCanvas = void 0;
+        var g = function (e, t, n) {
+            return t && i(e.prototype, t), n && i(e, n), e
+        };
+
+        function i(e, t) {
+            for (var n = 0; n < t.length; n++) {
+                var i = t[n];
+                i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(e, i.key, i)
+            }
+        }
+
+        var n = n(55), M = (n = n) && n.__esModule ? n : {default: n};
+
+        function L(e, t) {
+            if (e) return !t || "object" != typeof t && "function" != typeof t ? e : t;
+            throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
+        }
+
+        function S(e, t) {
+            if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t);
+            e.prototype = Object.create(t && t.prototype, {
+                constructor: {
+                    value: e,
+                    enumerable: !1,
+                    writable: !0,
+                    configurable: !0
+                }
+            }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t)
+        }
+
+        function k(e, t) {
+            if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function")
+        }
+
+        n = function () {
+            var m = null;
+
+            function l() {
+                m.oContext.clearRect(0, 0, m.m_iCanvasWidth, m.m_iCanvasHeight);
+                for (var e = 0, t = m.aShapes.length; e < t; e++) m.aShapes[e].draw()
+            }
+
+            function h(e) {
+                m.aShapes.length < m.iMaxShapeNumSupport && m.aShapes.push(e)
+            }
+
+            function t() {
+                var r = !1, a = 0, s = 0, o = "draw", u = null;
+
+                function d() {
+                    for (var e = -1, t = 0, n = m.aShapes.length; t < n; t++) if (m.aShapes[t].m_bChoosed) {
+                        e = t;
+                        break
+                    }
+                    return e
+                }
+
+                m.oCanvas[0].oncontextmenu = function () {
+                    return !1
+                }, m.oCanvas[0].onselectstart = function () {
+                    return !1
+                }, m.oCanvas.unbind(), m.oCanvas.bind("mousedown", function (e) {
+                    if (m.oCanvas[0].id === e.target.id) if (2 === e.button) m.bPolygonDrawing && u && u.m_aPoint.length >= u.m_iMinClosed && (u.m_bClosed = !0, m.bPolygonDrawing = !1, u.setPointInfo(u.m_aPoint), h(u), l(), r = !1, m.bDrawShapeMultiOneTime || (m.bDrawStatus = !1), window.onDrawShapeEvent && window.onDrawShapeEvent(u.m_szType, "onDrawEnd", u.m_szId)); else if (0 === e.button) {
+                        if (a = e.offsetX, s = e.offsetY, o = "draw", !m.bPolygonDrawing) {
+                            var t = d();
+                            if ("stretch" !== (o = -1 !== t && m.aShapes[t].inArc(e.offsetX, e.offsetY, 5) ? "stretch" : o)) for (var n = 0, i = m.aShapes.length; n < i; n++) m.aShapes[n].inShape(e.offsetX, e.offsetY) ? (m.aShapes[n].m_bChoosed = !0, m.aShapes[n].getMouseDownPoints(e.offsetX, e.offsetY), o = "drag", window.onDrawShapeEvent && window.onDrawShapeEvent(m.aShapes[n].m_szType, "onChoose", m.aShapes[n].m_szId)) : m.aShapes[n].m_bChoosed = !1;
+                            m.oCanvas[0].style.cursor = "drag" === o ? "move" : "default", "draw" === o && 1 === m.aShapes.length && 1 === m.aShapes[0].m_iRedrawMode && (m.deleteRepeatPolyonById(m.aShapes[0].m_szId), m.bDrawStatus = !0), m.bDrawStatus && !m.bDrawShapeMultiOneTime && (o = "draw")
+                        }
+                        if ("draw" === o && m.bDrawStatus) {
+                            if (m.iMaxShapeNumSupport <= m.aShapes.length && "Grid" !== m.szShapeType && "Point" !== m.szShapeType) return;
+                            "Rect" === m.szShapeType ? u = new c : "Grid" === m.szShapeType ? 0 === m.aShapes.length && h(u = new _) : "Polygon" === m.szShapeType ? (m.bPolygonDrawing || (m.bPolygonDrawing = !0, (u = new f).m_szId = m.oCurrentShapeInfo.szId || "", u.m_szTips = m.oCurrentShapeInfo.szTips || "", u.m_iMinClosed = m.oCurrentShapeInfo.iMinClosed || 3, u.m_iMaxPointNum = m.oCurrentShapeInfo.iMaxPointNum || 11, u.m_iPolygonType = m.oCurrentShapeInfo.iPolygonType, u.m_szDrawColor = m.oCurrentShapeInfo.szDrawColor, u.m_szFillColor = m.oCurrentShapeInfo.szFillColor, u.m_iTranslucent = m.oCurrentShapeInfo.iTranslucent, u.m_iRedrawMode = m.oCurrentShapeInfo.iRedrawMode), 1 === u.m_iPolygonType && (u.addPoint(a, s), u.m_aPoint.length === u.m_iMaxPointNum && (u.m_bClosed = !0, m.bPolygonDrawing = !1, h(u), l(), r = !1, m.bDrawShapeMultiOneTime || (m.bDrawStatus = !1), window.onDrawShapeEvent && window.onDrawShapeEvent(u.m_szType, "onDrawEnd", u.m_szId)))) : "Point" === m.szShapeType && (m.clearShapeByType("Point"), (u = new p).m_szId = m.oCurrentShapeInfo.szId || "", u.m_szDrawColor = m.oCurrentShapeInfo.szDrawColor, u.setPointInfo([[a, s]]), h(u), l())
+                        }
+                        r = !0
+                    }
+                }), m.oCanvas.bind("mousemove", function (e) {
+                    var t;
+                    m.bPolygonDrawing ? m.bDrawStatus && r && ("Polygon" === m.szShapeType && 0 === u.m_iPolygonType && (u.m_bClosed = !0), l(), u.move(e.offsetX, e.offsetY, a, s)) : -1 < (t = d()) ? r && ("drag" === o ? (m.aShapes[t].drag(e.offsetX, e.offsetY), window.onDrawShapeEvent && window.onDrawShapeEvent(m.aShapes[t].m_szType, "onDrag", m.aShapes[t].m_szId)) : "stretch" === o && (m.aShapes[t].stretch(e.offsetX, e.offsetY), window.onDrawShapeEvent && window.onDrawShapeEvent(m.aShapes[t].m_szType, "onStretch", m.aShapes[t].m_szId))) : m.bDrawStatus && r && ("Rect" === m.szShapeType ? u.move([[a, s], [e.offsetX, e.offsetY]]) : "Grid" === m.szShapeType && m.aShapes[0].move(a, s, e.offsetX, e.offsetY))
+                }), m.oCanvas.bind("mouseup", function (e) {
+                    var t;
+                    m.oCanvas[0].style.cursor = "default", null != u && "draw" === o && ("Rect" === m.szShapeType ? (2 < Math.abs(e.offsetX - a) && 2 < Math.abs(e.offsetY - s) && (h(u), m.bDrawShapeMultiOneTime || (m.bDrawStatus = !1)), m.oEventCallback && (t = {
+                        startPos: [],
+                        endPos: []
+                    }, e.offsetX > a && e.offsetY > s ? (t.startPos = u.m_aPoint[0] || [e.offsetX, e.offsetY], t.endPos = u.m_aPoint[2] || [e.offsetX, e.offsetY]) : (t.startPos = u.m_aPoint[2] || [e.offsetX, e.offsetY], t.endPos = u.m_aPoint[0] || [e.offsetX, e.offsetY]), m.oEventCallback && m.oEventCallback(t), m.clearAllShape()), u = null) : "Polygon" === m.szShapeType && 0 === u.m_iPolygonType && m.bPolygonDrawing && 2 < Math.abs(e.offsetX - a) && 2 < Math.abs(e.offsetY - s) && (h(u), m.bPolygonDrawing = !1, m.bDrawShapeMultiOneTime || (m.bDrawStatus = !1), window.onDrawShapeEvent && window.onDrawShapeEvent(u.m_szType, "onDrawEnd", u.m_szId))), r = !!m.bPolygonDrawing, m.bPolygonDrawing || l()
+                }), m.oCanvas.bind("dblclick", function () {
+                    m.bDrawStatus && "Grid" === m.szShapeType && (m.aShapes[0].m_szGridMap = "fffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffcfffffc", l())
+                }), m.oCanvas.bind("mouseout", function () {
+                    m.oCanvas[0].style.cursor = "default", r = !!m.bPolygonDrawing
+                })
+            }
+
+            g(n, [{
+                key: "draw", value: function () {
+                }
+            }, {
+                key: "drag", value: function (e, t) {
+                    for (var n = this.m_aPoint.length, i = 0, i = 0; i < n; i++) if (this.m_aPoint[i][0] + e - this.m_iDriftStartX > m.m_iCanvasWidth || this.m_aPoint[i][1] + t - this.m_iDriftStartY > m.m_iCanvasHeight || this.m_aPoint[i][0] + e - this.m_iDriftStartX < 0 || this.m_aPoint[i][1] + t - this.m_iDriftStartY < 0) return this.m_iDriftStartX = e, void (this.m_iDriftStartY = t);
+                    for (i = 0; i < n; i++) this.m_aPoint[i][0] = this.m_aPoint[i][0] + e - this.m_iDriftStartX, this.m_aPoint[i][1] = this.m_aPoint[i][1] + t - this.m_iDriftStartY;
+                    this.m_iDriftStartX = e, this.m_iDriftStartY = t, this.setPointInfo(this.m_aPoint), l()
+                }
+            }, {
+                key: "stretch", value: function (e, t) {
+                    0 === this.m_iEditType && (-1 !== this.m_iIndexChoosePoint && (this.m_aPoint[this.m_iIndexChoosePoint][0] = e, this.m_aPoint[this.m_iIndexChoosePoint][1] = t), this.setPointInfo(this.m_aPoint), l())
+                }
+            }, {
+                key: "inShape", value: function (e, t) {
+                    for (var n = !1, i = this.m_aPoint.length, r = 0, a = i - 1; r < i; a = r++) this.m_aPoint[r][1] > t != this.m_aPoint[a][1] > t && e < (this.m_aPoint[a][0] - this.m_aPoint[r][0]) * (t - this.m_aPoint[r][1]) / (this.m_aPoint[a][1] - this.m_aPoint[r][1]) + this.m_aPoint[r][0] && (n = !n);
+                    return n
+                }
+            }, {
+                key: "inArc", value: function (e, t, n) {
+                    for (var i = !1, r = 0, a = this.m_aPoint.length; r < a; r++) if (Math.sqrt((e - this.m_aPoint[r][0]) * (e - this.m_aPoint[r][0]) + (t - this.m_aPoint[r][1]) * (t - this.m_aPoint[r][1])) < n) {
+                        i = !0, this.m_iIndexChoosePoint = r;
+                        break
+                    }
+                    return i
+                }
+            }, {
+                key: "getMouseDownPoints", value: function (e, t) {
+                    this.m_iDriftStartX = e, this.m_iDriftStartY = t
+                }
+            }, {
+                key: "getPointInfo", value: function () {
+                    return this.m_aPoint
+                }
+            }, {
+                key: "setPointInfo", value: function (e) {
+                    null != e && 0 < e.length && (this.m_aPoint = e, this.setEdgePoints(e))
+                }
+            }, {
+                key: "addPoint", value: function (e, t) {
+                    this.m_aPoint.length < this.m_iMaxPointNum && this.m_aPoint.push([e, t]), this.m_aPoint.length === this.m_iMaxPointNum && this.setPointInfo(this.m_aPoint)
+                }
+            }, {
+                key: "setEdgePoints", value: function (e) {
+                    for (var t = 0, n = e.length; t < n; t++) 0 === t ? (this.m_oEdgePoints.top.x = e[t][0], this.m_oEdgePoints.top.y = e[t][1], this.m_oEdgePoints.left.x = e[t][0], this.m_oEdgePoints.left.y = e[t][1], this.m_oEdgePoints.right.x = e[t][0], this.m_oEdgePoints.right.y = e[t][1], this.m_oEdgePoints.bottom.x = e[t][0], this.m_oEdgePoints.bottom.y = e[t][1]) : (e[t][1] < this.m_oEdgePoints.top.y && (this.m_oEdgePoints.top.x = e[t][0], this.m_oEdgePoints.top.y = e[t][1]), e[t][0] > this.m_oEdgePoints.right.x && (this.m_oEdgePoints.right.x = e[t][0], this.m_oEdgePoints.right.y = e[t][1]), e[t][1] > this.m_oEdgePoints.bottom.y && (this.m_oEdgePoints.bottom.x = e[t][0], this.m_oEdgePoints.bottom.y = e[t][1]), e[t][0] < this.m_oEdgePoints.left.x && (this.m_oEdgePoints.left.x = e[t][0], this.m_oEdgePoints.left.y = e[t][1]))
+                }
+            }]);
+            var e = n;
+
+            function n() {
+                k(this, n), this.m_szId = "", this.m_aPoint = [], this.m_bChoosed = !1, this.m_szDrawColor = m.oShapeStyle.szDrawColor, this.m_szFillColor = m.oShapeStyle.szFillColor, this.m_iTranslucent = m.oShapeStyle.iTranslucent, this.m_iIndexChoosePoint = -1, this.m_iDriftStartX = 0, this.m_iDriftStartY = 0, this.m_oEdgePoints = {
+                    top: {
+                        x: 0,
+                        y: 0
+                    }, left: {x: 0, y: 0}, right: {x: 0, y: 0}, bottom: {x: 0, y: 0}
+                }, this.m_szTips = "", this.m_iEditType = 0, this.m_iMinClosed = 3, this.m_iMaxPointNum = 11, this.m_bClosed = !1, this.m_iRedrawMode = 0
+            }
+
+            S(i, e), g(i, [{
+                key: "setPointInfo", value: function (e) {
+                    if (null != e) {
+                        for (var t = e[0][0], n = e[0][1], i = e[0][0], r = e[0][1], a = 0, s = e.length; a < s; a++) t > e[a][0] && (t = e[a][0]), n > e[a][1] && (n = e[a][1]), i < e[a][0] && (i = e[a][0]), r < e[a][1] && (r = e[a][1]);
+                        this.m_aPoint = [[t, n], [i, n], [i, r], [t, r]]
+                    }
+                }
+            }, {
+                key: "draw", value: function () {
+                    m.oContext.fillStyle = this.m_szFillColor, m.oContext.strokeStyle = this.m_szDrawColor;
+                    var e = this.m_aPoint[0][0], t = this.m_aPoint[0][1], n = this.m_aPoint[2][0] - e,
+                        i = this.m_aPoint[2][1] - t;
+                    if (m.oContext.globalAlpha = this.m_iTranslucent, m.oContext.fillRect(e, t, n, i), m.oContext.globalAlpha = 1, m.oContext.fillText(this.m_szTips, (e + this.m_aPoint[2][0]) / 2, (t + this.m_aPoint[2][1]) / 2), this.m_bChoosed) {
+                        var r = Math.round(n / 2), a = Math.round(i / 2);
+                        if (0 === this.m_iEditType) for (var s = [e, e + r, e + n, e, e + n, e, e + r, e + n], o = [t, t, t, t + a, t + a, t + i, t + i, t + i], u = 0; u < 8; u++) m.oContext.beginPath(), m.oContext.arc(s[u], o[u], 3, 0, 360, !1), m.oContext.fillStyle = this.m_szDrawColor, m.oContext.closePath(), m.oContext.fill()
+                    }
+                    m.oContext.strokeRect(e, t, n, i)
+                }
+            }, {
+                key: "stretch", value: function (e, t) {
+                    0 === this.m_iEditType && (0 === this.m_iIndexChoosePoint ? e < this.m_aPoint[2][0] && t < this.m_aPoint[2][1] && (this.m_aPoint[0][0] = e, this.m_aPoint[0][1] = t, this.m_aPoint[3][0] = e, this.m_aPoint[1][1] = t) : 1 === this.m_iIndexChoosePoint ? t < this.m_aPoint[2][1] && (this.m_aPoint[0][1] = t, this.m_aPoint[1][1] = t) : 2 === this.m_iIndexChoosePoint ? e > this.m_aPoint[3][0] && t < this.m_aPoint[3][1] && (this.m_aPoint[1][0] = e, this.m_aPoint[1][1] = t, this.m_aPoint[2][0] = e, this.m_aPoint[0][1] = t) : 3 === this.m_iIndexChoosePoint ? e < this.m_aPoint[2][0] && (this.m_aPoint[0][0] = e, this.m_aPoint[3][0] = e) : 4 === this.m_iIndexChoosePoint ? e > this.m_aPoint[0][0] && (this.m_aPoint[1][0] = e, this.m_aPoint[2][0] = e) : 5 === this.m_iIndexChoosePoint ? e < this.m_aPoint[1][0] && t > this.m_aPoint[1][1] && (this.m_aPoint[3][0] = e, this.m_aPoint[3][1] = t, this.m_aPoint[0][0] = e, this.m_aPoint[2][1] = t) : 6 === this.m_iIndexChoosePoint ? t > this.m_aPoint[1][1] && (this.m_aPoint[2][1] = t, this.m_aPoint[3][1] = t) : 7 === this.m_iIndexChoosePoint && e > this.m_aPoint[0][0] && t > this.m_aPoint[0][1] && (this.m_aPoint[2][0] = e, this.m_aPoint[2][1] = t, this.m_aPoint[1][0] = e, this.m_aPoint[3][1] = t), l())
+                }
+            }, {
+                key: "move", value: function (e) {
+                    l(), this.m_bChoosed = !0;
+                    var t = e[0][0], n = e[0][1], i = e[1][0], e = e[1][1];
+                    this.setPointInfo([[t, n], [i, n], [i, e], [t, e]]), this.draw()
+                }
+            }, {
+                key: "inArc", value: function (e, t, n) {
+                    for (var i = this.m_aPoint[0][0], r = this.m_aPoint[0][1], a = this.m_aPoint[2][0] - i, s = this.m_aPoint[2][1] - r, o = Math.round(a / 2), u = Math.round(s / 2), d = [i, i + o, i + a, i, i + a, i, i + o, i + a], l = [r, r, r, r + u, r + u, r + s, r + s, r + s], h = 0; h < 8; h++) if (Math.sqrt((e - d[h]) * (e - d[h]) + (t - l[h]) * (t - l[h])) < n) return this.m_iIndexChoosePoint = h, !0;
+                    return !1
+                }
+            }]);
+            var c = i;
+
+            function i() {
+                k(this, i);
+                var e = L(this, (i.__proto__ || Object.getPrototypeOf(i)).call(this));
+                return e.m_szType = "Rect", e
+            }
+
+            S(r, e), g(r, [{
+                key: "draw", value: function () {
+                    var e, t, n, i;
+                    "true" === this.m_szEnabled && (e = this.m_aPoint[0][0], t = this.m_aPoint[0][1], n = this.m_aPoint[2][0] - e, i = this.m_aPoint[2][1] - t, m.oContext.beginPath(), m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.globalAlpha = 1, m.oContext.rect(e, t, n, i), m.oContext.font = "15px serif", m.oContext.strokeText(this.m_szText, e, t + 15), m.oContext.stroke())
+                }
+            }, {
+                key: "drag", value: function (e, t) {
+                    var n = this.m_aPoint.length, i = 0;
+                    if ("0" === this.m_szAlignment) {
+                        for (i = 0; i < n; i++) if (this.m_aPoint[i][1] + t - this.m_iDriftStartY > m.m_iCanvasHeight || this.m_aPoint[i][0] + e - this.m_iDriftStartX < 0 || this.m_aPoint[i][1] + t - this.m_iDriftStartY < 0) return this.m_iDriftStartX = e, void (this.m_iDriftStartY = t);
+                        for (i = 0; i < n; i++) this.m_aPoint[i][0] = this.m_aPoint[i][0] + e - this.m_iDriftStartX, this.m_aPoint[i][1] = this.m_aPoint[i][1] + t - this.m_iDriftStartY
+                    } else if ("1" === this.m_szAlignment || "2" === this.m_szAlignment) {
+                        for (i = 0; i < n; i++) if (this.m_aPoint[i][1] + t - this.m_iDriftStartY > m.m_iCanvasHeight || this.m_aPoint[i][1] + t - this.m_iDriftStartY < 0) return this.m_iDriftStartX = e, void (this.m_iDriftStartY = t);
+                        for (i = 0; i < n; i++) this.m_aPoint[i][1] = this.m_aPoint[i][1] + t - this.m_iDriftStartY
+                    }
+                    this.m_iDriftStartX = e, this.m_iDriftStartY = t, this.setEdgePoints(this.m_aPoint), l()
+                }
+            }, {
+                key: "stretch", value: function () {
+                }
+            }]);
+            var a = r;
+
+            function r(e, t) {
+                k(this, r);
+                var n = L(this, (r.__proto__ || Object.getPrototypeOf(r)).call(this));
+                return n.m_szType = "RectOSD", n.m_szOSDType = "overlay-date", n.m_szText = e || "", n.m_szEnabled = t || "", n.m_szDateStyle = "", n.m_szClockType = "", n.m_szDisplayWeek = "", n.m_szId = "", n.m_szAlignment = "0", n
+            }
+
+            S(s, e), g(s, [{
+                key: "draw", value: function () {
+                    for (var e = m.m_iCanvasWidth / this.m_iGridColNum, t = m.m_iCanvasHeight / this.m_iGridRowNum, n = "", i = 0; i < this.m_iGridRowNum; i++) {
+                        for (var r = this.m_szGridMap.substring(6 * i, 6 * i + 6), a = parseInt("f" + r, 16).toString(2).split("").slice(4), s = "", o = 0; o < this.m_iGridColNum; o++) {
+                            var u = "",
+                                u = "1" === a[o] ? (m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.globalAlpha = 1, m.oContext.strokeRect(e * o, t * i, e, t), "1") : "0";
+                            this.m_aAddGridMap.length && 1 === this.m_aAddGridMap[i][o] && (m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.strokeRect(e * o, t * i, e, t), u = "1"), s += u
+                        }
+                        n += parseInt("1111" + s + "00", 2).toString(16).substring(1)
+                    }
+                    this.m_szGridMap = n
+                }
+            }, {
+                key: "move", value: function (e, t, n, i) {
+                    for (var r = m.m_iCanvasWidth / this.m_iGridColNum, a = m.m_iCanvasHeight / this.m_iGridRowNum, s = Math.floor(e / r), o = Math.floor(t / a), u = Math.floor(Math.abs(n - e) / r), d = Math.floor(Math.abs(i - t) / a), l = 1, h = 1, l = 0 < n - e ? 1 : -1, h = 0 < i - t ? 1 : -1, c = [], _ = 0; _ < this.m_iGridRowNum; _++) {
+                        c[_] = [];
+                        for (var f = 0; f < this.m_iGridColNum; f++) c[_][f] = 1 === l ? 1 === h ? o <= _ && _ <= o + d && s <= f && f <= s + u ? 1 : 0 : _ <= o && o - d <= _ && s <= f && f <= s + u ? 1 : 0 : 1 === h ? o <= _ && _ <= o + d && f <= s && s - u <= f ? 1 : 0 : _ <= o && o - d <= _ && f <= s && s - u <= f ? 1 : 0
+                    }
+                    this.m_aAddGridMap = c, this.draw()
+                }
+            }]);
+            var _ = s;
+
+            function s() {
+                k(this, s);
+                var e = L(this, (s.__proto__ || Object.getPrototypeOf(s)).call(this));
+                return e.m_szType = "Grid", e.m_iGridColNum = 22, e.m_iGridRowNum = 18, e.m_szGridMap = "", e.m_aAddGridMap = [], e
+            }
+
+            S(u, e), g(u, [{
+                key: "draw", value: function () {
+                    0 === this.m_iLineType ? this.drawNormalLine() : 1 === this.m_iLineType ? this.drawArrowLine() : 3 === this.m_iLineType ? this.drawCrossLine() : 4 === this.m_iLineType && this.drawLineCount()
+                }
+            }, {
+                key: "drawNormalLine", value: function () {
+                    if (m.oContext.globalAlpha = 1, 0 < this.m_aPoint.length) {
+                        m.oContext.beginPath(), m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.lineWidth = 2, m.oContext.moveTo(this.m_aPoint[0][0], this.m_aPoint[0][1]);
+                        for (var e = 1, t = this.m_aPoint.length; e < t; e++) m.oContext.lineTo(this.m_aPoint[e][0], this.m_aPoint[e][1]);
+                        if (m.oContext.stroke(), this.m_bChoosed) for (var n = 0, i = this.m_aPoint.length; n < i; n++) m.oContext.beginPath(), m.oContext.fillStyle = this.m_szDrawColor, m.oContext.arc(this.m_aPoint[n][0], this.m_aPoint[n][1], 3, 0, 2 * Math.PI, !0), m.oContext.closePath(), m.oContext.fill();
+                        "" !== this.m_szTips && (m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.fillText(this.m_szTips, this.m_aPoint[0][0] + 10, this.m_aPoint[0][1] + 4))
+                    }
+                }
+            }, {
+                key: "drawArrowLine", value: function (e, t, n, i, r, a, s, o) {
+                    a = void 0 !== a ? a : 30, s = void 0 !== s ? s : 10, o = void 0 !== o ? o : 1;
+                    var u = 180 * Math.atan2(n - r, t - i) / Math.PI, d = (u + a) * Math.PI / 180,
+                        u = (u - a) * Math.PI / 180, a = s * Math.cos(d), d = s * Math.sin(d), l = s * Math.cos(u),
+                        s = s * Math.sin(u), u = (m.oContext.save(), m.oContext.beginPath(), t - a);
+                    m.oContext.moveTo(u, n - d), m.oContext.lineTo(t, n), m.oContext.lineTo(t - l, n - s), m.oContext.moveTo(t, n), m.oContext.lineTo(i, r), 1 === e && (m.oContext.moveTo(i + a, r + d), m.oContext.lineTo(i, r), m.oContext.lineTo(i + l, r + s)), m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.lineWidth = o, m.oContext.stroke(), m.oContext.restore()
+                }
+            }, {
+                key: "drawCrossLine", value: function () {
+                    this.drawNormalLine();
+                    var e = (this.m_aPoint[0][0] + this.m_aPoint[1][0]) / 2,
+                        t = (this.m_aPoint[0][1] + this.m_aPoint[1][1]) / 2,
+                        n = 180 * Math.atan2(t - this.m_aPoint[0][1], e - this.m_aPoint[0][0]) / Math.PI,
+                        i = (90 + n) * Math.PI / 180, n = (n - 90) * Math.PI / 180, r = 25 * Math.cos(i),
+                        i = 25 * Math.sin(i), a = 25 * Math.cos(n), n = 25 * Math.sin(n), s = 0, o = 0, s = e - r,
+                        o = t - i, r = 0, i = 0,
+                        i = 0 === this.m_iDirection ? (r = -10, -15) : 1 === this.m_iDirection ? r = 10 : (r = 10, -15);
+                    0 !== this.m_iDirection && this.drawArrowLine(0, s, o, e, t), m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.font = "8px", m.oContext.strokeText("A", s + r, o + 4), s = e - a, o = t - n, 1 !== this.m_iDirection && this.drawArrowLine(0, s, o, e, t), m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.font = "8px", m.oContext.strokeText("B", s + i, o + 4)
+                }
+            }, {
+                key: "drawLineCount", value: function () {
+                    this.drawNormalLine();
+                    var e = (this.m_aPoint[0][0] + this.m_aPoint[1][0]) / 2,
+                        t = (this.m_aPoint[0][1] + this.m_aPoint[1][1]) / 2,
+                        n = 180 * Math.atan2(t - this.m_aPoint[0][1], e - this.m_aPoint[0][0]) / Math.PI,
+                        i = (90 + n) * Math.PI / 180, n = (n - 90) * Math.PI / 180, r = 25 * Math.cos(i),
+                        i = 25 * Math.sin(i), a = 25 * Math.cos(n), n = 25 * Math.sin(n), s = 0, o = 0, s = e - r,
+                        o = t - i;
+                    1 === this.m_iArrowType ? this.drawArrowLine(0, s = e - a, o = t - n, e, t) : 0 === this.m_iArrowType && this.drawArrowLine(0, s, o, e, t), this.m_aCrossArrowPoint = [[e, t], [s, o]]
+                }
+            }, {
+                key: "inShape", value: function (e, t) {
+                    for (var n = !1, i = 0, r = this.m_aPoint.length - 1; i < r; i++) {
+                        var a = Math.sqrt((this.m_aPoint[i + 1][0] - this.m_aPoint[i][0]) * (this.m_aPoint[i + 1][0] - this.m_aPoint[i][0]) + (this.m_aPoint[i + 1][1] - this.m_aPoint[i][1]) * (this.m_aPoint[i + 1][1] - this.m_aPoint[i][1]));
+                        Math.sqrt((e - this.m_aPoint[i][0]) * (e - this.m_aPoint[i][0]) + (t - this.m_aPoint[i][1]) * (t - this.m_aPoint[i][1])) + Math.sqrt((e - this.m_aPoint[i + 1][0]) * (e - this.m_aPoint[i + 1][0]) + (t - this.m_aPoint[i + 1][1]) * (t - this.m_aPoint[i + 1][1])) - a < 1 && (n = !0)
+                    }
+                    return n
+                }
+            }]);
+            var o = u;
+
+            function u() {
+                k(this, u);
+                var e = L(this, (u.__proto__ || Object.getPrototypeOf(u)).call(this));
+                return e.m_szType = "Line", e.m_iLineType = 0, e.m_iDirection = 0, e.m_iArrowType = 0, e.m_aCrossArrowPoint = [], e
+            }
+
+            S(d, e), g(d, [{
+                key: "setPointInfo", value: function (e) {
+                    if (null != e) {
+                        if (0 === this.m_iPolygonType) {
+                            for (var t = e[0][0], n = e[0][1], i = e[0][0], r = e[0][1], a = 0, s = e.length; a < s; a++) t > e[a][0] && (t = e[a][0]), n > e[a][1] && (n = e[a][1]), i < e[a][0] && (i = e[a][0]), r < e[a][1] && (r = e[a][1]);
+                            this.m_aPoint = [[t, n], [i, n], [i, r], [t, r]]
+                        } else this.m_iPolygonType, this.m_aPoint = e;
+                        this.setEdgePoints(e)
+                    }
+                }
+            }, {
+                key: "draw", value: function () {
+                    if (0 < this.m_aPoint.length) {
+                        m.oContext.fillStyle = this.m_szFillColor, m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.globalAlpha = 1;
+                        var e = 0, t = 0;
+                        if (this.m_bChoosed) for (e = 0, t = this.m_aPoint.length; e < t; e++) m.oContext.beginPath(), m.oContext.arc(this.m_aPoint[e][0], this.m_aPoint[e][1], 3, 0, 360, !1), m.oContext.fillStyle = this.m_szDrawColor, m.oContext.closePath(), m.oContext.fill();
+                        for (m.oContext.beginPath(), m.oContext.moveTo(this.m_aPoint[0][0], this.m_aPoint[0][1]), e = 0, t = this.m_aPoint.length; e < t; e++) 0 !== e && m.oContext.lineTo(this.m_aPoint[e][0], this.m_aPoint[e][1]);
+                        m.oContext.stroke(), this.m_bClosed && (m.oContext.fillText(this.m_szTips, (this.m_oEdgePoints.left.x + this.m_oEdgePoints.right.x) / 2, (this.m_oEdgePoints.top.y + this.m_oEdgePoints.bottom.y) / 2), m.oContext.closePath(), m.oContext.stroke(), m.oContext.globalAlpha = this.m_iTranslucent, m.oContext.fill())
+                    }
+                }
+            }, {
+                key: "move", value: function (e, t, n, i) {
+                    if (1 === this.m_iPolygonType) {
+                        if (this.m_aPoint.length < this.m_iMaxPointNum && 0 < this.m_aPoint.length) {
+                            m.oContext.fillStyle = this.m_szFillColor, m.oContext.strokeStyle = this.m_szDrawColor, m.oContext.globalAlpha = 1;
+                            for (var r = 0, a = 0, r = 0, a = this.m_aPoint.length; r < a; r++) m.oContext.beginPath(), m.oContext.arc(this.m_aPoint[r][0], this.m_aPoint[r][1], 3, 0, 360, !1), m.oContext.fillStyle = this.m_szDrawColor, m.oContext.closePath(), m.oContext.fill();
+                            for (m.oContext.beginPath(), m.oContext.moveTo(this.m_aPoint[0][0], this.m_aPoint[0][1]), r = 0, a = this.m_aPoint.length; r < a; r++) 0 !== r && m.oContext.lineTo(this.m_aPoint[r][0], this.m_aPoint[r][1]);
+                            m.oContext.lineTo(e, t), m.oContext.closePath(), m.oContext.stroke()
+                        }
+                    } else 0 === this.m_iPolygonType && (this.m_bChoosed = !0, this.setPointInfo([[n, i], [e, i], [e, t], [n, t]]), this.draw())
+                }
+            }, {
+                key: "stretch", value: function (e, t) {
+                    0 === this.m_iEditType && (1 === this.m_iPolygonType ? -1 !== this.m_iIndexChoosePoint && (this.m_aPoint[this.m_iIndexChoosePoint][0] = e, this.m_aPoint[this.m_iIndexChoosePoint][1] = t) : 0 === this.m_iIndexChoosePoint ? e < this.m_aPoint[2][0] && t < this.m_aPoint[2][1] && (this.m_aPoint[0][0] = e, this.m_aPoint[0][1] = t, this.m_aPoint[3][0] = e, this.m_aPoint[1][1] = t) : 1 === this.m_iIndexChoosePoint ? e > this.m_aPoint[3][0] && t < this.m_aPoint[3][1] && (this.m_aPoint[1][0] = e, this.m_aPoint[1][1] = t, this.m_aPoint[2][0] = e, this.m_aPoint[0][1] = t) : 2 === this.m_iIndexChoosePoint ? e > this.m_aPoint[0][0] && t > this.m_aPoint[0][1] && (this.m_aPoint[2][0] = e, this.m_aPoint[2][1] = t, this.m_aPoint[1][0] = e, this.m_aPoint[3][1] = t) : 3 === this.m_iIndexChoosePoint && e < this.m_aPoint[1][0] && t > this.m_aPoint[1][1] && (this.m_aPoint[3][0] = e, this.m_aPoint[3][1] = t, this.m_aPoint[0][0] = e, this.m_aPoint[2][1] = t), this.setPointInfo(this.m_aPoint), l())
+                }
+            }]);
+            var f = d;
+
+            function d() {
+                k(this, d);
+                var e = L(this, (d.__proto__ || Object.getPrototypeOf(d)).call(this));
+                return e.m_szType = "Polygon", e.m_iPolygonType = 1, e
+            }
+
+            S(y, e), g(y, [{
+                key: "draw", value: function () {
+                    m.oContext.beginPath(), m.oContext.fillStyle = this.m_szDrawColor, m.oContext.globalAlpha = 1, m.oContext.arc(this.m_aPoint[0][0], this.m_aPoint[0][1], 10, 0, 2 * Math.PI, !0), m.oContext.closePath(), m.oContext.fill()
+                }
+            }, {
+                key: "drag", value: function () {
+                }
+            }, {
+                key: "stretch", value: function () {
+                }
+            }]);
+            var p = y;
+
+            function y() {
+                k(this, y);
+                var e = L(this, (y.__proto__ || Object.getPrototypeOf(y)).call(this));
+                return e.m_szType = "Point", e.m_szId = "", e
+            }
+
+            function v(e) {
+                k(this, v), (m = this).oCanvas = (0, M.default)("#" + e), this.oContext = this.oCanvas[0].getContext("2d"), this.aShapes = [], this.bDrawStatus = !1, this.szShapeType = "Rect", this.iMaxShapeNumSupport = 10, this.bDrawShapeMultiOneTime = !0, this.oCurrentShapeInfo = {}, this.oEventCallback = null, this.oShapeStyle = {
+                    szDrawColor: "#ff0000",
+                    szFillColor: "#343434",
+                    iTranslucent: .7
+                }, this.bPolygonDrawing = !1, this.m_iCanvasWidth = this.oCanvas.width(), this.m_iCanvasHeight = this.oCanvas.height(), this.m_iHorizontalResolution = 0, this.m_iVerticalResolution = 0, this.m_szDisplayMode = "", this.m_szVideoFormat = "", t(), this.aShapes.length = 0
+            }
+
+            return g(v, [{
+                key: "setDrawMutiShapeOneTime", value: function (e) {
+                    this.bDrawShapeMultiOneTime = e
+                }
+            }, {
+                key: "setMaxShapeSupport", value: function (e) {
+                    this.iMaxShapeNumSupport = e
+                }
+            }, {
+                key: "getMaxShapeSupport", value: function () {
+                    return this.iMaxShapeNumSupport
+                }
+            }, {
+                key: "setDrawStatus", value: function (e, t) {
+                    this.bDrawStatus = e, t && e && (this.oEventCallback = t), e || (this.oEventCallback = null)
+                }
+            }, {
+                key: "setShapeType", value: function (e) {
+                    this.szShapeType = e, l()
+                }
+            }, {
+                key: "setCurrentShapeInfo", value: function (e) {
+                    this.oCurrentShapeInfo = e || {
+                        szId: "",
+                        szTips: "",
+                        iMinClosed: 3,
+                        iMaxPointNum: 11,
+                        iPolygonType: 1,
+                        iRedrawMode: 0
+                    }
+                }
+            }, {
+                key: "getShapeType", value: function () {
+                    return this.szShapeType
+                }
+            }, {
+                key: "getAllShapesInfo", value: function () {
+                    for (var e = [], t = 0, n = this.aShapes.length; t < n; t++) "Grid" === this.aShapes[t].m_szType ? e.push({
+                        szType: this.aShapes[t].m_szType,
+                        szGridMap: this.aShapes[t].m_szGridMap,
+                        iGridColNum: this.aShapes[t].m_iGridColNum,
+                        iGridRowNum: this.aShapes[t].m_iGridRowNum
+                    }) : "RectOSD" === this.aShapes[t].m_szType ? e.push({
+                        szType: this.aShapes[t].m_szType,
+                        szText: this.aShapes[t].m_szText,
+                        szEnabled: this.aShapes[t].m_szEnabled,
+                        szOSDType: this.aShapes[t].m_szOSDType,
+                        iPositionX: this.aShapes[t].m_aPoint[0][0],
+                        iPositionY: this.aShapes[t].m_aPoint[0][1],
+                        szDateStyle: this.aShapes[t].m_szDateStyle,
+                        szClockType: this.aShapes[t].m_szClockType,
+                        szDisplayWeek: this.aShapes[t].m_szDisplayWeek,
+                        szId: this.aShapes[t].m_szId,
+                        szAlignment: this.aShapes[t].m_szAlignment
+                    }) : e.push({
+                        szType: this.aShapes[t].m_szType,
+                        aPoint: this.aShapes[t].m_aPoint,
+                        szId: this.aShapes[t].m_szId,
+                        bChoosed: this.aShapes[t].m_bChoosed
+                    });
+                    return e
+                }
+            }, {
+                key: "deleteRepeatPolyonById", value: function (e) {
+                    var t = this.getAllShapesInfo(), n = t.length;
+                    if (0 < n) for (var i = 0; i < n; i++) "Polygon" === t[i].szType && t[i].szId === e && this.deleteShape(i)
+                }
+            }, {
+                key: "getShapesInfoByType", value: function (e) {
+                    for (var t = [], n = 0, i = this.aShapes.length; n < i; n++) this.aShapes[n].m_szType === e && ("Grid" === this.aShapes[n].m_szType ? t.push({
+                        szType: this.aShapes[n].m_szType,
+                        szGridMap: this.aShapes[n].m_szGridMap,
+                        iGridColNum: this.aShapes[n].m_iGridColNum,
+                        iGridRowNum: this.aShapes[n].m_iGridRowNum
+                    }) : "RectOSD" === this.aShapes[n].m_szType ? t.push({
+                        szType: this.aShapes[n].m_szType,
+                        szText: this.aShapes[n].m_szText,
+                        szEnabled: this.aShapes[n].m_szEnabled,
+                        szOSDType: this.aShapes[n].m_szOSDType,
+                        iPositionX: this.aShapes[n].m_aPoint[0][0],
+                        iPositionY: this.aShapes[n].m_aPoint[0][1],
+                        szDateStyle: this.aShapes[n].m_szDateStyle,
+                        szClockType: this.aShapes[n].m_szClockType,
+                        szDisplayWeek: this.aShapes[n].m_szDisplayWeek,
+                        szId: this.aShapes[n].m_szId,
+                        szAlignment: this.aShapes[n].m_szAlignment
+                    }) : "Polygon" === e ? t.push({
+                        szType: this.aShapes[n].m_szType,
+                        szId: this.aShapes[n].m_szId,
+                        iPolygonType: this.aShapes[n].m_iPolygonType,
+                        iMinClosed: this.aShapes[n].m_iMinClosed,
+                        iMaxPointNum: this.aShapes[n].m_iMaxPointNum,
+                        iEditType: this.aShapes[n].m_iEditType,
+                        aPoint: this.aShapes[n].m_aPoint,
+                        bClosed: this.aShapes[n].m_bClosed,
+                        szTips: this.aShapes[n].m_szTips,
+                        szDrawColor: this.aShapes[n].m_szDrawColor,
+                        szFillColor: this.aShapes[n].m_szFillColor,
+                        iTranslucent: this.aShapes[n].m_iTranslucent
+                    }) : "Line" === e ? t.push({
+                        szType: this.aShapes[n].m_szType,
+                        szId: this.aShapes[n].m_szId,
+                        aPoint: this.aShapes[n].m_aPoint,
+                        szTips: this.aShapes[n].m_szTips,
+                        iLineType: this.aShapes[n].m_iLineType,
+                        iDirection: this.aShapes[n].m_iDirection,
+                        iArrowType: this.aShapes[n].m_iArrowType,
+                        szDrawColor: this.aShapes[n].m_szDrawColor,
+                        aCrossArrowPoint: this.aShapes[n].m_aCrossArrowPoint
+                    }) : "Rect" === e ? t.push({
+                        szType: this.aShapes[n].m_szType,
+                        iEditType: this.aShapes[n].m_iEditType,
+                        aPoint: this.aShapes[n].m_aPoint,
+                        szTips: this.aShapes[n].m_szTips,
+                        szDrawColor: this.aShapes[n].m_szDrawColor,
+                        szFillColor: this.aShapes[n].m_szFillColor,
+                        iTranslucent: this.aShapes[n].m_iTranslucent
+                    }) : t.push({szType: this.aShapes[n].m_szType, aPoint: this.aShapes[n].m_aPoint}));
+                    return t
+                }
+            }, {
+                key: "setShapesInfoByType", value: function (e, t) {
+                    t = t || [];
+                    var n = null;
+                    if ("Rect" === e || "Polygon" === e || "Line" === e || "Point" === e) for (var i = 0, r = t.length; i < r; i++) "Rect" === e ? ((n = new c).m_iEditType = t[i].iEditType, n.m_szTips = t[i].szTips || "", n.m_szDrawColor = t[i].szDrawColor, n.m_szFillColor = t[i].szFillColor, n.m_iTranslucent = t[i].iTranslucent, n.m_iRedrawMode = t[i].iRedrawMode) : "Polygon" === e ? (n = new f, 0 === t[i].iPolygonType ? n.m_bClosed = !0 : n.m_bClosed = t[i].bClosed, n.m_szTips = t[i].szTips || "", n.m_szId = t[i].szId || "", n.m_iPolygonType = t[i].iPolygonType, n.m_iMinClosed = t[i].iMinClosed || 3, n.m_iMaxPointNum = t[i].iMaxPointNum || 11, n.m_iEditType = t[i].iEditType, n.m_szDrawColor = t[i].szDrawColor, n.m_szFillColor = t[i].szFillColor, n.m_iTranslucent = t[i].iTranslucent, n.m_iRedrawMode = t[i].iRedrawMode) : "Line" === e ? ((n = new o).m_iLineType = t[i].iLineType, n.m_szTips = t[i].szTips || "", n.m_szId = t[i].szId, n.m_iDirection = t[i].iDirection, n.m_iArrowType = t[i].iArrowType, n.m_szDrawColor = t[i].szDrawColor, n.setPointInfo(t[i].aPoint)) : "Point" === e && ((n = new p).m_szId = t[i].szId, n.m_szDrawColor = t[i].szDrawColor, n.setPointInfo(t[i].aPoint)), n.setPointInfo(t[i].aPoint), 0 === i && (n.m_bChoosed = !0), h(n); else "Grid" === e && ((n = new _).m_szGridMap = t[0].szGridMap || "", n.m_iGridColNum = t[0].iGridColNum || 22, n.m_iGridRowNum = t[0].iGridRowNum || 18, h(n));
+                    l()
+                }
+            }, {
+                key: "addOSDShape", value: function (e, t, n, i, r) {
+                    n || i || (i = n = 0), r = r || {};
+                    t = new a(e, t), e = 10 * e.length;
+                    t.m_szOSDType = r.szOSDType || "", t.m_szDateStyle = r.szDateStyle || "", t.m_szClockType = r.szClockType || "", t.m_szDisplayWeek = r.szDisplayWeek || "", t.m_szId = r.szId || "", t.m_szAlignment = "" + r.szAlignment || "0", "0" === t.m_szAlignment ? t.m_aPoint = [[n, i], [e + n, i], [e + n, i + 20], [n, i + 20]] : "1" === t.m_szAlignment ? t.m_aPoint = [[0, i], [e, i], [e, i + 20], [0, i + 20]] : "2" === t.m_szAlignment ? t.m_aPoint = [[this.m_iCanvasWidth - e, i], [this.m_iCanvasWidth, i], [this.m_iCanvasWidth, i + 20], [this.m_iCanvasWidth - e, i + 20]] : t.m_aPoint = [[n, i], [e + n, i], [e + n, i + 20], [n, i + 20]], h(t), l()
+                }
+            }, {
+                key: "selectShapeById", value: function (e, t) {
+                    for (var n = 0, i = m.aShapes.length; n < i; n++) e === m.aShapes[n].m_szType && (t === m.aShapes[n].m_szId ? m.aShapes[n].m_bChoosed = !0 : m.aShapes[n].m_bChoosed = !1);
+                    l()
+                }
+            }, {
+                key: "setCanvasSize", value: function (e, t) {
+                    0 < e && 0 < t && (this.m_iCanvasWidth = e, this.m_iCanvasHeight = t, l())
+                }
+            }, {
+                key: "setDrawStyle", value: function (e, t, n) {
+                    this.oShapeStyle = {szDrawColor: e, szFillColor: t, iTranslucent: n}
+                }
+            }, {
+                key: "clearAllShape", value: function () {
+                    this.aShapes.length = 0, m.bPolygonDrawing = !1, l()
+                }
+            }, {
+                key: "clearShapeByType", value: function (e) {
+                    for (var t = this.aShapes.length; 0 < t; t--) this.aShapes[t - 1].m_szType === e && ("Grid" === e ? (this.aShapes[t - 1].m_szGridMap = "", this.aShapes[t - 1].m_aAddGridMap = []) : this.aShapes.splice(t - 1, 1));
+                    "Polygon" === e && (m.bPolygonDrawing = !1), l()
+                }
+            }, {
+                key: "deleteShape", value: function (e) {
+                    this.aShapes.length > e && this.aShapes.splice(e, 1), l()
+                }
+            }, {
+                key: "updateCanvas", value: function (e) {
+                    this.oCanvas = (0, M.default)("#" + e), this.oContext = this.oCanvas[0].getContext("2d"), this.m_iCanvasWidth = this.oCanvas.width(), this.m_iCanvasHeight = this.oCanvas.height(), t()
+                }
+            }, {
+                key: "resizeCanvas", value: function () {
+                    this.m_iCanvasWidth = this.oCanvas.width(), this.m_iCanvasHeight = this.oCanvas.height()
+                }
+            }, {
+                key: "canvasRedraw", value: function () {
+                    l()
+                }
+            }]), v
+        }();
+        t.ESCanvas = n
+    }, function (e, t, n) {
+        "use strict";
+        e.exports = n(291).default
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = _(n(9)), r = _(n(227)), a = _(n(301)), s = n(15), o = _(n(317)), u = _(n(333)), d = _(n(39)),
+            l = n(234), h = _(n(64)), c = n(5);
+
+        function _(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        r.default.install();
+        n = {
+            createPlayer: function (e, t) {
+                if (null == e || "object" !== (void 0 === e ? "undefined" : (0, i.default)(e))) throw new c.InvalidArgumentException("MediaDataSource must be an javascript object!");
+                if (e.hasOwnProperty("type")) return new ("flv" !== e.type ? u : o).default(e, t);
+                throw new c.InvalidArgumentException("MediaDataSource must has type field to indicate video file type!")
+            }, isSupported: function () {
+                return a.default.supportMSEH264Playback()
+            }, getFeatureList: function () {
+                return a.default.getFeatureList()
+            }
+        };
+        n.BaseLoader = s.BaseLoader, n.LoaderStatus = s.LoaderStatus, n.LoaderErrors = s.LoaderErrors, n.Events = d.default, n.ErrorTypes = l.ErrorTypes, n.ErrorDetails = l.ErrorDetails, n.FlvPlayer = o.default, n.NativePlayer = u.default, n.LoggingControl = h.default, Object.defineProperty(n, "version", {
+            enumerable: !0,
+            get: function () {
+                return "__VERSION__"
+            }
+        }), t.default = n
+    }, function (e, t, n) {
+        n(293), e.exports = n(3).Object.assign
+    }, function (e, t, n) {
+        var i = n(8);
+        i(i.S + i.F, "Object", {assign: n(294)})
+    }, function (e, t, n) {
+        "use strict";
+        var c = n(14), _ = n(30), f = n(59), m = n(37), p = n(24), y = n(72), r = Object.assign;
+        e.exports = !r || n(23)(function () {
+            var e = {}, t = {}, n = Symbol(), i = "abcdefghijklmnopqrst";
+            return e[n] = 7, i.split("").forEach(function (e) {
+                t[e] = e
+            }), 7 != r({}, e)[n] || Object.keys(r({}, t)).join("") != i
+        }) ? function (e, t) {
+            for (var n = p(e), i = arguments.length, r = 1, a = f.f, s = m.f; r < i;) for (var o, u = y(arguments[r++]), d = a ? _(u).concat(a(u)) : _(u), l = d.length, h = 0; h < l;) o = d[h++], c && !s.call(u, o) || (n[o] = u[o]);
+            return n
+        } : r
+    }, function (e, t, n) {
+        n(296), e.exports = n(3).Object.setPrototypeOf
+    }, function (e, t, n) {
+        var i = n(8);
+        i(i.S, "Object", {setPrototypeOf: n(297).set})
+    }, function (e, t, r) {
+        function a(e, t) {
+            if (i(e), !n(t) && null !== t) throw TypeError(t + ": can't set as prototype!")
+        }
+
+        var n = r(16), i = r(13);
+        e.exports = {
+            set: Object.setPrototypeOf || ("__proto__" in {} ? function (e, n, i) {
+                try {
+                    (i = r(22)(Function.call, r(60).f(Object.prototype, "__proto__").set, 2))(e, []), n = !(e instanceof Array)
+                } catch (e) {
+                    n = !0
+                }
+                return function (e, t) {
+                    return a(e, t), n ? e.__proto__ = t : i(e, t), e
+                }
+            }({}, !1) : void 0), check: a
+        }
+    }, function (e, t, n) {
+        !function (ie, re) {
+            /*!
+     * @overview es6-promise - a tiny implementation of Promises/A+.
+     * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+     * @license   Licensed under MIT license
+     *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
+     * @version   v4.2.8+1e68dce6
+     */
+            e.exports = function () {
+                "use strict";
+
+                function i(e) {
+                    var t = typeof e;
+                    return e !== null && (t === "object" || t === "function")
+                }
+
+                function u(e) {
+                    return typeof e === "function"
+                }
+
+                var e = void 0;
+                if (Array.isArray) e = Array.isArray; else e = function (e) {
+                    return Object.prototype.toString.call(e) === "[object Array]"
+                };
+                var n = e, r = 0, t = void 0, a = void 0, s = function e(t, n) {
+                    p[r] = t;
+                    p[r + 1] = n;
+                    r += 2;
+                    if (r === 2) if (a) a(y); else v()
+                };
+
+                function o(e) {
+                    a = e
+                }
+
+                function d(e) {
+                    s = e
+                }
+
+                var l = typeof window !== "undefined" ? window : undefined, h = l || {},
+                    c = h.MutationObserver || h.WebKitMutationObserver,
+                    _ = typeof self === "undefined" && typeof ie !== "undefined" && {}.toString.call(ie) === "[object process]",
+                    f = typeof Uint8ClampedArray !== "undefined" && typeof importScripts !== "undefined" && typeof MessageChannel !== "undefined";
+
+                function I() {
+                    return function () {
+                        return ie.nextTick(y)
+                    }
+                }
+
+                function W() {
+                    if (typeof t !== "undefined") return function () {
+                        t(y)
+                    };
+                    return m()
+                }
+
+                function H() {
+                    var e = 0;
+                    var t = new c(y);
+                    var n = document.createTextNode("");
+                    t.observe(n, {characterData: true});
+                    return function () {
+                        n.data = e = ++e % 2
+                    }
+                }
+
+                function j() {
+                    var e = new MessageChannel;
+                    e.port1.onmessage = y;
+                    return function () {
+                        return e.port2.postMessage(0)
+                    }
+                }
+
+                function m() {
+                    var e = setTimeout;
+                    return function () {
+                        return e(y, 1)
+                    }
+                }
+
+                var p = new Array(1e3);
+
+                function y() {
+                    for (var e = 0; e < r; e += 2) {
+                        var t = p[e];
+                        var n = p[e + 1];
+                        t(n);
+                        p[e] = undefined;
+                        p[e + 1] = undefined
+                    }
+                    r = 0
+                }
+
+                function F() {
+                    try {
+                        var e = Function("return this")().require("vertx");
+                        t = e.runOnLoop || e.runOnContext;
+                        return W()
+                    } catch (e) {
+                        return m()
+                    }
+                }
+
+                var v = void 0;
+                if (_) v = I(); else if (c) v = H(); else if (f) v = j(); else if (l === undefined && "function" === "function") v = F(); else v = m();
+
+                function g(e, t) {
+                    var n = this;
+                    var i = new this.constructor(S);
+                    if (i[L] === undefined) x(i);
+                    var r = n._state;
+                    if (r) {
+                        var a = arguments[r - 1];
+                        s(function () {
+                            return R(r, i, a, n._result)
+                        })
+                    } else P(n, i, e, t);
+                    return i
+                }
+
+                function M(e) {
+                    var t = this;
+                    if (e && typeof e === "object" && e.constructor === t) return e;
+                    var n = new t(S);
+                    T(n, e);
+                    return n
+                }
+
+                var L = Math.random().toString(36).substring(2);
+
+                function S() {
+                }
+
+                var k = void 0, b = 1, w = 2;
+
+                function B() {
+                    return new TypeError("You cannot resolve a promise with itself")
+                }
+
+                function N() {
+                    return new TypeError("A promises callback cannot return that same promise.")
+                }
+
+                function z(e, t, n, i) {
+                    try {
+                        e.call(t, n, i)
+                    } catch (e) {
+                        return e
+                    }
+                }
+
+                function U(e, i, r) {
+                    s(function (t) {
+                        var n = false;
+                        var e = z(r, i, function (e) {
+                            if (n) return;
+                            n = true;
+                            if (i !== e) T(t, e); else E(t, e)
+                        }, function (e) {
+                            if (n) return;
+                            n = true;
+                            Y(t, e)
+                        }, "Settle: " + (t._label || " unknown promise"));
+                        if (!n && e) {
+                            n = true;
+                            Y(t, e)
+                        }
+                    }, e)
+                }
+
+                function V(t, e) {
+                    if (e._state === b) E(t, e._result); else if (e._state === w) Y(t, e._result); else P(e, undefined, function (e) {
+                        return T(t, e)
+                    }, function (e) {
+                        return Y(t, e)
+                    })
+                }
+
+                function D(e, t, n) {
+                    if (t.constructor === e.constructor && n === g && t.constructor.resolve === M) V(e, t); else if (n === undefined) E(e, t); else if (u(n)) U(e, t, n); else E(e, t)
+                }
+
+                function T(t, e) {
+                    if (t === e) Y(t, B()); else if (i(e)) {
+                        var n = void 0;
+                        try {
+                            n = e.then
+                        } catch (e) {
+                            Y(t, e);
+                            return
+                        }
+                        D(t, e, n)
+                    } else E(t, e)
+                }
+
+                function G(e) {
+                    if (e._onerror) e._onerror(e._result);
+                    C(e)
+                }
+
+                function E(e, t) {
+                    if (e._state !== k) return;
+                    e._result = t;
+                    e._state = b;
+                    if (e._subscribers.length !== 0) s(C, e)
+                }
+
+                function Y(e, t) {
+                    if (e._state !== k) return;
+                    e._state = w;
+                    e._result = t;
+                    s(G, e)
+                }
+
+                function P(e, t, n, i) {
+                    var r = e._subscribers;
+                    var a = r.length;
+                    e._onerror = null;
+                    r[a] = t;
+                    r[a + b] = n;
+                    r[a + w] = i;
+                    if (a === 0 && e._state) s(C, e)
+                }
+
+                function C(e) {
+                    var t = e._subscribers;
+                    var n = e._state;
+                    if (t.length === 0) return;
+                    var i = void 0, r = void 0, a = e._result;
+                    for (var s = 0; s < t.length; s += 3) {
+                        i = t[s];
+                        r = t[s + n];
+                        if (i) R(n, i, r, a); else r(a)
+                    }
+                    e._subscribers.length = 0
+                }
+
+                function R(e, t, n, i) {
+                    var r = u(n), a = void 0, s = void 0, o = true;
+                    if (r) {
+                        try {
+                            a = n(i)
+                        } catch (e) {
+                            o = false;
+                            s = e
+                        }
+                        if (t === a) {
+                            Y(t, N());
+                            return
+                        }
+                    } else a = i;
+                    if (t._state !== k) ; else if (r && o) T(t, a); else if (o === false) Y(t, s); else if (e === b) E(t, a); else if (e === w) Y(t, a)
+                }
+
+                function J(n, e) {
+                    try {
+                        e(function e(t) {
+                            T(n, t)
+                        }, function e(t) {
+                            Y(n, t)
+                        })
+                    } catch (e) {
+                        Y(n, e)
+                    }
+                }
+
+                var A = 0;
+
+                function q() {
+                    return A++
+                }
+
+                function x(e) {
+                    e[L] = A++;
+                    e._state = undefined;
+                    e._result = undefined;
+                    e._subscribers = []
+                }
+
+                function K() {
+                    return new Error("Array Methods must be provided an Array")
+                }
+
+                var X = function () {
+                    function e(e, t) {
+                        this._instanceConstructor = e;
+                        this.promise = new e(S);
+                        if (!this.promise[L]) x(this.promise);
+                        if (n(t)) {
+                            this.length = t.length;
+                            this._remaining = t.length;
+                            this._result = new Array(this.length);
+                            if (this.length === 0) E(this.promise, this._result); else {
+                                this.length = this.length || 0;
+                                this._enumerate(t);
+                                if (this._remaining === 0) E(this.promise, this._result)
+                            }
+                        } else Y(this.promise, K())
+                    }
+
+                    e.prototype._enumerate = function e(t) {
+                        for (var n = 0; this._state === k && n < t.length; n++) this._eachEntry(t[n], n)
+                    };
+                    e.prototype._eachEntry = function e(t, n) {
+                        var i = this._instanceConstructor;
+                        var r = i.resolve;
+                        if (r === M) {
+                            var a = void 0;
+                            var s = void 0;
+                            var o = false;
+                            try {
+                                a = t.then
+                            } catch (e) {
+                                o = true;
+                                s = e
+                            }
+                            if (a === g && t._state !== k) this._settledAt(t._state, n, t._result); else if (typeof a !== "function") {
+                                this._remaining--;
+                                this._result[n] = t
+                            } else if (i === O) {
+                                var u = new i(S);
+                                if (o) Y(u, s); else D(u, t, a);
+                                this._willSettleAt(u, n)
+                            } else this._willSettleAt(new i(function (e) {
+                                return e(t)
+                            }), n)
+                        } else this._willSettleAt(r(t), n)
+                    };
+                    e.prototype._settledAt = function e(t, n, i) {
+                        var r = this.promise;
+                        if (r._state === k) {
+                            this._remaining--;
+                            if (t === w) Y(r, i); else this._result[n] = i
+                        }
+                        if (this._remaining === 0) E(r, this._result)
+                    };
+                    e.prototype._willSettleAt = function e(t, n) {
+                        var i = this;
+                        P(t, undefined, function (e) {
+                            return i._settledAt(b, n, e)
+                        }, function (e) {
+                            return i._settledAt(w, n, e)
+                        })
+                    };
+                    return e
+                }();
+
+                function Z(e) {
+                    return new X(this, e).promise
+                }
+
+                function $(r) {
+                    var a = this;
+                    if (!n(r)) return new a(function (e, t) {
+                        return t(new TypeError("You must pass an array to race."))
+                    }); else return new a(function (e, t) {
+                        var n = r.length;
+                        for (var i = 0; i < n; i++) a.resolve(r[i]).then(e, t)
+                    })
+                }
+
+                function Q(e) {
+                    var t = this;
+                    var n = new t(S);
+                    Y(n, e);
+                    return n
+                }
+
+                function ee() {
+                    throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")
+                }
+
+                function te() {
+                    throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")
+                }
+
+                var O = function () {
+                    function t(e) {
+                        this[L] = q();
+                        this._result = this._state = undefined;
+                        this._subscribers = [];
+                        if (S !== e) {
+                            typeof e !== "function" && ee();
+                            this instanceof t ? J(this, e) : te()
+                        }
+                    }
+
+                    t.prototype.catch = function e(t) {
+                        return this.then(null, t)
+                    };
+                    t.prototype.finally = function e(t) {
+                        var n = this;
+                        var i = n.constructor;
+                        if (u(t)) return n.then(function (e) {
+                            return i.resolve(t()).then(function () {
+                                return e
+                            })
+                        }, function (e) {
+                            return i.resolve(t()).then(function () {
+                                throw e
+                            })
+                        });
+                        return n.then(t, t)
+                    };
+                    return t
+                }();
+
+                function ne() {
+                    var e = void 0;
+                    if (typeof re !== "undefined") e = re; else if (typeof self !== "undefined") e = self; else try {
+                        e = Function("return this")()
+                    } catch (e) {
+                        throw new Error("polyfill failed because global object is unavailable in this environment")
+                    }
+                    var t = e.Promise;
+                    if (t) {
+                        var n = null;
+                        try {
+                            n = Object.prototype.toString.call(t.resolve())
+                        } catch (e) {
+                        }
+                        if (n === "[object Promise]" && !t.cast) return
+                    }
+                    e.Promise = O
+                }
+
+                return O.prototype.then = g, O.all = Z, O.race = $, O.resolve = M, O.reject = Q, O._setScheduler = o, O._setAsap = d, O._asap = s, O.polyfill = ne, O.Promise = O
+            }()
+        }.call(this, n(299), n(300))
+    }, function (e, t) {
+        var n, i, e = e.exports = {};
+
+        function r() {
+            throw new Error("setTimeout has not been defined")
+        }
+
+        function a() {
+            throw new Error("clearTimeout has not been defined")
+        }
+
+        try {
+            n = "function" == typeof setTimeout ? setTimeout : r
+        } catch (e) {
+            n = r
+        }
+        try {
+            i = "function" == typeof clearTimeout ? clearTimeout : a
+        } catch (e) {
+            i = a
+        }
+
+        function s(t) {
+            if (n === setTimeout) return setTimeout(t, 0);
+            if ((n === r || !n) && setTimeout) return (n = setTimeout)(t, 0);
+            try {
+                return n(t, 0)
+            } catch (e) {
+                try {
+                    return n.call(null, t, 0)
+                } catch (e) {
+                    return n.call(this, t, 0)
+                }
+            }
+        }
+
+        var o, u = [], d = !1, l = -1;
+
+        function h() {
+            d && o && (d = !1, o.length ? u = o.concat(u) : l = -1, u.length && c())
+        }
+
+        function c() {
+            if (!d) {
+                for (var e = s(h), t = (d = !0, u.length); t;) {
+                    for (o = u, u = []; ++l < t;) o && o[l].run();
+                    l = -1, t = u.length
+                }
+                o = null, d = !1, !function (t) {
+                    if (i === clearTimeout) return clearTimeout(t);
+                    if ((i === a || !i) && clearTimeout) return (i = clearTimeout)(t);
+                    try {
+                        i(t)
+                    } catch (e) {
+                        try {
+                            return i.call(null, t)
+                        } catch (e) {
+                            return i.call(this, t)
+                        }
+                    }
+                }(e)
+            }
+        }
+
+        function _(e, t) {
+            this.fun = e, this.array = t
+        }
+
+        function f() {
+        }
+
+        e.nextTick = function (e) {
+            var t = new Array(arguments.length - 1);
+            if (1 < arguments.length) for (var n = 1; n < arguments.length; n++) t[n - 1] = arguments[n];
+            u.push(new _(e, t)), 1 !== u.length || d || s(c)
+        }, _.prototype.run = function () {
+            this.fun.apply(null, this.array)
+        }, e.title = "browser", e.browser = !0, e.env = {}, e.argv = [], e.version = "", e.versions = {}, e.on = f, e.addListener = f, e.once = f, e.off = f, e.removeListener = f, e.removeAllListeners = f, e.emit = f, e.prependListener = f, e.prependOnceListener = f, e.listeners = function (e) {
+            return []
+        }, e.binding = function (e) {
+            throw new Error("process.binding is not supported")
+        }, e.cwd = function () {
+            return "/"
+        }, e.chdir = function (e) {
+            throw new Error("process.chdir is not supported")
+        }, e.umask = function () {
+            return 0
+        }
+    }, function (e, t) {
+        var n = function () {
+            return this
+        }();
+        try {
+            n = n || new Function("return this")()
+        } catch (e) {
+            "object" == typeof window && (n = window)
+        }
+        e.exports = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = o(n(1)), r = o(n(2)), a = o(n(228)), s = n(63);
+
+        function o(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(u, null, [{
+            key: "supportMSEH264Playback", value: function () {
+                return window.MediaSource && window.MediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"')
+            }
+        }, {
+            key: "supportNetworkStreamIO", value: function () {
+                var e = new a.default({}, (0, s.createDefaultConfig)()), t = e.loaderType;
+                return e.destroy(), "fetch-stream-loader" == t || "xhr-moz-chunked-loader" == t
+            }
+        }, {
+            key: "getNetworkLoaderTypeName", value: function () {
+                var e = new a.default({}, (0, s.createDefaultConfig)()), t = e.loaderType;
+                return e.destroy(), t
+            }
+        }, {
+            key: "supportNativeMediaPlayback", value: function (e) {
+                e = (u.videoElement = null == u.videoElement ? window.document.createElement("video") : u.videoElement).canPlayType(e);
+                return "probably" === e || "maybe" == e
+            }
+        }, {
+            key: "getFeatureList", value: function () {
+                var e = {
+                    mseFlvPlayback: !1,
+                    mseLiveFlvPlayback: !1,
+                    networkStreamIO: !1,
+                    networkLoaderName: "",
+                    nativeMP4H264Playback: !1,
+                    nativeWebmVP8Playback: !1,
+                    nativeWebmVP9Playback: !1
+                };
+                return e.mseFlvPlayback = u.supportMSEH264Playback(), e.networkStreamIO = u.supportNetworkStreamIO(), e.networkLoaderName = u.getNetworkLoaderTypeName(), e.mseLiveFlvPlayback = e.mseFlvPlayback && e.networkStreamIO, e.nativeMP4H264Playback = u.supportNativeMediaPlayback('video/mp4; codecs="avc1.42001E, mp4a.40.2"'), e.nativeWebmVP8Playback = u.supportNativeMediaPlayback('video/webm; codecs="vp8.0, vorbis"'), e.nativeWebmVP9Playback = u.supportNativeMediaPlayback('video/webm; codecs="vp9"'), e
+            }
+        }]);
+        n = u;
+
+        function u() {
+            (0, i.default)(this, u)
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        n(303), e.exports = n(3).Object.getPrototypeOf
+    }, function (e, t, n) {
+        var i = n(24), r = n(74);
+        n(52)("getPrototypeOf", function () {
+            return function (e) {
+                return r(i(e))
+            }
+        })
+    }, function (e, t, n) {
+        e.exports = {default: n(305), __esModule: !0}
+    }, function (e, t, n) {
+        n(306);
+        var i = n(3).Object;
+        e.exports = function (e, t) {
+            return i.create(e, t)
+        }
+    }, function (e, t, n) {
+        var i = n(8);
+        i(i.S, "Object", {create: n(46)})
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var d = _(n(9)), i = _(n(21)), r = _(n(1)), a = _(n(25)), s = _(n(32)), o = _(n(2)), u = _(n(26)),
+            l = (_(n(4)), _(n(33))), h = n(15), c = n(5);
+
+        function _(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = h.BaseLoader, (0, u.default)(f, n), (0, o.default)(f, null, [{
+            key: "isSupported", value: function () {
+                try {
+                    var e = l.default.msedge && 15048 <= l.default.version.minor, t = !l.default.msedge || e;
+                    return self.fetch && self.ReadableStream && t
+                } catch (e) {
+                    return !1
+                }
+            }
+        }]), (0, o.default)(f, [{
+            key: "destroy", value: function () {
+                this.isWorking() && this.abort(), (0, s.default)(f.prototype.__proto__ || (0, i.default)(f.prototype), "destroy", this).call(this)
+            }
+        }, {
+            key: "open", value: function (e, t) {
+                var n = this, i = (this._dataSource = e, this._range = t, e.url),
+                    r = (this._config.reuseRedirectedURL && null != e.redirectedURL && (i = e.redirectedURL), this._seekHandler.getConfig(i, t)),
+                    a = new self.Headers;
+                if ("object" === (0, d.default)(r.headers)) {
+                    var s, o = r.headers;
+                    for (s in o) o.hasOwnProperty(s) && a.append(s, o[s])
+                }
+                i = {
+                    method: "GET",
+                    headers: a,
+                    mode: "cors",
+                    cache: "default",
+                    referrerPolicy: "no-referrer-when-downgrade"
+                };
+                if ("object" === (0, d.default)(this._config.headers)) for (var u in this._config.headers) a.append(u, this._config.headers[u]);
+                !1 === e.cors && (i.mode = "same-origin"), e.withCredentials && (i.credentials = "include"), e.referrerPolicy && (i.referrerPolicy = e.referrerPolicy), this._status = h.LoaderStatus.kConnecting, self.fetch(r.url, i).then(function (e) {
+                    if (n._requestAbort) return n._requestAbort = !1, void (n._status = h.LoaderStatus.kIdle);
+                    var t;
+                    if (e.ok && 200 <= e.status && e.status <= 299) return e.url !== r.url && n._onURLRedirect && (t = n._seekHandler.removeURLParameters(e.url), n._onURLRedirect(t)), null != (t = e.headers.get("Content-Length")) && (n._contentLength = parseInt(t), 0 !== n._contentLength && n._onContentLengthKnown && n._onContentLengthKnown(n._contentLength)), n._pump.call(n, e.body.getReader());
+                    if (n._status = h.LoaderStatus.kError, !n._onError) throw new c.RuntimeException("FetchStreamLoader: Http code invalid, " + e.status + " " + e.statusText);
+                    n._onError(h.LoaderErrors.HTTP_STATUS_CODE_INVALID, {code: e.status, msg: e.statusText})
+                }).catch(function (e) {
+                    if (n._status = h.LoaderStatus.kError, !n._onError) throw e;
+                    n._onError(h.LoaderErrors.EXCEPTION, {code: -1, msg: e.message})
+                })
+            }
+        }, {
+            key: "abort", value: function () {
+                this._requestAbort = !0
+            }
+        }, {
+            key: "_pump", value: function (i) {
+                var r = this;
+                return i.read().then(function (e) {
+                    if (e.done) if (null !== r._contentLength && r._receivedLength < r._contentLength) {
+                        r._status = h.LoaderStatus.kError;
+                        var t = h.LoaderErrors.EARLY_EOF, n = {code: -1, msg: "Fetch stream meet Early-EOF"};
+                        if (!r._onError) throw new c.RuntimeException(n.msg);
+                        r._onError(t, n)
+                    } else r._status = h.LoaderStatus.kComplete, r._onComplete && r._onComplete(r._range.from, r._range.from + r._receivedLength - 1); else {
+                        if (!0 === r._requestAbort) return r._requestAbort = !1, r._status = h.LoaderStatus.kComplete, i.cancel();
+                        r._status = h.LoaderStatus.kBuffering;
+                        t = e.value.buffer, n = r._range.from + r._receivedLength;
+                        r._receivedLength += t.byteLength, r._onDataArrival && r._onDataArrival(t, n, r._receivedLength), r._pump(i)
+                    }
+                }).catch(function (e) {
+                    if (11 !== e.code || !l.default.msedge) {
+                        r._status = h.LoaderStatus.kError;
+                        var t = 0, n = null,
+                            n = 19 !== e.code && "network error" !== e.message || !(null === r._contentLength || null !== r._contentLength && r._receivedLength < r._contentLength) ? (t = h.LoaderErrors.EXCEPTION, {
+                                code: e.code,
+                                msg: e.message
+                            }) : (t = h.LoaderErrors.EARLY_EOF, {code: e.code, msg: "Fetch stream meet Early-EOF"});
+                        if (!r._onError) throw new c.RuntimeException(n.msg);
+                        r._onError(t, n)
+                    }
+                })
+            }
+        }]);
+        u = f;
+
+        function f(e, t) {
+            (0, r.default)(this, f);
+            var n = (0, a.default)(this, (f.__proto__ || (0, i.default)(f)).call(this, "fetch-stream-loader"));
+            return n.TAG = "FetchStreamLoader", n._seekHandler = e, n._config = t, n._needStash = !0, n._requestAbort = !1, n._contentLength = null, n._receivedLength = 0, n
+        }
+
+        t.default = u
+    }, function (e, t, n) {
+        e.exports = {default: n(309), __esModule: !0}
+    }, function (e, t, n) {
+        n(310);
+        var i = n(3).Object;
+        e.exports = function (e, t) {
+            return i.getOwnPropertyDescriptor(e, t)
+        }
+    }, function (e, t, n) {
+        var i = n(19), r = n(60).f;
+        n(52)("getOwnPropertyDescriptor", function () {
+            return function (e, t) {
+                return r(i(e), t)
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var u = _(n(9)), i = _(n(21)), r = _(n(1)), a = _(n(25)), s = _(n(32)), o = _(n(2)), d = _(n(26)), l = _(n(4)),
+            h = n(15), c = n(5);
+
+        function _(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = h.BaseLoader, (0, d.default)(f, n), (0, o.default)(f, null, [{
+            key: "isSupported", value: function () {
+                try {
+                    var e = new XMLHttpRequest;
+                    return e.open("GET", "https://example.com", !0), (e.responseType = "moz-chunked-arraybuffer") === e.responseType
+                } catch (e) {
+                    return l.default.w("MozChunkedLoader", e.message), !1
+                }
+            }
+        }]), (0, o.default)(f, [{
+            key: "destroy", value: function () {
+                this.isWorking() && this.abort(), this._xhr && (this._xhr.onreadystatechange = null, this._xhr.onprogress = null, this._xhr.onloadend = null, this._xhr.onerror = null, this._xhr = null), (0, s.default)(f.prototype.__proto__ || (0, i.default)(f.prototype), "destroy", this).call(this)
+            }
+        }, {
+            key: "open", value: function (e, t) {
+                this._dataSource = e, this._range = t;
+                var n = e.url,
+                    n = (this._config.reuseRedirectedURL && null != e.redirectedURL && (n = e.redirectedURL), this._seekHandler.getConfig(n, t)),
+                    i = (this._requestURL = n.url, this._xhr = new XMLHttpRequest);
+                if (i.open("GET", n.url, !0), i.responseType = "moz-chunked-arraybuffer", i.onreadystatechange = this._onReadyStateChange.bind(this), i.onprogress = this._onProgress.bind(this), i.onloadend = this._onLoadEnd.bind(this), i.onerror = this._onXhrError.bind(this), e.withCredentials && (i.withCredentials = !0), "object" === (0, u.default)(n.headers)) {
+                    var r, a = n.headers;
+                    for (r in a) a.hasOwnProperty(r) && i.setRequestHeader(r, a[r])
+                }
+                if ("object" === (0, u.default)(this._config.headers)) {
+                    var s, o = this._config.headers;
+                    for (s in o) o.hasOwnProperty(s) && i.setRequestHeader(s, o[s])
+                }
+                this._status = h.LoaderStatus.kConnecting, i.send()
+            }
+        }, {
+            key: "abort", value: function () {
+                this._requestAbort = !0, this._xhr && this._xhr.abort(), this._status = h.LoaderStatus.kComplete
+            }
+        }, {
+            key: "_onReadyStateChange", value: function (e) {
+                var t, e = e.target;
+                if (2 === e.readyState) if (null != e.responseURL && e.responseURL !== this._requestURL && this._onURLRedirect && (t = this._seekHandler.removeURLParameters(e.responseURL), this._onURLRedirect(t)), 0 !== e.status && (e.status < 200 || 299 < e.status)) {
+                    if (this._status = h.LoaderStatus.kError, !this._onError) throw new c.RuntimeException("MozChunkedLoader: Http code invalid, " + e.status + " " + e.statusText);
+                    this._onError(h.LoaderErrors.HTTP_STATUS_CODE_INVALID, {code: e.status, msg: e.statusText})
+                } else this._status = h.LoaderStatus.kBuffering
+            }
+        }, {
+            key: "_onProgress", value: function (e) {
+                var t;
+                this._status !== h.LoaderStatus.kError && (null === this._contentLength && null !== e.total && 0 !== e.total && (this._contentLength = e.total, this._onContentLengthKnown && this._onContentLengthKnown(this._contentLength)), e = e.target.response, t = this._range.from + this._receivedLength, this._receivedLength += e.byteLength, this._onDataArrival && this._onDataArrival(e, t, this._receivedLength))
+            }
+        }, {
+            key: "_onLoadEnd", value: function (e) {
+                !0 === this._requestAbort ? this._requestAbort = !1 : this._status !== h.LoaderStatus.kError && (this._status = h.LoaderStatus.kComplete, this._onComplete && this._onComplete(this._range.from, this._range.from + this._receivedLength - 1))
+            }
+        }, {
+            key: "_onXhrError", value: function (e) {
+                this._status = h.LoaderStatus.kError;
+                var t = 0, n = null,
+                    n = this._contentLength && e.loaded < this._contentLength ? (t = h.LoaderErrors.EARLY_EOF, {
+                        code: -1,
+                        msg: "Moz-Chunked stream meet Early-Eof"
+                    }) : (t = h.LoaderErrors.EXCEPTION, {code: -1, msg: e.constructor.name + " " + e.type});
+                if (!this._onError) throw new c.RuntimeException(n.msg);
+                this._onError(t, n)
+            }
+        }]);
+        d = f;
+
+        function f(e, t) {
+            (0, r.default)(this, f);
+            var n = (0, a.default)(this, (f.__proto__ || (0, i.default)(f)).call(this, "xhr-moz-chunked-loader"));
+            return n.TAG = "MozChunkedLoader", n._seekHandler = e, n._config = t, n._needStash = !0, n._xhr = null, n._requestAbort = !1, n._contentLength = null, n._receivedLength = 0, n
+        }
+
+        t.default = d
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var u = _(n(9)), i = _(n(21)), r = _(n(1)), a = _(n(25)), s = _(n(32)), o = _(n(2)), d = _(n(26)), l = _(n(4)),
+            h = n(15), c = n(5);
+
+        function _(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = h.BaseLoader, (0, d.default)(f, n), (0, o.default)(f, null, [{
+            key: "isSupported", value: function () {
+                try {
+                    if (void 0 === self.MSStream || void 0 === self.MSStreamReader) return !1;
+                    var e = new XMLHttpRequest;
+                    return e.open("GET", "https://example.com", !0), (e.responseType = "ms-stream") === e.responseType
+                } catch (e) {
+                    return l.default.w("MSStreamLoader", e.message), !1
+                }
+            }
+        }]), (0, o.default)(f, [{
+            key: "destroy", value: function () {
+                this.isWorking() && this.abort(), this._reader && (this._reader.onprogress = null, this._reader.onload = null, this._reader.onerror = null, this._reader = null), this._xhr && (this._xhr.onreadystatechange = null, this._xhr = null), (0, s.default)(f.prototype.__proto__ || (0, i.default)(f.prototype), "destroy", this).call(this)
+            }
+        }, {
+            key: "open", value: function (e, t) {
+                this._internalOpen(e, t, !1)
+            }
+        }, {
+            key: "_internalOpen", value: function (e, t, n) {
+                this._dataSource = e, n ? this._currentRange = t : this._totalRange = t;
+                var n = e.url,
+                    n = (this._config.reuseRedirectedURL && (null != this._currentRedirectedURL ? n = this._currentRedirectedURL : null != e.redirectedURL && (n = e.redirectedURL)), this._seekHandler.getConfig(n, t)),
+                    t = (this._currentRequestURL = n.url, this._reader = new self.MSStreamReader),
+                    i = (t.onprogress = this._msrOnProgress.bind(this), t.onload = this._msrOnLoad.bind(this), t.onerror = this._msrOnError.bind(this), this._xhr = new XMLHttpRequest);
+                if (i.open("GET", n.url, !0), i.responseType = "ms-stream", i.onreadystatechange = this._xhrOnReadyStateChange.bind(this), i.onerror = this._xhrOnError.bind(this), e.withCredentials && (i.withCredentials = !0), "object" === (0, u.default)(n.headers)) {
+                    var r, a = n.headers;
+                    for (r in a) a.hasOwnProperty(r) && i.setRequestHeader(r, a[r])
+                }
+                if ("object" === (0, u.default)(this._config.headers)) {
+                    var s, o = this._config.headers;
+                    for (s in o) o.hasOwnProperty(s) && i.setRequestHeader(s, o[s])
+                }
+                this._isReconnecting ? this._isReconnecting = !1 : this._status = h.LoaderStatus.kConnecting, i.send()
+            }
+        }, {
+            key: "abort", value: function () {
+                this._internalAbort(), this._status = h.LoaderStatus.kComplete
+            }
+        }, {
+            key: "_internalAbort", value: function () {
+                this._reader && (1 === this._reader.readyState && this._reader.abort(), this._reader.onprogress = null, this._reader.onload = null, this._reader.onerror = null, this._reader = null), this._xhr && (this._xhr.abort(), this._xhr.onreadystatechange = null, this._xhr = null)
+            }
+        }, {
+            key: "_xhrOnReadyStateChange", value: function (e) {
+                e = e.target;
+                if (2 === e.readyState) if (200 <= e.status && e.status <= 299) {
+                    this._status = h.LoaderStatus.kBuffering, null != e.responseURL && (t = this._seekHandler.removeURLParameters(e.responseURL), e.responseURL !== this._currentRequestURL && t !== this._currentRedirectedURL && (this._currentRedirectedURL = t, this._onURLRedirect && this._onURLRedirect(t)));
+                    var t = e.getResponseHeader("Content-Length");
+                    null == t || null != this._contentLength || 0 < (t = parseInt(t)) && (this._contentLength = t, this._onContentLengthKnown && this._onContentLengthKnown(this._contentLength))
+                } else {
+                    if (this._status = h.LoaderStatus.kError, !this._onError) throw new c.RuntimeException("MSStreamLoader: Http code invalid, " + e.status + " " + e.statusText);
+                    this._onError(h.LoaderErrors.HTTP_STATUS_CODE_INVALID, {code: e.status, msg: e.statusText})
+                } else 3 === e.readyState && 200 <= e.status && e.status <= 299 && (this._status = h.LoaderStatus.kBuffering, t = e.response, this._reader.readAsArrayBuffer(t))
+            }
+        }, {
+            key: "_xhrOnError", value: function (e) {
+                this._status = h.LoaderStatus.kError;
+                var t = h.LoaderErrors.EXCEPTION, e = {code: -1, msg: e.constructor.name + " " + e.type};
+                if (!this._onError) throw new c.RuntimeException(e.msg);
+                this._onError(t, e)
+            }
+        }, {
+            key: "_msrOnProgress", value: function (e) {
+                var t, n, e = e.target.result;
+                null == e ? this._doReconnectIfNeeded() : (t = e.slice(this._lastTimeBufferSize), this._lastTimeBufferSize = e.byteLength, n = this._totalRange.from + this._receivedLength, this._receivedLength += t.byteLength, this._onDataArrival && this._onDataArrival(t, n, this._receivedLength), e.byteLength >= this._bufferLimit && (l.default.v(this.TAG, "MSStream buffer exceeded max size near " + (n + t.byteLength) + ", reconnecting..."), this._doReconnectIfNeeded()))
+            }
+        }, {
+            key: "_doReconnectIfNeeded", value: function () {
+                var e;
+                (null == this._contentLength || this._receivedLength < this._contentLength) && (this._isReconnecting = !0, this._lastTimeBufferSize = 0, this._internalAbort(), e = {
+                    from: this._totalRange.from + this._receivedLength,
+                    to: -1
+                }, this._internalOpen(this._dataSource, e, !0))
+            }
+        }, {
+            key: "_msrOnLoad", value: function (e) {
+                this._status = h.LoaderStatus.kComplete, this._onComplete && this._onComplete(this._totalRange.from, this._totalRange.from + this._receivedLength - 1)
+            }
+        }, {
+            key: "_msrOnError", value: function (e) {
+                this._status = h.LoaderStatus.kError;
+                var t = 0, n = null,
+                    n = this._contentLength && this._receivedLength < this._contentLength ? (t = h.LoaderErrors.EARLY_EOF, {
+                        code: -1,
+                        msg: "MSStream meet Early-Eof"
+                    }) : (t = h.LoaderErrors.EARLY_EOF, {code: -1, msg: e.constructor.name + " " + e.type});
+                if (!this._onError) throw new c.RuntimeException(n.msg);
+                this._onError(t, n)
+            }
+        }]);
+        d = f;
+
+        function f(e, t) {
+            (0, r.default)(this, f);
+            var n = (0, a.default)(this, (f.__proto__ || (0, i.default)(f)).call(this, "xhr-msstream-loader"));
+            return n.TAG = "MSStreamLoader", n._seekHandler = e, n._config = t, n._needStash = !0, n._xhr = null, n._reader = null, n._totalRange = null, n._currentRange = null, n._currentRequestURL = null, n._currentRedirectedURL = null, n._contentLength = null, n._receivedLength = 0, n._bufferLimit = 16777216, n._lastTimeBufferSize = 0, n._isReconnecting = !1, n
+        }
+
+        t.default = d
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var u = f(n(9)), i = f(n(21)), r = f(n(1)), a = f(n(25)), s = f(n(32)), o = f(n(2)), d = f(n(26)), l = f(n(4)),
+            h = f(n(62)), c = n(15), _ = n(5);
+
+        function f(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = c.BaseLoader, (0, d.default)(m, n), (0, o.default)(m, null, [{
+            key: "isSupported", value: function () {
+                try {
+                    var e = new XMLHttpRequest;
+                    return e.open("GET", "https://example.com", !0), (e.responseType = "arraybuffer") === e.responseType
+                } catch (e) {
+                    return l.default.w("RangeLoader", e.message), !1
+                }
+            }
+        }]), (0, o.default)(m, [{
+            key: "destroy", value: function () {
+                this.isWorking() && this.abort(), this._xhr && (this._xhr.onreadystatechange = null, this._xhr.onprogress = null, this._xhr.onload = null, this._xhr.onerror = null, this._xhr = null), (0, s.default)(m.prototype.__proto__ || (0, i.default)(m.prototype), "destroy", this).call(this)
+            }
+        }, {
+            key: "open", value: function (e, t) {
+                this._dataSource = e, this._range = t, this._status = c.LoaderStatus.kConnecting;
+                e = !1;
+                null != this._dataSource.filesize && 0 !== this._dataSource.filesize && (e = !0, this._totalLength = this._dataSource.filesize), this._totalLengthReceived || e ? this._openSubRange() : (this._waitForTotalLength = !0, this._internalOpen(this._dataSource, {
+                    from: 0,
+                    to: -1
+                }))
+            }
+        }, {
+            key: "_openSubRange", value: function () {
+                var e = 1024 * this._currentChunkSizeKB, t = this._range.from + this._receivedLength, e = t + e;
+                null != this._contentLength && e - this._range.from >= this._contentLength && (e = this._range.from + this._contentLength - 1), this._currentRequestRange = {
+                    from: t,
+                    to: e
+                }, this._internalOpen(this._dataSource, this._currentRequestRange)
+            }
+        }, {
+            key: "_internalOpen", value: function (e, t) {
+                this._lastTimeLoaded = 0;
+                var n = e.url,
+                    n = (this._config.reuseRedirectedURL && (null != this._currentRedirectedURL ? n = this._currentRedirectedURL : null != e.redirectedURL && (n = e.redirectedURL)), this._seekHandler.getConfig(n, t)),
+                    i = (this._currentRequestURL = n.url, this._xhr = new XMLHttpRequest);
+                if (i.open("GET", n.url, !0), i.responseType = "arraybuffer", i.onreadystatechange = this._onReadyStateChange.bind(this), i.onprogress = this._onProgress.bind(this), i.onload = this._onLoad.bind(this), i.onerror = this._onXhrError.bind(this), e.withCredentials && (i.withCredentials = !0), "object" === (0, u.default)(n.headers)) {
+                    var r, a = n.headers;
+                    for (r in a) a.hasOwnProperty(r) && i.setRequestHeader(r, a[r])
+                }
+                if ("object" === (0, u.default)(this._config.headers)) {
+                    var s, o = this._config.headers;
+                    for (s in o) o.hasOwnProperty(s) && i.setRequestHeader(s, o[s])
+                }
+                i.send()
+            }
+        }, {
+            key: "abort", value: function () {
+                this._requestAbort = !0, this._internalAbort(), this._status = c.LoaderStatus.kComplete
+            }
+        }, {
+            key: "_internalAbort", value: function () {
+                this._xhr && (this._xhr.onreadystatechange = null, this._xhr.onprogress = null, this._xhr.onload = null, this._xhr.onerror = null, this._xhr.abort(), this._xhr = null)
+            }
+        }, {
+            key: "_onReadyStateChange", value: function (e) {
+                var t, e = e.target;
+                if (2 === e.readyState) if (null != e.responseURL && (t = this._seekHandler.removeURLParameters(e.responseURL), e.responseURL !== this._currentRequestURL && t !== this._currentRedirectedURL && (this._currentRedirectedURL = t, this._onURLRedirect && this._onURLRedirect(t))), 200 <= e.status && e.status <= 299) this._waitForTotalLength || (this._status = c.LoaderStatus.kBuffering); else {
+                    if (this._status = c.LoaderStatus.kError, !this._onError) throw new _.RuntimeException("RangeLoader: Http code invalid, " + e.status + " " + e.statusText);
+                    this._onError(c.LoaderErrors.HTTP_STATUS_CODE_INVALID, {code: e.status, msg: e.statusText})
+                }
+            }
+        }, {
+            key: "_onProgress", value: function (e) {
+                if (this._status !== c.LoaderStatus.kError) {
+                    if (null === this._contentLength) {
+                        var t = !1;
+                        if (this._waitForTotalLength && (this._waitForTotalLength = !1, t = this._totalLengthReceived = !0, n = e.total, this._internalAbort(), null != n & 0 !== n && (this._totalLength = n)), -1 === this._range.to ? this._contentLength = this._totalLength - this._range.from : this._contentLength = this._range.to - this._range.from + 1, t) return void this._openSubRange();
+                        this._onContentLengthKnown && this._onContentLengthKnown(this._contentLength)
+                    }
+                    var n = e.loaded - this._lastTimeLoaded;
+                    this._lastTimeLoaded = e.loaded, this._speedSampler.addBytes(n)
+                }
+            }
+        }, {
+            key: "_normalizeSpeed", value: function (e) {
+                var t, n = this._chunkSizeKBList, i = n.length - 1, r = 0, a = i;
+                if (e < n[0]) return n[0];
+                for (; r <= a;) {
+                    if ((t = r + Math.floor((a - r) / 2)) === i || e >= n[t] && e < n[t + 1]) return n[t];
+                    n[t] < e ? r = t + 1 : a = t - 1
+                }
+            }
+        }, {
+            key: "_onLoad", value: function (e) {
+                var t, n;
+                this._status !== c.LoaderStatus.kError && (this._waitForTotalLength ? this._waitForTotalLength = !1 : ((this._lastTimeLoaded = 0) === (t = this._speedSampler.lastSecondKBps) && (this._zeroSpeedChunkCount++, 3 <= this._zeroSpeedChunkCount && (t = this._speedSampler.currentKBps)), 0 !== t && (t = this._normalizeSpeed(t), this._currentSpeedNormalized !== t && (this._currentSpeedNormalized = t, this._currentChunkSizeKB = t)), t = e.target.response, e = this._range.from + this._receivedLength, this._receivedLength += t.byteLength, n = !1, null != this._contentLength && this._receivedLength < this._contentLength ? this._openSubRange() : n = !0, this._onDataArrival && this._onDataArrival(t, e, this._receivedLength), n && (this._status = c.LoaderStatus.kComplete, this._onComplete && this._onComplete(this._range.from, this._range.from + this._receivedLength - 1))))
+            }
+        }, {
+            key: "_onXhrError", value: function (e) {
+                this._status = c.LoaderStatus.kError;
+                var t = 0, n = null,
+                    n = this._contentLength && 0 < this._receivedLength && this._receivedLength < this._contentLength ? (t = c.LoaderErrors.EARLY_EOF, {
+                        code: -1,
+                        msg: "RangeLoader meet Early-Eof"
+                    }) : (t = c.LoaderErrors.EXCEPTION, {code: -1, msg: e.constructor.name + " " + e.type});
+                if (!this._onError) throw new _.RuntimeException(n.msg);
+                this._onError(t, n)
+            }
+        }, {
+            key: "currentSpeed", get: function () {
+                return this._speedSampler.lastSecondKBps
+            }
+        }]);
+        d = m;
+
+        function m(e, t) {
+            (0, r.default)(this, m);
+            var n = (0, a.default)(this, (m.__proto__ || (0, i.default)(m)).call(this, "xhr-range-loader"));
+            return n.TAG = "RangeLoader", n._seekHandler = e, n._config = t, n._needStash = !1, n._chunkSizeKBList = [128, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 5120, 6144, 7168, 8192], n._currentChunkSizeKB = 384, n._currentSpeedNormalized = 0, n._zeroSpeedChunkCount = 0, n._xhr = null, n._speedSampler = new h.default, n._requestAbort = !1, n._waitForTotalLength = !1, n._totalLengthReceived = !1, n._currentRequestURL = null, n._currentRedirectedURL = null, n._currentRequestRange = null, n._totalLength = null, n._contentLength = null, n._receivedLength = 0, n._lastTimeLoaded = 0, n
+        }
+
+        t.default = d
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = h(n(21)), r = h(n(1)), a = h(n(25)), s = h(n(32)), o = h(n(2)), u = h(n(26)), d = (h(n(4)), n(15)),
+            l = n(5);
+
+        function h(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = d.BaseLoader, (0, u.default)(c, n), (0, o.default)(c, null, [{
+            key: "isSupported", value: function () {
+                try {
+                    return void 0 !== self.WebSocket
+                } catch (e) {
+                    return !1
+                }
+            }
+        }]), (0, o.default)(c, [{
+            key: "destroy", value: function () {
+                this._ws && this.abort(), (0, s.default)(c.prototype.__proto__ || (0, i.default)(c.prototype), "destroy", this).call(this)
+            }
+        }, {
+            key: "open", value: function (t) {
+                try {
+                    var e = this._ws = new self.WebSocket(t.url);
+                    e.binaryType = "arraybuffer", e.onopen = this._onWebSocketOpen.bind(this), e.onclose = this._onWebSocketClose.bind(this), e.onmessage = this._onWebSocketMessage.bind(this), e.onerror = this._onWebSocketError.bind(this), this._status = d.LoaderStatus.kConnecting
+                } catch (e) {
+                    this._status = d.LoaderStatus.kError;
+                    t = {code: e.code, msg: e.message};
+                    if (!this._onError) throw new l.RuntimeException(t.msg);
+                    this._onError(d.LoaderErrors.EXCEPTION, t)
+                }
+            }
+        }, {
+            key: "abort", value: function () {
+                var e = this._ws;
+                !e || 0 !== e.readyState && 1 !== e.readyState || (this._requestAbort = !0, e.close()), this._ws = null, this._status = d.LoaderStatus.kComplete
+            }
+        }, {
+            key: "_onWebSocketOpen", value: function (e) {
+                this._status = d.LoaderStatus.kBuffering
+            }
+        }, {
+            key: "_onWebSocketClose", value: function (e) {
+                !0 === this._requestAbort ? this._requestAbort = !1 : (this._status = d.LoaderStatus.kComplete, this._onComplete && this._onComplete(0, this._receivedLength - 1))
+            }
+        }, {
+            key: "_onWebSocketMessage", value: function (e) {
+                var t = this;
+                if (e.data instanceof ArrayBuffer) this._dispatchArrayBuffer(e.data); else if (e.data instanceof Blob) {
+                    var n = new FileReader;
+                    n.onload = function () {
+                        t._dispatchArrayBuffer(n.result)
+                    }, n.readAsArrayBuffer(e.data)
+                } else {
+                    this._status = d.LoaderStatus.kError;
+                    e = {code: -1, msg: "Unsupported WebSocket message type: " + e.data.constructor.name};
+                    if (!this._onError) throw new l.RuntimeException(e.msg);
+                    this._onError(d.LoaderErrors.EXCEPTION, e)
+                }
+            }
+        }, {
+            key: "_dispatchArrayBuffer", value: function (e) {
+                var t = this._receivedLength;
+                this._receivedLength += e.byteLength, this._onDataArrival && this._onDataArrival(e, t, this._receivedLength)
+            }
+        }, {
+            key: "_onWebSocketError", value: function (e) {
+                this._status = d.LoaderStatus.kError;
+                e = {code: e.code, msg: e.message};
+                if (!this._onError) throw new l.RuntimeException(e.msg);
+                this._onError(d.LoaderErrors.EXCEPTION, e)
+            }
+        }]);
+        u = c;
+
+        function c() {
+            (0, r.default)(this, c);
+            var e = (0, a.default)(this, (c.__proto__ || (0, i.default)(c)).call(this, "websocket-loader"));
+            return e.TAG = "WebSocketLoader", e._needStash = !0, e._ws = null, e._requestAbort = !1, e._receivedLength = 0, e
+        }
+
+        t.default = u
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "getConfig", value: function (e, t) {
+                var n, i = {};
+                return 0 !== t.from || -1 !== t.to ? (n = void 0, n = -1 !== t.to ? "bytes=" + t.from.toString() + "-" + t.to.toString() : "bytes=" + t.from.toString() + "-", i.Range = n) : this._zeroStart && (i.Range = "bytes=0-"), {
+                    url: e,
+                    headers: i
+                }
+            }
+        }, {
+            key: "removeURLParameters", value: function (e) {
+                return e
+            }
+        }]);
+        n = a;
+
+        function a(e) {
+            (0, i.default)(this, a), this._zeroStart = e || !1
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function a(e, t) {
+            (0, i.default)(this, a), this._startName = e, this._endName = t
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "getConfig", value: function (e, t) {
+                var n;
+                return 0 === t.from && -1 === t.to || (n = !0, -1 === e.indexOf("?") && (e += "?", n = !1), n && (e += "&"), e += this._startName + "=" + t.from.toString(), -1 !== t.to && (e += "&" + this._endName + "=" + t.to.toString())), {
+                    url: e,
+                    headers: {}
+                }
+            }
+        }, {
+            key: "removeURLParameters", value: function (e) {
+                var t = e.split("?")[0], n = void 0, i = e.indexOf("?"), r = "";
+                if (null != (n = -1 !== i ? e.substring(i + 1) : n) && 0 < n.length) for (var a = n.split("&"), s = 0; s < a.length; s++) {
+                    var o = a[s].split("=");
+                    o[0] !== this._startName && o[0] !== this._endName && (0 < s && (r += "&"), r += a[s])
+                }
+                return 0 === r.length ? t : t + "?" + r
+            }
+        }]), t.default = a
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = M(n(11)), r = M(n(20)), a = M(n(9)), s = M(n(1)), o = M(n(2)), u = M(n(10)), d = M(n(4)), l = M(n(33)),
+            h = (M(n(62)), M(n(39))), c = M(n(318)), _ = M(n(40)), f = M(n(332)), m = M(n(232)), p = n(234), y = n(63),
+            v = n(5), g = M(n(233));
+
+        function M(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, o.default)(L, [{
+            key: "destroy", value: function () {
+                null != this._progressChecker && (window.clearInterval(this._progressChecker), this._progressChecker = null), this._transmuxer && this.unload(), this._mediaElement && this.detachMediaElement(), this.e = null, this._mediaDataSource = null, this._emitter && (this._emitter.removeAllListeners(), this._emitter = null)
+            }
+        }, {
+            key: "on", value: function (e, t) {
+                var n = this;
+                e === h.default.MEDIA_INFO ? null != this._mediaInfo && i.default.resolve().then(function () {
+                    n._emitter.emit(h.default.MEDIA_INFO, n.mediaInfo)
+                }) : e === h.default.STATISTICS_INFO && null != this._statisticsInfo && i.default.resolve().then(function () {
+                    n._emitter.emit(h.default.STATISTICS_INFO, n.statisticsInfo)
+                }), this._emitter.addListener(e, t)
+            }
+        }, {
+            key: "off", value: function (e, t) {
+                this._emitter.removeListener(e, t)
+            }
+        }, {
+            key: "attachMediaElement", value: function (e) {
+                var t = this;
+                if ((this._mediaElement = e).addEventListener("loadedmetadata", this.e.onvLoadedMetadata), e.addEventListener("seeking", this.e.onvSeeking), e.addEventListener("canplay", this.e.onvCanPlay), e.addEventListener("stalled", this.e.onvStalled), e.addEventListener("progress", this.e.onvProgress), e.addEventListener("timeupdate", this.e.onvTimeUpdate), this._msectl = new f.default(this._config), this._msectl.on(m.default.UPDATE_END, this._onmseUpdateEnd.bind(this)), this._msectl.on(m.default.BUFFER_FULL, this._onmseBufferFull.bind(this)), this._msectl.on(m.default.SOURCE_OPEN, function () {
+                    if (t._mseSourceOpened = !0, t._hasPendingLoad) for (t._hasPendingLoad = !1, t.load(), 0 < t._stashArray.length && console.warn("stash before source open", t._stashArray.length); 0 < t._stashArray.length;) {
+                        var e = t._stashArray.shift();
+                        t._onLoaderChunkArrival(e.data, e.byteStart)
+                    }
+                }), this._msectl.on(m.default.SOURCE_END, function () {
+                    t._emitter.emit(h.default.MEDIA_SOURCE_ENDED)
+                }), this._msectl.on(m.default.SOURCE_CLOSE, function () {
+                    t._mseSourceOpened = !1, t._emitter.emit(h.default.MEDIA_SOURCE_CLOSE)
+                }), this._msectl.on(m.default.ERROR, function (e) {
+                    t._emitter.emit(h.default.ERROR, p.ErrorTypes.MEDIA_ERROR, p.ErrorDetails.MEDIA_MSE_ERROR, e)
+                }), this._msectl.attachMediaElement(e), null != this._pendingSeekTime) try {
+                    e.currentTime = this._pendingSeekTime, this._pendingSeekTime = null
+                } catch (e) {
+                }
+            }
+        }, {
+            key: "detachMediaElement", value: function () {
+                this._mediaElement && (this._msectl.detachMediaElement(), this._mediaElement.removeEventListener("loadedmetadata", this.e.onvLoadedMetadata), this._mediaElement.removeEventListener("seeking", this.e.onvSeeking), this._mediaElement.removeEventListener("canplay", this.e.onvCanPlay), this._mediaElement.removeEventListener("stalled", this.e.onvStalled), this._mediaElement.removeEventListener("progress", this.e.onvProgress), this._mediaElement.removeEventListener("timeupdate", this.e.onvTimeUpdate), this._mediaElement = null), this._msectl && (this._msectl.destroy(), this._msectl = null), this._stashArray = []
+            }
+        }, {
+            key: "load", value: function () {
+                var i = this;
+                if (!this._mediaElement) throw new v.IllegalStateException("HTMLMediaElement must be attached before load()!");
+                if (this._transmuxer) throw new v.IllegalStateException("FlvPlayer.load() has been called, please call unload() first!");
+                this._hasPendingLoad || (this._config.deferLoadAfterSourceOpen && !1 === this._mseSourceOpened ? this._hasPendingLoad = !0 : (0 < this._mediaElement.readyState && (this._requestSetTime = !0, this._mediaElement.currentTime = 0), this.openLatencyMonitor(), this._transmuxer = new c.default(this._mediaDataSource, this._config), this._transmuxer.on(_.default.INIT_SEGMENT, function (e, t) {
+                    i._msectl.appendInitSegment(t)
+                }), this._transmuxer.on(_.default.MEDIA_SEGMENT, function (e, t) {
+                    var n;
+                    i._msectl.appendMediaSegment(t), i._config.lazyLoad && !i._config.isLive && (n = i._mediaElement.currentTime, t.info.endDts >= 1e3 * (n + i._config.lazyLoadMaxDuration) && null == i._progressChecker && (d.default.v(i.TAG, "Maximum buffering duration exceeded, suspend transmuxing task"), i._suspendTransmuxer()))
+                }), this._transmuxer.on(_.default.LOADING_COMPLETE, function () {
+                    i._msectl.endOfStream(), i._emitter.emit(h.default.LOADING_COMPLETE)
+                }), this._transmuxer.on(_.default.RECOVERED_EARLY_EOF, function () {
+                    i._emitter.emit(h.default.RECOVERED_EARLY_EOF)
+                }), this._transmuxer.on(_.default.IO_ERROR, function (e, t) {
+                    i._emitter.emit(h.default.ERROR, p.ErrorTypes.NETWORK_ERROR, e, t)
+                }), this._transmuxer.on(_.default.DEMUX_ERROR, function (e, t) {
+                    i._emitter.emit(h.default.ERROR, p.ErrorTypes.MEDIA_ERROR, e, {code: -1, msg: t})
+                }), this._transmuxer.on(_.default.MEDIA_INFO, function (e) {
+                    i._mediaInfo = e, i._emitter.emit(h.default.MEDIA_INFO, (0, r.default)({}, e))
+                }), this._transmuxer.on(_.default.METADATA_ARRIVED, function (e) {
+                    i._emitter.emit(h.default.METADATA_ARRIVED, e)
+                }), this._transmuxer.on(_.default.SCRIPTDATA_ARRIVED, function (e) {
+                    i._emitter.emit(h.default.SCRIPTDATA_ARRIVED, e)
+                }), this._transmuxer.on(_.default.STATISTICS_INFO, function (e) {
+                    i._statisticsInfo = i._fillStatisticsInfo(e), i._emitter.emit(h.default.STATISTICS_INFO, (0, r.default)({}, i._statisticsInfo))
+                }), this._transmuxer.on(_.default.RECOMMEND_SEEKPOINT, function (e) {
+                    i._mediaElement && !i._config.accurateSeek && (i._requestSetTime = !0, i._mediaElement.currentTime = e / 1e3)
+                }), this._transmuxer.on(_.default.VIDEO_RESOLUTION_CHANGED, function (e) {
+                    i._emitter.emit(h.default.VIDEO_RESOLUTION_CHANGED, e)
+                }), this._transmuxer.on(_.default.PARSEDDATA_ARRIVED, function (e, t) {
+                    i._onParsedData(e, t, i.iWndNum)
+                }), this._transmuxer.open()))
+            }
+        }, {
+            key: "unload", value: function () {
+                this._mediaElement && this._mediaElement.pause(), this._msectl && this._msectl.seek(0), this._transmuxer && (this._transmuxer.close(), this._transmuxer.destroy(), this._transmuxer = null), this._durationMonitor && (self.clearInterval(this._durationMonitor), this._durationMonitor = null), this._latencyDetectTimer && (self.clearInterval(this._latencyDetectTimer), this._latencyDetectTimer = null, this._latencyAdjustCount = 0, d.default.i(this.TAG, "--== Total latency adjust count : " + this._latencyAdjustCountTotal), this._latencyAdjustCountTotal = 0), this._forzenTimes = 0, this._lastDecodedFrames = 0
+            }
+        }, {
+            key: "play", value: function () {
+                return this._mediaElement.play()
+            }
+        }, {
+            key: "pause", value: function () {
+                this._mediaElement.pause()
+            }
+        }, {
+            key: "openFileSystem", value: function (e) {
+                this._isRecord = !0, this._fs = new g.default(e, this._initSegment.data)
+            }
+        }, {
+            key: "downloadFile", value: function () {
+                if (!this._isRecord || !this._fs) throw new Error("FileSystem is not ready");
+                this._fs.download(), this._isRecord = !1, this._fs = null
+            }
+        }, {
+            key: "setRecordFlag", value: function (e) {
+                this._transmuxer.setRecordFlag(e)
+            }
+        }, {
+            key: "_onLoaderChunkArrival", value: function (e, t, n) {
+                this._transmuxer.feed(e, t, n)
+            }
+        }, {
+            key: "onLoaderChunkArrival", value: function (e, t, n) {
+                this._mseSourceOpened ? (0 < this._stashArray.length && this._stashArray.push({
+                    data: e,
+                    byteStart: t
+                }), this._onLoaderChunkArrival(e, t, n)) : this._stashArray.push({data: e, byteStart: t})
+            }
+        }, {
+            key: "_fillStatisticsInfo", value: function (e) {
+                var t, n, i, r;
+                return e.playerType = this._type, this._mediaElement instanceof HTMLVideoElement && (t = !0, r = i = 0, this._mediaElement.getVideoPlaybackQuality ? (i = (n = this._mediaElement.getVideoPlaybackQuality()).totalVideoFrames, r = n.droppedVideoFrames) : null != this._mediaElement.webkitDecodedFrameCount ? (i = this._mediaElement.webkitDecodedFrameCount, r = this._mediaElement.webkitDroppedFrameCount) : t = !1, t && (e.decodedFrames = i, e.droppedFrames = r)), e
+            }
+        }, {
+            key: "enableVideoStateMonitor", value: function (e) {
+                this._enableDurationMonitor = e, this._enableVideoFrozenMonitor = e
+            }
+        }, {
+            key: "_increaseLatency", value: function (e) {
+                this._curLatencyThreshold += e, this._curLatencyThreshold > this._config.highLatencyThreshold && (this._curLatencyThreshold = this._config.highLatencyThreshold), d.default.i(this.TAG, "latency +" + this._curLatencyThreshold)
+            }
+        }, {
+            key: "_decreaseLatency", value: function (e) {
+                this._curLatencyThreshold -= e, this._curLatencyThreshold < this._config.lowLatencyThreshold && (this._curLatencyThreshold = this._config.lowLatencyThreshold), d.default.i(this.TAG, "latency -" + this._curLatencyThreshold)
+            }
+        }, {
+            key: "_updateCurrentLatencyThreshold", value: function (e) {
+                this._curLatencyThreshold = e, this._curLatencyThreshold < this._config.lowLatencyThreshold && (this._curLatencyThreshold = this._config.lowLatencyThreshold), this._curLatencyThreshold > this._config.highLatencyThreshold && (this._curLatencyThreshold = this._config.highLatencyThreshold), d.default.i(this.TAG, "update current latency threshold : " + this._curLatencyThreshold)
+            }
+        }, {
+            key: "_adjustDurationGap", value: function () {
+                this._latencyAdjustCount < this._latencyDetectThreshold ? this._decreaseLatency(this._latencyDetectAdjustStep) : this._latencyAdjustCount > this._latencyDetectThreshold && this._increaseLatency(5 * this._latencyDetectAdjustStep), this._latencyAdjustCount = 0
+            }
+        }, {
+            key: "_doDurationMonitor", value: function () {
+                if (this._enableDurationMonitor && this._mseSourceOpened && (!this._msectl || !this._msectl.checkSourceBufferNull())) {
+                    var e = this._mediaElement.buffered, t = this._mediaElement.currentTime,
+                        n = this._mediaElement.paused;
+                    if (null != e && 0 != e.length) {
+                        var e = e.end(0), t = e - t;
+                        if (!n && t > this._curLatencyThreshold && (n = e - this._decreaseDurationStep, d.default.w(this.TAG, "high latency gap {" + t + "}, decrease " + this._decreaseDurationStep + " and set to " + n), this._mediaElement.currentTime = n, this._requestSetTime = !0, this._latencyAdjustCountTotal++, 2 < this._latencyAdjustCountTotal && (++this._latencyAdjustCount, e = t + this._latencyDetectAdjustStep, this._updateCurrentLatencyThreshold(e))), this._enableVideoFrozenMonitor) {
+                            n = 0;
+                            if (this._mediaElement.getVideoPlaybackQuality) n = this._mediaElement.getVideoPlaybackQuality().totalVideoFrames; else {
+                                if (null == this._mediaElement.webkitDecodedFrameCount) return;
+                                n = this._mediaElement.webkitDecodedFrameCount
+                            }
+                            0 != this._lastDecodedFrames && (this._lastDecodedFrames == n ? this._forzenTimes++ : this._forzenTimes = 0), this._lastDecodedFrames = n, this._forzenTimes >= this._frozenTimesThreshold && (d.default.w(this.TAG, "Report video frozen event"), this._emitter.emit(h.default.VIDEO_FROZEN), this._forzenTimes = 0)
+                        }
+                    }
+                }
+            }
+        }, {
+            key: "openLatencyMonitor", value: function () {
+                this._enableDurationMonitor && null == this._durationMonitor && (this._durationMonitor = self.setInterval(this._doDurationMonitor.bind(this), this._videoStateMonitorInterval), this._forzenTimes = 0, this._lastDecodedFrames = 0, this._latencyDetectTimer = self.setInterval(this._adjustDurationGap.bind(this), this._latencyDetectInterval))
+            }
+        }, {
+            key: "closeLatencyMonitor", value: function () {
+                this._durationMonitor && (clearInterval(this._durationMonitor), this._durationMonitor = null), this._latencyDetectTimer && (clearInterval(this._latencyDetectTimer), this._latencyDetectTimer = null), this._emitter.listeners("timeupdate") && this._mediaElement.removeEventListener("timeupdate", this.e.onvTimeUpdate)
+            }
+        }, {
+            key: "_onmseUpdateEnd", value: function () {
+                if (this._config.lazyLoad && !this._config.isLive) {
+                    for (var e = this._mediaElement.buffered, t = this._mediaElement.currentTime, n = 0, i = 0; i < e.length; i++) {
+                        var r = e.start(i), a = e.end(i);
+                        if (r <= t && t < a) {
+                            n = a;
+                            break
+                        }
+                    }
+                    n >= t + this._config.lazyLoadMaxDuration && null == this._progressChecker && (d.default.v(this.TAG, "Maximum buffering duration exceeded, suspend transmuxing task"), this._suspendTransmuxer())
+                }
+            }
+        }, {
+            key: "_onmseBufferFull", value: function () {
+                d.default.v(this.TAG, "MSE SourceBuffer is full, suspend transmuxing task"), null == this._progressChecker && this._suspendTransmuxer(), this._emitter.emit(h.default.MS_BUFFER_FULL)
+            }
+        }, {
+            key: "_suspendTransmuxer", value: function () {
+                this._transmuxer && (this._transmuxer.pause(), null == this._progressChecker && (this._progressChecker = window.setInterval(this._checkProgressAndResume.bind(this), 1e3)))
+            }
+        }, {
+            key: "_checkProgressAndResume", value: function () {
+                for (var e = this._mediaElement.currentTime, t = this._mediaElement.buffered, n = !1, i = 0; i < t.length; i++) {
+                    var r = t.start(i), a = t.end(i);
+                    if (r <= e && e < a) {
+                        e >= a - this._config.lazyLoadRecoverDuration && (n = !0);
+                        break
+                    }
+                }
+                n && (window.clearInterval(this._progressChecker), this._progressChecker = null, n && (d.default.v(this.TAG, "Continue loading from paused position"), this._transmuxer.resume()))
+            }
+        }, {
+            key: "_isTimepointBuffered", value: function (e) {
+                for (var t = this._mediaElement.buffered, n = 0; n < t.length; n++) {
+                    var i = t.start(n), r = t.end(n);
+                    if (i <= e && e < r) return !0
+                }
+                return !1
+            }
+        }, {
+            key: "_internalSeek", value: function (e) {
+                var t, n = this._isTimepointBuffered(e), i = !1, r = 0;
+                e < 1 && 0 < this._mediaElement.buffered.length && (((t = this._mediaElement.buffered.start(0)) < 1 && e < t || l.default.safari) && (i = !0, r = l.default.safari ? .1 : t)), i ? (this._requestSetTime = !0, this._mediaElement.currentTime = r) : n ? (this._alwaysSeekKeyframe ? (t = this._msectl.getNearestKeyframe(Math.floor(1e3 * e)), this._requestSetTime = !0, this._mediaElement.currentTime = null != t ? t.dts / 1e3 : e) : (this._requestSetTime = !0, this._mediaElement.currentTime = e), null != this._progressChecker && this._checkProgressAndResume()) : (null != this._progressChecker && (window.clearInterval(this._progressChecker), this._progressChecker = null), this._msectl.seek(e), this._transmuxer.seek(Math.floor(1e3 * e)), this._config.accurateSeek && (this._requestSetTime = !0, this._mediaElement.currentTime = e))
+            }
+        }, {
+            key: "_checkAndApplyUnbufferedSeekpoint", value: function () {
+                var e;
+                this._seekpointRecord && (this._seekpointRecord.recordTime <= this._now() - 100 ? (e = this._mediaElement.currentTime, this._seekpointRecord = null, this._isTimepointBuffered(e) || (null != this._progressChecker && (window.clearTimeout(this._progressChecker), this._progressChecker = null), this._msectl.seek(e), this._transmuxer.seek(Math.floor(1e3 * e)), this._config.accurateSeek && (this._requestSetTime = !0, this._mediaElement.currentTime = e))) : window.setTimeout(this._checkAndApplyUnbufferedSeekpoint.bind(this), 50))
+            }
+        }, {
+            key: "_checkAndResumeStuckPlayback", value: function (e) {
+                var t = this._mediaElement;
+                e || !this._receivedCanPlay || t.readyState < 2 ? 0 < (e = t.buffered).length && t.currentTime < e.start(0) && (d.default.w(this.TAG, "Playback seems stuck at " + t.currentTime + ", seek to " + e.start(0)), this._requestSetTime = !0, this._mediaElement.currentTime = e.start(0), this._mediaElement.removeEventListener("progress", this.e.onvProgress)) : this._mediaElement.removeEventListener("progress", this.e.onvProgress)
+            }
+        }, {
+            key: "_onvLoadedMetadata", value: function (e) {
+                null != this._pendingSeekTime && (this._mediaElement.currentTime = this._pendingSeekTime, this._pendingSeekTime = null), this._emitter.emit(h.default.LOADED_META_DATA)
+            }
+        }, {
+            key: "_onvSeeking", value: function (e) {
+                var t = this._mediaElement.currentTime, n = this._mediaElement.buffered;
+                if (this._requestSetTime) this._requestSetTime = !1; else {
+                    if (t < 1 && 0 < n.length) {
+                        var n = n.start(0);
+                        if (n < 1 && t < n || l.default.safari) return this._requestSetTime = !0, void (this._mediaElement.currentTime = l.default.safari ? .1 : n)
+                    }
+                    if (this._isTimepointBuffered(t)) return this._alwaysSeekKeyframe && null != (n = this._msectl.getNearestKeyframe(Math.floor(1e3 * t))) && (this._requestSetTime = !0, this._mediaElement.currentTime = n.dts / 1e3), void (null != this._progressChecker && this._checkProgressAndResume());
+                    this._seekpointRecord = {
+                        seekPoint: t,
+                        recordTime: this._now()
+                    }, window.setTimeout(this._checkAndApplyUnbufferedSeekpoint.bind(this), 50)
+                }
+            }
+        }, {
+            key: "_onvCanPlay", value: function (e) {
+                var t;
+                this._receivedCanPlay = !0, this._mediaElement.removeEventListener("canplay", this.e.onvCanPlay), this._mediaElement.play(), this._enableAudioGain && (g_audioSource || (t = this._mediaElement, g_audioSource = g_audioCtx.createMediaElementSource(t)), g_audioSource.connect(g_audioGain), d.default.d(this.TAG, "Enable audio gain, level = " + this._audioGainLevel))
+            }
+        }, {
+            key: "_onvStalled", value: function (e) {
+                this._checkAndResumeStuckPlayback(!0)
+            }
+        }, {
+            key: "_onvProgress", value: function (e) {
+                this._checkAndResumeStuckPlayback()
+            }
+        }, {
+            key: "_onvTimeUpdate", value: function (e) {
+                var t, n, i, e = e.target;
+                e.currentTime && e.seekable && e.playbackRate && 0 != e.seekable.length && (t = e.currentTime, i = e.seekable.end(0), n = e.playbackRate, (i = i - t) > this._fastvalue && 1 === n && (e.playbackRate = 1.2), i < this._slowvalue && 1 < n && (e.playbackRate = 1))
+            }
+        }, {
+            key: "type", get: function () {
+                return this._type
+            }
+        }, {
+            key: "buffered", get: function () {
+                return this._mediaElement.buffered
+            }
+        }, {
+            key: "duration", get: function () {
+                return this._mediaElement.duration
+            }
+        }, {
+            key: "volume", get: function () {
+                return this._mediaElement.volume
+            }, set: function (e) {
+                this._mediaElement.volume = e
+            }
+        }, {
+            key: "muted", get: function () {
+                return this._mediaElement.muted
+            }, set: function (e) {
+                this._mediaElement.muted = e
+            }
+        }, {
+            key: "currentTime", get: function () {
+                return this._mediaElement ? this._mediaElement.currentTime : 0
+            }, set: function (e) {
+                this._mediaElement ? this._internalSeek(e) : this._pendingSeekTime = e
+            }
+        }, {
+            key: "mediaInfo", get: function () {
+                return (0, r.default)({}, this._mediaInfo)
+            }
+        }, {
+            key: "statisticsInfo", get: function () {
+                return null == this._statisticsInfo && (this._statisticsInfo = {}), this._statisticsInfo = this._fillStatisticsInfo(this._statisticsInfo), (0, r.default)({}, this._statisticsInfo)
+            }
+        }, {
+            key: "onParsedData", set: function (e) {
+                this._onParsedData = e
+            }
+        }]);
+        n = L;
+
+        function L(e, t) {
+            if ((0, s.default)(this, L), this.TAG = "FlvPlayer", this._type = "FlvPlayer", this._emitter = new u.default, this._config = (0, y.createDefaultConfig)(), "object" === (void 0 === t ? "undefined" : (0, a.default)(t)) && (0, r.default)(this._config, t), "flv" !== e.type.toLowerCase()) throw new v.InvalidArgumentException("FlvPlayer requires an flv MediaDataSource input!");
+            !0 === e.isLive && (this._config.isLive = !0), this.e = {
+                onvLoadedMetadata: this._onvLoadedMetadata.bind(this),
+                onvSeeking: this._onvSeeking.bind(this),
+                onvCanPlay: this._onvCanPlay.bind(this),
+                onvStalled: this._onvStalled.bind(this),
+                onvProgress: this._onvProgress.bind(this),
+                onvTimeUpdate: this._onvTimeUpdate.bind(this)
+            }, self.performance && self.performance.now ? this._now = self.performance.now.bind(self.performance) : this._now = Date.now, this._pendingSeekTime = null, this._requestSetTime = !1, this._seekpointRecord = null, this._progressChecker = null, this._mediaDataSource = e, this._mediaElement = null, this._msectl = null, this._transmuxer = null, this._fastvalue = 1.5, this._slowvalue = .5, 0 < e.stashInitialSize && (this._fastvalue = 4, this._slowvalue = 2.5), this._stashArray = [], this._mseSourceOpened = !1, this._hasPendingLoad = !1, this._receivedCanPlay = !1, this._mediaInfo = null, this._statisticsInfo = null;
+            t = l.default.chrome && (l.default.version.major < 50 || 50 === l.default.version.major && l.default.version.build < 2661);
+            this._alwaysSeekKeyframe = !!(t || l.default.msedge || l.default.msie), this._alwaysSeekKeyframe && (this._config.accurateSeek = !1), this._videoStateMonitorInterval = this._config.videoStateMonitorInterval, this._enableDurationMonitor = this._config.enableDurationMonitor, this._curLatencyThreshold = this._config.lowLatencyThreshold, this._decreaseDurationStep = this._config.decreaseDurationStep, this._durationMonitor = null, this._enableVideoFrozenMonitor = this._config.enableVideoFrozenMonitor, this._frozenTimesThreshold = this._config.frozenTimesThreshold, this._forzenTimes = 0, this._lastDecodedFrames = 0, this._latencyDetectInterval = this._config.latencyDetectInterval, this._latencyDetectThreshold = this._config.latencyDetectThreshold, this._latencyDetectAdjustStep = this._config.latencyDetectAdjustStep, this._latencyDetectTimer = null, this._latencyAdjustCount = 0, this._latencyAdjustCountTotal = 0, this._enableAudioGain = this._config.enableAudioGain, this._audioGainLevel = 0 < this._config.audioGainLevel ? this._config.audioGainLevel : 1, this.iWndNum = this._config.WDInfo.index
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = f(n(38)), a = f(n(11)), r = f(n(1)), s = f(n(2)), o = f(n(10)), u = f(n(4)), d = f(n(64)),
+            l = f(n(229)), h = f(n(40)), c = (f(n(231)), f(n(65))), _ = f(n(331));
+
+        function f(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function m(t, n) {
+            if ((0, r.default)(this, m), this.TAG = "Transmuxer", this._emitter = new o.default, n.enableWorker && "undefined" != typeof Worker) try {
+                this._worker = (0, _.default)(231), this._workerDestroying = !1, this._worker.addEventListener("message", this._onWorkerMessage.bind(this)), this._worker.postMessage({
+                    cmd: "init",
+                    param: [t, n]
+                }), this.e = {onLoggingConfigChanged: this._onLoggingConfigChanged.bind(this)}, d.default.registerListener(this.e.onLoggingConfigChanged), this._worker.postMessage({
+                    cmd: "logging_config",
+                    param: d.default.getConfig()
+                })
+            } catch (e) {
+                u.default.e(this.TAG, "Error while initialize transmuxing worker, fallback to inline transmuxing"), this._worker = null, this._controller = new l.default(t, n)
+            } else this._controller = new l.default(t, n);
+            this._controller && ((t = this._controller).on(h.default.IO_ERROR, this._onIOError.bind(this)), t.on(h.default.DEMUX_ERROR, this._onDemuxError.bind(this)), t.on(h.default.INIT_SEGMENT, this._onInitSegment.bind(this)), t.on(h.default.MEDIA_SEGMENT, this._onMediaSegment.bind(this)), t.on(h.default.LOADING_COMPLETE, this._onLoadingComplete.bind(this)), t.on(h.default.RECOVERED_EARLY_EOF, this._onRecoveredEarlyEof.bind(this)), t.on(h.default.MEDIA_INFO, this._onMediaInfo.bind(this)), t.on(h.default.METADATA_ARRIVED, this._onMetaDataArrived.bind(this)), t.on(h.default.SCRIPTDATA_ARRIVED, this._onScriptDataArrived.bind(this)), t.on(h.default.STATISTICS_INFO, this._onStatisticsInfo.bind(this)), t.on(h.default.RECOMMEND_SEEKPOINT, this._onRecommendSeekpoint.bind(this)), t.on(h.default.VIDEO_RESOLUTION_CHANGED, this._onVideoResolutionChanged.bind(this)), t.on(h.default.PARSEDDATA_ARRIVED, this._parsedDataArrived.bind(this)))
+        }
+
+        (0, s.default)(m, [{
+            key: "destroy", value: function () {
+                this._worker ? this._workerDestroying || (this._workerDestroying = !0, this._worker.postMessage({cmd: "destroy"}), d.default.removeListener(this.e.onLoggingConfigChanged), this.e = null) : (this._controller.destroy(), this._controller = null), this._emitter.removeAllListeners(), this._emitter = null
+            }
+        }, {
+            key: "on", value: function (e, t) {
+                this._emitter.addListener(e, t)
+            }
+        }, {
+            key: "off", value: function (e, t) {
+                this._emitter.removeListener(e, t)
+            }
+        }, {
+            key: "hasWorker", value: function () {
+                return null != this._worker
+            }
+        }, {
+            key: "open", value: function () {
+                this._worker ? this._worker.postMessage({cmd: "start"}) : this._controller.start()
+            }
+        }, {
+            key: "close", value: function () {
+                this._worker ? this._worker.postMessage({cmd: "stop"}) : this._controller.stop()
+            }
+        }, {
+            key: "seek", value: function (e) {
+                this._worker ? this._worker.postMessage({cmd: "seek", param: e}) : this._controller.seek(e)
+            }
+        }, {
+            key: "pause", value: function () {
+                this._worker ? this._worker.postMessage({cmd: "pause"}) : this._controller.pause()
+            }
+        }, {
+            key: "resume", value: function () {
+                this._worker ? this._worker.postMessage({cmd: "resume"}) : this._controller.resume()
+            }
+        }, {
+            key: "feed", value: function (e, t, n) {
+                this.hasWorker() ? this._worker.postMessage({
+                    cmd: "feed",
+                    feedData: {data: e, byteStart: t, receivedLength: n}
+                }) : this._controller._ioctl._onLoaderChunkArrival(e, t, n)
+            }
+        }, {
+            key: "setRecordFlag", value: function (e) {
+                this.hasWorker() ? this._worker.postMessage({
+                    cmd: "set_record_flag",
+                    value: e
+                }) : this._controller._demuxer.recordFlag = e
+            }
+        }, {
+            key: "_onInitSegment", value: function (e, t) {
+                var n = this;
+                a.default.resolve().then(function () {
+                    null != n._emitter && n._emitter.emit(h.default.INIT_SEGMENT, e, t)
+                })
+            }
+        }, {
+            key: "_onMediaSegment", value: function (e, t) {
+                var n = this;
+                a.default.resolve().then(function () {
+                    null != n._emitter && n._emitter.emit(h.default.MEDIA_SEGMENT, e, t)
+                })
+            }
+        }, {
+            key: "_onLoadingComplete", value: function () {
+                var e = this;
+                a.default.resolve().then(function () {
+                    e._emitter.emit(h.default.LOADING_COMPLETE)
+                })
+            }
+        }, {
+            key: "_onRecoveredEarlyEof", value: function () {
+                var e = this;
+                a.default.resolve().then(function () {
+                    e._emitter.emit(h.default.RECOVERED_EARLY_EOF)
+                })
+            }
+        }, {
+            key: "_onMediaInfo", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    null != t._emitter && t._emitter.emit(h.default.MEDIA_INFO, e)
+                })
+            }
+        }, {
+            key: "_onMetaDataArrived", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    null != t._emitter && t._emitter.emit(h.default.METADATA_ARRIVED, e)
+                })
+            }
+        }, {
+            key: "_onScriptDataArrived", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    null != t._emitter && t._emitter.emit(h.default.SCRIPTDATA_ARRIVED, e)
+                })
+            }
+        }, {
+            key: "_onStatisticsInfo", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    t._emitter.emit(h.default.STATISTICS_INFO, e)
+                })
+            }
+        }, {
+            key: "_onIOError", value: function (e, t) {
+                var n = this;
+                a.default.resolve().then(function () {
+                    null != n._emitter && n._emitter.emit(h.default.IO_ERROR, e, t)
+                })
+            }
+        }, {
+            key: "_onDemuxError", value: function (e, t) {
+                var n = this;
+                a.default.resolve().then(function () {
+                    null != n._emitter && n._emitter.emit(h.default.DEMUX_ERROR, e, t)
+                })
+            }
+        }, {
+            key: "_onRecommendSeekpoint", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    t._emitter.emit(h.default.RECOMMEND_SEEKPOINT, e)
+                })
+            }
+        }, {
+            key: "_onLoggingConfigChanged", value: function (e) {
+                this._worker && this._worker.postMessage({cmd: "logging_config", param: e})
+            }
+        }, {
+            key: "_onVideoResolutionChanged", value: function (e) {
+                var t = this;
+                a.default.resolve().then(function () {
+                    null != t._emitter && t._emitter.emit(h.default.VIDEO_RESOLUTION_CHANGED, e)
+                })
+            }
+        }, {
+            key: "_onWorkerMessage", value: function (e) {
+                var t = e.data, n = t.data;
+                if ("destroyed" === t.msg || this._workerDestroying) return this._workerDestroying = !1, this._worker.terminate(), void (this._worker = null);
+                switch (t.msg) {
+                    case h.default.INIT_SEGMENT:
+                    case h.default.MEDIA_SEGMENT:
+                        this._emitter.emit(t.msg, n.type, n.data);
+                        break;
+                    case h.default.LOADING_COMPLETE:
+                    case h.default.RECOVERED_EARLY_EOF:
+                        this._emitter.emit(t.msg);
+                        break;
+                    case h.default.MEDIA_INFO:
+                        (0, i.default)(n, c.default.prototype), this._emitter.emit(t.msg, n);
+                        break;
+                    case h.default.METADATA_ARRIVED:
+                    case h.default.SCRIPTDATA_ARRIVED:
+                    case h.default.STATISTICS_INFO:
+                        this._emitter.emit(t.msg, n);
+                        break;
+                    case h.default.IO_ERROR:
+                    case h.default.DEMUX_ERROR:
+                        this._emitter.emit(t.msg, n.type, n.info);
+                        break;
+                    case h.default.RECOMMEND_SEEKPOINT:
+                        this._emitter.emit(t.msg, n);
+                        break;
+                    case"logcat_callback":
+                        u.default.emitter.emit("log", n.type, n.logcat);
+                        break;
+                    case h.default.PARSEDDATA_ARRIVED:
+                        this._emitter.emit(t.msg, n.databuf, n.dataType)
+                }
+            }
+        }, {
+            key: "_parsedDataArrived", value: function (e, t, n, i) {
+                var r = this;
+                a.default.resolve().then(function () {
+                    r._emitter && r._emitter.emit(h.default.PARSEDDATA_ARRIVED, e, t, n, i)
+                })
+            }
+        }]), t.default = m
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var r = l(n(85)), a = l(n(20)), s = l(n(9)), p = l(n(320)), i = l(n(1)), o = l(n(2)), b = l(n(4)),
+            u = l(n(324)), w = l(n(326)), D = l(n(66)), d = l(n(65)), y = n(5);
+
+        function l(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, o.default)(v, [{
+            key: "destroy", value: function () {
+                this._mediaInfo = null, this._metadata = null, this._audioMetadata = null, this._videoMetadata = null, this._videoTrack = null, this._audioTrack = null, this._onError = null, this._onMediaInfo = null, this._onMetaDataArrived = null, this._onScriptDataArrived = null, this._onTrackMetadata = null, this._onDataAvailable = null, this._lastVideoDimension = null, this._recordFlag = !1, this._firstrVideo = !0, this._firstAudio = !0, this._flvHead = "", this._firstParseAudio = !0, this._bpsCalculator && (self.clearInterval(this._bpsCalculator), this._bpsCalculator = null, this._bpsInfo = null)
+            }
+        }, {
+            key: "bindDataSource", value: function (e) {
+                return e.onDataArrival = this.parseChunks.bind(this), this
+            }
+        }, {
+            key: "resetMediaInfo", value: function () {
+                this._mediaInfo = new d.default
+            }
+        }, {
+            key: "_isInitialMetadataDispatched", value: function () {
+                return this._hasAudio && this._hasVideo ? this._audioInitialMetadataDispatched && this._videoInitialMetadataDispatched : this._hasAudio && !this._hasVideo ? this._audioInitialMetadataDispatched : !(this._hasAudio || !this._hasVideo) && this._videoInitialMetadataDispatched
+            }
+        }, {
+            key: "_calculateRealtimeBitrate", value: function () {
+                this._bpsInfo && (this._bpsInfo.time_gap_factor < 1 && (this._bpsInfo.time_gap_factor = 1), 0 != this._bpsInfo.lastVideoBytes && (this._bpsInfo.bps_video = 8 * this._bpsInfo.lastVideoBytes / 1024 / this._bpsInfo.time_gap_factor, this._bpsInfo.lastVideoBytes = 0), 0 != this._bpsInfo.lastAudioBytes && (this._bpsInfo.bps_audio = 8 * this._bpsInfo.lastAudioBytes / 1024 / this._bpsInfo.time_gap_factor, this._bpsInfo.lastAudioBytes = 0), this._videoInfo.bitRate = this._bpsInfo.bps_video + this._bpsInfo.bps_audio, this._onParsedData(this._videoInfo, 3))
+            }
+        }, {
+            key: "parseChunks", value: function (e, t) {
+                if (!(this._onError && this._onMediaInfo && this._onTrackMetadata && this._onDataAvailable)) throw new y.IllegalStateException("Flv: onError & onMediaInfo & onTrackMetadata & onDataAvailable callback must be specified");
+                var n = 0, i = this._littleEndian;
+                if (0 === t) {
+                    if (!(13 < e.byteLength)) return 0;
+                    n = v.probe(e).dataOffset
+                }
+                this._bpsCalculator || (this._bpsCalculator = self.setInterval(this._calculateRealtimeBitrate.bind(this), 1e3)), this._firstParse && (this._firstParse = !1, t + n !== this._dataOffset && b.default.w(this.TAG, "First time parsing but chunk byteStart invalid!"), 0 !== new DataView(e, n).getUint32(0, !i) && b.default.w(this.TAG, "PrevTagSize0 !== 0 !!!"), n += 4, this._flvHead = new Uint8Array(e, 0, 13));
+                for (var r, a = 0, s = 0; n < e.byteLength;) {
+                    this._dispatch = !0;
+                    var o = new DataView(e, n);
+                    if (n + 11 + 4 > e.byteLength) break;
+                    var u = o.getUint8(0), d = 16777215 & o.getUint32(0, !i);
+                    if (n + 11 + d + 4 > e.byteLength) break;
+                    if (8 !== u && 9 !== u && 18 !== u && 191 !== u) b.default.w(this.TAG, "Unsupported tag type " + u + ", skipped"), n += 11 + d + 4; else {
+                        var l, h = o.getUint8(4), c = o.getUint8(5),
+                            _ = o.getUint8(6) | c << 8 | h << 16 | o.getUint8(7) << 24,
+                            f = (0 != (16777215 & o.getUint32(7, !i)) && b.default.w(this.TAG, "Meet tag which has StreamID != 0!"), n + 11);
+                        switch (!this._recordFlag || 8 !== u && 9 !== u && 18 !== u || this._onParsedData(new Uint8Array(e, n, 11 + d + 4), 1), u) {
+                            case 8:
+                                this._firstAudio && (l = (this._firstAudio = !1, p.default)(this._flvHead).concat((0, p.default)(new Uint8Array(e, n, 11 + d + 4))), this._flvHead = new Uint8Array(l), this._onParsedData(this._flvHead, 5)), this._parseAudioData(e, f, d, _), s += d;
+                                break;
+                            case 9:
+                                this._firstrVideo && (l = (this._firstrVideo = !1, p.default)(this._flvHead).concat((0, p.default)(new Uint8Array(e, n, 11 + d + 4))), this._flvHead = new Uint8Array(l), this._onParsedData(this._flvHead, 5), this._osdtimeInfo.flvstartTime = _), this._osdtimeInfo.flvduration = _ - this._osdtimeInfo.flvstartTime, this._parseVideoData(e, f, d, _, t + n), a += d;
+                                break;
+                            case 18:
+                                var m = (0, p.default)(this._flvHead).concat((0, p.default)(new Uint8Array(e, n, 11 + d + 4)));
+                                this._flvHead = new Uint8Array(m), this._parseScriptData(e, f, d);
+                                break;
+                            case 191:
+                                this._parsePrivateData(e, f, d)
+                        }
+                        c = o.getUint32(11 + d, !i);
+                        c !== 11 + d && (b.default.w(this.TAG, "Invalid PrevTagSize " + c), (2097152 < c || c < 16) && this._onParsedData("reset decoder", 11)), n += 11 + d + 4
+                    }
+                }
+                return this._bpsInfo && (this._bpsInfo.lastAudioBytes += s, this._bpsInfo.lastVideoBytes += a, 0 != this._bpsInfo.data_updated_time && (r = (r = (this._now() - this._bpsInfo.data_updated_time) / 1e3) < 1 ? 1 : Math.round(r), this._bpsInfo.time_gap_factor = r), this._bpsInfo.data_updated_time = this._now()), this._isInitialMetadataDispatched() && this._dispatch && (this._audioTrack.length || this._videoTrack.length) && this._onDataAvailable(this._audioTrack, this._videoTrack), n
+            }
+        }, {
+            key: "_parseScriptData", value: function (e, t, n) {
+                e = u.default.parseScriptData(e, t, n);
+                if (e.hasOwnProperty("onMetaData")) {
+                    if (null == e.onMetaData || "object" !== (0, s.default)(e.onMetaData)) return void b.default.w(this.TAG, "Invalid onMetaData structure!");
+                    this._metadata && b.default.w(this.TAG, "Found another onMetaData tag!"), this._metadata = e;
+                    var i, t = this._metadata.onMetaData;
+                    this._onMetaDataArrived && this._onMetaDataArrived((0, a.default)({}, t)), "boolean" == typeof t.hasAudio && !1 === this._hasAudioFlagOverrided && (this._hasAudio = t.hasAudio, this._mediaInfo.hasAudio = this._hasAudio), "boolean" == typeof t.hasVideo && !1 === this._hasVideoFlagOverrided && (this._hasVideo = t.hasVideo, this._mediaInfo.hasVideo = this._hasVideo), "number" == typeof t.audiodatarate && (this._mediaInfo.audioDataRate = t.audiodatarate), "number" == typeof t.videodatarate && (this._mediaInfo.videoDataRate = t.videodatarate), "number" == typeof t.width && (this._mediaInfo.width = t.width), "number" == typeof t.height && (this._mediaInfo.height = t.height), "number" == typeof t.duration ? this._durationOverrided || (n = Math.floor(t.duration * this._timescale), this._duration = n, this._mediaInfo.duration = n) : this._mediaInfo.duration = 0, "number" != typeof t.framerate || 0 < (n = Math.floor(1e3 * t.framerate)) && (i = n / 1e3, this._referenceFrameRate.fixed = !0, this._referenceFrameRate.fps = i, this._referenceFrameRate.fps_num = n, this._referenceFrameRate.fps_den = 1e3, this._mediaInfo.fps = i), "object" === (0, s.default)(t.keyframes) ? (this._mediaInfo.hasKeyframesIndex = !0, n = t.keyframes, this._mediaInfo.keyframesIndex = this._parseKeyframesIndex(n), t.keyframes = null) : this._mediaInfo.hasKeyframesIndex = !1, this._dispatch = !1, this._mediaInfo.metadata = t, b.default.v(this.TAG, "Parsed onMetaData, hasAudio:" + this._mediaInfo.hasAudio + ", hasVideo:" + this._mediaInfo.hasVideo + ", video demension:" + this._mediaInfo.width + "x" + this._mediaInfo.height + "@" + this._mediaInfo.fps + " fps, hasKeyframesIndex=" + this._mediaInfo.hasKeyframesIndex + ", video_bitrate=" + this._mediaInfo.videoDataRate + ", audio_bitrate=" + this._mediaInfo.audioDataRate), this._mediaInfo.isComplete() && this._onMediaInfo(this._mediaInfo)
+                }
+                0 < (0, r.default)(e).length && this._onScriptDataArrived && this._onScriptDataArrived((0, a.default)({}, e))
+            }
+        }, {
+            key: "_parseKeyframesIndex", value: function (e) {
+                for (var t = [], n = [], i = 1; i < e.times.length; i++) {
+                    var r = this._timestampBase + Math.floor(1e3 * e.times[i]);
+                    t.push(r), n.push(e.filepositions[i])
+                }
+                return {times: t, filepositions: n}
+            }
+        }, {
+            key: "_parseAudioData", value: function (e, t, n, i) {
+                if (n <= 1) b.default.w(this.TAG, "Flv: Invalid audio packet, missing SoundData payload!"); else if (!0 === this._hasAudioFlagOverrided && !1 === this._hasAudio) {
+                    if (this._firstParseAudio) {
+                        this._firstParseAudio = !1;
+                        var r = this._parseAACAudioData(e, t + 1, n - 1);
+                        if (null == r) return;
+                        this._videoInfo.audioType = "AAC", this._videoInfo.audioSampleRate = r.data.samplingRate
+                    }
+                } else {
+                    this._littleEndian;
+                    var r = new DataView(e, t, n).getUint8(0), a = r >>> 4;
+                    if (2 != a && 10 != a) this._onError(D.default.CODEC_UNSUPPORTED, "Flv: Unsupported audio codec idx: " + a); else {
+                        var s = 0, o = (12 & r) >>> 2;
+                        if (0 <= o && o <= 4) {
+                            var s = this._flvSoundRateTable[o], r = 1 & r, u = this._audioMetadata,
+                                d = this._audioTrack;
+                            if (u || (!1 === this._hasAudio && !1 === this._hasAudioFlagOverrided && (this._hasAudio = !0, this._mediaInfo.hasAudio = !0), (u = this._audioMetadata = {type: "audio"}).id = d.id, u.timescale = this._timescale, u.duration = this._duration, u.audioSampleRate = s, u.channelCount = 0 == r ? 1 : 2), 10 == a) {
+                                s = this._parseAACAudioData(e, t + 1, n - 1);
+                                if (null != s) {
+                                    if (0 === s.packetType) {
+                                        u.config && b.default.w(this.TAG, "Found another AudioSpecificConfig!");
+                                        r = s.data;
+                                        if (b.default.v(this.TAG, "old {channel:" + u.channelCount + ", codec:" + u.codec + ", sample rate:" + u.audioSampleRate + ", orignal codec:" + r.originalCodec + ", config:" + u.config + "}"), b.default.v(this.TAG, "new {channel:" + r.channelCount + ", codec:" + r.codec + ", sample rate:" + r.samplingRate + ", orignal codec:" + r.originalCodec + ", config:" + r.config + "}"), this._videoInfo.audioSampleRate = r.samplingRate, this._onParsedData(this._videoInfo, 3), u.channelCount === r.channelCount && u.audioSampleRate === r.samplingRate && u.codec === r.codec && u.originalCodec === r.originalCodec) return void b.default.w(this.TAG, "audio specific config do not changed, discard it.");
+                                        u.audioSampleRate = r.samplingRate, u.channelCount = r.channelCount, u.codec = r.codec, u.originalCodec = r.originalCodec, u.config = r.config, u.refSampleDuration = 1024 / u.audioSampleRate * u.timescale, this._isInitialMetadataDispatched() ? this._dispatch && (this._audioTrack.length || this._videoTrack.length) && this._onDataAvailable(this._audioTrack, this._videoTrack) : this._audioInitialMetadataDispatched = !0, this._dispatch = !1, this._onTrackMetadata("audio", u);
+                                        r = this._mediaInfo;
+                                        r.audioCodec = u.originalCodec, r.audioSampleRate = u.audioSampleRate, r.audioChannelCount = u.channelCount, r.hasVideo ? null != r.videoCodec && (r.mimeType = 'video/x-flv; codecs="' + r.videoCodec + "," + r.audioCodec + '"') : r.mimeType = 'video/x-flv; codecs="' + r.audioCodec + '"', r.isComplete() && this._onMediaInfo(r)
+                                    } else 1 === s.packetType ? (r = this._timestampBase + i, r = {
+                                        unit: s.data,
+                                        length: s.data.byteLength,
+                                        dts: r,
+                                        pts: r
+                                    }, d.samples.push(r), d.length += s.data.length) : b.default.e(this.TAG, "Flv: Unsupported AAC data type " + s.packetType);
+                                    this._videoInfo.audioType = "AAC"
+                                }
+                            } else if (2 == a) {
+                                if (!u.codec) {
+                                    r = this._parseMP3AudioData(e, t + 1, n - 1, !0);
+                                    if (null == r) return;
+                                    u.audioSampleRate = r.samplingRate, u.channelCount = r.channelCount, u.codec = r.codec, u.originalCodec = r.originalCodec, u.refSampleDuration = 1152 / u.audioSampleRate * u.timescale, b.default.v(this.TAG, "Parsed MPEG Audio Frame Header"), this._audioInitialMetadataDispatched = !0, this._onTrackMetadata("audio", u);
+                                    s = this._mediaInfo;
+                                    s.audioCodec = u.codec, s.audioSampleRate = u.audioSampleRate, s.audioChannelCount = u.channelCount, s.audioDataRate = r.bitRate, s.hasVideo ? null != s.videoCodec && (s.mimeType = 'video/x-flv; codecs="' + s.videoCodec + "," + s.audioCodec + '"') : s.mimeType = 'video/x-flv; codecs="' + s.audioCodec + '"', s.isComplete() && this._onMediaInfo(s), this._videoInfo.audioType = "MP3"
+                                }
+                                a = this._parseMP3AudioData(e, t + 1, n - 1, !1);
+                                null != a && (u = this._timestampBase + i, r = {
+                                    unit: a,
+                                    length: a.byteLength,
+                                    dts: u,
+                                    pts: u
+                                }, d.samples.push(r), d.length += a.length)
+                            }
+                        } else this._onError(D.default.FORMAT_ERROR, "Flv: Invalid audio sample rate idx: " + o)
+                    }
+                }
+            }
+        }, {
+            key: "_parseAACAudioData", value: function (e, t, n) {
+                var i, r;
+                {
+                    if (!(n <= 1)) return i = {}, r = new Uint8Array(e, t, n), i.packetType = r[0], 0 === r[0] ? i.data = this._parseAACAudioSpecificConfig(e, t + 1, n - 1) : i.data = r.subarray(1), i;
+                    b.default.w(this.TAG, "Flv: Invalid AAC packet, missing AACPacketType or/and Data!")
+                }
+            }
+        }, {
+            key: "_parseAACAudioSpecificConfig", value: function (e, t, n) {
+                var i, r, e = new Uint8Array(e, t, n), t = null, n = 0, a = null, n = i = e[0] >>> 3;
+                if ((r = (7 & e[0]) << 1 | e[1] >>> 7) < 0 || r >= this._mpegSamplingRates.length) this._onError(D.default.FORMAT_ERROR, "Flv: AAC invalid sampling frequency index!"); else {
+                    var s = this._mpegSamplingRates[r], o = (120 & e[1]) >>> 3;
+                    if (!(o < 0 || 8 <= o)) return 5 === n && (a = (7 & e[1]) << 1 | e[2] >>> 7, e[2]), -1 !== (e = self.navigator.userAgent.toLowerCase()).indexOf("firefox") ? a = 6 <= r ? (n = 5, t = new Array(4), r - 3) : (n = 2, t = new Array(2), r) : -1 !== e.indexOf("android") ? (n = 2, t = new Array(2), a = r) : (n = 5, a = r, t = new Array(4), 6 <= r ? a = r - 3 : 1 == o && (n = 2, t = new Array(2), a = r)), t[0] = n << 3, t[0] |= (15 & r) >>> 1, t[1] = (15 & r) << 7, t[1] |= (15 & o) << 3, 5 === n && (t[1] |= (15 & a) >>> 1, t[2] = (1 & a) << 7, t[2] |= 8, t[3] = 0), {
+                        config: t,
+                        samplingRate: s,
+                        channelCount: o,
+                        codec: "mp4a.40." + n,
+                        originalCodec: "mp4a.40." + i
+                    };
+                    this._onError(D.default.FORMAT_ERROR, "Flv: AAC invalid channel configuration")
+                }
+            }
+        }, {
+            key: "_parseMP3AudioData", value: function (e, t, n, i) {
+                if (!(n < 4)) {
+                    this._littleEndian;
+                    e = new Uint8Array(e, t, n), t = null;
+                    if (i) {
+                        if (255 !== e[0]) return;
+                        var n = e[1] >>> 3 & 3, i = (6 & e[1]) >> 1, r = (240 & e[2]) >>> 4, a = (12 & e[2]) >>> 2,
+                            s = 3 != (e[3] >>> 6 & 3) ? 2 : 1, o = 0, u = 0;
+                        switch (n) {
+                            case 0:
+                                o = this._mpegAudioV25SampleRateTable[a];
+                                break;
+                            case 2:
+                                o = this._mpegAudioV20SampleRateTable[a];
+                                break;
+                            case 3:
+                                o = this._mpegAudioV10SampleRateTable[a]
+                        }
+                        switch (i) {
+                            case 1:
+                                r < this._mpegAudioL3BitRateTable.length && (u = this._mpegAudioL3BitRateTable[r]);
+                                break;
+                            case 2:
+                                r < this._mpegAudioL2BitRateTable.length && (u = this._mpegAudioL2BitRateTable[r]);
+                                break;
+                            case 3:
+                                r < this._mpegAudioL1BitRateTable.length && (u = this._mpegAudioL1BitRateTable[r])
+                        }
+                        t = {bitRate: u, samplingRate: o, channelCount: s, codec: "mp3", originalCodec: "mp3"}
+                    } else t = e;
+                    return t
+                }
+                b.default.w(this.TAG, "Flv: Invalid MP3 packet, header missing!")
+            }
+        }, {
+            key: "_parseVideoData", value: function (e, t, n, i, r) {
+                var a, s;
+                n <= 1 ? b.default.w(this.TAG, "Flv: Invalid video packet, missing VideoData payload!") : !0 === this._hasVideoFlagOverrided && !1 === this._hasVideo || (a = (240 & (s = new Uint8Array(e, t, n)[0])) >>> 4, 7 != (s = 15 & s) ? this._onError(D.default.CODEC_UNSUPPORTED, "Flv: Unsupported codec in video frame: " + s) : this._parseAVCVideoPacket(e, t + 1, n - 1, i, r, a))
+            }
+        }, {
+            key: "_parseAVCVideoPacket", value: function (e, t, n, i, r, a) {
+                var s, o, u;
+                n < 4 ? b.default.w(this.TAG, "Flv: Invalid AVC packet, missing AVCPacketType or/and CompositionTime") : (s = this._littleEndian, o = (u = new DataView(e, t, n)).getUint8(0), u = (16777215 & u.getUint32(0, !s)) << 8 >> 8, 0 === o ? this._parseAVCDecoderConfigurationRecord(e, t + 4, n - 4) : 1 === o ? this._parseAVCVideoData(e, t + 4, n - 4, i, r, a, u) : 2 !== o && this._onError(D.default.FORMAT_ERROR, "Flv: Invalid video packet type " + o))
+            }
+        }, {
+            key: "_parseAVCDecoderConfigurationRecord", value: function (e, t, n) {
+                if (n < 7) b.default.w(this.TAG, "Flv: Invalid AVCDecoderConfigurationRecord, lack of data!"); else {
+                    var i = this._videoMetadata, r = this._videoTrack, a = this._littleEndian,
+                        s = new DataView(e, t, n), o = !1,
+                        r = (i ? void 0 !== i.avcc && (o = !0) : (!1 === this._hasVideo && !1 === this._hasVideoFlagOverrided && (this._hasVideo = !0, this._mediaInfo.hasVideo = !0), (i = this._videoMetadata = {type: "video"}).id = r.id, i.timescale = this._timescale, i.duration = this._duration), s.getUint8(0)),
+                        u = s.getUint8(1);
+                    s.getUint8(2), s.getUint8(3);
+                    if (1 !== r || 0 === u) this._onError(D.default.FORMAT_ERROR, "Flv: Invalid AVCDecoderConfigurationRecord"); else if (this._naluLengthSize = 1 + (3 & s.getUint8(4)), 3 !== this._naluLengthSize && 4 !== this._naluLengthSize) this._onError(D.default.FORMAT_ERROR, "Flv: Strange NaluLengthSizeMinusOne: " + (this._naluLengthSize - 1)); else {
+                        var d = 31 & s.getUint8(5);
+                        if (0 == d) this._onError(D.default.FORMAT_ERROR, "Flv: Invalid AVCDecoderConfigurationRecord: No SPS"); else {
+                            1 < d && b.default.w(this.TAG, "Flv: Strange AVCDecoderConfigurationRecord: SPS Count = " + d);
+                            for (var l = !0, h = 6, c = 0; c < d; c++) {
+                                var _ = s.getUint16(h, !a);
+                                if (h += 2, 0 !== _) {
+                                    var f = new Uint8Array(e, t + h, _), _ = (h += _, w.default.parseSPS(f));
+                                    if (0 === c) {
+                                        l = _.codec_size.width >= _.codec_size.height;
+                                        if (o && this._lastVideoDimension) {
+                                            if (this._lastVideoDimension.width != _.codec_size.width || this._lastVideoDimension.height != _.codec_size.height) {
+                                                this._resolutionChanged = !0, b.default.d(this.TAG, "video resolution changed from [" + this._lastVideoDimension.width + "x" + this._lastVideoDimension.height + "] to [" + _.codec_size.width + "x" + _.codec_size.height + "]"), this._lastVideoDimension.width = _.codec_size.width, this._lastVideoDimension.height = _.codec_size.height, this._lastVideoDimension.profile = _.profile_string, this._lastVideoDimension.level = _.level_string;
+                                                var m = {};
+                                                m.width = _.codec_size.width, m.height = _.codec_size.height, this._onVideoResolutionChanged(m)
+                                            } else if (this._lastVideoDimension.profile == _.profile_string && this._lastVideoDimension.level == _.level_string) return
+                                        } else this._lastVideoDimension.width = _.codec_size.width, this._lastVideoDimension.height = _.codec_size.height, this._lastVideoDimension.profile = _.profile_string, this._lastVideoDimension.level = _.level_string, b.default.d(this.TAG, "got new video dimension: [" + this._lastVideoDimension.width + "x" + this._lastVideoDimension.height + "]");
+                                        i.codecWidth = _.codec_size.width, i.codecHeight = _.codec_size.height, i.presentWidth = _.present_size.width, i.presentHeight = _.present_size.height, i.profile = _.profile_string, i.level = _.level_string, i.bitDepth = _.bit_depth, i.chromaFormat = _.chroma_format, i.sarRatio = _.sar_ratio, i.frameRate = _.frame_rate, !1 !== _.frame_rate.fixed && 0 !== _.frame_rate.fps_num && 0 !== _.frame_rate.fps_den || (i.frameRate = this._referenceFrameRate);
+                                        for (var m = i.frameRate.fps_den, p = i.frameRate.fps_num, y = (i.refSampleDuration = i.timescale * (m / p), f.subarray(1, 4)), v = "avc1.", g = 0; g < 3; g++) {
+                                            var M = y[g].toString(16);
+                                            v += M = M.length < 2 ? "0" + M : M
+                                        }
+                                        i.codec = v;
+                                        p = this._mediaInfo;
+                                        p.width = i.codecWidth, p.height = i.codecHeight, p.fps = i.frameRate.fps, p.profile = i.profile, p.level = i.level, p.refFrames = _.ref_frames, p.chromaFormat = _.chroma_format_string, p.sarNum = i.sarRatio.width, p.sarDen = i.sarRatio.height, p.videoCodec = v, p.hasAudio ? null != p.audioCodec && (p.mimeType = 'video/x-flv; codecs="' + p.videoCodec + "," + p.audioCodec + '"') : p.mimeType = 'video/x-flv; codecs="' + p.videoCodec + '"', p.isComplete() && this._onMediaInfo(p)
+                                    }
+                                }
+                            }
+                            var L = s.getUint8(h);
+                            if (0 === L) this._onError(D.default.FORMAT_ERROR, "Flv: Invalid AVCDecoderConfigurationRecord: No PPS"); else {
+                                1 < L && b.default.w(this.TAG, "Flv: Strange AVCDecoderConfigurationRecord: PPS Count = " + L), h++;
+                                for (var S = 0; S < L; S++) {
+                                    var k = s.getUint16(h, !a);
+                                    h += 2, 0 !== k && (h += k)
+                                }
+                                i.avcc = new Uint8Array(n), i.avcc.set(new Uint8Array(e, t, n), 0), b.default.v(this.TAG, "Parsed AVCDecoderConfigurationRecord done, " + i.codecWidth + "x" + i.codecHeight + "@" + i.frameRate.fps + " fps, profile=" + i.profile + ", level=" + i.level), this._isInitialMetadataDispatched() ? this._dispatch && (this._audioTrack.length || this._videoTrack.length) && this._onDataAvailable(this._audioTrack, this._videoTrack) : this._videoInitialMetadataDispatched = !0, this._dispatch = !1, this._config.enableConstVideoViewSize && (b.default.w(this.TAG, "--== const video view size enabled, use {" + this._config.constVideoViewWidth + "x" + this._config.constVideoViewHeight + "} ==--"), i.codecWidth = l ? this._config.constVideoViewWidth : this._config.constVideoViewHeight, i.codecHeight = l ? this._config.constVideoViewHeight : this._config.constVideoViewWidth), this._onTrackMetadata("video", i), this._videoInfo.bitRate = this._mediaInfo.videoDataRate, this._videoInfo.frameRate = i.frameRate.fps, this._videoInfo.width = i.codecWidth, this._videoInfo.height = i.codecHeight, this._onParsedData(this._videoInfo, 3)
+                            }
+                        }
+                    }
+                }
+            }
+        }, {
+            key: "_parseAVCVideoData", value: function (e, t, n, i, r, a, s) {
+                for (var o = this._littleEndian, u = new DataView(e, t, n), d = [], l = 0, h = 0, c = this._naluLengthSize, _ = this._timestampBase + i, f = 1 === a; h < n;) {
+                    if (n <= h + 4) {
+                        b.default.w(this.TAG, "Malformed Nalu near timestamp " + _ + ", offset = " + h + ", dataSize = " + n);
+                        break
+                    }
+                    var m = u.getUint32(h, !o);
+                    if (3 === c && (m >>>= 8), n - c < m) return void b.default.w(this.TAG, "Malformed Nalus near timestamp " + _ + ", NaluSize > DataSize!");
+                    var p = 31 & u.getUint8(h + c), y = (5 == p && (f = !0), new Uint8Array(e, t + h, c + m));
+                    d.push({type: p, data: y}), l += y.byteLength, h += c + m
+                }
+                f && this._onParsedData(this._osdtimeInfo, 2), d.length && (i = this._videoTrack, a = {
+                    units: d,
+                    length: l,
+                    isKeyframe: f,
+                    dts: _,
+                    cts: s,
+                    pts: _ + s
+                }, f && (a.fileposition = r), i.samples.push(a), i.length += l)
+            }
+        }, {
+            key: "_parsePrivateData", value: function (e, t, n) {
+                var i, r, a, e = new Uint8Array(e, t, n);
+                64 === e[0] && 14 === e[1] && (this._firstTimeStamp = !1, t = e[6] + 2e3, n = e[7] >> 4, i = (15 & e[7]) << 1 | e[8] >> 7, r = e[8] >> 2 & 31, a = (3 & e[8]) << 4 | e[9] >> 4, e = (15 & e[9]) << 2 | e[10] >> 6, this._osdtimeInfo.globalTime = t + "-" + n + "-" + i + " " + r + ":" + a + ":" + e)
+            }
+        }, {
+            key: "recordFlag", get: function () {
+                return this._recordFlag
+            }, set: function (e) {
+                e && this._onParsedData(this._flvHead, 1), this._recordFlag = e
+            }
+        }, {
+            key: "onTrackMetadata", get: function () {
+                return this._onTrackMetadata
+            }, set: function (e) {
+                this._onTrackMetadata = e
+            }
+        }, {
+            key: "onMediaInfo", get: function () {
+                return this._onMediaInfo
+            }, set: function (e) {
+                this._onMediaInfo = e
+            }
+        }, {
+            key: "onMetaDataArrived", get: function () {
+                return this._onMetaDataArrived
+            }, set: function (e) {
+                this._onMetaDataArrived = e
+            }
+        }, {
+            key: "onScriptDataArrived", get: function () {
+                return this._onScriptDataArrived
+            }, set: function (e) {
+                this._onScriptDataArrived = e
+            }
+        }, {
+            key: "onError", get: function () {
+                return this._onError
+            }, set: function (e) {
+                this._onError = e
+            }
+        }, {
+            key: "onDataAvailable", get: function () {
+                return this._onDataAvailable
+            }, set: function (e) {
+                this._onDataAvailable = e
+            }
+        }, {
+            key: "timestampBase", get: function () {
+                return this._timestampBase
+            }, set: function (e) {
+                this._timestampBase = e
+            }
+        }, {
+            key: "overridedDuration", get: function () {
+                return this._duration
+            }, set: function (e) {
+                this._durationOverrided = !0, this._duration = e, this._mediaInfo.duration = e
+            }
+        }, {
+            key: "overridedHasAudio", set: function (e) {
+                this._hasAudioFlagOverrided = !0, this._hasAudio = e, this._mediaInfo.hasAudio = e
+            }
+        }, {
+            key: "overridedHasVideo", set: function (e) {
+                this._hasVideoFlagOverrided = !0, this._hasVideo = e, this._mediaInfo.hasVideo = e
+            }
+        }, {
+            key: "onVideoResolutionChanged", get: function () {
+                return this._onVideoResolutionChanged
+            }, set: function (e) {
+                this._onVideoResolutionChanged = e
+            }
+        }, {
+            key: "onParsedData", set: function (e) {
+                this._onParsedData = e
+            }
+        }], [{
+            key: "probe", value: function (e) {
+                var e = new Uint8Array(e), t = {match: !1};
+                if (70 !== e[0] || 76 !== e[1] || 86 !== e[2] || 1 !== e[3]) return t;
+                var n, i = (4 & e[4]) >>> 2 != 0, r = 0 != (1 & e[4]),
+                    e = e[n = 5] << 24 | e[n + 1] << 16 | e[n + 2] << 8 | e[n + 3];
+                return e < 9 ? t : {match: !0, consumed: e, dataOffset: e, hasAudioTrack: i, hasVideoTrack: r}
+            }
+        }]);
+        n = v;
+
+        function v(e, t) {
+            (0, i.default)(this, v), this.TAG = "FLVDemuxer", this._config = t, this._onError = null, this._onMediaInfo = null, this._onMetaDataArrived = null, this._onScriptDataArrived = null, this._onTrackMetadata = null, this._onDataAvailable = null, this._onVideoResolutionChanged = null, this._onParsedData = null, this._dataOffset = e.dataOffset, this._firstParse = !0, this._dispatch = !1, this._hasAudio = !1, this._hasVideo = e.hasVideoTrack, this._hasAudioFlagOverrided = !1, this._hasVideoFlagOverrided = !1, this._audioInitialMetadataDispatched = !1, this._videoInitialMetadataDispatched = !1, this._mediaInfo = new d.default, this._mediaInfo.hasAudio = this._hasAudio, this._mediaInfo.hasVideo = this._hasVideo, this._metadata = null, this._audioMetadata = null, this._videoMetadata = null, this._naluLengthSize = 4, this._timestampBase = 0, this._timescale = 1e3, this._duration = 0, this._durationOverrided = !1, this._referenceFrameRate = {
+                fixed: !0,
+                fps: 23.976,
+                fps_num: 23976,
+                fps_den: 1e3
+            }, this._flvSoundRateTable = [5500, 11025, 22050, 44100, 48e3], this._mpegSamplingRates = [96e3, 88200, 64e3, 48e3, 44100, 32e3, 24e3, 22050, 16e3, 12e3, 11025, 8e3, 7350], this._lastVideoDimension = {
+                width: -1,
+                height: -1,
+                profile: "",
+                level: ""
+            }, this._bpsCalculator = null, this._bpsInfo = {
+                lastVideoBytes: 0,
+                lastAudioBytes: 0,
+                bps_video: 0,
+                bps_audio: 0,
+                data_updated_time: 0,
+                time_gap_factor: 1
+            }, this._resolutionChanged = !1, self.performance && self.performance.now ? this._now = self.performance.now.bind(self.performance) : this._now = Date.now, this._mpegAudioV10SampleRateTable = [44100, 48e3, 32e3, 0], this._mpegAudioV20SampleRateTable = [22050, 24e3, 16e3, 0], this._mpegAudioV25SampleRateTable = [11025, 12e3, 8e3, 0], this._mpegAudioL1BitRateTable = [0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1], this._mpegAudioL2BitRateTable = [0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1], this._mpegAudioL3BitRateTable = [0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1], this._videoTrack = {
+                type: "video",
+                id: 1,
+                sequenceNumber: 0,
+                samples: [],
+                length: 0
+            }, this._audioTrack = {
+                type: "audio",
+                id: 2,
+                sequenceNumber: 0,
+                samples: [],
+                length: 0
+            }, this._littleEndian = (t = new ArrayBuffer(2), new DataView(t).setInt16(0, 256, !0), 256 === new Int16Array(t)[0]), this._recordFlag = !1, this._firstrVideo = !0, this._firstAudio = !0, this._firstTimeStamp = !0, this._flvHead = "", this._videoInfo = {
+                VideType: "H264",
+                audioType: "without",
+                width: 0,
+                height: 0,
+                frameRate: 25,
+                bitRate: 0,
+                systemFormt: "flv",
+                audioSampleRate: 0
+            }, this._firstParseAudio = !0, this._osdtimeInfo = {flvstartTime: 0, globalTime: 0, flvduration: 0}
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        e.exports = {default: n(321), __esModule: !0}
+    }, function (e, t, n) {
+        n(41), n(322), e.exports = n(3).Array.from
+    }, function (e, t, n) {
+        "use strict";
+        var h = n(22), i = n(8), c = n(24), _ = n(77), f = n(78), m = n(47), p = n(323), y = n(79);
+        i(i.S + i.F * !n(84)(function (e) {
+            Array.from(e)
+        }), "Array", {
+            from: function (e) {
+                var t, n, i, r, a = c(e), e = "function" == typeof this ? this : Array, s = arguments.length,
+                    o = 1 < s ? arguments[1] : void 0, u = void 0 !== o, d = 0, l = y(a);
+                if (u && (o = h(o, 2 < s ? arguments[2] : void 0, 2)), null == l || e == Array && f(l)) for (n = new e(t = m(a.length)); d < t; d++) p(n, d, u ? o(a[d], d) : a[d]); else for (r = l.call(a), n = new e; !(i = r.next()).done; d++) p(n, d, u ? _(r, o, [i.value, d], !0) : i.value);
+                return n.length = d, n
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var i = n(12), r = n(28);
+        e.exports = function (e, t, n) {
+            t in e ? i.f(e, t, r(0, n)) : e[t] = n
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = s(n(1)), r = s(n(2)), v = s(n(4)), a = s(n(325)), g = n(5);
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        n = new ArrayBuffer(2), new DataView(n).setInt16(0, 256, !0);
+        var M = 256 === new Int16Array(n)[0], n = ((0, r.default)(L, null, [{
+            key: "parseScriptData", value: function (e, t, n) {
+                var i = {};
+                try {
+                    var r = L.parseValue(e, t, n), a = L.parseValue(e, t + r.size, n - r.size);
+                    i[r.data] = a.data
+                } catch (e) {
+                    v.default.e("AMF", e.toString())
+                }
+                return i
+            }
+        }, {
+            key: "parseObject", value: function (e, t, n) {
+                if (n < 3) throw new g.IllegalStateException("Data not enough when parse ScriptDataObject");
+                var i = L.parseString(e, t, n), e = L.parseValue(e, t + i.size, n - i.size), t = e.objectEnd;
+                return {data: {name: i.data, value: e.data}, size: i.size + e.size, objectEnd: t}
+            }
+        }, {
+            key: "parseVariable", value: function (e, t, n) {
+                return L.parseObject(e, t, n)
+            }
+        }, {
+            key: "parseString", value: function (e, t, n) {
+                if (n < 2) throw new g.IllegalStateException("Data not enough when parse String");
+                n = new DataView(e, t, n).getUint16(0, !M);
+                return {data: 0 < n ? (0, a.default)(new Uint8Array(e, t + 2, n)) : "", size: 2 + n}
+            }
+        }, {
+            key: "parseLongString", value: function (e, t, n) {
+                if (n < 4) throw new g.IllegalStateException("Data not enough when parse LongString");
+                n = new DataView(e, t, n).getUint32(0, !M);
+                return {data: 0 < n ? (0, a.default)(new Uint8Array(e, t + 4, n)) : "", size: 4 + n}
+            }
+        }, {
+            key: "parseDate", value: function (e, t, n) {
+                if (n < 10) throw new g.IllegalStateException("Data size invalid when parse Date");
+                e = new DataView(e, t, n), t = e.getFloat64(0, !M);
+                return t += 60 * e.getInt16(8, !M) * 1e3, {data: new Date(t), size: 10}
+            }
+        }, {
+            key: "parseValue", value: function (e, t, n) {
+                if (n < 1) throw new g.IllegalStateException("Data not enough when parse Value");
+                var i = new DataView(e, t, n), r = 1, a = i.getUint8(0), s = void 0, o = !1;
+                try {
+                    switch (a) {
+                        case 0:
+                            s = i.getFloat64(1, !M), r += 8;
+                            break;
+                        case 1:
+                            s = !!i.getUint8(1);
+                            r += 1;
+                            break;
+                        case 2:
+                            var u = L.parseString(e, t + 1, n - 1);
+                            s = u.data, r += u.size;
+                            break;
+                        case 3:
+                            s = {};
+                            var d = 0;
+                            for (9 == (16777215 & i.getUint32(n - 4, !M)) && (d = 3); r < n - 4;) {
+                                var l = L.parseObject(e, t + r, n - r - d);
+                                if (l.objectEnd) break;
+                                s[l.data.name] = l.data.value, r += l.size
+                            }
+                            r <= n - 3 && 9 == (16777215 & i.getUint32(r - 1, !M)) && (r += 3);
+                            break;
+                        case 8:
+                            s = {}, r += 4;
+                            var h = 0;
+                            for (9 == (16777215 & i.getUint32(n - 4, !M)) && (h = 3); r < n - 8;) {
+                                var c = L.parseVariable(e, t + r, n - r - h);
+                                if (c.objectEnd) break;
+                                s[c.data.name] = c.data.value, r += c.size
+                            }
+                            r <= n - 3 && 9 == (16777215 & i.getUint32(r - 1, !M)) && (r += 3);
+                            break;
+                        case 9:
+                            r = 1, o = !(s = void 0);
+                            break;
+                        case 10:
+                            s = [];
+                            var _ = i.getUint32(1, !M);
+                            r += 4;
+                            for (var f = 0; f < _; f++) {
+                                var m = L.parseValue(e, t + r, n - r);
+                                s.push(m.data), r += m.size
+                            }
+                            break;
+                        case 11:
+                            var p = L.parseDate(e, t + 1, n - 1);
+                            s = p.data, r += p.size;
+                            break;
+                        case 12:
+                            var y = L.parseString(e, t + 1, n - 1);
+                            s = y.data, r += y.size;
+                            break;
+                        default:
+                            r = n, v.default.w("AMF", "Unsupported AMF value type " + a)
+                    }
+                } catch (e) {
+                    v.default.e("AMF", e.toString())
+                }
+                return {data: s, size: r, objectEnd: o}
+            }
+        }]), L);
+
+        function L() {
+            (0, i.default)(this, L)
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+
+        function o(e, t, n) {
+            var i = e;
+            if (t + n < i.length) {
+                for (; n--;) if (128 != (192 & i[++t])) return;
+                return 1
+            }
+        }
+
+        Object.defineProperty(t, "__esModule", {value: !0}), t.default = function (e) {
+            for (var t = [], n = e, i = 0, r = e.length; i < r;) if (n[i] < 128) t.push(String.fromCharCode(n[i])), ++i; else {
+                if (!(n[i] < 192)) if (n[i] < 224) {
+                    if (o(n, i, 1)) {
+                        var a = (31 & n[i]) << 6 | 63 & n[i + 1];
+                        if (128 <= a) {
+                            t.push(String.fromCharCode(65535 & a)), i += 2;
+                            continue
+                        }
+                    }
+                } else if (n[i] < 240) {
+                    if (o(n, i, 2)) {
+                        a = (15 & n[i]) << 12 | (63 & n[i + 1]) << 6 | 63 & n[i + 2];
+                        if (2048 <= a && 55296 != (63488 & a)) {
+                            t.push(String.fromCharCode(65535 & a)), i += 3;
+                            continue
+                        }
+                    }
+                } else if (n[i] < 248 && o(n, i, 3)) {
+                    var s = (7 & n[i]) << 18 | (63 & n[i + 1]) << 12 | (63 & n[i + 2]) << 6 | 63 & n[i + 3];
+                    if (65536 < s && s < 1114112) {
+                        s -= 65536, t.push(String.fromCharCode(s >>> 10 | 55296)), t.push(String.fromCharCode(1023 & s | 56320)), i += 4;
+                        continue
+                    }
+                }
+                t.push(String.fromCharCode(65533)), ++i
+            }
+            return t.join("")
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = a(n(1)), r = a(n(2)), T = a(n(327));
+
+        function a(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(E, null, [{
+            key: "_ebsp2rbsp", value: function (e) {
+                for (var t = e, n = t.byteLength, i = new Uint8Array(n), r = 0, a = 0; a < n; a++) 2 <= a && 3 === t[a] && 0 === t[a - 1] && 0 === t[a - 2] || (i[r] = t[a], r++);
+                return new Uint8Array(i.buffer, 0, r)
+            }
+        }, {
+            key: "parseSPS", value: function (e) {
+                var e = E._ebsp2rbsp(e), t = new T.default(e), e = (t.readByte(), t.readByte()),
+                    n = (t.readByte(), t.readByte()), i = (t.readUEG(), E.getProfileString(e)), n = E.getLevelString(n),
+                    r = 1, a = 420, s = 8;
+                if ((100 === e || 110 === e || 122 === e || 244 === e || 44 === e || 83 === e || 86 === e || 118 === e || 128 === e || 138 === e || 144 === e) && (3 === (r = t.readUEG()) && t.readBits(1), r <= 3 && (a = [0, 420, 422, 444][r]), s = t.readUEG() + 8, t.readUEG(), t.readBits(1), t.readBool())) for (var o = 3 !== r ? 8 : 12, u = 0; u < o; u++) t.readBool() && E._skipScalingList(t, u < 6 ? 16 : 64);
+                t.readUEG();
+                e = t.readUEG();
+                if (0 === e) t.readUEG(); else if (1 === e) {
+                    t.readBits(1), t.readSEG(), t.readSEG();
+                    for (var d = t.readUEG(), l = 0; l < d; l++) t.readSEG()
+                }
+                var e = t.readUEG(), h = (t.readBits(1), t.readUEG()), c = t.readUEG(), _ = t.readBits(1),
+                    f = (0 === _ && t.readBits(1), t.readBits(1), 0), m = 0, p = 0, y = 0,
+                    v = (t.readBool() && (f = t.readUEG(), m = t.readUEG(), p = t.readUEG(), y = t.readUEG()), 1),
+                    g = 1, M = 0, L = !0, S = 0, k = 0,
+                    b = (t.readBool() && (t.readBool() && (0 < (w = t.readByte()) && w < 16 ? (v = [1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2][w - 1], g = [1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1][w - 1]) : 255 === w && (v = t.readByte() << 8 | t.readByte(), g = t.readByte() << 8 | t.readByte())), t.readBool() && t.readBool(), t.readBool() && (t.readBits(4), t.readBool() && t.readBits(24)), t.readBool() && (t.readUEG(), t.readUEG()), t.readBool() && (w = t.readBits(32), b = t.readBits(32), L = t.readBool(), M = (S = b) / (k = 2 * w))), 1),
+                    w = (1 === v && 1 === g || (b = v / g), 0), D = 0,
+                    r = (D = 0 === r ? (w = 1, 2 - _) : (w = 3 === r ? 1 : 2, (1 === r ? 2 : 1) * (2 - _)), 16 * (h + 1)),
+                    h = 16 * (c + 1) * (2 - _), c = (r -= (f + m) * w, h -= (p + y) * D, Math.ceil(r * b));
+                return t.destroy(), t = null, {
+                    profile_string: i,
+                    level_string: n,
+                    bit_depth: s,
+                    ref_frames: e,
+                    chroma_format: a,
+                    chroma_format_string: E.getChromaFormatString(a),
+                    frame_rate: {fixed: L, fps: M, fps_den: k, fps_num: S},
+                    sar_ratio: {width: v, height: g},
+                    codec_size: {width: r, height: h},
+                    present_size: {width: c, height: h}
+                }
+            }
+        }, {
+            key: "_skipScalingList", value: function (e, t) {
+                for (var n = 8, i = 8, r = 0; r < t; r++) n = 0 === (i = 0 !== i ? (n + e.readSEG() + 256) % 256 : i) ? n : i
+            }
+        }, {
+            key: "getProfileString", value: function (e) {
+                switch (e) {
+                    case 66:
+                        return "Baseline";
+                    case 77:
+                        return "Main";
+                    case 88:
+                        return "Extended";
+                    case 100:
+                        return "High";
+                    case 110:
+                        return "High10";
+                    case 122:
+                        return "High422";
+                    case 244:
+                        return "High444";
+                    default:
+                        return "Unknown"
+                }
+            }
+        }, {
+            key: "getLevelString", value: function (e) {
+                return (e / 10).toFixed(1)
+            }
+        }, {
+            key: "getChromaFormatString", value: function (e) {
+                switch (e) {
+                    case 420:
+                        return "4:2:0";
+                    case 422:
+                        return "4:2:2";
+                    case 444:
+                        return "4:4:4";
+                    default:
+                        return "Unknown"
+                }
+            }
+        }]);
+        n = E;
+
+        function E() {
+            (0, i.default)(this, E)
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = s(n(1)), r = s(n(2)), a = n(5);
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(o, [{
+            key: "destroy", value: function () {
+                this._buffer = null
+            }
+        }, {
+            key: "_fillCurrentWord", value: function () {
+                var e = this._total_bytes - this._buffer_index;
+                if (e <= 0) throw new a.IllegalStateException("ExpGolomb: _fillCurrentWord() but no bytes available");
+                var e = Math.min(4, e), t = new Uint8Array(4);
+                t.set(this._buffer.subarray(this._buffer_index, this._buffer_index + e)), this._current_word = new DataView(t.buffer).getUint32(0, !1), this._buffer_index += e, this._current_word_bits_left = 8 * e
+            }
+        }, {
+            key: "readBits", value: function (e) {
+                if (32 < e) throw new a.InvalidArgumentException("ExpGolomb: readBits() bits exceeded max 32bits!");
+                if (e <= this._current_word_bits_left) return t = this._current_word >>> 32 - e, this._current_word <<= e, this._current_word_bits_left -= e, t;
+                var t = this._current_word_bits_left ? this._current_word : 0,
+                    e = (t >>>= 32 - this._current_word_bits_left, e - this._current_word_bits_left),
+                    e = (this._fillCurrentWord(), Math.min(e, this._current_word_bits_left)),
+                    n = this._current_word >>> 32 - e;
+                return this._current_word <<= e, this._current_word_bits_left -= e, t = t << e | n
+            }
+        }, {
+            key: "readBool", value: function () {
+                return 1 === this.readBits(1)
+            }
+        }, {
+            key: "readByte", value: function () {
+                return this.readBits(8)
+            }
+        }, {
+            key: "_skipLeadingZero", value: function () {
+                for (var e = void 0, e = 0; e < this._current_word_bits_left; e++) if (0 != (this._current_word & 2147483648 >>> e)) return this._current_word <<= e, this._current_word_bits_left -= e, e;
+                return this._fillCurrentWord(), e + this._skipLeadingZero()
+            }
+        }, {
+            key: "readUEG", value: function () {
+                var e = this._skipLeadingZero();
+                return this.readBits(e + 1) - 1
+            }
+        }, {
+            key: "readSEG", value: function () {
+                var e = this.readUEG();
+                return 1 & e ? e + 1 >>> 1 : -1 * (e >>> 1)
+            }
+        }]);
+        n = o;
+
+        function o(e) {
+            (0, i.default)(this, o), this.TAG = "ExpGolomb", this._buffer = e, this._buffer_index = 0, this._total_bytes = e.byteLength, this._total_bits = 8 * e.byteLength, this._current_word = 0, this._current_word_bits_left = 0
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = s(n(1)), r = s(n(2)), A = s(n(4)), x = s(n(329)), O = s(n(330)), I = s(n(33)), W = n(230), a = n(5);
+
+        function s(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(o, [{
+            key: "destroy", value: function () {
+                this._dtsBase = -1, this._dtsBaseInited = !1, this._audioMeta = null, this._videoMeta = null, this._audioSegmentInfoList.clear(), this._audioSegmentInfoList = null, this._videoSegmentInfoList.clear(), this._videoSegmentInfoList = null, this._onInitSegment = null, this._onMediaSegment = null
+            }
+        }, {
+            key: "bindDataSource", value: function (e) {
+                return e.onDataAvailable = this.remux.bind(this), e.onTrackMetadata = this._onTrackMetadataReceived.bind(this), this
+            }
+        }, {
+            key: "insertDiscontinuity", value: function () {
+                this._audioNextDts = this._videoNextDts = void 0
+            }
+        }, {
+            key: "seek", value: function (e) {
+                this._audioStashedLastSample = null, this._videoStashedLastSample = null, this._videoSegmentInfoList.clear(), this._audioSegmentInfoList.clear()
+            }
+        }, {
+            key: "remux", value: function (e, t) {
+                if (!this._onMediaSegment) throw new a.IllegalStateException("MP4Remuxer: onMediaSegment callback must be specificed!");
+                this._dtsBaseInited || this._calculateDtsBase(e, t), this._remuxVideo(t), this._remuxAudio(e)
+            }
+        }, {
+            key: "_onTrackMetadataReceived", value: function (e, t) {
+                var n = null, i = "mp4", r = t.codec;
+                if ("audio" === e) n = "mp3" === (this._audioMeta = t).codec && this._mp3UseMpegAudio ? (i = "mpeg", r = "", new Uint8Array) : x.default.generateInitSegment(t); else {
+                    if ("video" !== e) return;
+                    this._videoMeta = t, n = x.default.generateInitSegment(t)
+                }
+                if (!this._onInitSegment) throw new a.IllegalStateException("MP4Remuxer: onInitSegment callback must be specified!");
+                this._onInitSegment(e, {
+                    type: e,
+                    data: n.buffer,
+                    codec: r,
+                    container: e + "/" + i,
+                    mediaDuration: t.duration
+                })
+            }
+        }, {
+            key: "_calculateDtsBase", value: function (e, t) {
+                this._dtsBaseInited || (e.samples && e.samples.length && (this._audioDtsBase = e.samples[0].dts), t.samples && t.samples.length && (this._videoDtsBase = t.samples[0].dts), this._dtsBase = Math.min(this._audioDtsBase, this._videoDtsBase), this._dtsBaseInited = !0)
+            }
+        }, {
+            key: "flushStashedSamples", value: function () {
+                var e = this._videoStashedLastSample, t = this._audioStashedLastSample,
+                    n = {type: "video", id: 1, sequenceNumber: 0, samples: [], length: 0},
+                    e = (null != e && (n.samples.push(e), n.length = e.length), {
+                        type: "audio",
+                        id: 2,
+                        sequenceNumber: 0,
+                        samples: [],
+                        length: 0
+                    });
+                null != t && (e.samples.push(t), e.length = t.length), this._videoStashedLastSample = null, this._audioStashedLastSample = null, this._remuxVideo(n, !0), this._remuxAudio(e, !0)
+            }
+        }, {
+            key: "_remuxAudio", value: function (e, t) {
+                if (null != this._audioMeta) {
+                    var n = e.samples, i = void 0, r = -1, a = this._audioMeta.refSampleDuration,
+                        s = "mp3" === this._audioMeta.codec && this._mp3UseMpegAudio,
+                        o = this._dtsBaseInited && void 0 === this._audioNextDts, u = !1;
+                    if (n && 0 !== n.length && (1 !== n.length || t)) {
+                        for (var d = 0, l = null, h = 0, h = s ? (d = 0, e.length) : (d = 8) + e.length, c = null, t = (1 < n.length && (h -= (c = n.pop()).length), null != this._audioStashedLastSample && (t = this._audioStashedLastSample, this._audioStashedLastSample = null, n.unshift(t), h += t.length), null != c && (this._audioStashedLastSample = c), n[0].dts - this._dtsBase), _ = (this._audioNextDts ? i = t - this._audioNextDts : this._audioSegmentInfoList.isEmpty() ? (i = 0, this._fillSilentAfterSeek && !this._videoSegmentInfoList.isEmpty() && "mp3" !== this._audioMeta.originalCodec && (u = !0)) : i = null != (C = this._audioSegmentInfoList.getLastSampleBefore(t)) ? (P = t - (C.originalDts + C.duration), t - (C.dts + C.duration + (P = P <= 3 ? 0 : P))) : 0, u && (C = t - i, null != (P = this._videoSegmentInfoList.getLastSegmentBefore(t)) && P.beginDts < C ? (t = O.default.getSilentFrame(this._audioMeta.originalCodec, this._audioMeta.channelCount)) && (R = P.beginDts, C = C - P.beginDts, A.default.v(this.TAG, "InsertPrefixSilentAudio: dts: " + R + ", duration: " + C), n.unshift({
+                            unit: t,
+                            dts: R,
+                            pts: R
+                        }), h += t.byteLength) : u = !1), []), f = 0; f < n.length; f++) {
+                            var m = n[f], p = m.unit, y = m.dts - this._dtsBase, v = y, g = !1, M = null, L = 0;
+                            if (!(y < -.001)) {
+                                if ("mp3" !== this._audioMeta.codec) {
+                                    var S = y;
+                                    if ((i = y - (S = this._audioNextDts ? this._audioNextDts : S)) <= -3 * a) {
+                                        A.default.w(this.TAG, "Dropping 1 audio frame (originalDts: " + y + " ms ,curRefDts: " + S + " ms)  due to dtsCorrection: " + i + " ms overlap.");
+                                        continue
+                                    }
+                                    if (3 * a <= i && this._fillAudioTimestampGap && !I.default.safari) {
+                                        var g = !0, k = Math.floor(i / a),
+                                            b = (A.default.w(this.TAG, "Large audio timestamp gap detected, may cause AV sync to drift. Silent frames will be generated to avoid unsync.\noriginalDts: " + y + " ms, curRefDts: " + S + " ms, dtsCorrection: " + Math.round(i) + " ms, generate: " + k + " frames"), v = Math.floor(S), L = Math.floor(S + a) - v, O.default.getSilentFrame(this._audioMeta.originalCodec, this._audioMeta.channelCount));
+                                        null == b && (A.default.w(this.TAG, "Unable to generate silent frame for " + this._audioMeta.originalCodec + " with " + this._audioMeta.channelCount + " channels, repeat last frame"), b = p);
+                                        for (var M = [], w = 0; w < k; w++) {
+                                            S += a;
+                                            var D = Math.floor(S), T = Math.floor(S + a) - D, D = {
+                                                dts: D,
+                                                pts: D,
+                                                cts: 0,
+                                                unit: b,
+                                                size: b.byteLength,
+                                                duration: T,
+                                                originalDts: y,
+                                                flags: {isLeading: 0, dependsOn: 1, isDependedOn: 0, hasRedundancy: 0}
+                                            };
+                                            M.push(D), h += p.byteLength
+                                        }
+                                        this._audioNextDts = S + a
+                                    } else v = Math.floor(S), L = Math.floor(S + a) - v, this._audioNextDts = S + a
+                                } else {
+                                    v = y - i;
+                                    L = f !== n.length - 1 ? n[f + 1].dts - this._dtsBase - i - v : null != c ? c.dts - this._dtsBase - i - v : 1 <= _.length ? _[_.length - 1].duration : Math.floor(a), this._audioNextDts = v + L
+                                }
+                                -1 === r && (r = v), _.push({
+                                    dts: v,
+                                    pts: v,
+                                    cts: 0,
+                                    unit: m.unit,
+                                    size: m.unit.byteLength,
+                                    duration: L,
+                                    originalDts: y,
+                                    flags: {isLeading: 0, dependsOn: 1, isDependedOn: 0, hasRedundancy: 0}
+                                }), g && _.push.apply(_, M)
+                            }
+                        }
+                        if (0 === _.length) return e.samples = [], void (e.length = 0);
+                        s ? l = new Uint8Array(h) : ((l = new Uint8Array(h))[0] = h >>> 24 & 255, l[1] = h >>> 16 & 255, l[2] = h >>> 8 & 255, l[3] = 255 & h, l.set(x.default.types.mdat, 4));
+                        for (var E = 0; E < _.length; E++) {
+                            var Y = _[E].unit;
+                            l.set(Y, d), d += Y.byteLength
+                        }
+                        var P = _[_.length - 1], C = P.dts + P.duration, R = new W.MediaSegmentInfo,
+                            t = (R.beginDts = r, R.endDts = C, R.beginPts = r, R.endPts = C, R.originalBeginDts = _[0].originalDts, R.originalEndDts = P.originalDts + P.duration, R.firstSample = new W.SampleInfo(_[0].dts, _[0].pts, _[0].duration, _[0].originalDts, !1), R.lastSample = new W.SampleInfo(P.dts, P.pts, P.duration, P.originalDts, !1), this._isLive || this._audioSegmentInfoList.append(R), e.samples = _, e.sequenceNumber++, null),
+                            t = s ? new Uint8Array : x.default.moof(e, r), u = (e.samples = [], e.length = 0, {
+                                type: "audio",
+                                data: this._mergeBoxes(t, l).buffer,
+                                sampleCount: _.length,
+                                info: R
+                            });
+                        s && o && (u.timestampOffset = r), this._onMediaSegment("audio", u)
+                    }
+                }
+            }
+        }, {
+            key: "_remuxVideo", value: function (e, t) {
+                if (null != this._videoMeta) {
+                    var n = e, i = n.samples, r = void 0, a = -1, s = -1;
+                    if (i && 0 !== i.length && (1 !== i.length || t)) {
+                        for (var o = 8, u = null, t = 8 + e.length, d = null, e = (1 < i.length && (t -= (d = i.pop()).length), null != this._videoStashedLastSample && (e = this._videoStashedLastSample, this._videoStashedLastSample = null, i.unshift(e), t += e.length), null != d && (this._videoStashedLastSample = d), i[0].dts - this._dtsBase), l = (r = this._videoNextDts ? e - this._videoNextDts : !this._videoSegmentInfoList.isEmpty() && null != (b = this._videoSegmentInfoList.getLastSampleBefore(e)) ? (w = e - (b.originalDts + b.duration), e - (b.dts + b.duration + (w = w <= 3 ? 0 : w))) : 0, new W.MediaSegmentInfo), h = [], c = 0; c < i.length; c++) {
+                            var _, f = i[c], m = f.dts - this._dtsBase, p = f.isKeyframe, y = m - r, v = f.cts,
+                                g = y + v, M = (-1 === a && (a = y, s = g), 0);
+                            M = c !== i.length - 1 ? i[c + 1].dts - this._dtsBase - r - y : null != d ? d.dts - this._dtsBase - r - y : 1 <= h.length ? h[h.length - 1].duration : Math.floor(this._videoMeta.refSampleDuration), p && ((_ = new W.SampleInfo(y, g, M, f.dts, !0)).fileposition = f.fileposition, l.appendSyncPoint(_)), h.push({
+                                dts: y,
+                                pts: g,
+                                cts: v,
+                                units: f.units,
+                                size: f.length,
+                                isKeyframe: p,
+                                duration: M,
+                                originalDts: m,
+                                flags: {
+                                    isLeading: 0,
+                                    dependsOn: p ? 2 : 1,
+                                    isDependedOn: p ? 1 : 0,
+                                    hasRedundancy: 0,
+                                    isNonSync: p ? 0 : 1
+                                }
+                            })
+                        }
+                        (u = new Uint8Array(t))[0] = t >>> 24 & 255, u[1] = t >>> 16 & 255, u[2] = t >>> 8 & 255, u[3] = 255 & t, u.set(x.default.types.mdat, 4);
+                        for (var L = 0; L < h.length; L++) for (var S = h[L].units; S.length;) {
+                            var k = S.shift().data;
+                            u.set(k, o), o += k.byteLength
+                        }
+                        var e = h[h.length - 1], b = e.dts + e.duration, w = e.pts + e.duration,
+                            b = (this._videoNextDts = b, l.beginDts = a, l.endDts = b, l.beginPts = s, l.endPts = w, l.originalBeginDts = h[0].originalDts, l.originalEndDts = e.originalDts + e.duration, l.firstSample = new W.SampleInfo(h[0].dts, h[0].pts, h[0].duration, h[0].originalDts, h[0].isKeyframe), l.lastSample = new W.SampleInfo(e.dts, e.pts, e.duration, e.originalDts, e.isKeyframe), this._isLive || this._videoSegmentInfoList.append(l), n.samples = h, n.sequenceNumber++, this._forceFirstIDR && ((t = h[0].flags).dependsOn = 2, t.isNonSync = 0), x.default.moof(n, a));
+                        n.samples = [], n.length = 0, this._onMediaSegment("video", {
+                            type: "video",
+                            data: this._mergeBoxes(b, u).buffer,
+                            sampleCount: h.length,
+                            info: l
+                        })
+                    }
+                }
+            }
+        }, {
+            key: "_mergeBoxes", value: function (e, t) {
+                var n = new Uint8Array(e.byteLength + t.byteLength);
+                return n.set(e, 0), n.set(t, e.byteLength), n
+            }
+        }, {
+            key: "onInitSegment", get: function () {
+                return this._onInitSegment
+            }, set: function (e) {
+                this._onInitSegment = e
+            }
+        }, {
+            key: "onMediaSegment", get: function () {
+                return this._onMediaSegment
+            }, set: function (e) {
+                this._onMediaSegment = e
+            }
+        }]);
+        n = o;
+
+        function o(e) {
+            (0, i.default)(this, o), this.TAG = "MP4Remuxer", this._config = e, this._isLive = !0 === e.isLive, this._dtsBase = -1, this._dtsBaseInited = !1, this._audioDtsBase = 1 / 0, this._videoDtsBase = 1 / 0, this._audioNextDts = void 0, this._videoNextDts = void 0, this._audioStashedLastSample = null, this._videoStashedLastSample = null, this._audioMeta = null, this._videoMeta = null, this._audioSegmentInfoList = new W.MediaSegmentInfoList("audio"), this._videoSegmentInfoList = new W.MediaSegmentInfoList("video"), this._onInitSegment = null, this._onMediaSegment = null, this._forceFirstIDR = !(!I.default.chrome || !(I.default.version.major < 50 || 50 === I.default.version.major && I.default.version.build < 2661)), this._fillSilentAfterSeek = I.default.msedge || I.default.msie, this._mp3UseMpegAudio = !I.default.firefox, this._fillAudioTimestampGap = this._config.fixAudioTimestampGap
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r(n(2)).default)(l, null, [{
+            key: "init", value: function () {
+                for (var e in l.types = {
+                    avc1: [],
+                    avcC: [],
+                    btrt: [],
+                    dinf: [],
+                    dref: [],
+                    esds: [],
+                    ftyp: [],
+                    hdlr: [],
+                    mdat: [],
+                    mdhd: [],
+                    mdia: [],
+                    mfhd: [],
+                    minf: [],
+                    moof: [],
+                    moov: [],
+                    mp4a: [],
+                    mvex: [],
+                    mvhd: [],
+                    sdtp: [],
+                    stbl: [],
+                    stco: [],
+                    stsc: [],
+                    stsd: [],
+                    stsz: [],
+                    stts: [],
+                    tfdt: [],
+                    tfhd: [],
+                    traf: [],
+                    trak: [],
+                    trun: [],
+                    trex: [],
+                    tkhd: [],
+                    vmhd: [],
+                    smhd: [],
+                    ".mp3": []
+                }) l.types.hasOwnProperty(e) && (l.types[e] = [e.charCodeAt(0), e.charCodeAt(1), e.charCodeAt(2), e.charCodeAt(3)]);
+                var t = l.constants = {};
+                t.FTYP = new Uint8Array([105, 115, 111, 109, 0, 0, 0, 1, 105, 115, 111, 109, 97, 118, 99, 49]), t.STSD_PREFIX = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 1]), t.STTS = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0]), t.STSC = t.STCO = t.STTS, t.STSZ = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), t.HDLR_VIDEO = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 118, 105, 100, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 105, 100, 101, 111, 72, 97, 110, 100, 108, 101, 114, 0]), t.HDLR_AUDIO = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 115, 111, 117, 110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 111, 117, 110, 100, 72, 97, 110, 100, 108, 101, 114, 0]), t.DREF = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 117, 114, 108, 32, 0, 0, 0, 1]), t.SMHD = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0]), t.VMHD = new Uint8Array([0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0])
+            }
+        }, {
+            key: "box", value: function (e) {
+                for (var t = 8, n = null, i = Array.prototype.slice.call(arguments, 1), r = i.length, a = 0; a < r; a++) t += i[a].byteLength;
+                (n = new Uint8Array(t))[0] = t >>> 24 & 255, n[1] = t >>> 16 & 255, n[2] = t >>> 8 & 255, n[3] = 255 & t, n.set(e, 4);
+                for (var s = 8, o = 0; o < r; o++) n.set(i[o], s), s += i[o].byteLength;
+                return n
+            }
+        }, {
+            key: "generateInitSegment", value: function (e) {
+                var t = l.box(l.types.ftyp, l.constants.FTYP), e = l.moov(e),
+                    n = new Uint8Array(t.byteLength + e.byteLength);
+                return n.set(t, 0), n.set(e, t.byteLength), n
+            }
+        }, {
+            key: "moov", value: function (e) {
+                var t = l.mvhd(e.timescale, e.duration), n = l.trak(e), e = l.mvex(e);
+                return l.box(l.types.moov, t, n, e)
+            }
+        }, {
+            key: "mvhd", value: function (e, t) {
+                return l.box(l.types.mvhd, new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, e >>> 24 & 255, e >>> 16 & 255, e >>> 8 & 255, 255 & e, t >>> 24 & 255, t >>> 16 & 255, t >>> 8 & 255, 255 & t, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255]))
+            }
+        }, {
+            key: "trak", value: function (e) {
+                return l.box(l.types.trak, l.tkhd(e), l.mdia(e))
+            }
+        }, {
+            key: "tkhd", value: function (e) {
+                var t = e.id, n = e.duration, i = e.presentWidth, e = e.presentHeight;
+                return l.box(l.types.tkhd, new Uint8Array([0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, t >>> 24 & 255, t >>> 16 & 255, t >>> 8 & 255, 255 & t, 0, 0, 0, 0, n >>> 24 & 255, n >>> 16 & 255, n >>> 8 & 255, 255 & n, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, i >>> 8 & 255, 255 & i, 0, 0, e >>> 8 & 255, 255 & e, 0, 0]))
+            }
+        }, {
+            key: "mdia", value: function (e) {
+                return l.box(l.types.mdia, l.mdhd(e), l.hdlr(e), l.minf(e))
+            }
+        }, {
+            key: "mdhd", value: function (e) {
+                var t = e.timescale, e = e.duration;
+                return l.box(l.types.mdhd, new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, t >>> 24 & 255, t >>> 16 & 255, t >>> 8 & 255, 255 & t, e >>> 24 & 255, e >>> 16 & 255, e >>> 8 & 255, 255 & e, 85, 196, 0, 0]))
+            }
+        }, {
+            key: "hdlr", value: function (e) {
+                var t = null, t = "audio" === e.type ? l.constants.HDLR_AUDIO : l.constants.HDLR_VIDEO;
+                return l.box(l.types.hdlr, t)
+            }
+        }, {
+            key: "minf", value: function (e) {
+                var t = null,
+                    t = "audio" === e.type ? l.box(l.types.smhd, l.constants.SMHD) : l.box(l.types.vmhd, l.constants.VMHD);
+                return l.box(l.types.minf, t, l.dinf(), l.stbl(e))
+            }
+        }, {
+            key: "dinf", value: function () {
+                return l.box(l.types.dinf, l.box(l.types.dref, l.constants.DREF))
+            }
+        }, {
+            key: "stbl", value: function (e) {
+                return l.box(l.types.stbl, l.stsd(e), l.box(l.types.stts, l.constants.STTS), l.box(l.types.stsc, l.constants.STSC), l.box(l.types.stsz, l.constants.STSZ), l.box(l.types.stco, l.constants.STCO))
+            }
+        }, {
+            key: "stsd", value: function (e) {
+                return "audio" === e.type ? "mp3" === e.codec ? l.box(l.types.stsd, l.constants.STSD_PREFIX, l.mp3(e)) : l.box(l.types.stsd, l.constants.STSD_PREFIX, l.mp4a(e)) : l.box(l.types.stsd, l.constants.STSD_PREFIX, l.avc1(e))
+            }
+        }, {
+            key: "mp3", value: function (e) {
+                var t = e.channelCount, e = e.audioSampleRate,
+                    t = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, t, 0, 16, 0, 0, 0, 0, e >>> 8 & 255, 255 & e, 0, 0]);
+                return l.box(l.types[".mp3"], t)
+            }
+        }, {
+            key: "mp4a", value: function (e) {
+                var t = e.channelCount, n = e.audioSampleRate,
+                    t = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, t, 0, 16, 0, 0, 0, 0, n >>> 8 & 255, 255 & n, 0, 0]);
+                return l.box(l.types.mp4a, t, l.esds(e))
+            }
+        }, {
+            key: "esds", value: function (e) {
+                var e = e.config || [], t = e.length,
+                    t = new Uint8Array([0, 0, 0, 0, 3, 23 + t, 0, 1, 0, 4, 15 + t, 64, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5].concat([t]).concat(e).concat([6, 1, 2]));
+                return l.box(l.types.esds, t)
+            }
+        }, {
+            key: "avc1", value: function (e) {
+                var t = e.avcc, n = e.codecWidth, e = e.codecHeight,
+                    n = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, n >>> 8 & 255, 255 & n, e >>> 8 & 255, 255 & e, 0, 72, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 1, 10, 120, 113, 113, 47, 102, 108, 118, 46, 106, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 255, 255]);
+                return l.box(l.types.avc1, n, l.box(l.types.avcC, t))
+            }
+        }, {
+            key: "mvex", value: function (e) {
+                return l.box(l.types.mvex, l.trex(e))
+            }
+        }, {
+            key: "trex", value: function (e) {
+                e = e.id, e = new Uint8Array([0, 0, 0, 0, e >>> 24 & 255, e >>> 16 & 255, e >>> 8 & 255, 255 & e, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1]);
+                return l.box(l.types.trex, e)
+            }
+        }, {
+            key: "moof", value: function (e, t) {
+                return l.box(l.types.moof, l.mfhd(e.sequenceNumber), l.traf(e, t))
+            }
+        }, {
+            key: "mfhd", value: function (e) {
+                e = new Uint8Array([0, 0, 0, 0, e >>> 24 & 255, e >>> 16 & 255, e >>> 8 & 255, 255 & e]);
+                return l.box(l.types.mfhd, e)
+            }
+        }, {
+            key: "traf", value: function (e, t) {
+                var n = e.id,
+                    n = l.box(l.types.tfhd, new Uint8Array([0, 0, 0, 0, n >>> 24 & 255, n >>> 16 & 255, n >>> 8 & 255, 255 & n])),
+                    t = l.box(l.types.tfdt, new Uint8Array([0, 0, 0, 0, t >>> 24 & 255, t >>> 16 & 255, t >>> 8 & 255, 255 & t])),
+                    i = l.sdtp(e), e = l.trun(e, i.byteLength + 16 + 16 + 8 + 16 + 8 + 8);
+                return l.box(l.types.traf, n, t, e, i)
+            }
+        }, {
+            key: "sdtp", value: function (e) {
+                for (var t = e.samples || [], n = t.length, i = new Uint8Array(4 + n), r = 0; r < n; r++) {
+                    var a = t[r].flags;
+                    i[r + 4] = a.isLeading << 6 | a.dependsOn << 4 | a.isDependedOn << 2 | a.hasRedundancy
+                }
+                return l.box(l.types.sdtp, i)
+            }
+        }, {
+            key: "trun", value: function (e, t) {
+                var n = e.samples || [], i = n.length, e = 12 + 16 * i, r = new Uint8Array(e);
+                r.set([0, 0, 15, 1, i >>> 24 & 255, i >>> 16 & 255, i >>> 8 & 255, 255 & i, (t += 8 + e) >>> 24 & 255, t >>> 16 & 255, t >>> 8 & 255, 255 & t], 0);
+                for (var a = 0; a < i; a++) {
+                    var s = n[a].duration, o = n[a].size, u = n[a].flags, d = n[a].cts;
+                    r.set([s >>> 24 & 255, s >>> 16 & 255, s >>> 8 & 255, 255 & s, o >>> 24 & 255, o >>> 16 & 255, o >>> 8 & 255, 255 & o, u.isLeading << 2 | u.dependsOn, u.isDependedOn << 6 | u.hasRedundancy << 4 | u.isNonSync, 0, 0, d >>> 24 & 255, d >>> 16 & 255, d >>> 8 & 255, 255 & d], 12 + 16 * a)
+                }
+                return l.box(l.types.trun, r)
+            }
+        }, {
+            key: "mdat", value: function (e) {
+                return l.box(l.types.mdat, e)
+            }
+        }]);
+        n = l;
+
+        function l() {
+            (0, i.default)(this, l)
+        }
+
+        n.init(), t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function a() {
+            (0, i.default)(this, a)
+        }
+
+        (0, r(n(2)).default)(a, null, [{
+            key: "getSilentFrame", value: function (e, t) {
+                if ("mp4a.40.2" === e) {
+                    if (1 === t) return new Uint8Array([0, 200, 0, 128, 35, 128]);
+                    if (2 === t) return new Uint8Array([33, 0, 73, 144, 2, 25, 0, 35, 128]);
+                    if (3 === t) return new Uint8Array([0, 200, 0, 128, 32, 132, 1, 38, 64, 8, 100, 0, 142]);
+                    if (4 === t) return new Uint8Array([0, 200, 0, 128, 32, 132, 1, 38, 64, 8, 100, 0, 128, 44, 128, 8, 2, 56]);
+                    if (5 === t) return new Uint8Array([0, 200, 0, 128, 32, 132, 1, 38, 64, 8, 100, 0, 130, 48, 4, 153, 0, 33, 144, 2, 56]);
+                    if (6 === t) return new Uint8Array([0, 200, 0, 128, 32, 132, 1, 38, 64, 8, 100, 0, 130, 48, 4, 153, 0, 33, 144, 2, 0, 178, 0, 32, 8, 224])
+                } else {
+                    if (1 === t) return new Uint8Array([1, 64, 34, 128, 163, 78, 230, 128, 186, 8, 0, 0, 0, 28, 6, 241, 193, 10, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 94]);
+                    if (2 === t) return new Uint8Array([1, 64, 34, 128, 163, 94, 230, 128, 186, 8, 0, 0, 0, 0, 149, 0, 6, 241, 161, 10, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 94]);
+                    if (3 === t) return new Uint8Array([1, 64, 34, 128, 163, 94, 230, 128, 186, 8, 0, 0, 0, 0, 149, 0, 6, 241, 161, 10, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 94])
+                }
+                return null
+            }
+        }]), t.default = a
+    }, function (e, t, h) {
+        function a(n) {
+            var i = {};
+
+            function r(e) {
+                if (i[e]) return i[e].exports;
+                var t = i[e] = {i: e, l: !1, exports: {}};
+                return n[e].call(t.exports, t, t.exports, r), t.l = !0, t.exports
+            }
+
+            r.m = n, r.c = i, r.i = function (e) {
+                return e
+            }, r.d = function (e, t, n) {
+                r.o(e, t) || Object.defineProperty(e, t, {configurable: !1, enumerable: !0, get: n})
+            }, r.r = function (e) {
+                Object.defineProperty(e, "__esModule", {value: !0})
+            }, r.n = function (e) {
+                var t = e && e.__esModule ? function () {
+                    return e.default
+                } : function () {
+                    return e
+                };
+                return r.d(t, "a", t), t
+            }, r.o = function (e, t) {
+                return Object.prototype.hasOwnProperty.call(e, t)
+            }, r.p = "/", r.oe = function (e) {
+                throw console.error(e), e
+            };
+            var e = r(r.s = ENTRY_MODULE);
+            return e.default || e
+        }
+
+        var c = "[\\.|\\-|\\+|\\w|/|@]+", _ = "\\(\\s*(/\\*.*?\\*/)?\\s*.*?(" + c + ").*?\\)";
+
+        function f(e) {
+            return (e + "").replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")
+        }
+
+        function m(e, t, n) {
+            var i = {}, r = (i[n] = [], t.toString()), t = r.match(/^function\s?\w*\(\w+,\s*\w+,\s*(\w+)\)/);
+            if (t) {
+                for (var a, t = t[1], s = new RegExp("(\\\\n|\\W)" + f(t) + _, "g"); a = s.exec(r);) "dll-reference" !== a[3] && i[n].push(a[3]);
+                for (s = new RegExp("\\(" + f(t) + '\\("(dll-reference\\s(' + c + '))"\\)\\)' + _, "g"); a = s.exec(r);) e[a[2]] || (i[n].push(a[1]), e[a[2]] = h(a[1]).m), i[a[2]] = i[a[2]] || [], i[a[2]].push(a[4]);
+                for (var o, u = Object.keys(i), d = 0; d < u.length; d++) for (var l = 0; l < i[u[d]].length; l++) o = i[u[d]][l], isNaN(+o) || (i[u[d]][l] = +i[u[d]][l])
+            }
+            return i
+        }
+
+        function s(e, t) {
+            for (var n = {main: [t]}, i = {main: []}, r = {main: {}}; function (n) {
+                return Object.keys(n).reduce(function (e, t) {
+                    return e || 0 < n[t].length
+                }, !1)
+            }(n);) for (var a = Object.keys(n), s = 0; s < a.length; s++) {
+                var o = a[s], u = n[o].pop();
+                if (r[o] = r[o] || {}, !r[o][u] && e[o][u]) {
+                    r[o][u] = !0, i[o] = i[o] || [], i[o].push(u);
+                    for (var d = m(e, e[o][u], o), l = Object.keys(d), h = 0; h < l.length; h++) n[l[h]] = n[l[h]] || [], n[l[h]] = n[l[h]].concat(d[l[h]])
+                }
+            }
+            return i
+        }
+
+        e.exports = function (e, t) {
+            var n = {main: h.m}, i = (t = t || {}).all ? {main: Object.keys(n.main)} : s(n, e), r = "",
+                e = (Object.keys(i).filter(function (e) {
+                    return "main" !== e
+                }).forEach(function (t) {
+                    for (var e = 0; i[t][e];) e++;
+                    i[t].push(e), n[t][e] = "(function(module, exports, __webpack_require__) { module.exports = __webpack_require__; })", r = r + "var " + t + " = (" + a.toString().replace("ENTRY_MODULE", JSON.stringify(e)) + ")({" + i[t].map(function (e) {
+                        return JSON.stringify(e) + ": " + n[t][e].toString()
+                    }).join(",") + "});\n"
+                }), r = r + "new ((" + a.toString().replace("ENTRY_MODULE", JSON.stringify(e)) + ")({" + i.main.map(function (e) {
+                    return JSON.stringify(e) + ": " + n.main[e].toString()
+                }).join(",") + "}))(self);", new window.Blob([r], {type: "text/javascript"}));
+            if (t.bare) return e;
+            t = (window.URL || window.webkitURL || window.mozURL || window.msURL).createObjectURL(e), e = new window.Worker(t);
+            return e.objectURL = t, e
+        }
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = c(n(1)), r = c(n(2)), a = c(n(10)), o = c(n(4)), u = c(n(33)), s = c(n(232)), d = n(230), l = n(5),
+            h = (c(n(233)), c(n(0)));
+
+        function c(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, r.default)(_, [{
+            key: "destroy", value: function () {
+                (this._mediaElement || this._mediaSource) && this.detachMediaElement(), this.e = null, this._emitter.removeAllListeners(), this._emitter = null
+            }
+        }, {
+            key: "on", value: function (e, t) {
+                this._emitter.addListener(e, t)
+            }
+        }, {
+            key: "off", value: function (e, t) {
+                this._emitter.removeListener(e, t)
+            }
+        }, {
+            key: "attachMediaElement", value: function (e) {
+                if (this._mediaSource) throw new l.IllegalStateException("MediaSource has been attached to an HTMLMediaElement!");
+                var t = this._mediaSource = new window.MediaSource;
+                t.addEventListener("sourceopen", this.e.onSourceOpen), t.addEventListener("sourceended", this.e.onSourceEnded), t.addEventListener("sourceclose", this.e.onSourceClose), this._mediaElement = e, this._mediaSourceObjectURL = window.URL.createObjectURL(this._mediaSource), e.src = this._mediaSourceObjectURL
+            }
+        }, {
+            key: "detachMediaElement", value: function () {
+                if (this._mediaSource) {
+                    var e, t = this._mediaSource;
+                    for (e in this._sourceBuffers) {
+                        var n = this._pendingSegments[e],
+                            n = (n.splice(0, n.length), this._pendingSegments[e] = null, this._pendingRemoveRanges[e] = null, this._lastInitSegments[e] = null, this._sourceBuffers[e]);
+                        if (n) {
+                            if ("closed" !== t.readyState) {
+                                try {
+                                    t.removeSourceBuffer(n)
+                                } catch (e) {
+                                    o.default.e(this.TAG, e.message)
+                                }
+                                n.removeEventListener("error", this.e.onSourceBufferError), n.removeEventListener("updateend", this.e.onSourceBufferUpdateEnd)
+                            }
+                            this._mimeTypes[e] = null, this._sourceBuffers[e] = null
+                        }
+                    }
+                    if ("open" === t.readyState) try {
+                        t.endOfStream()
+                    } catch (e) {
+                        o.default.e(this.TAG, e.message)
+                    }
+                    t.removeEventListener("sourceopen", this.e.onSourceOpen), t.removeEventListener("sourceended", this.e.onSourceEnded), t.removeEventListener("sourceclose", this.e.onSourceClose), this._pendingSourceBufferInit = [], this._isBufferFull = !1, this._idrList.clear(), this._mediaSource = null
+                }
+                this._mediaElement && (this._mediaElement.src = "", this._mediaElement.removeAttribute("src"), this._mediaElement = null), this._mediaSourceObjectURL && (window.URL.revokeObjectURL(this._mediaSourceObjectURL), this._mediaSourceObjectURL = null), this._hasAudio = !0
+            }
+        }, {
+            key: "checkAudioSourceBufferInit", value: function (e) {
+                return this._sourceBuffers.audio || "audio" === e.type || !this._hasAudio
+            }
+        }, {
+            key: "_onAudioSourceBufferInited", value: function () {
+                if (0 < this._pendingSourceBufferInit.length) for (var e = this._pendingSourceBufferInit; e.length;) {
+                    var t = e.shift();
+                    this.appendInitSegment(t, !0)
+                }
+                this._hasPendingSegments() && this._doAppendSegments(), this._emitter.emit(s.default.SOURCE_OPEN)
+            }
+        }, {
+            key: "checkMediaSource", value: function (e) {
+                return !(!this._mediaSource || "open" !== this._mediaSource.readyState)
+            }
+        }, {
+            key: "appendInitSegment", value: function (e, t) {
+                if (!this.checkMediaSource("appendInitSegment") || !this.checkAudioSourceBufferInit(e)) return this._pendingSourceBufferInit.push(e), void this._pendingSegments[e.type].push(e);
+                var n = "" + e.container, i = (e.codec && 0 < e.codec.length && (n += ";codecs=" + e.codec), !1);
+                if (this._lastInitSegments[e.type] = e, n !== this._mimeTypes[e.type]) {
+                    if (this._mimeTypes[e.type]) o.default.v(this.TAG, "Notice: " + e.type + " mimeType changed, origin: " + this._mimeTypes[e.type] + ", target: " + n); else {
+                        i = !0, console.info("[debug] %c" + (0, h.default)().format("YYYY-MM-DD HH:mm:ss.SSS") + "%c appendInitSegment", "color: blue", "color: black", this._mediaElement.readyState, n);
+                        try {
+                            var r = this._sourceBuffers[e.type] = this._mediaSource.addSourceBuffer(n);
+                            r.addEventListener("error", this.e.onSourceBufferError), r.addEventListener("updateend", this.e.onSourceBufferUpdateEnd), "audio" === e.type && this._onAudioSourceBufferInited()
+                        } catch (e) {
+                            return o.default.e(this.TAG, e.message, this._mediaElement.error), void this._emitter.emit(s.default.ERROR, {
+                                code: e.code,
+                                msg: e.message
+                            })
+                        }
+                    }
+                    this._mimeTypes[e.type] = n
+                }
+                t || this._pendingSegments[e.type].push(e), i || this._sourceBuffers[e.type] && !this._sourceBuffers[e.type].updating && this._doAppendSegments(), u.default.safari && "audio/mpeg" === e.container && 0 < e.mediaDuration && (this._requireSetMediaDuration = !0, this._pendingMediaDuration = e.mediaDuration / 1e3, this._updateMediaSourceDuration())
+            }
+        }, {
+            key: "appendMediaSegment", value: function (e) {
+                var t;
+                this.checkMediaSource("appendMediaSegment") && (this._pendingSegments[(e = e).type].push(e), this._config.autoCleanupSourceBuffer && this._needCleanupSourceBuffer() && this._doCleanupSourceBuffer(), !(t = this._sourceBuffers[e.type]) || t.updating || this._hasPendingRemoveRanges() ? this._hasAudio && 5 < this._pendingSegments[e.type].length && (this._hasAudio = !1, this._onAudioSourceBufferInited()) : this._doAppendSegments())
+            }
+        }, {
+            key: "seek", value: function (e) {
+                if (this.checkMediaSource("seek")) for (var t in this._sourceBuffers) if (this._sourceBuffers[t]) {
+                    var n = this._sourceBuffers[t];
+                    if ("open" === this._mediaSource.readyState) try {
+                        n.abort()
+                    } catch (e) {
+                        o.default.e(this.TAG, e.message)
+                    }
+                    this._idrList.clear();
+                    var i = this._pendingSegments[t];
+                    if (i.splice(0, i.length), "closed" !== this._mediaSource.readyState) {
+                        for (var r = 0; r < n.buffered.length; r++) {
+                            var a = n.buffered.start(r), s = n.buffered.end(r);
+                            this._pendingRemoveRanges[t].push({start: a, end: s})
+                        }
+                        n.updating || this._doRemoveRanges("seek"), !u.default.safari || (i = this._lastInitSegments[t]) && (this._pendingSegments[t].push(i), n.updating || this._doAppendSegments())
+                    }
+                }
+            }
+        }, {
+            key: "endOfStream", value: function () {
+                var e = this._mediaSource, t = this._sourceBuffers;
+                e && "open" === e.readyState ? t.video && t.video.updating || t.audio && t.audio.updating ? this._hasPendingEos = !0 : (this._hasPendingEos = !1, e.endOfStream()) : e && "closed" === e.readyState && this._hasPendingSegments() && (this._hasPendingEos = !0)
+            }
+        }, {
+            key: "getNearestKeyframe", value: function (e) {
+                return this._idrList.getLastSyncPointBeforeDts(e)
+            }
+        }, {
+            key: "checkSourceBufferNull", value: function () {
+                var e, t = !0;
+                for (e in this._sourceBuffers) if (null != this._sourceBuffers[e]) {
+                    t = !1;
+                    break
+                }
+                return t
+            }
+        }, {
+            key: "_needCleanupSourceBuffer", value: function () {
+                if (this._config.autoCleanupSourceBuffer && this.checkMediaSource("_needCleanupSourceBuffer")) {
+                    var e, t = this._mediaElement.currentTime;
+                    for (e in this._sourceBuffers) {
+                        var n = this._sourceBuffers[e];
+                        if (n) {
+                            n = n.buffered;
+                            if (1 <= n.length && t - n.start(0) >= this._config.autoCleanupMaxBackwardDuration) return !0
+                        }
+                    }
+                }
+                return !1
+            }
+        }, {
+            key: "_doCleanupSourceBuffer", value: function () {
+                var e = this._mediaElement.currentTime;
+                if (this.checkMediaSource("_doCleanupSourceBuffer")) for (var t in this._sourceBuffers) {
+                    var n = this._sourceBuffers[t];
+                    if (n) {
+                        for (var i = n.buffered, r = !1, a = 0; a < i.length; a++) {
+                            var s, o = i.start(a), u = i.end(a);
+                            o <= e && e < u + 3 ? e - o >= this._config.autoCleanupMaxBackwardDuration && (r = !0, s = e - this._config.autoCleanupMinBackwardDuration, this._pendingRemoveRanges[t].push({
+                                start: o,
+                                end: s
+                            })) : u < e && (r = !0, this._pendingRemoveRanges[t].push({start: o, end: u}))
+                        }
+                        r && !n.updating && this._doRemoveRanges("_doCleanupSourceBuffer")
+                    }
+                }
+            }
+        }, {
+            key: "_updateMediaSourceDuration", value: function () {
+                var e, t;
+                this.checkMediaSource("_updateMediaSourceDuration") && (e = this._sourceBuffers, 0 === this._mediaElement.readyState || "open" !== this._mediaSource.readyState || e.video && e.video.updating || e.audio && e.audio.updating || (e = this._mediaSource.duration, 0 < (t = this._pendingMediaDuration) && (isNaN(e) || e < t) && (o.default.v(this.TAG, "Update MediaSource duration from " + e + " to " + t), this._mediaSource.duration = t), this._requireSetMediaDuration = !1, this._pendingMediaDuration = 0))
+            }
+        }, {
+            key: "_doRemoveRanges", value: function (e) {
+                if (this.checkMediaSource("_doRemoveRanges")) for (var t in this._pendingRemoveRanges) if (this._sourceBuffers[t] && !this._sourceBuffers[t].updating) for (var n = this._sourceBuffers[t], i = this._pendingRemoveRanges[t]; i.length && !n.updating;) {
+                    var r = i.shift();
+                    n.remove(r.start, r.end)
+                }
+            }
+        }, {
+            key: "_doAppendSegments", value: function () {
+                if (this.checkMediaSource("_doAppendSegments")) {
+                    var t, e = this._pendingSegments;
+                    for (t in e) if (this._sourceBuffers[t] && !this._sourceBuffers[t].updating && 0 < e[t].length) {
+                        var n, i, r = e[t].shift();
+                        if (r.timestampOffset && (n = this._sourceBuffers[t].timestampOffset, i = r.timestampOffset / 1e3, .1 < Math.abs(n - i) && (o.default.v(this.TAG, "Update MPEG audio timestampOffset from " + n + " to " + i), this._sourceBuffers[t].timestampOffset = i), delete r.timestampOffset), r.data && 0 !== r.data.byteLength) try {
+                            this._sourceBuffers[t].appendBuffer(r.data), this._isBufferFull = !1, "video" === t && r.hasOwnProperty("info") && this._idrList.appendArray(r.info.syncPoints)
+                        } catch (e) {
+                            this._pendingSegments[t].unshift(r), 22 === e.code ? (this._isBufferFull || this._emitter.emit(s.default.BUFFER_FULL), this._isBufferFull = !0) : (o.default.e(this.TAG, e.message, this._mediaElement.error), this._emitter.emit(s.default.ERROR, {
+                                code: e.code,
+                                msg: e.message
+                            }))
+                        }
+                    }
+                }
+            }
+        }, {
+            key: "_onSourceOpen", value: function () {
+                if (o.default.v(this.TAG, "MediaSource onSourceOpen"), this._mediaSource.removeEventListener("sourceopen", this.e.onSourceOpen), 0 < this._pendingSourceBufferInit.length) for (var e = this._pendingSourceBufferInit; e.length;) {
+                    var t = e.shift();
+                    this.appendInitSegment(t, !0)
+                }
+                this._hasPendingSegments() && this._doAppendSegments(), this._emitter.emit(s.default.SOURCE_OPEN)
+            }
+        }, {
+            key: "_onSourceEnded", value: function () {
+                o.default.v(this.TAG, "MediaSource onSourceEnded"), this._emitter.emit(s.default.SOURCE_END)
+            }
+        }, {
+            key: "_onSourceClose", value: function () {
+                o.default.v(this.TAG, "MediaSource onSourceClose"), this._mediaSource && null != this.e && (this._mediaSource.removeEventListener("sourceopen", this.e.onSourceOpen), this._mediaSource.removeEventListener("sourceended", this.e.onSourceEnded), this._mediaSource.removeEventListener("sourceclose", this.e.onSourceClose)), this._emitter.emit(s.default.SOURCE_CLOSE)
+            }
+        }, {
+            key: "_hasPendingSegments", value: function () {
+                var e = this._pendingSegments;
+                return 0 < e.video.length || 0 < e.audio.length
+            }
+        }, {
+            key: "_hasPendingRemoveRanges", value: function () {
+                var e = this._pendingRemoveRanges;
+                return 0 < e.video.length || 0 < e.audio.length
+            }
+        }, {
+            key: "_onSourceBufferUpdateEnd", value: function () {
+                this._requireSetMediaDuration ? this._updateMediaSourceDuration() : this._hasPendingRemoveRanges() ? this._doRemoveRanges("_onSourceBufferUpdateEnd") : this._hasPendingSegments() ? this._doAppendSegments() : this._hasPendingEos && this.endOfStream(), this._emitter.emit(s.default.UPDATE_END)
+            }
+        }, {
+            key: "_onSourceBufferError", value: function (e) {
+                o.default.e(this.TAG, "SourceBuffer Error: ", e), this._emitter.emit(s.default.ERROR, {
+                    code: e.code,
+                    msg: e.message
+                })
+            }
+        }]);
+        n = _;
+
+        function _(e) {
+            (0, i.default)(this, _), this.TAG = "MSEController", this._config = e, this._emitter = new a.default, this._config.isLive && null == this._config.autoCleanupSourceBuffer && (this._config.autoCleanupSourceBuffer = !0), this.e = {
+                onSourceOpen: this._onSourceOpen.bind(this),
+                onSourceEnded: this._onSourceEnded.bind(this),
+                onSourceClose: this._onSourceClose.bind(this),
+                onSourceBufferError: this._onSourceBufferError.bind(this),
+                onSourceBufferUpdateEnd: this._onSourceBufferUpdateEnd.bind(this)
+            }, this._mediaSource = null, this._mediaSourceObjectURL = null, this._mediaElement = null, this._hasAudio = !0, this._isBufferFull = !1, this._hasPendingEos = !1, this._requireSetMediaDuration = !1, this._pendingMediaDuration = 0, this._pendingSourceBufferInit = [], this._mimeTypes = {
+                video: null,
+                audio: null
+            }, this._sourceBuffers = {video: null, audio: null}, this._lastInitSegments = {
+                video: null,
+                audio: null
+            }, this._pendingSegments = {video: [], audio: []}, this._pendingRemoveRanges = {
+                video: [],
+                audio: []
+            }, this._idrList = new d.IDRSampleList
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = c(n(11)), r = c(n(20)), a = c(n(9)), s = c(n(1)), o = c(n(2)), u = c(n(10)), d = c(n(39)), l = n(63),
+            h = n(5);
+
+        function c(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        (0, o.default)(_, [{
+            key: "destroy", value: function () {
+                this._mediaElement && (this.unload(), this.detachMediaElement()), this.e = null, this._mediaDataSource = null, this._emitter.removeAllListeners(), this._emitter = null
+            }
+        }, {
+            key: "on", value: function (e, t) {
+                var n = this;
+                e === d.default.MEDIA_INFO ? null != this._mediaElement && 0 !== this._mediaElement.readyState && i.default.resolve().then(function () {
+                    n._emitter.emit(d.default.MEDIA_INFO, n.mediaInfo)
+                }) : e === d.default.STATISTICS_INFO && null != this._mediaElement && 0 !== this._mediaElement.readyState && i.default.resolve().then(function () {
+                    n._emitter.emit(d.default.STATISTICS_INFO, n.statisticsInfo)
+                }), this._emitter.addListener(e, t)
+            }
+        }, {
+            key: "off", value: function (e, t) {
+                this._emitter.removeListener(e, t)
+            }
+        }, {
+            key: "attachMediaElement", value: function (e) {
+                if ((this._mediaElement = e).addEventListener("loadedmetadata", this.e.onvLoadedMetadata), null != this._pendingSeekTime) try {
+                    e.currentTime = this._pendingSeekTime, this._pendingSeekTime = null
+                } catch (e) {
+                }
+            }
+        }, {
+            key: "detachMediaElement", value: function () {
+                this._mediaElement && (this._mediaElement.src = "", this._mediaElement.removeAttribute("src"), this._mediaElement.removeEventListener("loadedmetadata", this.e.onvLoadedMetadata), this._mediaElement = null), null != this._statisticsReporter && (window.clearInterval(this._statisticsReporter), this._statisticsReporter = null)
+            }
+        }, {
+            key: "load", value: function () {
+                if (!this._mediaElement) throw new h.IllegalStateException("HTMLMediaElement must be attached before load()!");
+                this._mediaElement.src = this._mediaDataSource.url, 0 < this._mediaElement.readyState && (this._mediaElement.currentTime = 0), this._mediaElement.preload = "auto", this._mediaElement.load(), this._statisticsReporter = window.setInterval(this._reportStatisticsInfo.bind(this), this._config.statisticsInfoReportInterval)
+            }
+        }, {
+            key: "unload", value: function () {
+                this._mediaElement && (this._mediaElement.src = "", this._mediaElement.removeAttribute("src")), null != this._statisticsReporter && (window.clearInterval(this._statisticsReporter), this._statisticsReporter = null)
+            }
+        }, {
+            key: "play", value: function () {
+                return this._mediaElement.play()
+            }
+        }, {
+            key: "pause", value: function () {
+                this._mediaElement.pause()
+            }
+        }, {
+            key: "_onvLoadedMetadata", value: function (e) {
+                null != this._pendingSeekTime && (this._mediaElement.currentTime = this._pendingSeekTime, this._pendingSeekTime = null), this._emitter.emit(d.default.MEDIA_INFO, this.mediaInfo)
+            }
+        }, {
+            key: "_reportStatisticsInfo", value: function () {
+                this._emitter.emit(d.default.STATISTICS_INFO, this.statisticsInfo)
+            }
+        }, {
+            key: "type", get: function () {
+                return this._type
+            }
+        }, {
+            key: "buffered", get: function () {
+                return this._mediaElement.buffered
+            }
+        }, {
+            key: "duration", get: function () {
+                return this._mediaElement.duration
+            }
+        }, {
+            key: "volume", get: function () {
+                return this._mediaElement.volume
+            }, set: function (e) {
+                this._mediaElement.volume = e
+            }
+        }, {
+            key: "muted", get: function () {
+                return this._mediaElement.muted
+            }, set: function (e) {
+                this._mediaElement.muted = e
+            }
+        }, {
+            key: "currentTime", get: function () {
+                return this._mediaElement ? this._mediaElement.currentTime : 0
+            }, set: function (e) {
+                this._mediaElement ? this._mediaElement.currentTime = e : this._pendingSeekTime = e
+            }
+        }, {
+            key: "mediaInfo", get: function () {
+                var e = {mimeType: (this._mediaElement instanceof HTMLAudioElement ? "audio/" : "video/") + this._mediaDataSource.type};
+                return this._mediaElement && (e.duration = Math.floor(1e3 * this._mediaElement.duration), this._mediaElement instanceof HTMLVideoElement && (e.width = this._mediaElement.videoWidth, e.height = this._mediaElement.videoHeight)), e
+            }
+        }, {
+            key: "statisticsInfo", get: function () {
+                var e, t, n, i, r = {playerType: this._type, url: this._mediaDataSource.url};
+                return this._mediaElement instanceof HTMLVideoElement && (e = !0, i = n = 0, this._mediaElement.getVideoPlaybackQuality ? (n = (t = this._mediaElement.getVideoPlaybackQuality()).totalVideoFrames, i = t.droppedVideoFrames) : null != this._mediaElement.webkitDecodedFrameCount ? (n = this._mediaElement.webkitDecodedFrameCount, i = this._mediaElement.webkitDroppedFrameCount) : e = !1, e && (r.decodedFrames = n, r.droppedFrames = i)), r
+            }
+        }]);
+        n = _;
+
+        function _(e, t) {
+            if ((0, s.default)(this, _), this.TAG = "NativePlayer", this._type = "NativePlayer", this._emitter = new u.default, this._config = (0, l.createDefaultConfig)(), "object" === (void 0 === t ? "undefined" : (0, a.default)(t)) && (0, r.default)(this._config, t), "flv" === e.type.toLowerCase()) throw new h.InvalidArgumentException("NativePlayer does't support flv MediaDataSource input!");
+            if (e.hasOwnProperty("segments")) throw new h.InvalidArgumentException("NativePlayer(" + e.type + ") doesn't support multipart playback!");
+            this.e = {onvLoadedMetadata: this._onvLoadedMetadata.bind(this)}, this._pendingSeekTime = null, this._statisticsReporter = null, this._mediaDataSource = e, this._mediaElement = null
+        }
+
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        Object.defineProperty(t, "__esModule", {value: !0});
+        var i = r(n(1));
+
+        function r(e) {
+            return e && e.__esModule ? e : {default: e}
+        }
+
+        function a() {
+            (0, i.default)(this, a), this._ua = self.navigator.userAgent.toLowerCase(), this._system = void 0, this._systemVersion = void 0, this._systemByte = void 0, this._platform = void 0, this._engine = void 0, this._engineVersion = void 0, this._supporter = void 0, this._supporterVersion = void 0, this._shell = void 0, this._shellVersion = void 0, this._start()
+        }
+
+        (0, r(n(2)).default)(a, [{
+            key: "_start", value: function () {
+                this._checkSystem(), this._checkPlatform(), this._checkEngine(), this._checkSupporter(), this._checkShell()
+            }
+        }, {
+            key: "_checkUa", value: function (e) {
+                return e.test(this._ua)
+            }
+        }, {
+            key: "_getVersion", value: function (e) {
+                e = e.exec(this._ua);
+                return e ? e.shift().split(/\s|\/|:/gi).pop() : null
+            }
+        }, {
+            key: "_checkSystem", value: function () {
+                var e, t = this, n = this._checkUa.bind(this),
+                    i = [{sys: "windows", re: /windows|win32|win64|wow32|wow64/gi}, {
+                        sys: "osx",
+                        re: /macintosh|macintel/gi
+                    }, {sys: "linux", re: /x11/gi}, {sys: "android", re: /android|adr/gi}, {
+                        sys: "ios",
+                        re: /ios|iphone|ipad|iwatch/gi
+                    }].find(function (e) {
+                        return n(e.re)
+                    }), i = (this._system = i ? i.sys : void 0, this._systemByte = n(/win32|wow32|x32/gi) ? 32 : 64, [{
+                        sys: "osx",
+                        re: /os x [\d(.|_)]+/gi
+                    }, {sys: "android", re: /android [\d(.|_)]+/gi}, {
+                        sys: "ios",
+                        re: /os [\d(.|_)]+/gi
+                    }].find(function (e) {
+                        return e.sys === t._system
+                    }));
+                "windows" === this._system ? (e = [{vs: "2000", re: /windows nt 5.0|windows 2000/gi}, {
+                    vs: "xp",
+                    re: /windows nt 5.1|windows 2000/gi
+                }, {vs: "2003", re: /windows nt 5.2|windows 2003/gi}, {
+                    vs: "vista",
+                    re: /windows nt 6.0|windows vista/gi
+                }, {vs: "7", re: /windows nt 6.1|windows 7/gi}, {vs: "8", re: /windows nt 6.2|windows 8/gi}, {
+                    vs: "8.1",
+                    re: /windows nt 6.3|windows 8.1/gi
+                }, {vs: "10", re: /windows nt 10.0|windows 10/gi}].find(function (e) {
+                    return n(e.re)
+                }), this._systemVersion = e ? e.vs : void 0) : this._systemVersion = i ? this._getVersion(i.re) : void 0
+            }
+        }, {
+            key: "_checkPlatform", value: function () {
+                var t = this;
+                ["windows", "osx"].find(function (e) {
+                    return e === t._system
+                }) ? this._platform = "desktop" : ["ios", "android", "linux"].find(function (e) {
+                    return e === t._system
+                }) && (this._platform = "mobile")
+            }
+        }, {
+            key: "_checkEngine", value: function () {
+                var t = this._checkUa.bind(this),
+                    e = [{eng: "webkit", re: /applewebkit/gi, vre: /applewebkit\/[\d(.|_)]+/gi}, {
+                        eng: "presto",
+                        re: /presto/gi,
+                        vre: /presto\/[\d(.|_)]+/gi
+                    }, {
+                        eng: "trident",
+                        re: /trident|compatible|msie/gi,
+                        vre: /(trident|compatible|msie)\/[\d(.|_)]+/gi
+                    }, {eng: "gecko", re: /gecko|firefox/gi, vre: /(gecko|firefox)\/[\d(.|_)]+/gi}].find(function (e) {
+                        return t(e.re)
+                    });
+                e && (this._engine = e.eng, this._engineVersion = this._getVersion(e.vre))
+            }
+        }, {
+            key: "_checkSupporter", value: function () {
+                var t = this._checkUa.bind(this), e = this._system, n = this._engine;
+                "android" === e && "webkit" === n ? (e = this._ua.match(/chrome\/\d+[\.\d+]+/gi)) && (e = e.pop().split("/"), this._supporterVersion = e.pop(), this._supporter = e.pop()) : "webkit" === n ? (e = [{
+                    sp: "edge",
+                    re: /edge/gi,
+                    vre: /edge\/[\d(.|_)]+/gi
+                }, {sp: "opera", re: /opr/gi, vre: /opr\/[\d(.|_)]+/gi}, {
+                    sp: "chrome",
+                    re: /chrome|crios/gi,
+                    vre: /(chrome|crios)\/[\d(.|_)]+/gi
+                }, {sp: "safari", re: /safari/gi, vre: /version\/[\d(.|_)]+/gi}].find(function (e) {
+                    return t(e.re)
+                })) && (this._supporter = e.sp, this._supporterVersion = this._getVersion(e.vre)) : "presto" === n ? (this.supporter = "opera", this._supporterVersion = this._getVersion(/opera\/[\d(.|_)]+/gi)) : "trident" === n ? (this._supporter = "ie", this._supporterVersion = this._getVersion(/rv:[\d(.|_)]+/gi)) : "gecko" === n && (this._supporter = "firefox", this._supporterVersion = this._getVersion(/(rv:|firefox\/)[\d(.|_)]+/gi))
+            }
+        }, {
+            key: "_checkShell", value: function () {
+                var t = this._checkUa.bind(this), e = this._system, n = this._engine;
+                "android" !== e && "linux" !== e || "webkit" !== n ? (e = [{
+                    sl: "weChat",
+                    re: /micromessenger/gi,
+                    vre: /micromessenger\/[\d(.|_)]+/gi
+                }, {sl: "qq", re: /qqbrowser/gi, vre: /micromessenger\/[\d(.|_)]+/gi}, {
+                    sl: "uc",
+                    re: /ucbrowser/gi,
+                    vre: /ucbrowser\/[\d(.|_)]+/gi
+                }, {
+                    sl: "baidu",
+                    re: /baidu(boxapp|browser)/gi,
+                    vre: /baidu(boxapp|browser)\/[\d(.|_)]+/gi
+                }].find(function (e) {
+                    return t(e.re)
+                })) && (this._shell = e.sl, this._shellVersion = this._getVersion(e.vre)) : (n = this._ua.match(/[\w|\/]+Browser\/\d+[\.\d+]+/gi)) && (e = n.pop().split("/"), this._shellVersion = e.pop(), this._shell = e.pop())
+            }
+        }, {
+            key: "system", get: function () {
+                return this._system
+            }
+        }, {
+            key: "systemVersion", get: function () {
+                return this._systemVersion
+            }
+        }, {
+            key: "systemByte", get: function () {
+                return this._systemByte
+            }
+        }, {
+            key: "platform", get: function () {
+                return this._platform
+            }
+        }, {
+            key: "engine", get: function () {
+                return this._engine
+            }
+        }, {
+            key: "engineVersion", get: function () {
+                return this._engineVersion
+            }
+        }, {
+            key: "supporter", get: function () {
+                return this._supporter
+            }
+        }, {
+            key: "supporterVersion", get: function () {
+                return this._supporterVersion
+            }
+        }, {
+            key: "shell", get: function () {
+                return this._shell
+            }
+        }, {
+            key: "shellVersion", get: function () {
+                return this._shellVersion
+            }
+        }]), t.default = a
+    }, function (e) {
+        e.exports = JSON.parse('{"name":"h5player","version":"2.1.2build20220713","description":"player for h5 page without plugin","main":"./dist/h5player.min.js","scripts":{"start":"webpack --config build/webpack.dev.js --watch","dev":"webpack-dev-server --config build/webpack.dev.js","dev:https":"webpack-dev-server --config build/webpack.dev.js --https --coop","build":"npm run prod && npm run backup","build:dev":"webpack --config build/webpack.dev.js","prod":"webpack --config build/webpack.prod.js","backup":"webpack --config build/webpack.backup.js","http":"node dev/http.js","https":"node dev/https.js","preinstall":"node ./bin/preinstall.js","postinstall":"node ./bin/postinstall.js","preuninstall":"node ./bin/preuninstall.js","prepublishOnly":"npm run prod"},"author":"hezhuen","license":"MIT","dependencies":{"chalk":"^4.1.2","inquirer":"^8.2.0","shelljs":"^0.8.4"},"devDependencies":{"@babel/polyfill":"^7.12.1","babel-core":"^6.26.3","babel-eslint":"^8.2.6","babel-loader":"^7.1.5","babel-plugin-syntax-dynamic-import":"^6.18.0","babel-plugin-transform-runtime":"^6.23.0","babel-preset-env":"^1.7.0","babel-preset-es2015":"^6.24.1","babel-runtime":"^6.26.0","copy-webpack-plugin":"^4.5.2","css-loader":"^1.0.0","es6-promise":"^4.2.8","eslint":"^5.1.0","eslint-loader":"^2.1.0","html-loader":"^0.5.5","jquery":"^3.6.0","json-loader":"^0.5.7","less":"^3.7.1","less-loader":"^4.1.0","mime":"^2.5.2","moment":"^2.0.0","style-loader":"^0.21.0","uglifyjs-webpack-plugin":"^2.2.0","url-loader":"^1.0.1","uuid":"^3.3.3","webpack":"^4.16.1","webpack-cli":"^3.1.0","webpack-dev-server":"^3.11.2","webpack-merge":"^5.7.3","webworkify":"^1.5.0","webworkify-webpack":"^2.1.5"},"publishConfig":{"registry":"https://af.hikvision.com.cn/artifactory/api/npm/npm-fsdmdept/","access":"public"},"files":["dist","bin"]}')
+    }], a = {}, r.m = n, r.c = a, r.d = function (e, t, n) {
+        r.o(e, t) || Object.defineProperty(e, t, {enumerable: !0, get: n})
+    }, r.r = function (e) {
+        "undefined" != typeof Symbol && Symbol.toStringTag && Object.defineProperty(e, Symbol.toStringTag, {value: "Module"}), Object.defineProperty(e, "__esModule", {value: !0})
+    }, r.t = function (t, e) {
+        if (1 & e && (t = r(t)), 8 & e) return t;
+        if (4 & e && "object" == typeof t && t && t.__esModule) return t;
+        var n = Object.create(null);
+        if (r.r(n), Object.defineProperty(n, "default", {
+            enumerable: !0,
+            value: t
+        }), 2 & e && "string" != typeof t) for (var i in t) r.d(n, i, function (e) {
+            return t[e]
+        }.bind(null, i));
+        return n
+    }, r.n = function (e) {
+        var t = e && e.__esModule ? function () {
+            return e.default
+        } : function () {
+            return e
+        };
+        return r.d(t, "a", t), t
+    }, r.o = function (e, t) {
+        return Object.prototype.hasOwnProperty.call(e, t)
+    }, r.p = "", r(r.s = 235);
+
+    function r(e) {
+        if (a[e]) return a[e].exports;
+        var t = a[e] = {i: e, l: !1, exports: {}};
+        return n[e].call(t.exports, t, t.exports, r), t.l = !0, t.exports
+    }
+
+    var n, a
+});
\ No newline at end of file
diff --git a/mosty-common.iml b/mosty-common.iml
new file mode 100644
index 0000000..4fd5057
--- /dev/null
+++ b/mosty-common.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/operation-log-aspect-starter/operation-log-aspect-starter.iml b/operation-log-aspect-starter/operation-log-aspect-starter.iml
new file mode 100644
index 0000000..8e3f6fb
--- /dev/null
+++ b/operation-log-aspect-starter/operation-log-aspect-starter.iml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="module" module-name="common-base-starter" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.9" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="module" module-name="common-redis-starter" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="module" module-name="common-token-starter" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/operation-log-aspect-starter/pom.xml b/operation-log-aspect-starter/pom.xml
new file mode 100644
index 0000000..234a78a
--- /dev/null
+++ b/operation-log-aspect-starter/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mosty</groupId>
+        <artifactId>mosty-common</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>operation-log-aspect-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+<!--        <spring-cloud-dependencies.version>Hoxton.SR8</spring-cloud-dependencies.version>-->
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-dependencies.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.2.5.RELEASE</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-hystrix</artifactId>
+            <version>10.10.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.feign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>8.14.4</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.kafka</groupId>-->
+<!--            <artifactId>kafka-clients</artifactId>-->
+<!--            <version>2.6.0</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.kafka</groupId>-->
+<!--            <artifactId>spring-kafka</artifactId>-->
+<!--            <version>2.6.6</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>mosty-nexus-releases</id>
+            <name>release version</name>
+            <url>http://47.108.232.77:8181/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>mosty-nexus-snapshots</id>
+            <name>snapshots version</name>
+            <url>http://47.108.232.77:8181/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/LogAspect.java b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/LogAspect.java
new file mode 100644
index 0000000..23f628b
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/LogAspect.java
@@ -0,0 +1,204 @@
+package com.mosty.operation.log.aspect;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.support.spring.PropertyPreFilters;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.base.exception.BusinessStatus;
+import com.mosty.common.base.threadpool.SimpleThreadPool;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.base.util.ServletUtils;
+import com.mosty.common.base.util.SpringIocContext;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.JWTUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.operation.log.aspect.feign.OperationLogClient;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.Map;
+
+import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_HEADER;
+import static com.mosty.common.base.entity.log.LogConst.LOG_THREAD_POOL;
+
+
+/**
+ * 操作日志记录处理
+ *
+ * @author ruoyi
+ */
+@Slf4j
+@Aspect
+@Component
+public class LogAspect {
+
+    @Autowired
+    private OperationLogClient operationLogClient;
+
+    // 排除敏感属性字段
+    public static final String[] EXCLUDE_PROPERTIES = {"password", "oldPassword", "newPassword", "confirmPassword","zb"};
+
+    // 配置织入点
+    @Pointcut("@annotation(com.mosty.common.base.entity.log.Log)")
+    public void logPointCut() {
+    }
+
+    // 处理完请求后执行
+    @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) {
+        handleLog(joinPoint, controllerLog, null, jsonResult);
+    }
+
+    // 拦截异常操作
+    @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) {
+        handleLog(joinPoint, controllerLog, e, null);
+    }
+
+    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
+        try {
+
+            String token = ServletUtils.getRequest().getHeader(TOKEN_HEADER);
+            // 获取当前的用户 从header中获取
+            UserInfo userInfo = JWTUtil.getUserInfo(token);
+            String ipAddress = IpUtil.getIpAddress(ServletUtils.getRequest());
+            // *========数据库日志=========*//
+            SysOperLog operLog = new SysOperLog();
+            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+            // 请求的地址
+            operLog.setOperIp(ipAddress);
+            String url = ServletUtils.getRequest().getRequestURI();
+            operLog.setOperUrl(url);
+            //  添加服务名称
+            if (url != null && url.length() >= 11) {
+                String[] s = url.split("/");
+                if (s.length >= 2 && s[1].contains("mosty-")) {
+                    operLog.setMkmc(s[1]);
+                }
+            }
+            if (userInfo != null) {
+                operLog.setOperName(userInfo.getUserLoginName());
+                operLog.setOperUserId(String.valueOf(userInfo.getUserId()));
+                operLog.setOperSfzh(userInfo.getIdEntityCard());
+                if (StringUtils.isNotNull(userInfo.getDeptId())
+                        && StringUtils.isNotEmpty(userInfo.getDeptName())) {
+                    operLog.setSsbm(userInfo.getDeptName());
+                    operLog.setSsbmid(String.valueOf(userInfo.getDeptId()));
+                    operLog.setSsbmdm(userInfo.getDeptCode());
+                }
+            }
+            if (e != null) {
+                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+            }
+            // 设置方法名称
+            String className = joinPoint.getTarget().getClass().getName();
+            String methodName = joinPoint.getSignature().getName();
+            operLog.setMethod(className + "." + methodName + "()");
+            // 设置请求方式
+            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+            // 处理设置注解上的参数
+            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+
+            SimpleThreadPool.execute(LOG_THREAD_POOL, () -> {
+                operationLogClient.addOperationLog(operLog);
+            });
+        } catch (Exception exp) {
+            // 记录本地异常日志
+            log.error("==前置通知异常==");
+            log.error("异常信息:{}", exp.getMessage());
+            exp.printStackTrace();
+        }
+    }
+
+    // 获取注解中对方法的描述信息 用于Controller层注解
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception {
+        // 设置action动作
+        operLog.setBusinessType(log.businessType().ordinal());
+        // 设置标题
+        operLog.setTitle(log.title());
+        // 设置操作人类别
+        operLog.setOperatorType(log.operatorType().ordinal());
+        // 是否需要保存request，参数和值
+        if (log.isSaveRequestData()) {
+            // 获取参数的信息，传入到数据库中。
+            setRequestValue(joinPoint, operLog);
+        }
+        // 是否需要保存response，参数和值
+        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) {
+            operLog.setJsonResult(StringUtils.substring(JSONObject.toJSONString(jsonResult), 0, 2000));
+        }
+    }
+
+    // 获取请求的参数，放到log中
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception {
+        Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
+        if (StringUtils.isNotEmpty(map)) {
+            String params = JSONObject.toJSONString(map, excludePropertyPreFilter());
+            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+        } else {
+            Object args = joinPoint.getArgs();
+            if (StringUtils.isNotNull(args)) {
+                String params = argsArrayToString(joinPoint.getArgs());
+                operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+            }
+        }
+    }
+
+    // 忽略敏感属性
+    public PropertyPreFilters.MySimplePropertyPreFilter excludePropertyPreFilter() {
+        return new PropertyPreFilters().addFilter().addExcludes(EXCLUDE_PROPERTIES);
+    }
+
+    // 参数拼装
+    private String argsArrayToString(Object[] paramsArray) {
+        StringBuilder params = new StringBuilder();
+        if (paramsArray != null && paramsArray.length > 0) {
+            for (Object o : paramsArray) {
+                if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
+                    try {
+                        Object jsonObj = JSONObject.toJSONString(o, excludePropertyPreFilter());
+                        params.append(jsonObj.toString()).append(" ");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return params.toString().trim();
+    }
+
+    // 判断是否需要过滤的对象
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o) {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray()) {
+            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            Collection collection = (Collection) o;
+            for (Object value : collection) {
+                return value instanceof MultipartFile;
+            }
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            Map map = (Map) o;
+            for (Object value : map.entrySet()) {
+                Map.Entry entry = (Map.Entry) value;
+                return entry.getValue() instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+                || o instanceof BindingResult;
+    }
+}
diff --git a/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.java b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.java
new file mode 100644
index 0000000..b1fa3af
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.java
@@ -0,0 +1,18 @@
+package com.mosty.operation.log.aspect;
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  feign其他 微服务操作日志处理 启动器
+ * @author kevin
+ * @date 2022/6/7 5:01 下午
+ * @since 1.0.0
+ */
+@Configuration
+@EnableFeignClients(basePackages = "com.mosty.operation.log.aspect")
+@ComponentScan(basePackages = "com.mosty.operation.log.aspect")
+public class OperationLogAspectAutoConfiguration {
+
+}
diff --git a/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogClient.java b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogClient.java
new file mode 100644
index 0000000..3a28e75
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogClient.java
@@ -0,0 +1,23 @@
+package com.mosty.operation.log.aspect.feign;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.SysOperLog;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ *   添加操作日志
+ * @author kevin
+ * @date 2022/3/8 8:37 PM
+ * @since 1.0.0
+ */
+@FeignClient(value = "mosty-base", fallbackFactory = OperationLogFallbackFactory.class,
+        contextId = "com.mosty.operation.log.aspect.feign.OperationLogClient")
+public interface OperationLogClient {
+
+    // 保存操作日志
+    @PostMapping(value = "/mosty-base/provider/monitor/operateLog/save")
+    ResponseResult<Boolean> addOperationLog(@RequestBody SysOperLog sysOperLog);
+
+}
diff --git a/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.java b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.java
new file mode 100644
index 0000000..5f97db2
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.java
@@ -0,0 +1,27 @@
+package com.mosty.operation.log.aspect.feign;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.common.base.domain.ResponseResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ *  操作日志feign客户端
+ * @author kevin
+ * @date 2022/2/4 8:38 PM
+ * @since 1.0.0
+ */
+@Slf4j
+@Component
+public class OperationLogFallbackFactory implements FallbackFactory<OperationLogClient> {
+
+    @Override
+    public OperationLogClient create(Throwable throwable) {
+        log.error("fallback", throwable);
+        return sysOperLog -> {
+            log.error("参数:sysOperLog:{}", JSON.toJSONString(sysOperLog));
+            return ResponseResult.fail(null);
+        };
+    }
+}
diff --git a/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.java b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.java
new file mode 100644
index 0000000..5ccdc96
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/java/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.java
@@ -0,0 +1,53 @@
+package com.mosty.operation.log.aspect.kafka;
+
+//import org.apache.kafka.clients.producer.ProducerConfig;
+//import org.apache.kafka.common.serialization.StringSerializer;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+//import org.springframework.kafka.core.KafkaTemplate;
+//import org.springframework.kafka.core.ProducerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+//@Configuration
+public class KafkaProducerConfig {
+//    @Value("${spring.kafka.bootstrap-servers}")
+//    private String servers;
+//    @Value("${spring.kafka.producer.retries}")
+//    private int retries;
+//    @Value("${spring.kafka.producer.acks}")
+//    private String acks;
+//    @Value("${spring.kafka.producer.batch-size}")
+//    private int batchSize;
+//    @Value("${spring.kafka.producer.properties.linger.ms}")
+//    private int linger;
+//    @Value("${spring.kafka.producer.buffer-memory}")
+//    private int bufferMemory;
+//
+//    public Map<String, Object> producerConfigs() {
+//        Map<String, Object> props = new HashMap<>();
+//        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, servers);
+//        props.put(ProducerConfig.RETRIES_CONFIG, retries);
+//        props.put(ProducerConfig.ACKS_CONFIG, acks);
+//        props.put(ProducerConfig.BATCH_SIZE_CONFIG, batchSize);
+//        props.put(ProducerConfig.LINGER_MS_CONFIG, linger);
+//        props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, bufferMemory);
+//        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+//        return props;
+//    }
+//
+//    public ProducerFactory<String, Object> producerFactory() {
+//        return new DefaultKafkaProducerFactory<>(producerConfigs());
+//    }
+//
+//    @Bean
+//    public KafkaTemplate<String, Object> kafkaTemplate() {
+//        KafkaTemplate template = new KafkaTemplate<String, Object>(producerFactory());
+//        template.setDefaultTopic("platform-log"); // 设置默认的 topic
+//        return template;
+//    }
+}
\ No newline at end of file
diff --git a/operation-log-aspect-starter/src/main/resources/META-INF/spring.factories b/operation-log-aspect-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..f2b4e6a
--- /dev/null
+++ b/operation-log-aspect-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.operation.log.aspect.OperationLogAspectAutoConfiguration
\ No newline at end of file
diff --git a/operation-log-aspect-starter/target/classes/META-INF/spring.factories b/operation-log-aspect-starter/target/classes/META-INF/spring.factories
new file mode 100644
index 0000000..f2b4e6a
--- /dev/null
+++ b/operation-log-aspect-starter/target/classes/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.operation.log.aspect.OperationLogAspectAutoConfiguration
\ No newline at end of file
diff --git a/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/LogAspect.class b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/LogAspect.class
new file mode 100644
index 0000000..4b6974e
Binary files /dev/null and b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/LogAspect.class differ
diff --git a/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.class b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.class
new file mode 100644
index 0000000..0f948fa
Binary files /dev/null and b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/OperationLogAspectAutoConfiguration.class differ
diff --git a/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogClient.class b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogClient.class
new file mode 100644
index 0000000..f5aea46
Binary files /dev/null and b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogClient.class differ
diff --git a/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.class b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.class
new file mode 100644
index 0000000..6fa0688
Binary files /dev/null and b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/feign/OperationLogFallbackFactory.class differ
diff --git a/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.class b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.class
new file mode 100644
index 0000000..e07ea8a
Binary files /dev/null and b/operation-log-aspect-starter/target/classes/com/mosty/operation/log/aspect/kafka/KafkaProducerConfig.class differ
diff --git a/operation-log-aspect-starter/target/maven-archiver/pom.properties b/operation-log-aspect-starter/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..57d684d
--- /dev/null
+++ b/operation-log-aspect-starter/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 18 12:45:12 CST 2024
+version=1.0.0-SNAPSHOT
+groupId=com.mosty
+artifactId=operation-log-aspect-starter
diff --git a/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..745d3f4
--- /dev/null
+++ b/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,5 @@
+com\mosty\operation\log\aspect\feign\OperationLogFallbackFactory.class
+com\mosty\operation\log\aspect\feign\OperationLogClient.class
+com\mosty\operation\log\aspect\kafka\KafkaProducerConfig.class
+com\mosty\operation\log\aspect\LogAspect.class
+com\mosty\operation\log\aspect\OperationLogAspectAutoConfiguration.class
diff --git a/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..10aca08
--- /dev/null
+++ b/operation-log-aspect-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,5 @@
+C:\tools\dy外网\mosty-common\operation-log-aspect-starter\src\main\java\com\mosty\operation\log\aspect\kafka\KafkaProducerConfig.java
+C:\tools\dy外网\mosty-common\operation-log-aspect-starter\src\main\java\com\mosty\operation\log\aspect\LogAspect.java
+C:\tools\dy外网\mosty-common\operation-log-aspect-starter\src\main\java\com\mosty\operation\log\aspect\OperationLogAspectAutoConfiguration.java
+C:\tools\dy外网\mosty-common\operation-log-aspect-starter\src\main\java\com\mosty\operation\log\aspect\feign\OperationLogFallbackFactory.java
+C:\tools\dy外网\mosty-common\operation-log-aspect-starter\src\main\java\com\mosty\operation\log\aspect\feign\OperationLogClient.java
diff --git a/operation-log-aspect-starter/target/operation-log-aspect-starter-1.0.0-SNAPSHOT.jar b/operation-log-aspect-starter/target/operation-log-aspect-starter-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..f4fb396
Binary files /dev/null and b/operation-log-aspect-starter/target/operation-log-aspect-starter-1.0.0-SNAPSHOT.jar differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..c769b30
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.mosty</groupId>
+	<artifactId>mosty-common</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+	<modules>
+		<module>common-base-starter</module>
+		<module>common-redis-starter</module>
+		<module>common-log-base-starter</module>
+		<module>operation-log-aspect-starter</module>
+		<module>common-config-starter</module>
+		<module>common-generator-starter</module>
+        <module>common-core-starter</module>
+        <module>common-token-starter</module>
+		<module>common-task-starter</module>
+        <module>common-dynamic-datasource-starter</module>
+        <module>common-magic-api-starter</module>
+	</modules>
+	<name>mosty-common</name>
+	<description>智羽项目公共组件</description>
+	<properties>
+		<java.version>1.8</java.version>
+		<fastjson.version>1.2.83</fastjson.version>
+		<shiro.version>1.8.0</shiro.version>
+		<starter-data-redis.version>2.3.0.RELEASE</starter-data-redis.version>
+		<transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+		<spring-boot-dependencies.version>2.3.2.RELEASE</spring-boot-dependencies.version>
+		<transmittable-version>2.11.5</transmittable-version>
+	</properties>
+	<dependencies>
+
+	</dependencies>
+
+<!--	<build>-->
+		<!--<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>-->
+<!--	</build>-->
+
+	<dependencyManagement>
+		<dependencies>
+			<!-- Shiro核心框架 -->
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-core</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+
+			<!-- Shiro使用Spring框架 -->
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-spring</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+
+			<!-- Shiro使用EhCache缓存框架 -->
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-ehcache</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-data-redis</artifactId>
+				<version>${starter-data-redis.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<distributionManagement>
+		<repository>
+			<id>mosty-nexus-releases</id>
+			<name>release version</name>
+			<url>http://10.64.201.126:8081/repository/maven-releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>mosty-nexus-snapshots</id>
+			<name>snapshots version</name>
+			<url>http://10.64.201.126:8081/repository/maven-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/sql/common2022-0207.sql b/sql/common2022-0207.sql
new file mode 100644
index 0000000..16ef715
--- /dev/null
+++ b/sql/common2022-0207.sql
@@ -0,0 +1,736 @@
+-- ----------------------------
+-- 1、部门表
+-- ----------------------------
+drop table if exists sys_dept;
+create table sys_dept (
+  id                bigint(20)      not null auto_increment    comment '部门id',
+  org_code          varchar(20)     default ''                  comment '部门编码',
+  org_name          varchar(50)     default ''                 comment '部门名称',
+  org_type          int (1)         default ''                 comment '部门类型',
+  org_level            int(1)     default null               comment '部门等级',
+  org_biz_type             int(1)     default null               comment '联系电话',
+  email             varchar(50)     default null               comment '邮箱',
+  status            char(1)         default '0'                comment '部门状态（0正常 1停用）',
+  deleted           bigint(20)      default 0                  comment '删除标志（0代表存在 2代表删除）',
+  create_by         bigint(20)      default null               comment '创建者id',
+  create_name       varchar(64)     default null               comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null               comment '创建者id',
+  update_name       varchar(64)     default null               comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  primary key (dept_id)
+) engine=innodb auto_increment=200 comment = '部门表';
+
+-- ----------------------------
+-- 初始化-部门表数据
+-- ----------------------------
+insert into sys_dept values(100,  0,   '0',          '若依科技',   0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(101,  100, '0,100',      '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(102,  100, '0,100',      '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(103,  101, '0,100,101',  '研发部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(104,  101, '0,100,101',  '市场部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(105,  101, '0,100,101',  '测试部门',   3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(106,  101, '0,100,101',  '财务部门',   4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(107,  101, '0,100,101',  '运维部门',   5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(108,  102, '0,100,102',  '市场部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(109,  102, '0,100,102',  '财务部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+
+
+-- ----------------------------
+-- 2、用户信息表
+-- ----------------------------
+drop table if exists sys_user;
+create table sys_user (
+  user_id           bigint(20)      not null auto_increment    comment '用户ID',
+  dept_id           bigint(20)      default null               comment '部门ID',
+  login_name        varchar(30)     not null                   comment '登录账号',
+  user_name         varchar(30)     default ''                 comment '用户昵称',
+  user_type         varchar(2)      default '00'               comment '用户类型（00系统用户 01注册用户）',
+  email             varchar(50)     default ''                 comment '用户邮箱',
+  phone_number      varchar(11)     default ''                 comment '手机号码',
+  sex               int(1)          default '0'                comment '用户性别（0男 1女 2未知）',
+  avatar            varchar(100)    default ''                 comment '头像路径',
+  password          varchar(50)     default ''                 comment '密码',
+  salt              varchar(20)     default ''                 comment '盐加密',
+  status            int(1)          default '0'                comment '帐号状态（0正常 1停用）',
+  login_ip          varchar(128)    default ''                 comment '最后登录IP',
+  login_date        datetime                                   comment '最后登录时间',
+  pwd_update_date   datetime                                   comment '密码最后更新时间',
+  deleted           bigint(20)      default 0               comment '删除标志（0代表存在 2代表删除）',
+  create_by         bigint(20)      default null                    comment '创建者id',
+  create_name       varchar(64)     default null                   comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                 comment '创建者id',
+  update_name       varchar(64)     default null                   comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (user_id)
+) engine=innodb auto_increment=100 comment = '用户信息表';
+
+-- ----------------------------
+-- 初始化-用户信息表数据
+-- ----------------------------
+insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '29c67a30398638269fe600f73a054934', '111111', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '管理员');
+insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '8e6d98b90472783cc73c17047ddccf36', '222222', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '测试员');
+
+
+-- ----------------------------
+-- 3、岗位信息表
+-- ----------------------------
+drop table if exists sys_post;
+create table sys_post
+(
+  post_id           bigint(20)      not null auto_increment    comment '岗位ID',
+  post_code         varchar(64)     not null                   comment '岗位编码',
+  post_name         varchar(50)     not null                   comment '岗位名称',
+  post_sort         int(4)          not null                   comment '显示顺序',
+  status            int(1)         not null                   comment '状态（0正常 1停用）',
+  deleted           bigint(20)      default 0               comment '删除标志（0代表存在 2代表删除）',
+  create_by         bigint(20)      default null                    comment '创建者id',
+  create_name       varchar(64)     default null                  comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                    comment '创建者id',
+  update_name       varchar(64)     default null                 comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark        varchar(500)      default null               comment '备注',
+  primary key (post_id)
+) engine=innodb comment = '岗位信息表';
+
+-- ----------------------------
+-- 初始化-岗位信息表数据
+-- ----------------------------
+insert into sys_post values(1, 'ceo',  '董事长',    1, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(2, 'se',   '项目经理',  2, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(3, 'hr',   '人力资源',  3, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(4, 'user', '普通员工',  4, '0', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 4、角色信息表
+-- ----------------------------
+drop table if exists sys_role;
+create table sys_role (
+  role_id           bigint(20)      not null auto_increment    comment '角色ID',
+  role_name         varchar(30)     not null                   comment '角色名称',
+  role_key          varchar(100)    not null                   comment '角色权限字符串',
+  role_sort         int(4)          not null                   comment '显示顺序',
+  data_scope        int(1)          default 1               comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
+  status            int(1)          not null                   comment '角色状态（0正常 1停用）',
+  deleted           bigint(20)      default 0               comment '删除标志（0代表存在 2代表删除）',
+  create_by         bigint(20)      default null                   comment '创建者id',
+  create_name       varchar(64)     default null                 comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                  comment '创建者id',
+  update_name       varchar(64)     default null                   comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (role_id)
+) engine=innodb auto_increment=100 comment = '角色信息表';
+
+-- ----------------------------
+-- 初始化-角色信息表数据
+-- ----------------------------
+insert into sys_role values('1', '超级管理员', 'admin',  1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员');
+insert into sys_role values('2', '普通角色',   'common', 2, 2, '0', '0', 'admin', sysdate(), '', null, '普通角色');
+
+
+-- ----------------------------
+-- 5、菜单权限表
+-- ----------------------------
+drop table if exists sys_menu;
+create table sys_menu (
+  menu_id           bigint(20)      not null auto_increment    comment '菜单ID',
+  menu_name         varchar(50)     not null                   comment '菜单名称',
+  parent_id         bigint(20)      default 0                  comment '父菜单ID',
+  order_num         int(4)          default 0                  comment '显示顺序',
+  url               varchar(200)    default '#'                comment '请求地址',
+  target            varchar(20)     default ''                 comment '打开方式（menuItem页签 menuBlank新窗口）',
+  menu_type         varchar(1)      default ''                 comment '菜单类型（M目录 C菜单 F按钮）',
+  visible           int(1)          default 0                  comment '菜单状态（0显示 1隐藏）',
+  is_refresh        int(1)          default 1                  comment '是否刷新（0刷新 1不刷新）',
+  perms             varchar(100)    default null               comment '权限标识',
+  icon              varchar(100)    default '#'                comment '菜单图标',
+  deleted           bigint(20)      default 0                  comment '删除标志（0代表存在 2代表删除）',
+  create_by         bigint(20)      default null                  comment '创建者id',
+  create_name       varchar(64)     default null                 comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                 comment '创建者id',
+  update_name       varchar(64)     default null               comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark            varchar(500)    default ''                 comment '备注',
+  primary key (menu_id)
+) engine=innodb auto_increment=2000 comment = '菜单权限表';
+
+-- ----------------------------
+-- 初始化-菜单信息表数据
+-- ----------------------------
+-- 一级菜单
+insert into sys_menu values('1', '系统管理', '0', '1', '#',                '',          'M', '0', '1', '', 'fa fa-gear',           'admin', sysdate(), '', null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '2', '#',                '',          'M', '0', '1', '', 'fa fa-video-camera',   'admin', sysdate(), '', null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '3', '#',                '',          'M', '0', '1', '', 'fa fa-bars',           'admin', sysdate(), '', null, '系统工具目录');
+insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', 'menuBlank', 'C', '0', '1', '', 'fa fa-location-arrow', 'admin', sysdate(), '', null, '若依官网地址');
+-- 二级菜单
+insert into sys_menu values('100',  '用户管理', '1', '1', '/system/user',          '', 'C', '0', '1', 'system:user:view',         'fa fa-user-o',          'admin', sysdate(), '', null, '用户管理菜单');
+insert into sys_menu values('101',  '角色管理', '1', '2', '/system/role',          '', 'C', '0', '1', 'system:role:view',         'fa fa-user-secret',     'admin', sysdate(), '', null, '角色管理菜单');
+insert into sys_menu values('102',  '菜单管理', '1', '3', '/system/menu',          '', 'C', '0', '1', 'system:menu:view',         'fa fa-th-list',         'admin', sysdate(), '', null, '菜单管理菜单');
+insert into sys_menu values('103',  '部门管理', '1', '4', '/system/dept',          '', 'C', '0', '1', 'system:dept:view',         'fa fa-outdent',         'admin', sysdate(), '', null, '部门管理菜单');
+insert into sys_menu values('104',  '岗位管理', '1', '5', '/system/post',          '', 'C', '0', '1', 'system:post:view',         'fa fa-address-card-o',  'admin', sysdate(), '', null, '岗位管理菜单');
+insert into sys_menu values('105',  '字典管理', '1', '6', '/system/dict',          '', 'C', '0', '1', 'system:dict:view',         'fa fa-bookmark-o',      'admin', sysdate(), '', null, '字典管理菜单');
+insert into sys_menu values('106',  '参数设置', '1', '7', '/system/config',        '', 'C', '0', '1', 'system:config:view',       'fa fa-sun-o',           'admin', sysdate(), '', null, '参数设置菜单');
+insert into sys_menu values('107',  '通知公告', '1', '8', '/system/notice',        '', 'C', '0', '1', 'system:notice:view',       'fa fa-bullhorn',        'admin', sysdate(), '', null, '通知公告菜单');
+insert into sys_menu values('108',  '日志管理', '1', '9', '#',                     '', 'M', '0', '1', '',                         'fa fa-pencil-square-o', 'admin', sysdate(), '', null, '日志管理菜单');
+insert into sys_menu values('109',  '在线用户', '2', '1', '/monitor/online',       '', 'C', '0', '1', 'monitor:online:view',      'fa fa-user-circle',     'admin', sysdate(), '', null, '在线用户菜单');
+insert into sys_menu values('110',  '定时任务', '2', '2', '/monitor/job',          '', 'C', '0', '1', 'monitor:job:view',         'fa fa-tasks',           'admin', sysdate(), '', null, '定时任务菜单');
+insert into sys_menu values('111',  '数据监控', '2', '3', '/monitor/data',         '', 'C', '0', '1', 'monitor:data:view',        'fa fa-bug',             'admin', sysdate(), '', null, '数据监控菜单');
+insert into sys_menu values('112',  '服务监控', '2', '4', '/monitor/server',       '', 'C', '0', '1', 'monitor:server:view',      'fa fa-server',          'admin', sysdate(), '', null, '服务监控菜单');
+insert into sys_menu values('113',  '缓存监控', '2', '5', '/monitor/cache',        '', 'C', '0', '1', 'monitor:cache:view',       'fa fa-cube',            'admin', sysdate(), '', null, '缓存监控菜单');
+insert into sys_menu values('114',  '表单构建', '3', '1', '/tool/build',           '', 'C', '0', '1', 'tool:build:view',          'fa fa-wpforms',         'admin', sysdate(), '', null, '表单构建菜单');
+insert into sys_menu values('115',  '代码生成', '3', '2', '/tool/gen',             '', 'C', '0', '1', 'tool:gen:view',            'fa fa-code',            'admin', sysdate(), '', null, '代码生成菜单');
+insert into sys_menu values('116',  '系统接口', '3', '3', '/tool/swagger',         '', 'C', '0', '1', 'tool:swagger:view',        'fa fa-gg',              'admin', sysdate(), '', null, '系统接口菜单');
+-- 三级菜单
+insert into sys_menu values('500',  '操作日志', '108', '1', '/monitor/operlog',    '', 'C', '0', '1', 'monitor:operlog:view',     'fa fa-address-book',    'admin', sysdate(), '', null, '操作日志菜单');
+insert into sys_menu values('501',  '登录日志', '108', '2', '/monitor/logininfor', '', 'C', '0', '1', 'monitor:logininfor:view',  'fa fa-file-image-o',    'admin', sysdate(), '', null, '登录日志菜单');
+-- 用户管理按钮
+insert into sys_menu values('1000', '用户查询', '100', '1',  '#', '',  'F', '0', '1', 'system:user:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1001', '用户新增', '100', '2',  '#', '',  'F', '0', '1', 'system:user:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1002', '用户修改', '100', '3',  '#', '',  'F', '0', '1', 'system:user:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1003', '用户删除', '100', '4',  '#', '',  'F', '0', '1', 'system:user:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1004', '用户导出', '100', '5',  '#', '',  'F', '0', '1', 'system:user:export',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1005', '用户导入', '100', '6',  '#', '',  'F', '0', '1', 'system:user:import',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1006', '重置密码', '100', '7',  '#', '',  'F', '0', '1', 'system:user:resetPwd',    '#', 'admin', sysdate(), '', null, '');
+-- 角色管理按钮
+insert into sys_menu values('1007', '角色查询', '101', '1',  '#', '',  'F', '0', '1', 'system:role:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1008', '角色新增', '101', '2',  '#', '',  'F', '0', '1', 'system:role:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1009', '角色修改', '101', '3',  '#', '',  'F', '0', '1', 'system:role:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1010', '角色删除', '101', '4',  '#', '',  'F', '0', '1', 'system:role:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1011', '角色导出', '101', '5',  '#', '',  'F', '0', '1', 'system:role:export',      '#', 'admin', sysdate(), '', null, '');
+-- 菜单管理按钮
+insert into sys_menu values('1012', '菜单查询', '102', '1',  '#', '',  'F', '0', '1', 'system:menu:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1013', '菜单新增', '102', '2',  '#', '',  'F', '0', '1', 'system:menu:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1014', '菜单修改', '102', '3',  '#', '',  'F', '0', '1', 'system:menu:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1015', '菜单删除', '102', '4',  '#', '',  'F', '0', '1', 'system:menu:remove',      '#', 'admin', sysdate(), '', null, '');
+-- 部门管理按钮
+insert into sys_menu values('1016', '部门查询', '103', '1',  '#', '',  'F', '0', '1', 'system:dept:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1017', '部门新增', '103', '2',  '#', '',  'F', '0', '1', 'system:dept:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1018', '部门修改', '103', '3',  '#', '',  'F', '0', '1', 'system:dept:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1019', '部门删除', '103', '4',  '#', '',  'F', '0', '1', 'system:dept:remove',      '#', 'admin', sysdate(), '', null, '');
+-- 岗位管理按钮
+insert into sys_menu values('1020', '岗位查询', '104', '1',  '#', '',  'F', '0', '1', 'system:post:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1021', '岗位新增', '104', '2',  '#', '',  'F', '0', '1', 'system:post:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1022', '岗位修改', '104', '3',  '#', '',  'F', '0', '1', 'system:post:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1023', '岗位删除', '104', '4',  '#', '',  'F', '0', '1', 'system:post:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1024', '岗位导出', '104', '5',  '#', '',  'F', '0', '1', 'system:post:export',      '#', 'admin', sysdate(), '', null, '');
+-- 字典管理按钮
+insert into sys_menu values('1025', '字典查询', '105', '1',  '#', '',  'F', '0', '1', 'system:dict:list',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1026', '字典新增', '105', '2',  '#', '',  'F', '0', '1', 'system:dict:add',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1027', '字典修改', '105', '3',  '#', '',  'F', '0', '1', 'system:dict:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1028', '字典删除', '105', '4',  '#', '',  'F', '0', '1', 'system:dict:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1029', '字典导出', '105', '5',  '#', '',  'F', '0', '1', 'system:dict:export',      '#', 'admin', sysdate(), '', null, '');
+-- 参数设置按钮
+insert into sys_menu values('1030', '参数查询', '106', '1',  '#', '',  'F', '0', '1', 'system:config:list',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1031', '参数新增', '106', '2',  '#', '',  'F', '0', '1', 'system:config:add',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1032', '参数修改', '106', '3',  '#', '',  'F', '0', '1', 'system:config:edit',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1033', '参数删除', '106', '4',  '#', '',  'F', '0', '1', 'system:config:remove',    '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1034', '参数导出', '106', '5',  '#', '',  'F', '0', '1', 'system:config:export',    '#', 'admin', sysdate(), '', null, '');
+-- 通知公告按钮
+insert into sys_menu values('1035', '公告查询', '107', '1',  '#', '',  'F', '0', '1', 'system:notice:list',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1036', '公告新增', '107', '2',  '#', '',  'F', '0', '1', 'system:notice:add',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1037', '公告修改', '107', '3',  '#', '',  'F', '0', '1', 'system:notice:edit',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1038', '公告删除', '107', '4',  '#', '',  'F', '0', '1', 'system:notice:remove',    '#', 'admin', sysdate(), '', null, '');
+-- 操作日志按钮
+insert into sys_menu values('1039', '操作查询', '500', '1',  '#', '',  'F', '0', '1', 'monitor:operlog:list',    '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1040', '操作删除', '500', '2',  '#', '',  'F', '0', '1', 'monitor:operlog:remove',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1041', '详细信息', '500', '3',  '#', '',  'F', '0', '1', 'monitor:operlog:detail',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1042', '日志导出', '500', '4',  '#', '',  'F', '0', '1', 'monitor:operlog:export',  '#', 'admin', sysdate(), '', null, '');
+-- 登录日志按钮
+insert into sys_menu values('1043', '登录查询', '501', '1',  '#', '',  'F', '0', '1', 'monitor:logininfor:list',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1044', '登录删除', '501', '2',  '#', '',  'F', '0', '1', 'monitor:logininfor:remove',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1045', '日志导出', '501', '3',  '#', '',  'F', '0', '1', 'monitor:logininfor:export',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1046', '账户解锁', '501', '4',  '#', '',  'F', '0', '1', 'monitor:logininfor:unlock',       '#', 'admin', sysdate(), '', null, '');
+-- 在线用户按钮
+insert into sys_menu values('1047', '在线查询', '109', '1',  '#', '',  'F', '0', '1', 'monitor:online:list',             '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1048', '批量强退', '109', '2',  '#', '',  'F', '0', '1', 'monitor:online:batchForceLogout', '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1049', '单条强退', '109', '3',  '#', '',  'F', '0', '1', 'monitor:online:forceLogout',      '#', 'admin', sysdate(), '', null, '');
+-- 定时任务按钮
+insert into sys_menu values('1050', '任务查询', '110', '1',  '#', '',  'F', '0', '1', 'monitor:job:list',                '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1051', '任务新增', '110', '2',  '#', '',  'F', '0', '1', 'monitor:job:add',                 '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1052', '任务修改', '110', '3',  '#', '',  'F', '0', '1', 'monitor:job:edit',                '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1053', '任务删除', '110', '4',  '#', '',  'F', '0', '1', 'monitor:job:remove',              '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1054', '状态修改', '110', '5',  '#', '',  'F', '0', '1', 'monitor:job:changeStatus',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1055', '任务详细', '110', '6',  '#', '',  'F', '0', '1', 'monitor:job:detail',              '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1056', '任务导出', '110', '7',  '#', '',  'F', '0', '1', 'monitor:job:export',              '#', 'admin', sysdate(), '', null, '');
+-- 代码生成按钮
+insert into sys_menu values('1057', '生成查询', '115', '1',  '#', '',  'F', '0', '1', 'tool:gen:list',     '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1058', '生成修改', '115', '2',  '#', '',  'F', '0', '1', 'tool:gen:edit',     '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1059', '生成删除', '115', '3',  '#', '',  'F', '0', '1', 'tool:gen:remove',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1060', '预览代码', '115', '4',  '#', '',  'F', '0', '1', 'tool:gen:preview',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1061', '生成代码', '115', '5',  '#', '',  'F', '0', '1', 'tool:gen:code',     '#', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 6、用户和角色关联表  用户N-1角色
+-- ----------------------------
+drop table if exists sys_user_role;
+create table sys_user_role (
+  user_id   bigint(20) not null comment '用户ID',
+  role_id   bigint(20) not null comment '角色ID',
+  primary key(user_id, role_id)
+) engine=innodb comment = '用户和角色关联表';
+
+-- ----------------------------
+-- 初始化-用户和角色关联表数据
+-- ----------------------------
+insert into sys_user_role values ('1', '1');
+insert into sys_user_role values ('2', '2');
+
+
+-- ----------------------------
+-- 7、角色和菜单关联表  角色1-N菜单
+-- ----------------------------
+drop table if exists sys_role_menu;
+create table sys_role_menu (
+  role_id   bigint(20) not null comment '角色ID',
+  menu_id   bigint(20) not null comment '菜单ID',
+  primary key(role_id, menu_id)
+) engine=innodb comment = '角色和菜单关联表';
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+insert into sys_role_menu values ('2', '1');
+insert into sys_role_menu values ('2', '2');
+insert into sys_role_menu values ('2', '3');
+insert into sys_role_menu values ('2', '4');
+insert into sys_role_menu values ('2', '100');
+insert into sys_role_menu values ('2', '101');
+insert into sys_role_menu values ('2', '102');
+insert into sys_role_menu values ('2', '103');
+insert into sys_role_menu values ('2', '104');
+insert into sys_role_menu values ('2', '105');
+insert into sys_role_menu values ('2', '106');
+insert into sys_role_menu values ('2', '107');
+insert into sys_role_menu values ('2', '108');
+insert into sys_role_menu values ('2', '109');
+insert into sys_role_menu values ('2', '110');
+insert into sys_role_menu values ('2', '111');
+insert into sys_role_menu values ('2', '112');
+insert into sys_role_menu values ('2', '113');
+insert into sys_role_menu values ('2', '114');
+insert into sys_role_menu values ('2', '115');
+insert into sys_role_menu values ('2', '116');
+insert into sys_role_menu values ('2', '500');
+insert into sys_role_menu values ('2', '501');
+insert into sys_role_menu values ('2', '1000');
+insert into sys_role_menu values ('2', '1001');
+insert into sys_role_menu values ('2', '1002');
+insert into sys_role_menu values ('2', '1003');
+insert into sys_role_menu values ('2', '1004');
+insert into sys_role_menu values ('2', '1005');
+insert into sys_role_menu values ('2', '1006');
+insert into sys_role_menu values ('2', '1007');
+insert into sys_role_menu values ('2', '1008');
+insert into sys_role_menu values ('2', '1009');
+insert into sys_role_menu values ('2', '1010');
+insert into sys_role_menu values ('2', '1011');
+insert into sys_role_menu values ('2', '1012');
+insert into sys_role_menu values ('2', '1013');
+insert into sys_role_menu values ('2', '1014');
+insert into sys_role_menu values ('2', '1015');
+insert into sys_role_menu values ('2', '1016');
+insert into sys_role_menu values ('2', '1017');
+insert into sys_role_menu values ('2', '1018');
+insert into sys_role_menu values ('2', '1019');
+insert into sys_role_menu values ('2', '1020');
+insert into sys_role_menu values ('2', '1021');
+insert into sys_role_menu values ('2', '1022');
+insert into sys_role_menu values ('2', '1023');
+insert into sys_role_menu values ('2', '1024');
+insert into sys_role_menu values ('2', '1025');
+insert into sys_role_menu values ('2', '1026');
+insert into sys_role_menu values ('2', '1027');
+insert into sys_role_menu values ('2', '1028');
+insert into sys_role_menu values ('2', '1029');
+insert into sys_role_menu values ('2', '1030');
+insert into sys_role_menu values ('2', '1031');
+insert into sys_role_menu values ('2', '1032');
+insert into sys_role_menu values ('2', '1033');
+insert into sys_role_menu values ('2', '1034');
+insert into sys_role_menu values ('2', '1035');
+insert into sys_role_menu values ('2', '1036');
+insert into sys_role_menu values ('2', '1037');
+insert into sys_role_menu values ('2', '1038');
+insert into sys_role_menu values ('2', '1039');
+insert into sys_role_menu values ('2', '1040');
+insert into sys_role_menu values ('2', '1041');
+insert into sys_role_menu values ('2', '1042');
+insert into sys_role_menu values ('2', '1043');
+insert into sys_role_menu values ('2', '1044');
+insert into sys_role_menu values ('2', '1045');
+insert into sys_role_menu values ('2', '1046');
+insert into sys_role_menu values ('2', '1047');
+insert into sys_role_menu values ('2', '1048');
+insert into sys_role_menu values ('2', '1049');
+insert into sys_role_menu values ('2', '1050');
+insert into sys_role_menu values ('2', '1051');
+insert into sys_role_menu values ('2', '1052');
+insert into sys_role_menu values ('2', '1053');
+insert into sys_role_menu values ('2', '1054');
+insert into sys_role_menu values ('2', '1055');
+insert into sys_role_menu values ('2', '1056');
+insert into sys_role_menu values ('2', '1057');
+insert into sys_role_menu values ('2', '1058');
+insert into sys_role_menu values ('2', '1059');
+insert into sys_role_menu values ('2', '1060');
+insert into sys_role_menu values ('2', '1061');
+
+-- ----------------------------
+-- 8、角色和部门关联表  角色1-N部门
+-- ----------------------------
+drop table if exists sys_role_dept;
+create table sys_role_dept (
+  role_id   bigint(20) not null comment '角色ID',
+  dept_id   bigint(20) not null comment '部门ID',
+  primary key(role_id, dept_id)
+) engine=innodb comment = '角色和部门关联表';
+
+-- ----------------------------
+-- 初始化-角色和部门关联表数据
+-- ----------------------------
+insert into sys_role_dept values ('2', '100');
+insert into sys_role_dept values ('2', '101');
+insert into sys_role_dept values ('2', '105');
+
+-- ----------------------------
+-- 9、用户与岗位关联表  用户1-N岗位
+-- ----------------------------
+drop table if exists sys_user_post;
+create table sys_user_post
+(
+  user_id   bigint(20) not null comment '用户ID',
+  post_id   bigint(20) not null comment '岗位ID',
+  primary key (user_id, post_id)
+) engine=innodb comment = '用户与岗位关联表';
+
+-- ----------------------------
+-- 初始化-用户与岗位关联表数据
+-- ----------------------------
+insert into sys_user_post values ('1', '1');
+insert into sys_user_post values ('2', '2');
+
+
+-- ----------------------------
+-- 10、操作日志记录
+-- ----------------------------
+drop table if exists sys_oper_log;
+create table sys_oper_log (
+  oper_id           bigint(20)      not null auto_increment    comment '日志主键',
+  title             varchar(50)     default ''                 comment '模块标题',
+  business_type     int(2)          default 0                  comment '业务类型（0其它 1新增 2修改 3删除）',
+  method            varchar(100)    default ''                 comment '方法名称',
+  request_method    varchar(10)     default ''                 comment '请求方式',
+  operator_type     int(1)          default 0                  comment '操作类别（0其它 1后台用户 2手机端用户）',
+  oper_name         varchar(50)     default ''                 comment '操作人员',
+  dept_name         varchar(50)     default ''                 comment '部门名称',
+  oper_url          varchar(255)    default ''                 comment '请求URL',
+  oper_ip           varchar(128)    default ''                 comment '主机地址',
+  oper_location     varchar(255)    default ''                 comment '操作地点',
+  oper_param        varchar(2000)   default ''                 comment '请求参数',
+  json_result       varchar(2000)   default ''                 comment '返回参数',
+  status            int(1)          default 0                  comment '操作状态（0正常 1异常）',
+  error_msg         varchar(2000)   default ''                 comment '错误消息',
+  oper_time         datetime                                   comment '操作时间',
+  primary key (oper_id)
+) engine=innodb auto_increment=100 comment = '操作日志记录';
+
+
+-- ----------------------------
+-- 11、字典类型表
+-- ----------------------------
+drop table if exists sys_dict_type;
+create table sys_dict_type
+(
+  dict_id          bigint(20)      not null auto_increment    comment '字典主键',
+  dict_name        varchar(100)    default ''                 comment '字典名称',
+  dict_type        varchar(100)    default ''                 comment '字典类型',
+  status           int(1)         default '0'                comment '状态（0正常 1停用）',
+  create_by        varchar(64)     default ''                 comment '创建者',
+  create_time      datetime                                   comment '创建时间',
+  update_by        varchar(64)     default ''                 comment '更新者',
+  update_time      datetime                                   comment '更新时间',
+  remark           varchar(500)    default null               comment '备注',
+  primary key (dict_id),
+  unique (dict_type)
+) engine=innodb auto_increment=100 comment = '字典类型表';
+
+insert into sys_dict_type values(1,  '用户性别', 'sys_user_sex',        '0', 'admin', sysdate(), '', null, '用户性别列表');
+insert into sys_dict_type values(2,  '菜单状态', 'sys_show_hide',       '0', 'admin', sysdate(), '', null, '菜单状态列表');
+insert into sys_dict_type values(3,  '系统开关', 'sys_normal_disable',  '0', 'admin', sysdate(), '', null, '系统开关列表');
+insert into sys_dict_type values(4,  '任务状态', 'sys_job_status',      '0', 'admin', sysdate(), '', null, '任务状态列表');
+insert into sys_dict_type values(5,  '任务分组', 'sys_job_group',       '0', 'admin', sysdate(), '', null, '任务分组列表');
+insert into sys_dict_type values(6,  '系统是否', 'sys_yes_no',          '0', 'admin', sysdate(), '', null, '系统是否列表');
+insert into sys_dict_type values(7,  '通知类型', 'sys_notice_type',     '0', 'admin', sysdate(), '', null, '通知类型列表');
+insert into sys_dict_type values(8,  '通知状态', 'sys_notice_status',   '0', 'admin', sysdate(), '', null, '通知状态列表');
+insert into sys_dict_type values(9,  '操作类型', 'sys_oper_type',       '0', 'admin', sysdate(), '', null, '操作类型列表');
+insert into sys_dict_type values(10, '系统状态', 'sys_common_status',   '0', 'admin', sysdate(), '', null, '登录状态列表');
+
+
+-- ----------------------------
+-- 12、字典数据表
+-- ----------------------------
+drop table if exists sys_dict_data;
+create table sys_dict_data
+(
+  dict_code        bigint(20)      not null auto_increment    comment '字典编码',
+  dict_sort        int(4)          default 0                  comment '字典排序',
+  dict_label       varchar(100)    default ''                 comment '字典标签',
+  dict_value       varchar(100)    default ''                 comment '字典键值',
+  dict_type        varchar(100)    default ''                 comment '字典类型',
+  css_class        varchar(100)    default null               comment '样式属性（其他样式扩展）',
+  list_class       varchar(100)    default null               comment '表格回显样式',
+  is_default       varchar(1)         default 'N'                comment '是否默认（Y是 N否）',
+  status           int(1)         default '0'                comment '状态（0正常 1停用）',
+  create_by         bigint(20)      not null                   comment '创建者id',
+  create_name       varchar(64)     not null                   comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      not null                   comment '创建者id',
+  update_name       varchar(64)     not null                   comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark           varchar(500)    default null               comment '备注',
+  primary key (dict_code)
+) engine=innodb auto_increment=100 comment = '字典数据表';
+
+insert into sys_dict_data values(1,  1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 'admin', sysdate(), '', null, '性别男');
+insert into sys_dict_data values(2,  2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别女');
+insert into sys_dict_data values(3,  3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别未知');
+insert into sys_dict_data values(4,  1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单');
+insert into sys_dict_data values(5,  2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '隐藏菜单');
+insert into sys_dict_data values(6,  1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(7,  2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+insert into sys_dict_data values(8,  1,  '正常',     '0',       'sys_job_status',      '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(9,  2,  '暂停',     '1',       'sys_job_status',      '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+insert into sys_dict_data values(10, 1,  '默认',     'DEFAULT', 'sys_job_group',       '',   '',        'Y', '0', 'admin', sysdate(), '', null, '默认分组');
+insert into sys_dict_data values(11, 2,  '系统',     'SYSTEM',  'sys_job_group',       '',   '',        'N', '0', 'admin', sysdate(), '', null, '系统分组');
+insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是');
+insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '系统默认否');
+insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知');
+insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 'admin', sysdate(), '', null, '公告');
+insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '关闭状态');
+insert into sys_dict_data values(18, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '其他操作');
+insert into sys_dict_data values(19, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '新增操作');
+insert into sys_dict_data values(20, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '修改操作');
+insert into sys_dict_data values(21, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '删除操作');
+insert into sys_dict_data values(22, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作');
+insert into sys_dict_data values(23, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作');
+insert into sys_dict_data values(24, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作');
+insert into sys_dict_data values(25, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '强退操作');
+insert into sys_dict_data values(26, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作');
+insert into sys_dict_data values(27, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '清空操作');
+insert into sys_dict_data values(28, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(29, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+
+
+-- ----------------------------
+-- 13、参数配置表
+-- ----------------------------
+drop table if exists sys_config;
+create table sys_config (
+  config_id         int(5)          not null auto_increment    comment '参数主键',
+  config_name       varchar(100)    default ''                 comment '参数名称',
+  config_key        varchar(100)    default ''                 comment '参数键名',
+  config_value      varchar(500)    default ''                 comment '参数键值',
+  config_type       char(1)         default 'N'                comment '系统内置（Y是 N否）',
+  create_by         bigint(20)      default null                   comment '创建者id',
+  create_name       varchar(64)     default null                   comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                    comment '创建者id',
+  update_name       varchar(64)     default null                    comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (config_id)
+) engine=innodb auto_increment=100 comment = '参数配置表';
+
+insert into sys_config values(1,  '主框架页-默认皮肤样式名称',     'sys.index.skinName',               'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow');
+insert into sys_config values(2,  '用户管理-账号初始密码',         'sys.user.initPassword',            '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456');
+insert into sys_config values(3,  '主框架页-侧边栏主题',           'sys.index.sideTheme',              'theme-dark',    'Y', 'admin', sysdate(), '', null, '深黑主题theme-dark，浅色主题theme-light，深蓝主题theme-blue');
+insert into sys_config values(4,  '账号自助-是否开启用户注册功能', 'sys.account.registerUser',         'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(5,  '用户管理-密码字符范围',         'sys.account.chrtype',              '0',             'Y', 'admin', sysdate(), '', null, '默认任意字符范围，0任意（密码可以输入任意字符），1数字（密码只能为0-9数字），2英文字母（密码只能为a-z和A-Z字母），3字母和数字（密码必须包含字母，数字）,4字母数字和特殊字符（目前支持的特殊字符包括：~!@#$%^&*()-=_+）');
+insert into sys_config values(6,  '用户管理-初始密码修改策略',     'sys.account.initPasswordModify',   '0',             'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
+insert into sys_config values(7,  '用户管理-账号密码更新周期',     'sys.account.passwordValidateDays', '0',             'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
+insert into sys_config values(8,  '主框架页-菜单导航显示风格',     'sys.index.menuStyle',              'default',       'Y', 'admin', sysdate(), '', null, '菜单导航显示风格（default为左侧导航菜单，topnav为顶部导航菜单）');
+insert into sys_config values(9,  '主框架页-是否开启页脚',         'sys.index.footer',                 'true',          'Y', 'admin', sysdate(), '', null, '是否开启底部页脚显示（true显示，false隐藏）');
+insert into sys_config values(10, '主框架页-是否开启页签',         'sys.index.tagsView',               'true',          'Y', 'admin', sysdate(), '', null, '是否开启菜单多页签显示（true显示，false隐藏）');
+
+
+-- ----------------------------
+-- 14、系统访问记录
+-- ----------------------------
+drop table if exists sys_logininfor;
+create table sys_logininfor (
+  info_id        bigint(20)     not null auto_increment   comment '访问ID',
+  login_name     varchar(50)    default ''                comment '登录账号',
+  ipaddr         varchar(128)   default ''                comment '登录IP地址',
+  login_location varchar(255)   default ''                comment '登录地点',
+  browser        varchar(50)    default ''                comment '浏览器类型',
+  os             varchar(50)    default ''                comment '操作系统',
+  status         char(1)        default '0'               comment '登录状态（0成功 1失败）',
+  msg            varchar(255)   default ''                comment '提示消息',
+  login_time     datetime                                 comment '访问时间',
+  primary key (info_id)
+) engine=innodb auto_increment=100 comment = '系统访问记录';
+
+
+-- ----------------------------
+-- 15、在线用户记录
+-- ----------------------------
+drop table if exists sys_user_online;
+create table sys_user_online (
+  sessionId         varchar(50)   default ''                comment '用户会话id',
+  login_name        varchar(50)   default ''                comment '登录账号',
+  dept_name         varchar(50)   default ''                comment '部门名称',
+  ipaddr            varchar(128)  default ''                comment '登录IP地址',
+  login_location    varchar(255)  default ''                comment '登录地点',
+  browser           varchar(50)   default ''                comment '浏览器类型',
+  os                varchar(50)   default ''                comment '操作系统',
+  status            varchar(10)   default ''                comment '在线状态on_line在线off_line离线',
+  start_timestamp   datetime                                comment 'session创建时间',
+  last_access_time  datetime                                comment 'session最后访问时间',
+  expire_time       int(5)        default 0                 comment '超时时间，单位为分钟',
+  primary key (sessionId)
+) engine=innodb comment = '在线用户记录';
+
+
+-- ----------------------------
+-- 16、定时任务调度表
+-- ----------------------------
+drop table if exists sys_job;
+create table sys_job (
+  job_id              bigint(20)    not null auto_increment    comment '任务ID',
+  job_name            varchar(64)   default ''                 comment '任务名称',
+  job_group           varchar(64)   default 'DEFAULT'          comment '任务组名',
+  invoke_target       varchar(500)  not null                   comment '调用目标字符串',
+  cron_expression     varchar(255)  default ''                 comment 'cron执行表达式',
+  misfire_policy      varchar(20)   default '3'                comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
+  concurrent          int(1)       default '1'                comment '是否并发执行（0允许 1禁止）',
+  status              int(1)       default '0'                comment '状态（0正常 1暂停）',
+  create_by         bigint(20)     default null                   comment '创建者id',
+  create_name       varchar(64)     default null                  comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null                  comment '创建者id',
+  update_name       varchar(64)     default null                  comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark              varchar(500)  default ''                 comment '备注信息',
+  primary key (job_id, job_name, job_group)
+) engine=innodb auto_increment=100 comment = '定时任务调度表';
+
+insert into sys_job values(1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams',        '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')',  '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)',  '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 17、定时任务调度日志表
+-- ----------------------------
+drop table if exists sys_job_log;
+create table sys_job_log (
+  job_log_id          bigint(20)     not null auto_increment    comment '任务日志ID',
+  job_name            varchar(64)    not null                   comment '任务名称',
+  job_group           varchar(64)    not null                   comment '任务组名',
+  invoke_target       varchar(500)   not null                   comment '调用目标字符串',
+  job_message         varchar(500)                              comment '日志信息',
+  status              int(1)        default '0'                comment '执行状态（0正常 1失败）',
+  exception_info      varchar(2000)  default ''                 comment '异常信息',
+  create_time         datetime                                  comment '创建时间',
+  primary key (job_log_id)
+) engine=innodb comment = '定时任务调度日志表';
+
+
+-- ----------------------------
+-- 18、通知公告表
+-- ----------------------------
+drop table if exists sys_notice;
+create table sys_notice (
+  notice_id         int(4)           not null auto_increment    comment '公告ID',
+  notice_title      varchar(50)      not null                   comment '公告标题',
+  notice_type       int(1)           not null                   comment '公告类型（1通知 2公告）',
+  notice_content    varchar(2000)    default null               comment '公告内容',
+  status            int(1)           default '0'                comment '公告状态（0正常 1关闭）',
+  create_by         bigint(20)       default null                 comment '创建者id',
+  create_name       varchar(64)      default null                   comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)       default null                   comment '创建者id',
+  update_name       varchar(64)      default null                  comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  remark            varchar(255)     default null               comment '备注',
+  primary key (notice_id)
+) engine=innodb auto_increment=10 comment = '通知公告表';
+
+-- ----------------------------
+-- 初始化-公告信息表数据
+-- ----------------------------
+insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', sysdate(), '', null, '管理员');
+
+
+-- ----------------------------
+-- 19、代码生成业务表
+-- ----------------------------
+drop table if exists gen_table;
+create table gen_table (
+  table_id             bigint(20)      not null auto_increment    comment '编号',
+  table_name           varchar(200)    default ''                 comment '表名称',
+  table_comment        varchar(500)    default ''                 comment '表描述',
+  sub_table_name       varchar(64)     default null               comment '关联子表的表名',
+  sub_table_fk_name    varchar(64)     default null               comment '子表关联的外键名',
+  class_name           varchar(100)    default ''                 comment '实体类名称',
+  tpl_category         varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）',
+  package_name         varchar(100)                               comment '生成包路径',
+  module_name          varchar(30)                                comment '生成模块名',
+  business_name        varchar(30)                                comment '生成业务名',
+  function_name        varchar(50)                                comment '生成功能名',
+  function_author      varchar(50)                                comment '生成功能作者',
+  gen_type             int(1)          default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
+  gen_path             varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
+  options              varchar(1000)                              comment '其它生成选项',
+  create_by            bigint(20)         default null            comment '创建者id',
+  create_name          varchar(64)        default null            comment '创建者名称',
+  create_time          datetime                                   comment '创建时间',
+  update_by            bigint(20)         default null            comment '创建者id',
+  update_name          varchar(64)        default null            comment '创建者名称',
+  update_time          datetime                                   comment '创建时间',
+  remark               varchar(500)    default null               comment '备注',
+  primary key (table_id)
+) engine=innodb auto_increment=1 comment = '代码生成业务表';
+
+
+-- ----------------------------
+-- 20、代码生成业务表字段
+-- ----------------------------
+drop table if exists gen_table_column;
+create table gen_table_column (
+  column_id         bigint(20)      not null auto_increment    comment '编号',
+  table_id          varchar(64)                                comment '归属表编号',
+  column_name       varchar(200)                               comment '列名称',
+  column_comment    varchar(500)                               comment '列描述',
+  column_type       varchar(100)                               comment '列类型',
+  java_type         varchar(500)                               comment 'JAVA类型',
+  java_field        varchar(200)                               comment 'JAVA字段名',
+  is_pk             int(1)                                     comment '是否主键（1是）',
+  is_increment      int(1)                                     comment '是否自增（1是）',
+  is_required       int(1)                                     comment '是否必填（1是）',
+  is_insert         int(1)                                     comment '是否为插入字段（1是）',
+  is_edit           int(1)                                     comment '是否编辑字段（1是）',
+  is_list           int(1)                                     comment '是否列表字段（1是）',
+  is_query          int(1)                                     comment '是否查询字段（1是）',
+  query_type        varchar(200)    default 'EQ'               comment '查询方式（等于、不等于、大于、小于、范围）',
+  html_type         varchar(200)                               comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
+  dict_type         varchar(200)    default ''                 comment '字典类型',
+  sort              int                                        comment '排序',
+  create_by         bigint(20)      default null               comment '创建者id',
+  create_name       varchar(64)     default null               comment '创建者名称',
+  create_time       datetime                                   comment '创建时间',
+  update_by         bigint(20)      default null               comment '创建者id',
+  update_name       varchar(64)     default null               comment '创建者名称',
+  update_time       datetime                                   comment '创建时间',
+  primary key (column_id)
+) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
\ No newline at end of file