Browse Source

添加线上配置文档

lidongyang 5 years ago
parent
commit
7ea86feae0

+ 36 - 0
.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>

+ 3 - 0
.idea/misc.xml

@@ -4,6 +4,9 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

+ 193 - 288
.idea/workspace.xml

@@ -2,156 +2,41 @@
 <project version="4">
   <component name="ArtifactsWorkspaceSettings">
     <artifacts-to-build>
-      <artifact name="hsdataportal:war" />
+      <artifact name="hsdataportal:war exploded" />
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5e0a6283-3bb9-4464-9eb8-7061908be2e9" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/cas" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/config" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/text/open/config" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.properties" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" selection-start-line="13" selection-end-line="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config.properties" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="275">
-              <caret line="74" lean-forward="true" selection-start-line="74" selection-end-line="74" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand />
+    <select />
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GradleLocalSettings">
-    <option name="projectSyncType">
-      <map>
-        <entry key="$USER_HOME$/Desktop/PAAS中标部署/app-cloud-master" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/PAAS中标部署/dcw-mgmt-server-master" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/apiplatform_2.1.0.201809200314" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/dcw-mgmt-server" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/i慧湖/cmsApi" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/proto-firechat/mars" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/sh-server" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/张家港E管家项目/GIT/bike-h5-zjg" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/张家港E管家项目/GIT/egj-dataserver" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/张家港E管家项目/GIT/egj-epay-server" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/张家港E管家项目/GIT/egj-manager-server" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/张家港E管家项目/GIT/steward-epay" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/智慧党建/GIT/gd-event-service" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/智慧党建/GIT/gd-infomation" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/智慧党建/GIT/partyaffairs" value="PREVIEW" />
-        <entry key="$USER_HOME$/Desktop/软著资料/dcw-mgmt-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/BigData/GIT/analysismgr" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/BigData/GIT/dataportal" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/analysismgr" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/cas" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/coupon-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/cspservice" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/dc-lcn" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/dc-tm-manager" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/dcw-boot" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/demoService" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/demoWebService" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/egj-manager-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/event-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/information-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/operationmgr" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/payment-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/points" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/securitycall" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/shopping-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/third-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/userservice" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/GIT/verifyserver" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/LCN事务管理器/GIT/test-tm-appa" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/LCN事务管理器/GIT/test-tm-appb" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/LCN事务管理器/GIT/test-tm-appc" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/developer/GIT/app-cloud" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/developer/GIT/dc-cas-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/developer/GIT/dc-cas-server/dc-cas-server-webapp" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/paycloud/GIT/dc-cas-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/dc-lcn" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/fescar-develop" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/fescar-samples-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/springboot-dubbo-fescar-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/tx-lcn-5.0.2.RELEASE" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/sample/txlcn-demo-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/北京网/GIT/sh-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/大数据平台/GIT/analyflume" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/大数据平台/GIT/analysismgr" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/大数据平台/GIT/dataportal" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/开发者门户/GIT/app-cloud" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/开发者门户/GIT/dcw-mgmt-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../LIGHTINIT/00-项目资料/05-公租房/GIT/housing-common" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../LIGHTINIT/00-项目资料/05-公租房/GIT/housing-datasync" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../LCN事务管理器/GIT/mrf-lcn" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../LCN事务管理器/GIT/mrf-tm-manager" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../daas/GIT/apiOutService" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../daas/GIT/apiService" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../developer/GIT/dcw-mgmt-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../framework/GIT/csp-commons" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../framework/GIT/dc-cas-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../framework/GIT/demoService" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../framework/GIT/mrf-boot" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../framework/GIT/mrf-cas-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/cas" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/cspservice" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/image" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/operationmgr" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/securitycall" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/third-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/userservice" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../platformBusiness/GIT/ytserver" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../product/鲜果多多/GIT/fruits-service" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/GradleSide-master/20-plugin-proguard" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/Installer-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/confusion-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/moco-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/proguard-spring-boot-example-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/sso-master/sso-client1" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/sso-master/sso-client2" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/sso-master/sso-server" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../sample/txlcn-demo-master" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../SR/framework/GIT/dcw-boot" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../TOOLS/lombok-intellij-plugin" value="PREVIEW" />
-      </map>
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
@@ -166,131 +51,67 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
   <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1440" />
     <option name="height" value="900" />
   </component>
