Merge remote-tracking branch 'origin/master'

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/caimei365-cloud-config-files.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/dbnavigator.xml

@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DataEditorManager">
+    <record-view-column-sorting-type value="BY_INDEX" />
+    <value-preview-text-wrapping value="true" />
+    <value-preview-pinned value="false" />
+  </component>
+  <component name="DBNavigator.Project.DataExportManager">
+    <export-instructions>
+      <create-header value="true" />
+      <friendly-headers value="false" />
+      <quote-values-containing-separator value="true" />
+      <quote-all-values value="false" />
+      <value-separator value="" />
+      <file-name value="" />
+      <file-location value="" />
+      <scope value="GLOBAL" />
+      <destination value="FILE" />
+      <format value="EXCEL" />
+      <charset value="GBK" />
+    </export-instructions>
+  </component>
+  <component name="DBNavigator.Project.DatabaseBrowserManager">
+    <autoscroll-to-editor value="false" />
+    <autoscroll-from-editor value="true" />
+    <show-object-properties value="true" />
+    <loaded-nodes />
+  </component>
+  <component name="DBNavigator.Project.DatabaseFileManager">
+    <open-files />
+  </component>
+  <component name="DBNavigator.Project.EditorStateManager">
+    <last-used-providers />
+  </component>
+  <component name="DBNavigator.Project.ExecutionManager">
+    <retain-sticky-names value="false" />
+  </component>
+  <component name="DBNavigator.Project.MethodExecutionManager">
+    <method-browser />
+    <execution-history>
+      <group-entries value="true" />
+      <execution-inputs />
+    </execution-history>
+    <argument-values-cache />
+  </component>
+  <component name="DBNavigator.Project.ObjectDependencyManager">
+    <last-used-dependency-type value="INCOMING" />
+  </component>
+  <component name="DBNavigator.Project.ObjectQuickFilterManager">
+    <last-used-operator value="EQUAL" />
+    <filters />
+  </component>
+  <component name="DBNavigator.Project.ScriptExecutionManager" clear-outputs="true">
+    <recently-used-interfaces />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections />
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="true" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+        <enable-column-tooltip value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <tracking-columns>
+        <columnNames value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </tracking-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-actions-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-actions-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="Properties" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="CSS" enabled="true" />
+          <content-type name="Java" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JavaScript" enabled="true" />
+          <content-type name="JSON" enabled="true" />
+          <content-type name="JSON5" enabled="true" />
+          <content-type name="JSP" enabled="true" />
+          <content-type name="JSPx" enabled="true" />
+          <content-type name="Groovy" enabled="true" />
+          <content-type name="FTL" enabled="true" />
+          <content-type name="GSP" enabled="true" />
+          <content-type name="VTL" enabled="true" />
+          <content-type name="AIDL" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+          <content-type name="Manifest" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+        <enable-spellchecking value="true" />
+        <enable-reference-spellchecking value="false" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+      <debugger>
+        <debugger-type value="ASK" />
+        <use-generic-runners value="true" />
+      </debugger>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+  <component name="DBNavigator.Project.StatementExecutionManager">
+    <execution-variables />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </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$/.idea/caimei365-cloud-config-files.iml" filepath="$PROJECT_DIR$/.idea/caimei365-cloud-config-files.iml" />
+    </modules>
+  </component>
+</project>

.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

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

caimei365-cloud-commodity/commodity-beta.yml

@@ -18,7 +18,7 @@ spring:
   # 数据源连接--end
 
   redis:
-    host: 47.119.112.46
+    host: 172.31.165.27
     port: 6379
     password: 6#xsI%b4o@5c3RoE
     #Redis数据库索引（默认为0）
@@ -78,6 +78,6 @@ aliyunConfig:
 # 服务域名
 caimei:
   wwwDomain: https://www-b.caimei365.com
-  spiDomain: https://spi-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
   imageDomain: https://img-b.caimei365.com
 

caimei365-cloud-commodity/commodity-dev.yml

@@ -54,7 +54,7 @@ eureka:
 logging:
   level:
     root: info
-    com.caimei365.user.mapper: debug
+    com.caimei365.commodity.mapper: debug
 
 # swagger配置
 swagger:
@@ -73,6 +73,6 @@ aliyunConfig:
 # 服务域名
 caimei:
   wwwDomain: https://www-b.caimei365.com
-  spiDomain: https://spi-b.caimei365.com
-  imageDomain: https://img-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: http://192.168.2.100
 

caimei365-cloud-commodity/commodity-prod.yml

