1

.idea/workspace.xml

@@ -4,29 +4,20 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f5b29ce0-57fe-4bf7-aba4-d141b149854d" name="Changes" comment="2111121">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="f5b29ce0-57fe-4bf7-aba4-d141b149854d" name="Changes" comment="1">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/5511xml/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/5511xml/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/5522xml/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/5522xml/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Library.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Library.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/api2.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/service/impl/Guiji_Medicine_ServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/utils/HttpUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/test-api-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/test-api-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4（政务外网）.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet（互联网使用）.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_Housingconstruction.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_Housingconstruction.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_Library.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_Library.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_civiladministration.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_civiladministration.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_healthcommission.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_healthcommission.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_naturalresources.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/api/Guiji_naturalresources.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/sooka-auth/target/" />
@@ -43,42 +34,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="GetJptsstaQsxx_Api.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/GetJptsstaQsxx_Api.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GetJptsstaHmd_Api.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/GetJptsstaHmd_Api.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GetJptsstaFpzyz_Api.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/GetJptsstaFpzyz_Api.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PeoplemarryInfosingle_Api.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/PeoplemarryInfosingle_Api.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="Sfz_Api.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Sfz_Api.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -109,8 +64,8 @@
       <file leaf-file-name="Guiji_Library.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Library.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="57" />
+            <state relative-caret-position="293">
+              <caret line="57" column="29" lean-forward="true" selection-start-line="57" selection-start-column="29" selection-end-line="57" selection-end-column="29" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -118,20 +73,47 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Guiji_Library_ServiceImpl.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java">
+      <file leaf-file-name="Guiji_Housingconstruction.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="26" column="48" lean-forward="true" selection-start-line="26" selection-start-column="48" selection-end-line="26" selection-end-column="48" />
+            <state relative-caret-position="311">
+              <caret line="255" column="17" lean-forward="true" selection-start-line="255" selection-start-column="17" selection-end-line="255" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PeoplemarryInfodouble_Api.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/PeoplemarryInfodouble_Api.java">
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+            <state relative-caret-position="306">
+              <caret line="18" column="34" lean-forward="true" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="289">
+              <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/5511xml/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="298">
+              <caret line="24" column="50" selection-start-line="24" selection-start-column="50" selection-end-line="24" selection-end-column="50" />
             </state>
           </provider>
         </entry>
@@ -146,6 +128,18 @@
       <find>归集-市卫建委</find>
       <find>yhjbxx_forward:</find>
       <find>System.out.println</find>
+      <find>addLog</find>
+      <find>/system/interfaceLog/addLog</find>
+      <find>crashLog</find>
+      <find>t_u_interface</find>
+      <find>172.17.5.7</find>
+      <find>72.17.5.7</find>
+      <find>72.18.128.8</find>
+      <find>sername: thsjz</find>
+      <find>assword: thsjz</find>
+      <find>政务网</find>
+      <find>t_u_g</find>
+      <find>互联网使用 政务外网需要注释掉 不然报错</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -157,10 +151,14 @@
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Medicine_ServiceImpl.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/HttpUtil.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" />
-        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Library.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" />
+        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/test-api/5511xml/application-dev.yml" />
+        <option value="$PROJECT_DIR$/test-api/5522xml/application-dev.yml" />
       </list>
     </option>
   </component>
@@ -190,8 +188,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="429" />
-    <option name="y" value="42" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
     <option name="width" value="1280" />
     <option name="height" value="798" />
   </component>
@@ -202,9 +200,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -215,40 +210,51 @@
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
-              <item name="test-api" type="462c0819:PsiDirectoryNode" />
+              <item name="sooka-auth" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
-              <item name="test-api" type="462c0819:PsiDirectoryNode" />
-              <item name="5511xml" type="462c0819:PsiDirectoryNode" />
+              <item name="sooka-auth" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
+              <item name="sooka-auth" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
+              <item name="sooka-auth" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
               <item name="test-api" type="462c0819:PsiDirectoryNode" />