+  <component name="ProjectId" id="1YeXFSQMCuc7Ew6NW28UfdCrHuR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="hsdataportal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hsdataportal" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="hsdataportal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hsdataportal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="hsdataportal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hsdataportal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="hsdataportal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hsdataportal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="AndroidView" />
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-    </panes>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
       <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <patterns />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
+    <configuration default="true" type="TestNG">
       <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
       <properties />
       <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.30" ALTERNATIVE_JRE_ENABLED="false">
+    <configuration name="tomcat8" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.31" ALTERNATIVE_JRE_ENABLED="false">
       <option name="UPDATING_POLICY" value="restart-server" />
       <deployment>
-        <artifact name="hsdataportal:war">
+        <artifact name="hsdataportal:war exploded">
           <settings>
-            <option name="CONTEXT_PATH" value="/" />
+            <option name="CONTEXT_PATH" value="/hsdataportal_war_exploded" />
           </settings>
         </artifact>
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_hsdataportal" />
       </server-settings>
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
+      <predefined_log_file enabled="true" id="Tomcat" />
+      <predefined_log_file enabled="true" id="Tomcat Catalina" />
+      <predefined_log_file id="Tomcat Manager" />
+      <predefined_log_file id="Tomcat Host Manager" />
+      <predefined_log_file id="Tomcat Localhost Access" />
       <RunnerSettings RunnerId="Debug">
         <option name="DEBUG_PORT" value="51411" />
       </RunnerSettings>
@@ -339,9 +160,10 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method>
+      <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
-          <artifact name="hsdataportal:war" />
+          <artifact name="hsdataportal:war exploded" />
         </option>
       </method>
     </configuration>
@@ -354,6 +176,31 @@
       </map>
     </option>
   </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand>
+              <path>
+                <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+                <item name="Tomcat Server" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              </path>
+              <path>
+                <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+                <item name="Tomcat Server" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+                <item name="Finished" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              </path>
+            </expand>
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
+  <component name="SshConsoleOptionsProvider">
+    <option name="myEncoding" value="UTF-8" />
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -365,73 +212,131 @@
       <option name="presentableId" value="Default" />
       <updated>1575597043903</updated>
       <workItem from="1575597045187" duration="123000" />