@@ -78,6 +78,6 @@ aliyunConfig:
 # 服务域名
 caimei:
   wwwDomain: https://www.caimei365.com
-  spiDomain: https://spi.caimei365.com
+  coreDomain: https://core.caimei365.com
   imageDomain: https://img.caimei365.com
 

caimei365-cloud-order/order-beta.yml

@@ -71,7 +71,7 @@ swagger:
 # 服务域名
 caimei:
   wwwDomain: https://www-b.caimei365.com
-  spiDomain: https://spi-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
   imageDomain: https://img-b.caimei365.com
 
 # 微信配置
@@ -84,13 +84,17 @@ wx:
   # 小程序wx信息
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+  #收款小程序wx信息
+  receipt-app-id: wxa0cc52c471e03c1a
+  receipt-app-secret: 9e64c5651aebbdb96a4b17ef3b00fedb
   # crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   # 呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
-
+  #推送消息模板
+  message-template-id: lTO7t_PrhPvhEQVDtFNr91gCTSR6Gqq1ljIlfA8fTW0
 
 pay:
   # 支付链接重定向地址
@@ -101,9 +105,18 @@ pay:
   notify-url: https://core-b.caimei365.com/order/pay/callback
   # 二手支付异步回调地址
   second-notify-url: https://core-b.caimei365.com/order/pay/second/callback
+  # 价值优惠券支付异步回调地址
+  coupon-notify-url: https://core-b.caimei365.com/order/pay/coupon/callback
+  # 超级会员支付异步回调地址
+  vip-notify-url: https://core-b.caimei365.com/order/pay/vip/callback
   # 延时分账异步回调地址
   delayed-splitting-url: https://core-b.caimei365.com/order/pay/delay/split/callback
-
+  # 超级会员网银支付异步回调地址
+  vip-union-url: https://core-b.caimei365.com/order/pay/vip/callback/union
+  # 二手支付网银异步回调地址
+  second-union-url: https://core-b.caimei365.com/order/pay/second/callback/union
+  # 支付网银异步回调地址
+  union-url: https://core-b.caimei365.com/order/pay/union/callback
 
 
 

caimei365-cloud-order/order-dev.yml

@@ -1,12 +1,12 @@
 spring:
   # 数据源连接--start
   datasource:
-    #url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    #username: developer
-    #password: 05bZ/OxTB:X+yd%1
-    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p3tgOVazNl4ydf
+    password: 05bZ/OxTB:X+yd%1
+    # url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    # username: developer
+    # password: J5p3tgOVazNl4ydf
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
@@ -57,7 +57,7 @@ eureka:
 logging:
   level:
     root: info
-    com.caimei365.user.mapper: debug
+    com.caimei365.order.mapper: debug
 
 # swagger配置
 swagger:
@@ -70,8 +70,8 @@ swagger:
 # 服务域名
 caimei:
   wwwDomain: https://www-b.caimei365.com
-  spiDomain: https://spi-b.caimei365.com
-  imageDomain: https://img-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: http://192.168.2.100
 
 # 微信配置
 wx:
@@ -83,26 +83,40 @@ wx:
   #小程序wx信息
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+  #收款小程序wx信息
+  receipt-app-id: wxa0cc52c471e03c1a
+  receipt-app-secret: 9e64c5651aebbdb96a4b17ef3b00fedb
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
-
+  #推送消息模板
+  message-template-id: lTO7t_PrhPvhEQVDtFNr91gCTSR6Gqq1ljIlfA8fTW0
 
 pay:
   # 支付链接重定向地址
   redirect-link: http://localhost:18002/order/pay/link/jump
   # 链接页面
-  # link-page: http://localhost:8009/pay/caimei-pay.html
-  link-page: https://www-b.caimei365.com/pay/caimei-pay.html
+  # link-page: https://www-b.caimei365.com/pay/caimei-pay.html
+  link-page: http://localhost:8009/pay/caimei-pay.html
   # 支付异步回调地址
   notify-url: http://localhost:18002/order/pay/callback
   # 二手支付异步回调地址
   second-notify-url: http://localhost:18002/order/pay/second/callback
+  # 价值优惠券支付异步回调地址
+  coupon-notify-url: https://localhost:18002/order/pay/coupon/callback
+  # 超级会员支付异步回调地址
+  vip-notify-url: http://localhost:18002/order/pay/vip/callback
   # 延时分账异步回调地址
   delayed-splitting-url: http://localhost:18002/order/pay/delay/split/callback