-              <item name="5522xml" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
               <item name="test-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="5511xml" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
               <item name="test-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="5522xml" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" type="462c0819:PsiDirectoryNode" />
               <item name="test-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
@@ -256,8 +262,6 @@
               <item name="test-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="sooka" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
@@ -266,8 +270,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
@@ -277,7 +279,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
@@ -287,7 +288,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="api_pagefile" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
@@ -301,6 +302,9 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -309,10 +313,10 @@
   </component>
   <component name="PropertiesComponent">
     <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
-    <property name="SearchEverywhereHistoryKey" value="Application&#9;FILE&#9;file://D:/D/Workspaces/idea/zhongtai_100/wangzhe_show/cloud_show/test-api/5511xml/application-dev.yml" />
+    <property name="SearchEverywhereHistoryKey" value="5511&#9;FILE&#9;file://D:/D/Workspaces/idea/zhongtai_100/wangzhe_show/cloud_show/test-api/5511xml&#10;Application&#9;FILE&#9;file://D:/D/Workspaces/idea/zhongtai_100/wangzhe_show/cloud_show/test-api/5511xml/application-dev.yml" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../thsjzt" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../thsjzt_cloud_internet" />
     <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="project.structure.last.edited" value="Project" />
@@ -368,7 +372,10 @@
       <updated>1688820102581</updated>
       <workItem from="1688820103918" duration="597000" />
       <workItem from="1688864575134" duration="8173000" />
-      <workItem from="1689039031914" duration="1630000" />
+      <workItem from="1689039031914" duration="5237000" />
+      <workItem from="1689063426471" duration="625000" />
+      <workItem from="1689124950243" duration="582000" />
+      <workItem from="1689150067370" duration="5056000" />
     </task>
     <task id="LOCAL-00001" summary="2111121">
       <option name="closed" value="true" />
@@ -446,18 +453,25 @@
       <option name="project" value="LOCAL" />
       <updated>1688906341491</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1">
+      <created>1689043417047</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1689043417048</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10821000" />
+    <option name="totallyTimeSpent" value="20691000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.17537314" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.11353944" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -471,15 +485,16 @@
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32893288" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run Dashboard" />
+      <window_info anchor="bottom" id="Run Dashboard" order="9" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32893288" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3817382" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3817382" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32893288" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2771855" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21268657" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="3" side_tool="true" />
       <window_info anchor="bottom" id="SonarLint" order="7" />
+      <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -487,7 +502,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -531,27 +545,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/PeoplemarryInfodouble_Api.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="23" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
@@ -573,13 +566,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="5" lean-forward="true" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
@@ -608,20 +594,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="28" column="14" lean-forward="true" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/5511xml/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="249" column="3" selection-start-line="249" selection-start-column="3" selection-end-line="249" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_Medicine_Service.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -629,13 +601,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="229" column="18" selection-start-line="229" selection-start-column="18" selection-end-line="229" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/HttpUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-81">
@@ -654,9 +619,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
           <caret line="87" column="47" selection-start-line="87" selection-start-column="47" selection-end-line="87" selection-end-column="47" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -674,13 +636,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="59" column="28" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Public_Resource.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
@@ -877,20 +832,76 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="5" lean-forward="true" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="26" column="48" selection-start-line="26" selection-start-column="48" selection-end-line="26" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="1023" column="51" lean-forward="true" selection-start-line="1023" selection-start-column="51" selection-end-line="1023" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Library.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="57" />
+        <state relative-caret-position="293">
+          <caret line="57" column="29" lean-forward="true" selection-start-line="57" selection-start-column="29" selection-end-line="57" selection-end-column="29" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet（互联网使用）.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="26" column="48" lean-forward="true" selection-start-line="26" selection-start-column="48" selection-end-line="26" selection-end-column="48" />
+        <state relative-caret-position="238">
+          <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="18" column="34" lean-forward="true" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/5511xml/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="255" column="17" lean-forward="true" selection-start-line="255" selection-start-column="17" selection-end-line="255" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="24" column="50" selection-start-line="24" selection-start-column="50" selection-end-line="24" selection-end-column="50" />
         </state>
       </provider>
     </entry>