+      <workItem from="1583303931371" duration="2233000" />
+      <workItem from="1583373953901" duration="2325000" />
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="123000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="bottom" id="FindBugs-IDEA" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Application Servers" weight="0.32969698" />
-      <window_info anchor="right" id="Maven Projects" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info id="Capture Tool" />
-      <window_info id="Designer" />
-      <window_info anchor="right" id="Database" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info id="UI Designer" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" weight="0.32969698" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info id="Image Layers" />
-      <window_info anchor="bottom" id="Java Enterprise" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Spring" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
-      <window_info anchor="right" id="Bean Validation" />
-      <window_info id="Web" side_tool="true" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-    </layout>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="74" lean-forward="true" selection-start-line="74" selection-end-line="74" />
-        </state>
-      </provider>
-    </entry>
+  <component name="WindowStateProjectService">
+    <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583374099371">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1280.735@0.23.1280.735" timestamp="1583374099371" />
+    <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1583375590595">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser/0.23.1280.735@0.23.1280.735" timestamp="1583375590595" />
+    <state width="846" height="183" key="GridCell.Tab.0.bottom" timestamp="1583376074488">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.0.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
+    <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
+    <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
+    <state width="846" height="183" key="GridCell.Tab.0.center" timestamp="1583376074488">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.0.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
+    <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
+    <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
+    <state width="846" height="183" key="GridCell.Tab.0.left" timestamp="1583376074487">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.0.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010600" />
+    <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074487" />
+    <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363192" />
+    <state width="846" height="183" key="GridCell.Tab.0.right" timestamp="1583376074488">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.0.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
+    <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
+    <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
+    <state width="846" height="183" key="GridCell.Tab.1.bottom" timestamp="1583376074490">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.1.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010603" />
+    <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
+    <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
+    <state width="846" height="183" key="GridCell.Tab.1.center" timestamp="1583376074490">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.1.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
+    <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
+    <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
+    <state width="846" height="183" key="GridCell.Tab.1.left" timestamp="1583376074489">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.1.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
+    <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074489" />
+    <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
+    <state width="846" height="183" key="GridCell.Tab.1.right" timestamp="1583376074490">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="1238" height="228" key="GridCell.Tab.1.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
+    <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
+    <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
+    <state width="846" height="183" key="GridCell.Tab.2.bottom" timestamp="1583376074492">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
+    <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
+    <state width="846" height="183" key="GridCell.Tab.2.center" timestamp="1583376074491">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
+    <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
+    <state width="846" height="183" key="GridCell.Tab.2.left" timestamp="1583376074491">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
+    <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
+    <state width="846" height="183" key="GridCell.Tab.2.right" timestamp="1583376074491">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
+    <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
+    <state width="846" height="183" key="GridCell.Tab.3.bottom" timestamp="1583376074493">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
+    <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363197" />
+    <state width="846" height="183" key="GridCell.Tab.3.center" timestamp="1583376074492">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
+    <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
+    <state width="846" height="183" key="GridCell.Tab.3.left" timestamp="1583376074492">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
+    <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
+    <state width="846" height="183" key="GridCell.Tab.3.right" timestamp="1583376074492">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
+    <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
+    <state width="846" height="183" key="GridCell.Tab.4.bottom" timestamp="1583376074494">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.4.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074494" />
+    <state width="846" height="183" key="GridCell.Tab.4.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363199" />
+    <state width="846" height="183" key="GridCell.Tab.4.center" timestamp="1583376074493">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.4.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
+    <state width="846" height="183" key="GridCell.Tab.4.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363197" />
+    <state width="846" height="183" key="GridCell.Tab.4.left" timestamp="1583376074493">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.4.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
+    <state width="846" height="183" key="GridCell.Tab.4.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363197" />
+    <state width="846" height="183" key="GridCell.Tab.4.right" timestamp="1583376074493">
+      <screen x="0" y="23" width="1280" height="735" />
+    </state>
+    <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
+    <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363198" />
   </component>
   <component name="masterDetails">
     <states>

+ 7 - 7
src/main/resources/config.properties

@@ -55,12 +55,12 @@ redis.server=192.168.107.112
 
 
 
-userType=user
-redirectHomeUrl=/open/
-redirectLoginUrl=/open/account/login.htm
-#userType=admin
-#redirectHomeUrl=/share/
-#redirectLoginUrl=/share/account/login.htm
+#userType=user
+#redirectHomeUrl=/open/
+#redirectLoginUrl=/open/account/login.htm
+userType=admin
+redirectHomeUrl=/share/
+redirectLoginUrl=/share/account/login.htm
 imageContextPath=http://localhost:8080/hsdataimages/
 #\u521B\u4E1A\u5DE5\u5382 \u70B9\u51FB\u8FDB\u5165
 devops=http://121.17.30.198:8097/devops-web/
@@ -76,7 +76,7 @@ devopsAnalysis=http://citysdk.dgtis.com:8088/login/
 #\u77ED\u4FE1\u914D\u7F6E
 regionId=cn-hangzhou
 accessKeyId=LTAIu3VL1kYEvDhb
-secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJz
+secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJzhsdataportal
 
 #\u5FAE\u4FE1\u652F\u4ED8
 #appId=wxe6aeac33838845d8

+ 7 - 0
src/main/resources/text.share/cas

@@ -0,0 +1,7 @@
+// 服务器共享平台cas 配置
+#CTS ActiveMQ configuration information
+casService=http://citysdk.dgtis.com:8080/hsdatashare/cas
+casServerUrlPrefix=http://39.105.217.215:8080/cas
+loginUrl=http://39.105.217.215:8080/cas/login?service=http://citysdk.dgtis.com:8080/hsdatashare/cas
+failureUrl = http://39.105.217.215:8080/cas/login?service=http://citysdk.dgtis.com:8080/hsdatashare/cas
+redirectUrl = http://39.105.217.215:8080/cas/logout?service=http://citysdk.dgtis.com:8080/hsdatashare