+  # 超级会员网银支付异步回调地址
+  vip-union-url: http://localhost:18002/order/pay/vip/callback/union
+  # 二手支付网银异步回调地址
+  second-union-url: http://localhost:18002/order/pay/second/callback/union
+  # 支付网银异步回调地址
+  union-url: http://localhost:18002/order/pay/union/callback
 
 
 

caimei365-cloud-order/order-prod.yml

@@ -71,7 +71,7 @@ swagger:
 # 服务域名
 caimei:
   wwwDomain: https://www.caimei365.com
-  spiDomain: https://spi.caimei365.com
+  coreDomain: https://core.caimei365.com
   imageDomain: https://img.caimei365.com
 
 # 微信配置
@@ -84,13 +84,17 @@ wx:
   #小程序wx信息
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+  #收款小程序wx信息
+  receipt-app-id: wxa0cc52c471e03c1a
+  receipt-app-secret: 9e64c5651aebbdb96a4b17ef3b00fedb
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
-
+  #推送消息模板
+  message-template-id: lTO7t_PrhPvhEQVDtFNr91gCTSR6Gqq1ljIlfA8fTW0
 
 pay:
   # 支付链接重定向地址
@@ -101,8 +105,18 @@ pay:
   notify-url: https://core.caimei365.com/order/pay/callback
   # 二手支付异步回调地址
   second-notify-url: https://core.caimei365.com/order/pay/second/callback
+  # 价值优惠券支付异步回调地址
+  coupon-notify-url: https://core.caimei365.com/order/pay/coupon/callback
+  # 超级会员支付异步回调地址
+  vip-notify-url: https://core.caimei365.com/order/pay/vip/callback
   # 延时分账异步回调地址
   delayed-splitting-url: https://core.caimei365.com/order/pay/delay/split/callback
+  # 超级会员网银支付异步回调地址
+  vip-union-url: https://core.caimei365.com/order/pay/vip/callback/union
+  # 二手支付网银异步回调地址
+  second-union-url: https://core.caimei365.com/order/pay/second/callback/union
+  # 支付网银异步回调地址
+  union-url: https://core.caimei365.com/order/pay/union/callback
 
 
 

caimei365-cloud-tools/tools-beta.yml

@@ -66,12 +66,35 @@ swagger:
   ui-config:
     operations-sorter: method
 
+# 服务域名
+caimei:
+  wwwDomain: https://www-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: https://img-b.caimei365.com
+  
+#DFS配置
+fdfs:
+  so-timeout: 5000 #上传的超时时间
+  connect-timeout: 2000 #连接超时时间
+  thumb-image:             #缩略图生成参数
+    width: 150
+    height: 150
+  tracker-list:            #TrackerList参数,支持多个
+  - 172.31.165.28:22122
+
+# 阿里云
+aliyunConfig:
+  #阿里云oss存储
+  accessKeyId: LTAI4GBL3o4YkWnbKYgf2Xia
+  accessKeySecret: dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
+  bucketName: caimei-oss
+  endpoint: https://oss-cn-shenzhen.aliyuncs.com
 
 # rocketmq 配置项，对应 RocketMQProperties 配置类
 rocketmq:
-  name-server: 120.79.25.27:9876   # RocketMQ Namesrv
+  name-server: 39.108.11.105:9876  # RocketMQ Namesrv,测试环境120.79.25.27:9876未启动
   producer:
-    group: caimei_group            # 生产者分组
+    group: caimei_beta_group            # 生产者分组
     send-message-timeout: 3000     # 发送消息超时时间，单位：毫秒。默认为 3000 。
 #    compress-message-body-threshold: 4096 # 消息压缩阀值，当消息体的大小超过该阀值后，进行消息压缩。默认为 4 * 1024B
 #    max-message-size: 4194304 # 消息体的最大允许大小。。默认为 4 * 1024 * 1024B
@@ -87,4 +110,3 @@ rocketmq:
 #    listeners: # 配置某个消费分组，是否监听指定 Topic 。结构为 Map<消费者分组, <Topic, Boolean>> 。默认情况下，不配置表示监听。
 #      erbadagang-consumer-group:
 #        topic1: false # 关闭 test-consumer-group 对 topic1 的监听消费
-

caimei365-cloud-tools/tools-dev.yml

@@ -53,7 +53,7 @@ eureka:
 logging:
   level:
     root: info
-    com.caimei365.user.mapper: debug
+    com.caimei365.tools.mapper: debug
 
 # swagger配置
 swagger:
