Merge branch 'developer' of caimei-repository/caimei-mall into master

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?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="caimei-mall" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="caimei-mall" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>

.idea/libraries/Maven__asm_asm_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: asm:asm:3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.3/asm-3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.3/asm-3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.3/asm-3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__asm_asm_commons_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: asm:asm-commons:3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.3/asm-commons-3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.3/asm-commons-3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.3/asm-commons-3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__asm_asm_tree_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: asm:asm-tree:3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.3/asm-tree-3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.3/asm-tree-3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.3/asm-tree-3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.1.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.1.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_alibaba_fastjson_1_2_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:fastjson:1.2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.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>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.jsqlparser:jsqlparser:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper:5.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jayway.jsonpath:json-path:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-fileupload:commons-fileupload:1.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.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>

.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__junit_junit_4_12.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_21.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-java:5.1.21">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:accessors-smart:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:json-smart:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__ognl_ognl_3_0_19.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ognl:ognl:3.0.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.19/ognl-3.0.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.19/ognl-3.0.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.19/ognl-3.0.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_commons_commons_lang3_3_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.2/commons-lang3-3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.2/commons-lang3-3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.2/commons-lang3-3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_struts_struts2_core_2_3_32.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.struts:struts2-core:2.3.32">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_32.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.struts.xwork:xwork-core:2.3.32">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.23/tomcat-jdbc-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.23/tomcat-jdbc-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.23/tomcat-jdbc-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:tomcat-juli:8.5.23">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.23/tomcat-juli-8.5.23.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.23/tomcat-juli-8.5.23-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.23/tomcat-juli-8.5.23-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.assertj:assertj-core:2.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/2.6.0/assertj-core-2.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/2.6.0/assertj-core-2.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/2.6.0/assertj-core-2.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy:2.4.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.13/groovy-2.4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.13/groovy-2.4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.13/groovy-2.4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.freemarker:freemarker:2.3.27-incubating">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.27-incubating/freemarker-2.3.27-incubating.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.27-incubating/freemarker-2.3.27-incubating-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.27-incubating/freemarker-2.3.27-incubating-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-library:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-validator:5.3.6.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.3.6.Final/hibernate-validator-5.3.6.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.3.6.Final/hibernate-validator-5.3.6.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.3.6.Final/hibernate-validator-5.3.6.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.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>

.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.logging:jboss-logging:3.3.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.1.Final/jboss-logging-3.3.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.1.Final/jboss-logging-3.3.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.1.Final/jboss-logging-3.3.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-core:1.10.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis:3.4.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.5/mybatis-3.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.5/mybatis-3.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.5/mybatis-3.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis-spring:1.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.1/mybatis-spring-1.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.1/mybatis-spring-1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.1/mybatis-spring-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm:5.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.3/asm-5.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.skyscreamer:jsonassert:1.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.4.0/jsonassert-1.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.4.0/jsonassert-1.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.4.0/jsonassert-1.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:log4j-over-slf4j:1.7.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.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>

.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-test:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.6.RELEASE/thymeleaf-2.1.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.6.RELEASE/thymeleaf-2.1.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.6.RELEASE/thymeleaf-2.1.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.6.RELEASE/thymeleaf-spring4-2.1.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.6.RELEASE/thymeleaf-spring4-2.1.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.6.RELEASE/thymeleaf-spring4-2.1.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.unbescape:unbescape:1.1.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.17">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xerces:xercesImpl:2.11.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xml-apis:xml-apis:1.4.01">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,13 @@
+<?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" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/caimei-mall.iml" filepath="$PROJECT_DIR$/caimei-mall.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

pom.xml

@@ -1,8 +1,13 @@
 <?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">
+<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>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
     <groupId>com.caimei</groupId>
     <artifactId>caimei-mall</artifactId>
@@ -14,13 +19,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
-    </parent>
-
     <dependencies>
+
+        <dependency>
+            <groupId>com.caimei.module</groupId>
+            <artifactId>caimei-search</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
         <!--spring Boot原始依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -36,14 +47,12 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.1</version>
+            <version>2.1.1</version>
         </dependency>
-
-        <!-- mysql的依赖 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
+            <version>8.0.18</version>
         </dependency>
 
         <dependency>
@@ -90,7 +99,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
 
     <profiles>
@@ -136,7 +144,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
                 <configuration>
                     <mainClass>com.caimei.StartApplication</mainClass><!--springboot启动类目录-->
                 </configuration>
@@ -153,4 +160,4 @@
     </build>
 
 
-</project>
+</project>

src/main/java/com/caimei/StartApplication.java

@@ -1,13 +1,15 @@
 package com.caimei;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.caimei.module.service", "com.caimei.controller.**", "com.caimei.service.**"})