+ 95 - 0
src/main/resources/text.share/config

@@ -0,0 +1,95 @@
+// 服务器上共享平台
+#JDBC configuration information
+#jdbc.sentry.url=jdbc:mysql://127.0.0.1:3306/hslocalhost?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+#jdbc.sentry.username=root
+#jdbc.sentry.password=123456
+jdbc.sentry.url=jdbc:mysql://localhost:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+jdbc.sentry.username=root
+jdbc.sentry.password=Admin#123
+jdbc.sentry.driverClassName=com.mysql.jdbc.Driver
+jdbc.sentry.maxWait=60000
+jdbc.sentry.maxActive=20
+jdbc.sentry.initialSize=1
+jdbc.sentry.minIdle=10
+jdbc.sentry.maxOpenPreparedStatements=20
+jdbc.sentry.removeAbandonedTimeout=1800
+jdbc.sentry.logAbandoned=true
+jdbc.sentry.testOnBorrow=false
+jdbc.sentry.testWhileIdle=true
+jdbc.sentry.testOnReturn=false
+jdbc.sentry.timeBetweenEvictionRunsMillis=60000
+jdbc.sentry.minEvictableIdleTimeMillis=300000
+jdbc.sentry.removeAbandoned=true
+
+filters=stat
+validationQuery=SELECT 1
+
+#shiro
+password.algorithmName=md5
+password.hashIterations=2
+
+#CAMRS JDBC configuration information
+jdbc.camrs.url= jdbc:mysql://192.168.107.112:3306/camrs_db?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+jdbc.camrs.username=root
+jdbc.camrs.password=root
+jdbc.camrs.driverClassName=com.mysql.jdbc.Driver
+jdbc.camrs.maxWait=60000
+jdbc.camrs.maxActive=20
+jdbc.camrs.initialSize=1
+jdbc.camrs.minIdle=10
+jdbc.camrs.maxOpenPreparedStatements=20
+jdbc.camrs.removeAbandonedTimeout=1800
+jdbc.camrs.logAbandoned=true
+jdbc.camrs.testOnBorrow=false
+jdbc.camrs.testWhileIdle=true
+jdbc.camrs.testOnReturn=false
+jdbc.camrs.timeBetweenEvictionRunsMillis=60000
+jdbc.camrs.minEvictableIdleTimeMillis=300000
+jdbc.camrs.removeAbandoned=true
+
+
+#REDIS Configuration Information
+redis.server=192.168.107.112
+
+
+
+userType=admin
+redirectHomeUrl=/share/
+redirectLoginUrl=/share/account/login.htm
+imageContextPath=http://39.105.217.215:8080/hsdataimages/
+devops=http://121.17.30.198:8097/devops-web/
+
+
+uploadFileRootDir=/var/local/HSDataPlatform/Upload/Files/
+uploadImageRootDir=/var/local/HSDataPlatform/Upload/Images/
+
+
+
+regionId=cn-hangzhou
+accessKeyId=LTAIu3VL1kYEvDhb
+secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJz
+
+#微信支付
+#appId=wxe6aeac33838845d8
+appId=wxd35ecf3a9abb6ef2
+#mchId=1491469272
+mchId=1505182281
+#wxKey=9kej8w1aggec21udarxvzj9v64cxz89w
+wxKey=r4re3redsw3e5tg9oi87hy65tbvgt5wx
+notifyurl=http://citysdk.dgtis.com:8080/hsdataopen/wxpay/notify.action
+
+#新网关路径
+newGatewayPath = http://39.105.217.215:8080/hsdatagateway
+signAppId=123
+
+#应用id
+applicationId=app1551771060908923486
+
+#创业工厂 点击进入
+devops=http://39.105.210.5:5151/devops-web/
+#创业工厂 服务开发环境
+devopsService=http://39.105.210.5:5151/devops-web/
+#创业工厂 数据可视化开发
+devopsDate=http://39.105.217.215:8088
+#创业工厂 大数据分析建模
+devopsAnalysis=http://39.105.217.215:8088