sooka-auth/src/main/resources/application-dev.yml

@@ -8,15 +8,14 @@ spring:
   # jdbc_config   datasource
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://36.97.65.105:53306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
   # 互联网
 #    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
   # 政务网 Vpn
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
   # 政务网 dzzw
-    url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    username: thsjzt
-    password: thsjzt
+    url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: thsjzt4e009fa5
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

test-api/5511xml/application-dev.yml

@@ -39,13 +39,6 @@ spring:
           url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: jl503001
           password: Lg83RJp5
-#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: thsjzt
-#          password: thsjzt
-
-
-
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:
@@ -200,18 +193,6 @@ spring:
               # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-
-
-
-
-
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
   jersey:
     application-path: api
 

test-api/5522xml/application-dev.yml

@@ -11,6 +11,10 @@ spring:
       primary: db1
       datasource:
         db1:
+          # 互联网
+#          url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#          username: thsjzt
+#          password: thsjzt
           # 政务网 Vpn
 #          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           # 政务网 dzzw
@@ -39,13 +43,6 @@ spring:
           url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: jl503001
           password: Lg83RJp5
-#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: thsjzt
-#          password: thsjzt
-
-
-
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:
@@ -200,18 +197,6 @@ spring:
               # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-
-
-
-
-
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
   jersey:
     application-path: api
 