+@MapperScan(basePackages = {"com.caimei.module.dao", "com.caimei.mapper.**"})
 public class StartApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(StartApplication.class, args);
     }
 
-}
+}

src/main/java/com/caimei/controller/order/OrderController.java

@@ -0,0 +1,313 @@
+package com.caimei.controller.order;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.caimei.entity.*;
+import com.caimei.service.order.OrderService;
+import com.caimei.service.user.LoginService;
+import com.caimei.utils.HttpRequest;
+import com.caimei.utils.JsonMapper;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单
+ */
+@Controller
+@RequestMapping("/order")
+public class OrderController {
+    protected static final Logger logger = LoggerFactory.getLogger(OrderController.class);
+
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private LoginService loginService;
+    @Autowired
+    private Environment env;
+
+    /**
+     * 确认订单信息
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/confirm")
+    public CmWxJsonModel confirmOrder(Integer userId, String classifyIDS, Integer organizeID, String productIDs, Integer count) {
+        Map<String, Object> map = orderService.confirmOrder(userId, classifyIDS, organizeID, productIDs, count);
+        return CmWxJsonModel.newInstance().success(map);
+    }
+
+    /**
+     * 分享订单
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/share")
+    public CmWxJsonModel shareOrder(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        String shareCode = null;
+        try {
+            shareCode = orderService.shareOrder(orderID);
+        } catch (Exception e) {
+            return model.error("" + e.getMessage());
+        }
+        return model.success(shareCode);
+    }
+
+    /**
+     * 分享订单,分享码验证通过
+     */
+    @ResponseBody
+    @RequestMapping("/shareCode")
+    public CmWxJsonModel verifyShareCode(String shareCode, String code, Integer orderID, Integer userID,
+                                         Integer organizeID, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        logger.info("Start get SessionKey");
+        Map<String, Object> map = new HashMap<>();
+        String referer = request.getHeader("Referer"); //获取当前微信小程序的环境
+        logger.info("referer-is----:" + referer);
+        map.put("referer", referer);
+        String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
+        Map<String, String> requestUrlParam = new HashMap<String, String>();
+        requestUrlParam.put("appid", env.getProperty("miniprogram.AppId" + organizeID));//小程序appId
+        requestUrlParam.put("secret", env.getProperty("miniprogram.AppSecret" + organizeID));//小程序appsecret
+        requestUrlParam.put("js_code", code);//小程序端返回的code
+        requestUrlParam.put("grant_type", "authorization_code");//默认参数
+        //发送post请求读取调用微信接口获取openid用户唯一标识
+        String infos;
+        try {
+            infos = HttpRequest.sendPost(requestUrl, requestUrlParam);
+        } catch (Exception e) {
+            model.setData(map);
+            return model.error("服务器内部异常");
+        }
+        //解析相应内容（转换成json对象）
+        JSONObject jsonObject = JSON.parseObject(infos);
+        String openid = jsonObject.getString("openid");
+        logger.info("openid----->" + openid);
+        String session_key = jsonObject.getString("session_key");
+        String errcode = jsonObject.getString("errcode");
+        String errmsg = jsonObject.getString("errmsg");
+        if (!org.springframework.util.StringUtils.isEmpty(errcode) &&
+                (errcode.equals("-1") || errcode.equals("40029") || errcode.equals("45011"))) {
+            model.setMsg(errmsg);
+            model.setData(map);
+            map.put("sessionKey", session_key);
+            model.setCode("-1");
+            return model;
+        }
+        if (orderID == null || userID == null || organizeID == null) {
+            model.error("参数异常");
+        }
+        CmWxJsonModel jsonModel = orderService.verifyShareCode(shareCode, openid, orderID, userID, organizeID);
+        return jsonModel;
+    }
+
+    /**
+     * 订单详情
+     */
+    @ResponseBody
+    @RequestMapping("/particulars")
+    public CmWxJsonModel particulars(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        Map<String, Object> map = null;
+        try {
+            map = orderService.particulars(orderID);
+        } catch (Exception e) {
+            return model.error("" + e.getMessage());
+        }
+        return model.success(map);
+    }
+
+    /**
+     * 提交订单接口
+     *
+     * @return code:-1=(用户账户异常,数据异常,操作异常等)，1提交成功（支付完成）,2提交成功(未支付)，code为1和2的情况下出现 data{orderNo:订单号，orderID:订单ID,payTotalFee:订单金额，orderMark：订单标识}
+     * @Param params参数格式：
+     * 参数1=userId用户ID
+     * 参数2=organizeID组织ID，
+     * 参数3=cartType购买类型（1购物车提交，2直接购买提交）
+     * 参数4=ddressID订单收货地址
+     * 参数5=orderInfo订单信息参数格式：
+     * [
+     * {"shopId":1001,
+     * "note":81,
+     * "productInfo":[{"productId":1,"productNum":80},{"productId":2,"productNum":100}]
+     * }
+     * ]
+     * 参数6=balanceDeductionFlag是否使用余额抵扣(1使用，2不使用)
+     * 参数7=orderShouldPayFee订单应付金额（商品总金额 - 余额抵扣 - 经理折扣默认为0）
+     */
+    @Transactional
+    @ResponseBody
+    @RequestMapping("/submitOrder")
+    public synchronized CmWxJsonModel submitOrder(String params, HttpServletRequest request) {
+        CmWxJsonModel cmWxJsonModel = CmWxJsonModel.newInstance();
+        logger.info(">>>>>>订单信息params:" + params);
+        //检查用户是否登入
+//        CmMallOperationUser currentUser = SessionHelper.getCurrentUser(request);
+        HttpSession session = request.getSession();
+        String openid = (String) session.getAttribute("openid");
+        Integer organizeID1 = (Integer) session.getAttribute("organizeID");
+        CmMallOperationUser currentUser = loginService.doLogin(openid, organizeID1);
+        if (null == currentUser) {
+            return cmWxJsonModel.error("-1", "用户账户异常");
+        }
+        Integer cmOperationID = currentUser.getId();//当前操作者ID
+        if (StringUtils.isBlank(params)) {
+            return cmWxJsonModel.error("-1", "数据异常");
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        try {
+            map = (Map<String, Object>) JsonMapper.getInstance().fromJsonString(params, Map.class);
+            if (null == map) {
+                logger.info(">>>>>数据异常，参数不能为空");
+                return cmWxJsonModel.error("-1", "数据异常");
+            }
+            Integer userId = (Integer) map.get("userId");
+            Integer organizeID = (Integer) map.get("organizeID");
+            String cartType = String.valueOf(map.get("cartType"));
+            Integer addressID = (Integer) map.get("addressID");
+            Object orderInfo = map.get("orderInfo");
+            String balanceDeductionFlag = String.valueOf(map.get("balanceDeductionFlag"));
+            Double orderShouldPayFee = Double.parseDouble(String.valueOf(map.get("orderShouldPayFee")));//此金额为前端计算，适用于后端计算金额复查
+            //校验传入参数的正确性
+            if (null == userId) {
+                return cmWxJsonModel.error("-1", "用户数据异常");
+            }
+            if (null == organizeID) {
+                return cmWxJsonModel.error("-1", "组织数据异常");
+            }
+            if (StringUtils.isEmpty(cartType)) {
+                return cmWxJsonModel.error("-1", "购买类型数据异常");
+            }
+            if (null == addressID) {
+                return cmWxJsonModel.error("-1", "地址数据异常");
+            }
+            if (null == orderInfo) {
+                return cmWxJsonModel.error("-1", "订单数据异常");
+            }
+            if (StringUtils.isEmpty(balanceDeductionFlag)) {
+                return cmWxJsonModel.error("-1", "余额抵扣数据异常");
+            }
+            if (null == orderShouldPayFee) {
+                return cmWxJsonModel.error("-1", "订单应付金额数据异常");
+            }
+            //保存订单信息
+            return orderService.saveOrderInfo(cmWxJsonModel, userId, organizeID, cartType, addressID, orderInfo, balanceDeductionFlag, orderShouldPayFee, cmOperationID);
+        } catch (Exception e) {
+            logger.info(">>>>>系统异常" + e.getMessage());
+            return cmWxJsonModel.error("-1", "数据异常");
+
+        }
+    }
+
+    /**
+     * 物流详情
+     */
+    @ResponseBody
+    @RequestMapping("/logistics")
+    public CmWxJsonModel logistics(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        List<CmMallLogisticsBatch> logistics = null;
+        try {
+            logistics = orderService.logistics(orderID);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return model.success(logistics);
+    }
+
+    /**
+     * 查询我的订单
+     *
+     * @param orderState 订单状态
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/myOrder")
+    public CmWxJsonModel myOrder(Integer orderState, Integer userID, Integer index, Integer pageSize, Integer organizeID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (userID == null || orderState == null || organizeID == null) return model.error("参数异常");
+        if (index == null) index = 1;
+        if (pageSize == null) pageSize = 10;
+        PageHelper.startPage(index, pageSize);
+        List<CmMallOrder> orderList = orderService.myOrder(userID, orderState, organizeID);
+        CmMallPage<CmMallOrder> page = new CmMallPage<>(orderList);
+        return model.success(page);
+    }
+
+    /**
+     * 常采购商品
+     */
+    @ResponseBody
+    @RequestMapping("/purchase")
+    public CmWxJsonModel oftenPurchase(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (userID == null || organizeID == null) return model.error("参数异常");
+        Map<String, Object> map = orderService.oftenPurchase(userID, organizeID, index, pageSize);
+        return model.success(map);
+    }
+
+    /**
+     * 删除订单
+     */
+    @ResponseBody
+    @RequestMapping("/delete")
+    public CmWxJsonModel deleteOrder(Integer orderID) {
+        CmWxJsonModel model = null;
+        try {
+            model = orderService.deleteOrder(orderID);
+        } catch (Exception e) {
+            return model.error("删除订单失败," + e.getMessage());
+        }
+        return model;
+    }
+
+    /**
+     * 取消订单
+     */
+    @ResponseBody
+    @RequestMapping("/cancel")
+    public CmWxJsonModel cancelOrder(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            orderService.cancelOrder(orderID);
+        } catch (Exception e) {
+            return model.error("" + e.getMessage());
+        }
+        return model.success("取消订单成功", "");
+    }
+
+    /**
+     * 确认收货
+     */
+    @ResponseBody
+    @RequestMapping("/affirm")
+    public CmWxJsonModel affirmCargo(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            orderService.affirmCargo(orderID);
+        } catch (Exception e) {
+            return model.error("" + e.getMessage());
+        }
+        return model.success("确认收货成功", "");
+    }
+}
+