+ 95 - 0
src/main/resources/text/open/config

@@ -0,0 +1,95 @@
+// 服务器配置
+#JDBC configuration information
+#jdbc.sentry.url=jdbc:mysql://127.0.0.1:3306/hslocalhost?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+#jdbc.sentry.username=root
+#jdbc.sentry.password=123456
+jdbc.sentry.url=jdbc:mysql://localhost:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+jdbc.sentry.username=root
+jdbc.sentry.password=Admin#123
+jdbc.sentry.driverClassName=com.mysql.jdbc.Driver
+jdbc.sentry.maxWait=60000
+jdbc.sentry.maxActive=20
+jdbc.sentry.initialSize=1
+jdbc.sentry.minIdle=10
+jdbc.sentry.maxOpenPreparedStatements=20
+jdbc.sentry.removeAbandonedTimeout=1800
+jdbc.sentry.logAbandoned=true
+jdbc.sentry.testOnBorrow=false
+jdbc.sentry.testWhileIdle=true
+jdbc.sentry.testOnReturn=false
+jdbc.sentry.timeBetweenEvictionRunsMillis=60000
+jdbc.sentry.minEvictableIdleTimeMillis=300000
+jdbc.sentry.removeAbandoned=true
+
+filters=stat
+validationQuery=SELECT 1
+
+#shiro
+password.algorithmName=md5
+password.hashIterations=2
+
+#CAMRS JDBC configuration information
+jdbc.camrs.url= jdbc:mysql://192.168.107.112:3306/camrs_db?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+jdbc.camrs.username=root
+jdbc.camrs.password=root
+jdbc.camrs.driverClassName=com.mysql.jdbc.Driver
+jdbc.camrs.maxWait=60000
+jdbc.camrs.maxActive=20
+jdbc.camrs.initialSize=1
+jdbc.camrs.minIdle=10
+jdbc.camrs.maxOpenPreparedStatements=20
+jdbc.camrs.removeAbandonedTimeout=1800
+jdbc.camrs.logAbandoned=true
+jdbc.camrs.testOnBorrow=false
+jdbc.camrs.testWhileIdle=true
+jdbc.camrs.testOnReturn=false
+jdbc.camrs.timeBetweenEvictionRunsMillis=60000
+jdbc.camrs.minEvictableIdleTimeMillis=300000
+jdbc.camrs.removeAbandoned=true
+
+
+#REDIS Configuration Information
+redis.server=192.168.107.112
+
+
+
+userType=user
+redirectHomeUrl=/open/
+redirectLoginUrl=/open/account/login.htm
+imageContextPath=http://39.105.217.215:8080/hsdataimages/
+devops=http://39.105.210.5:5151/devops-web/
+
+
+uploadFileRootDir=/var/local/HSDataPlatform/Upload/Files/
+uploadImageRootDir=/var/local/HSDataPlatform/Upload/Images/
+
+
+#短信配置
+regionId=cn-hangzhou
+accessKeyId=LTAIu3VL1kYEvDhb
+secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJz
+
+#微信支付
+#appId=wxe6aeac33838845d8
+appId=wxd35ecf3a9abb6ef2
+#mchId=1491469272
+mchId=1505182281
+#wxKey=9kej8w1aggec21udarxvzj9v64cxz89w
+wxKey=r4re3redsw3e5tg9oi87hy65tbvgt5wx
+notifyurl=http://citysdk.dteorder.com/hsdataopen/wxpay/notify.action
+
+#新网关路径
+newGatewayPath = http://39.105.217.215:8080/hsdatagateway
+signAppId=123
+
+#应用id
+applicationId=app1551771060908923486
+
+#创业工厂 点击进入
+devops=http://39.105.210.5:5151/devops-web/
+#创业工厂 服务开发环境
+devopsService=http://39.105.210.5:5151/devops-web/
+#创业工厂 数据可视化开发
+devopsDate=http://39.105.217.215:8088
+#创业工厂 大数据分析建模
+devopsAnalysis=http://39.105.217.215:8088