test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -233,7 +233,7 @@ public class Guiji_Housingconstruction extends BaseApi {
     final String scheduTime = "0 0 0-23 * * ?";//互联网使用 政务外网需要注释掉
 //    final String scheduTime = "0 06 22 * * ?";//本地测试使用
 
-//    @Scheduled(cron = scheduTime)//互联网使用 政务外网需要注释掉 不然报错
+    @Scheduled(cron = scheduTime)//互联网使用 政务外网需要注释掉 不然报错
     public ResultModel guiji_housingconstruction_hqhrzzxsjjk() {
         getHeatToken();
         String str = HttpUtil.doGet("http://222.160.143.205:28080/api/realtime/data", null, head);
@@ -269,7 +269,7 @@ public class Guiji_Housingconstruction extends BaseApi {
 
 
     //获取热源最新数据接口
-    //@Scheduled(cron = scheduTime)//互联网使用 政务外网需要注释掉 不然报错
+    @Scheduled(cron = scheduTime)//互联网使用 政务外网需要注释掉 不然报错
     public ResultModel guiji_housingconstruction_hqryzxsjjk() {
         getHeatToken();
         String str = HttpUtil.doGet("http://222.160.143.205:28080/api/realtime/source", null, head);

test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4（政务外网）.yml

@@ -1,253 +0,0 @@
-
-spring:
-  ############################################################
-  #
-  # 配置数据源相关 使用 HikariCP 数据源
-  #
-  ############################################################
-  # jdbc_config   datasource
-  datasource:
-    dynamic:
-      primary: db1
-      datasource:
-        db1:
-          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: root
-          password: thsjzt4e009fa5
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db_gjj_s:
-          url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503001
-          password: Lg83RJp5
-#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: thsjzt
-#          password: thsjzt
-
-
-
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db2:
-          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503033
-          password: Bx82TIg0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db3:
-          url: jdbc:mysql://59.198.246.77:32368/jl503029?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503029
-          password: Lp18NUg8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db4:
-          url: jdbc:mysql://59.198.246.77:32368/jl503011?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503011
-          password: Oq82TSa8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db5:
-          url: jdbc:mysql://59.198.246.77:32368/jl503026?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503026
-          password: Sw80ABr2
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db6:
-          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503008
-          password: Jl10PEr0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db7:
-          # 市医药
-          url: jdbc:mysql://59.198.246.77:32368/jl503061?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503061
-          password: Vk38BTo1
-#          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: jl503008
-#          password: Jl10PEr0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-
-
-
-
-
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-  jersey:
-    application-path: api
-
-############################################################
-#
-# mybatis 配置
-#
-############################################################
-# mybatis \配置
-mybatis:
-  type-aliases-package: com.sooka.pojo
-  mapper-locations: classpath:mapper/*.xml,system/*.xml
-# 通用mapper配置
-mapper:
-  mappers: com.sooka.utils.MyMapper
-  not-empty: false
-  identity: MYSQL
-
-############################################################
-#
-# Server 服务器相关配置
-#
-############################################################
-server:
-  # 配置api端口号
-  port: 5522
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-
-############################################################
-#
-# 新点接口地址配置
-#
-############################################################
-xd:
-  # 基础地址
-  base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
-project:
-  setting:
-    env: local

test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet（互联网使用）.yml

@@ -1,112 +0,0 @@
-
-spring:
-  ############################################################
-  #
-  # 配置数据源相关 使用 HikariCP 数据源
-  #
-  ############################################################
-  # jdbc_config   datasource
-#  datasource:
-#    dynamic:
-#      primary: db1
-#      datasource:
-#        db1:
-#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#
-#          username: thsjzt
-#          password: thsjzt
-#            # Hikari will use the above plus the following to setup connection pooling
-#          type: com.zaxxer.hikari.HikariDataSource
-#          hikari:
-#        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-#            connection-timeout: 30000
-#              # 最小连接数
-#            minimum-idle: 5
-#        # 最大连接数
-#            maximum-pool-size: 15
-#        # 自动提交
-#            auto-commit: true
-#        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-#            idle-timeout: 600000
-#        # 连接池的名字
-#            pool-name: DatebookHikariCP
-#        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-#            max-lifetime: 28740000
-#            connection-test-query: SELECT 1
-#
-#        db2:
-##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          username: thsjzt
-##          password: thsjzt
-#
-#          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: jl503033
-#          password: Bx82TIg0
-#                  # Hikari will use the above plus the following to setup connection pooling
-#          type: com.zaxxer.hikari.HikariDataSource
-#          hikari:
-#              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-#            connection-timeout: 30000
-#                    # 最小连接数
-#            minimum-idle: 5
-#              # 最大连接数
-#            maximum-pool-size: 15
-#              # 自动提交
-#            auto-commit: true
-#              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-#            idle-timeout: 600000
-#              # 连接池的名字
-#            pool-name: DatebookHikariCP
-#              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-#            max-lifetime: 28740000
-#            connection-test-query: SELECT 1
-
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-  jersey:
-    application-path: api
-
-############################################################
-#
-# mybatis 配置
-#
-############################################################
-# mybatis \配置
-mybatis:
-  type-aliases-package: com.sooka.pojo
-  mapper-locations: classpath:mapper/*.xml,system/*.xml
-# 通用mapper配置
-mapper:
-  mappers: com.sooka.utils.MyMapper
-  not-empty: false
-  identity: MYSQL
-
-############################################################
-#
-# Server 服务器相关配置
-#
-############################################################
-server:
-  # 配置api端口号
-  port: 5522
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-
-############################################################
-#
-# 新点接口地址配置
-#
-############################################################
-xd:
-  # 基础地址
-  base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
-project:
-  setting:
-    env: internate

test-api/src/main/resources/application-dev.yml

@@ -11,9 +11,9 @@ spring:
       primary: db1
       datasource:
         db1:
-          # 政务网 Vpn
+          # Vpn
           url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          # 政务网 dzzw
+          # dzzw
 #          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: root
           password: thsjzt4e009fa5
@@ -35,17 +35,6 @@ spring:
         # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-#        db_gjj_s:
-#          url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: jl503001
-#          password: Lg83RJp5
-##          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          username: thsjzt
-##          password: thsjzt
-#
-#
-#
 #            # Hikari will use the above plus the following to setup connection pooling
 #          type: com.zaxxer.hikari.HikariDataSource
 #          hikari:
@@ -200,18 +189,6 @@ spring:
 #              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
 #            max-lifetime: 28740000
 #            connection-test-query: SELECT 1
-
-
-
-
-
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
   jersey:
     application-path: api