@@ -62,11 +62,35 @@ swagger:
   ui-config:
     operations-sorter: method
 
+# 服务域名
+caimei:
+  wwwDomain: https://www-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: http://192.168.2.100
+  
+#DFS配置
+fdfs:
+  so-timeout: 5000 #上传的超时时间
+  connect-timeout: 2000 #连接超时时间
+  thumb-image:             #缩略图生成参数
+    width: 150
+    height: 150
+  tracker-list:            #TrackerList参数,支持多个
+  - 192.168.2.100:22122
+
+# 阿里云
+aliyunConfig:
+  #阿里云oss存储
+  accessKeyId: LTAI4GBL3o4YkWnbKYgf2Xia
+  accessKeySecret: dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
+  bucketName: caimei-oss
+  endpoint: https://oss-cn-shenzhen.aliyuncs.com
+
 # rocketmq 配置项，对应 RocketMQProperties 配置类
 rocketmq:
   name-server: 192.168.2.100:9876  # RocketMQ Namesrv
   producer:
-    group: caimei_group            # 生产者分组
+    group: caimei_dev_group        # 生产者分组
     send-message-timeout: 3000     # 发送消息超时时间，单位：毫秒。默认为 3000 。
 #    compress-message-body-threshold: 4096 # 消息压缩阀值，当消息体的大小超过该阀值后，进行消息压缩。默认为 4 * 1024B
 #    max-message-size: 4194304 # 消息体的最大允许大小。。默认为 4 * 1024 * 1024B

caimei365-cloud-tools/tools-prod.yml

@@ -65,12 +65,36 @@ swagger:
   ui-config:
     operations-sorter: method
 
+# 服务域名
+caimei:
+  wwwDomain: https://www.caimei365.com
+  coreDomain: https://core.caimei365.com
+  imageDomain: https://img.caimei365.com
+  
+#DFS配置
+fdfs:
+  so-timeout: 5000 #上传的超时时间
+  connect-timeout: 2000 #连接超时时间
+  thumb-image:             #缩略图生成参数
+    width: 150
+    height: 150
+  tracker-list:            #TrackerList参数,支持多个
+  - 172.31.165.24:22122
+  
+# 阿里云
+aliyunConfig:
+  #阿里云oss存储
+  accessKeyId: LTAI4GBL3o4YkWnbKYgf2Xia
+  accessKeySecret: dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
+  bucketName: caimei-oss
+  endpoint: https://oss-cn-shenzhen.aliyuncs.com
+
 
 # rocketmq 配置项，对应 RocketMQProperties 配置类
 rocketmq:
   name-server: 39.108.11.105:9876  # RocketMQ Namesrv
   producer:
-    group: caimei_group            # 生产者分组
+    group: caimei_prod_group            # 生产者分组
     send-message-timeout: 3000     # 发送消息超时时间，单位：毫秒。默认为 3000 。
 #    compress-message-body-threshold: 4096 # 消息压缩阀值，当消息体的大小超过该阀值后，进行消息压缩。默认为 4 * 1024B
 #    max-message-size: 4194304 # 消息体的最大允许大小。。默认为 4 * 1024 * 1024B

caimei365-cloud-user/user-beta.yml

@@ -18,7 +18,7 @@ spring:
   # 数据源连接--end
 
   redis:
-    host: 47.119.112.46
+    host: 172.31.165.27
     port: 6379
     password: 6#xsI%b4o@5c3RoE
     #Redis数据库索引（默认为0）
@@ -70,8 +70,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
@@ -86,4 +86,7 @@ swagger:
 caimei:
   # 小程序邀请码过期天数
   validTime: 7
-
+  # 服务域名
+  wwwDomain: https://www-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: https://img-b.caimei365.com

caimei365-cloud-user/user-dev.yml

@@ -68,8 +68,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
@@ -83,4 +83,8 @@ swagger:
 
 caimei:
   # 小程序邀请码过期天数
-  validTime: 7
+  validTime: 7
+  # 服务域名
+  wwwDomain: https://www-b.caimei365.com
+  coreDomain: https://core-b.caimei365.com
+  imageDomain: http://192.168.2.100

caimei365-cloud-user/user-prod.yml

@@ -70,8 +70,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
@@ -86,5 +86,7 @@ swagger:
 caimei:
   # 小程序邀请码过期天数
   validTime: 7
-
-
+  # 服务域名
+  wwwDomain: https://www.caimei365.com
+  coreDomain: https://core.caimei365.com
+  imageDomain: https://img.caimei365.com