src/main/java/com/caimei/controller/products/DetailsController.java

@@ -1,9 +1,9 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.products.DetailsService;
 import com.caimei.service.user.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +32,9 @@ public class DetailsController {
      */
     @ResponseBody
     @RequestMapping("/product")
-    public WxJsonModel productDetails(Integer id, Integer userID) {
-        CmOrganizeProducts organizeProducts = detailsService.productDetails(id, userID);
-        return WxJsonModel.newInstance().success(organizeProducts);
+    public CmWxJsonModel productDetails(Integer id, Integer userID) {
+        CmMallOrganizeProducts organizeProducts = detailsService.productDetails(id, userID);
+        return CmWxJsonModel.newInstance().success(organizeProducts);
     }
 
     /**
@@ -44,11 +44,11 @@ public class DetailsController {
      */
     @ResponseBody
     @RequestMapping("/addCart")
-    public synchronized WxJsonModel addCart(@RequestBody CmMallCart cmMallCart, HttpServletRequest request) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public synchronized CmWxJsonModel addCart(@RequestBody CmMallCart cmMallCart, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (cmMallCart == null) return model.error("参数异常");
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, cmMallCart.getOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, cmMallCart.getOrganizeID());
         if (operationUser == null) return model.error("账户异常");
         Integer count = 0;
         try {

src/main/java/com/caimei/controller/products/HomePageController.java

@@ -1,6 +1,7 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.*;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.service.products.HomePageService;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +29,9 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/information")
-    public WxJsonModel information(Integer organizeID, Integer userID) {
+    public CmWxJsonModel information(Integer organizeID, Integer userID) {
         Map<String, Object> map = homePageService.information(organizeID, userID);
-        return WxJsonModel.newInstance().success(map);
+        return CmWxJsonModel.newInstance().success(map);
     }
 
     /**
@@ -40,13 +41,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/classify")
-    public WxJsonModel classify(CmOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
+    public CmWxJsonModel classify(CmMallOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmOrganizeProducts> list = homePageService.classify(organizeProducts);
-        Page<CmOrganizeProducts> page = new Page<>(list);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallOrganizeProducts> list = homePageService.classify(organizeProducts);
+        CmMallPage<CmMallOrganizeProducts> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -56,13 +57,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/preferred")
-    public WxJsonModel preferred(CmOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
+    public CmWxJsonModel preferred(CmMallOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmOrganizeProducts> list = homePageService.preferred(organizeProducts);
-        Page<CmOrganizeProducts> page = new Page<>(list);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallOrganizeProducts> list = homePageService.preferred(organizeProducts);
+        CmMallPage<CmMallOrganizeProducts> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -72,13 +73,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/member")
-    public WxJsonModel member(Integer index, Integer pageSize) {
+    public CmWxJsonModel member(Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<hospital> member = homePageService.member();
-        Page<hospital> page = new Page<>(member);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallHospital> member = homePageService.member();
+        CmMallPage<CmMallHospital> page = new CmMallPage<>(member);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -88,8 +89,8 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/afterSale")
-    public WxJsonModel afterSale(Integer organizeID) {
+    public CmWxJsonModel afterSale(Integer organizeID) {
         CmMallOrganize organize = homePageService.afterSale(organizeID);
-        return WxJsonModel.newInstance().success(organize);
+        return CmWxJsonModel.newInstance().success(organize);
     }
 }

src/main/java/com/caimei/controller/products/ShoppingController.java

@@ -1,8 +1,8 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.products.ShoppingService;
 import com.caimei.service.user.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +30,8 @@ public class ShoppingController {
      */
     @ResponseBody
     @RequestMapping("/cart")
-    public WxJsonModel cart(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel cart(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         Map<String, Object> map = shoppingService.findAllCart(userID, index, pageSize);
@@ -54,12 +54,12 @@ public class ShoppingController {
      */
     @ResponseBody
     @RequestMapping("/delete")
-    public WxJsonModel deleteCart(Integer userID, String productIDs, HttpServletRequest request) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel deleteCart(Integer userID, String productIDs, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         HttpSession session = request.getSession();
         String openid = (String) session.getAttribute("openid");
         Integer organizeID = (Integer) session.getAttribute("organizeID");
-        CmOperationUser operationUser = loginService.doLogin(openid, organizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, organizeID);
         if (operationUser == null) return model.error("账户异常");
         try {
             shoppingService.deleteCart(userID, productIDs);

src/main/java/com/caimei/controller/search/SearchController.java

@@ -0,0 +1,188 @@
+package com.caimei.controller.search;
+
+import com.caimei.controller.user.LoginController;
+import com.caimei.entity.*;
+import com.caimei.mapper.order.OrderMapper;
+
+import com.caimei.module.entity.vo.*;
+import com.caimei.module.service.SearchService;
+import com.caimei.utils.AppUtils;
+import com.caimei.utils.CopyUtil;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 搜索
+ */
+@Controller
+@RequestMapping("/search")
+public class SearchController {
+    @Autowired
+    private SearchService searchService;
+    @Autowired
+    private LoginController loginController;
+    @Resource
+    private OrderMapper orderMapper;
+    @Value("${miniprogram.domain}")
+    private String domain;
+
+    /**
+     * 首页搜索商品
+     */
+    @ResponseBody
+    @RequestMapping("/product")
+    public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
+                                       Integer pageSize, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
+        //查询历史记录是否存在
+        CmMallProductSearchHistoryVo productSearchHistory = searchService.findAllProductRecord(organizeID, searchWord, openID);
+        if (productSearchHistory == null) {
+            //保存并删除大于10条的历史记录
+            searchService.saveProductRecord(organizeID, searchWord, openID);
+            searchService.deleteProductRecord(organizeID, openID);
+        } else {
+            searchService.updateProductRecord(organizeID, searchWord, openID);
+        }
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
+        PageHelper.startPage(index, pageSize);
+        List<CmMallOrganizeProductsVo> list = searchService.searchProduct(organizeID, searchWord);
+        for (CmMallOrganizeProductsVo products : list) {
+            products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
+            //是否启用阶梯价格
+            if (products.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice());
+            }
+        }
+        CmMallPage<CmMallOrganizeProductsVo> productsPage = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(productsPage);
+    }
+
+    /**
+     * 首页搜索历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/record")
+    public CmWxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = (String) jsonModel.getData();
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findProductRecord(organizeID, openID);
+        return CmWxJsonModel.newInstance().success(historyList);
+    }
+
+    /**
+     * 首页搜索删除历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/delete")
+    public CmWxJsonModel deleteProductRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+            String openID = (String) jsonModel.getData();
+            searchService.deleteRecord(organizeID, openID);
+        } catch (Exception e) {
+            return model.error("删除失败");
+        }
+        return model.success();
+    }
+
+    /**
+     * 订单列表搜索订单
+     */
+    @ResponseBody
+    @RequestMapping("/order")
+    public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
+                                     Integer pageSize, Long userID, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
+        //查询历史记录是否存在
+        CmMallProductSearchHistoryVo orderSearchHistory = searchService.findAllOrderRecord(organizeID, searchWord, openID);
+        if (orderSearchHistory == null) {
+            //保存并删除大于10条的历史记录
+            searchService.saveOrderRecord(organizeID, searchWord, openID);
+            searchService.deleteOrderRecord(organizeID, openID);
+        } else {
+            searchService.updateOrderRecord(organizeID, searchWord, openID);
+        }
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
+        PageHelper.startPage(index, pageSize);
+        List<CmMallOrderVo> orderList = searchService.searchOrder(organizeID, searchWord, userID);
+        for (CmMallOrderVo order : orderList) {
+            //111,待付待收待发
+            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
+                order.setStatus("111");
+            }
+            String[] ShopOrderIDs = {};
+            if (order.getShopOrderIDs().contains(",")) {
+                ShopOrderIDs = order.getShopOrderIDs().split(",");
+            } else {
+                ShopOrderIDs = new String[]{order.getShopOrderIDs()};
+            }
+            List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+            List<CmMallShopOrderVo> shopOrderVoList = new ArrayList<>();
+            for (CmMallShopOrder shopOrder : shopOrderList) {
+                CmMallShopOrderVo shopOrderVo = new CmMallShopOrderVo();
+                CopyUtil.copyProperties(shopOrderVo, shopOrder);
+                List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+                List<CmMallOrderProductVo> orderProductVoList = new ArrayList<>();
+                for (CmMallOrderProduct orderProduct : orderProductList) {
+                    CmMallOrderProductVo orderProductVo = new CmMallOrderProductVo();
+                    CopyUtil.copyProperties(orderProductVo, orderProduct);
+                    orderProductVo.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
+                    orderProductVoList.add(orderProductVo);
+                }
+                shopOrderVo.setCmOrderProducts(orderProductVoList);
+                shopOrderVo.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
+            }
+            order.setShopOrderList(shopOrderVoList);
+        }
+        CmMallPage<CmMallOrderVo> orderPage = new CmMallPage<>(orderList);
+        return model.success(orderPage);
+    }
+
+    /**
+     * 订单搜索历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/history")
+    public CmWxJsonModel orderRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = (String) jsonModel.getData();
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findOrderRecord(organizeID, openID);
+        return CmWxJsonModel.newInstance().success(historyList);
+    }
+
+    /**
+     * 订单搜索删除历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/deleteOrderRecord")
+    public CmWxJsonModel deleteOrderRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+            String openID = (String) jsonModel.getData();
+            searchService.deleteSearchHistory(organizeID, openID);
+        } catch (Exception e) {
+            return model.error("删除失败");
+        }
+        return model.success();
+    }
+}

src/main/java/com/caimei/controller/user/LoginController.java

@@ -2,8 +2,8 @@ package com.caimei.controller.user;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.user.LoginService;
 import com.caimei.utils.HttpRequest;
 import com.caimei.utils.SessionHelper;
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,22 +36,21 @@ public class LoginController {
     private LoginService loginService;
     @Value("${miniprogram.ValidTime}")
     private Integer ValidTime;
-    @Value("${miniprogram.AppId}")
-    private String AppId;
-    @Value("${miniprogram.AppSecret}")
-    private String AppSecret;
+    @Autowired
+    private Environment env;
 
-    public WxJsonModel login(String code, HttpServletRequest request) {
+    public CmWxJsonModel login(String code, HttpServletRequest request, Integer organizeID) {
         logger.info("Start get SessionKey");
-        WxJsonModel res = WxJsonModel.newInstance();
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         Map<String, Object> map = new HashMap<>();
         String referer = request.getHeader("Referer"); //获取当前微信小程序的环境
         logger.info("referer-is----:" + referer);
         map.put("referer", referer);
         String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
         Map<String, String> requestUrlParam = new HashMap<String, String>();
-        requestUrlParam.put("appid", AppId);//小程序appId
-        requestUrlParam.put("secret", AppSecret);//小程序appsecret
+        requestUrlParam.put("appid", env.getProperty("miniprogram.AppId" + organizeID));//小程序appId
+        logger.info("" + env.getProperty("miniprogram.AppId" + organizeID));
+        requestUrlParam.put("secret", env.getProperty("miniprogram.AppSecret" + organizeID));//小程序appsecret
         requestUrlParam.put("js_code", code);//小程序端返回的code
         requestUrlParam.put("grant_type", "authorization_code");//默认参数
         //发送post请求读取调用微信接口获取openid用户唯一标识
@@ -88,11 +88,11 @@ public class LoginController {
      */
     @ResponseBody
     @RequestMapping("/doLogin")
-    public WxJsonModel doLogin(@RequestParam(value = "code", required = true) String code,
-                               @RequestParam(value = "userOrganizeID") Integer userOrganizeID,
-                               HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        WxJsonModel model = login(code, request);
+    public CmWxJsonModel doLogin(@RequestParam(value = "code", required = true) String code,
+                                 @RequestParam(value = "userOrganizeID") Integer userOrganizeID,
+                                 HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmWxJsonModel model = login(code, request, userOrganizeID);
         if (model.getCode().equals("-1")) {
             return model;
         }
@@ -102,7 +102,7 @@ public class LoginController {
         String sessionId = session.getId();
         session.setAttribute("openid", openid);
         session.setAttribute("organizeID", userOrganizeID);
-        CmOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
         if (operationUser == null) {
             String mobile = loginService.cellPhone(userOrganizeID);
             return res.error("-1", mobile, "游客,请登录");
@@ -122,13 +122,13 @@ public class LoginController {
      */
     @RequestMapping("/isEnabled")
     @ResponseBody
-    public WxJsonModel isEnabled(String invitationCode, Integer userOrganizeID) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel isEnabled(String invitationCode, Integer userOrganizeID) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         String mobile = loginService.cellPhone(userOrganizeID);
         if (invitationCode == null || invitationCode.equals("")) {
             return res.error("0", mobile);
         }
-        CmOperationUser operationUser = loginService.isEnabled(invitationCode, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.isEnabled(invitationCode, userOrganizeID);
         if (operationUser == null) {
             return res.error("-1", "邀请码错误");
         }
@@ -161,15 +161,15 @@ public class LoginController {
      */
     @RequestMapping("/register")
     @ResponseBody
-    public WxJsonModel register(@RequestParam(value = "code", required = true) String code,
-                                CmOperationUser operationUser, HttpServletRequest request) {
-        WxJsonModel model = login(code, request);
+    public CmWxJsonModel register(@RequestParam(value = "code", required = true) String code,
+                                  CmMallOperationUser operationUser, HttpServletRequest request) {
+        CmWxJsonModel model = login(code, request, operationUser.getUserOrganizeID());
         if (model.getCode().equals("-1")) {
             return model;
         }
         String openid = (String) model.getData();
         operationUser.setOpenid(openid);
-        WxJsonModel jsonModel = loginService.update(operationUser, request);
+        CmWxJsonModel jsonModel = loginService.update(operationUser, request);
         return jsonModel;
     }
 }

src/main/java/com/caimei/controller/user/PersonalController.java

@@ -34,9 +34,9 @@ public class PersonalController {
      */
     @RequestMapping("/myCentre")
     @ResponseBody
-    public WxJsonModel myCentre(CmOperationUser operationUser) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        Club club = personalService.myCentre(operationUser);
+    public CmWxJsonModel myCentre(CmMallOperationUser operationUser) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmMallClub club = personalService.myCentre(operationUser);
         return res.success("1", club);
     }
 
@@ -47,7 +47,7 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/touchBalance")
-    public Map<String, Object> touchBalance(int year, int month, Integer index, Integer pageSize, CmUserBalanceRecord balanceRecord) {
+    public Map<String, Object> touchBalance(int year, int month, Integer index, Integer pageSize, CmMallUserBalanceRecord balanceRecord) {
         Map<String, Object> map = personalService.touchBalance(index, pageSize, year, month, balanceRecord);
         return map;
     }
@@ -57,8 +57,8 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/address")
-    public List<Province> address() {
-        List<Province> list = personalService.address();
+    public List<CmMallProvince> address() {
+        List<CmMallProvince> list = personalService.address();
         return list;
     }
 
@@ -67,9 +67,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/province")
-    public List<Province> getProvince() {
-        List<Province> provinceList = personalService.getProvince();
-        return provinceList;
+    public List<CmMallProvince> getProvince() {
+        List<CmMallProvince> cmMallProvinceList = personalService.getProvince();
+        return cmMallProvinceList;
     }
 
     /**
@@ -77,9 +77,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/city")
-    public List<City> getCity(Long provinceid) {
-        List<City> cityList = personalService.getCity(provinceid);
-        return cityList;
+    public List<CmMallCity> getCity(Long provinceid) {
+        List<CmMallCity> cmMallCityList = personalService.getCity(provinceid);
+        return cmMallCityList;
     }
 
     /**
@@ -87,9 +87,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/town")
-    public List<Town> getTown(Integer cityid) {
-        List<Town> townList = personalService.getTown(cityid);
-        return townList;
+    public List<CmMallTown> getTown(Integer cityid) {
+        List<CmMallTown> cmMallTownList = personalService.getTown(cityid);
+        return cmMallTownList;
     }
 
     /**
@@ -100,12 +100,12 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/findAddress")
-    public Page<Address> findAddress(Integer userID, Integer index, Integer pageSize) {
+    public CmMallPage<CmMallAddress> findAddress(Integer userID, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<Address> addressList = personalService.findAddress(userID);
-        Page<Address> page = new Page<>(addressList);
+        List<CmMallAddress> addressList = personalService.findAddress(userID);
+        CmMallPage<CmMallAddress> page = new CmMallPage<>(addressList);
         return page;
     }
 
@@ -116,12 +116,12 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public WxJsonModel saveAddress(@RequestBody Address address, String code, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel saveAddress(@RequestBody CmMallAddress address, String code, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         if (address == null) return res.error("参数异常");
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
         if (operationUser == null) return res.error("账户异常");
         try {
             personalService.saveAddress(address);
@@ -136,11 +136,11 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/delete")
-    public WxJsonModel deleteAddress(Integer addressID, String code, Integer userOrganizeID, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel deleteAddress(Integer addressID, String code, Integer userOrganizeID, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
         if (operationUser == null) return res.error("账户异常");
         try {
             personalService.deleteAddress(addressID);
@@ -150,4 +150,14 @@ public class PersonalController {
         return res.success("删除成功", "");
     }
 
+    /**
+     * 发票信息
+     */
+    @ResponseBody
+    @RequestMapping("/invoice")
+    public CmWxJsonModel invoice(@RequestBody CmMallUserInvoiceInfo userInvoiceInfo) {
+        if (userInvoiceInfo == null) return CmWxJsonModel.newInstance().error("参数异常");
+        CmWxJsonModel jsonModel = personalService.invoice(userInvoiceInfo);
+        return jsonModel;
+    }
 }

src/main/java/com/caimei/entity/Address.java → src/main/java/com/caimei/entity/CmMallAddress.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class Address implements Serializable {
+public class CmMallAddress implements Serializable {
     private Integer addressID; //用户地址ID
     private Integer userID; //用户ID
     private String shouHuoRen; //收货人

src/main/java/com/caimei/entity/CmMallBpOrderUserInfo.java

@@ -0,0 +1,132 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+public class CmMallBpOrderUserInfo implements Serializable {
+    private Integer id;
+    private Integer orderId;//订单ID
+    private Integer clubId;//机构ID
+    private Integer userId;//用户ID
+    private String name;//买家买家
+    private String shouHuoRen;//收货人
+    private Integer townId;//县区ID
+    private String mobile;//手机
+    private String phone;//电话
+    private String postalCode;//邮编
+    private String province;//省、直辖市
+    private String city;//市
+    private String town;//县、区
+    private String address;//收货地址
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getClubId() {
+        return clubId;
+    }
+
+    public void setClubId(Integer clubId) {
+        this.clubId = clubId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getShouHuoRen() {
+        return shouHuoRen;
+    }
+
+    public void setShouHuoRen(String shouHuoRen) {
+        this.shouHuoRen = shouHuoRen;
+    }
+
+    public Integer getTownId() {
+        return townId;
+    }
+
+    public void setTownId(Integer townId) {
+        this.townId = townId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getTown() {
+        return town;
+    }
+
+    public void setTown(String town) {
+        this.town = town;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+}

src/main/java/com/caimei/entity/brand.java → src/main/java/com/caimei/entity/CmMallBrand.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class brand implements Serializable {
+public class CmMallBrand implements Serializable {
     private Integer id;
     private String name;         //品牌名称
     private String logo;         //品牌logo
@@ -16,7 +16,7 @@ public class brand implements Serializable {
     private String delFlag;      //删除标记 0 否，其余是
     private String certificate;  //品牌证书
     private String certifiedPhoto;  //认证照片
-    private List<hospital> hospitals; //医院信息
+    private List<CmMallHospital> hospitals; //医院信息
     private Integer sort;  //排序值
     private String securityLink;   //防伪链接
 
@@ -132,17 +132,17 @@ public class brand implements Serializable {
         this.delFlag = delFlag;
     }
 
-    public List<hospital> getHospitals() {
+    public List<CmMallHospital> getHospitals() {
         return hospitals;
     }
 
-    public void setHospitals(List<hospital> hospitals) {
+    public void setHospitals(List<CmMallHospital> hospitals) {
         this.hospitals = hospitals;
     }
 
     @Override
     public String toString() {
-        return "brand{" +
+        return "CmMallBrand{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", logo='" + logo + '\'' +

src/main/java/com/caimei/entity/City.java → src/main/java/com/caimei/entity/CmMallCity.java

@@ -4,12 +4,12 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class City implements Serializable {
+public class CmMallCity implements Serializable {
     private Integer cityid; //市ID
     private Integer provinceid; //所属省ID
     private String name;        //市名
     private String validflag;   //是否有效(0 无效,1 有效)
-    private List<Town> towns;   //下面的区
+    private List<CmMallTown> towns;   //下面的区
 
     public Integer getCityid() {
         return cityid;
@@ -43,11 +43,11 @@ public class City implements Serializable {
         this.validflag = validflag;
     }
 
-    public List<Town> getTowns() {
+    public List<CmMallTown> getTowns() {
         return towns;
     }
 
-    public void setTowns(List<Town> towns) {
+    public void setTowns(List<CmMallTown> towns) {
         this.towns = towns;
     }
 }