住建对接房地产试运行

.idea/workspace.xml

@@ -7,17 +7,27 @@
     <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/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$/sooka-auth/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/classes/application-dev.yml" 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$/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_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/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/HttpUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/HttpUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/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" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/com/sooka/utils/HttpUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/com/sooka/utils/HttpUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/mapper/Guiji_City_Real_Estate_Mapper2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/mapper/Guiji_City_Real_Estate_Mapper2.xml" afterDir="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" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/sooka-auth/target/" />
@@ -34,68 +44,77 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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">
+      <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="85">
-              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            <state relative-caret-position="3281">
+              <caret line="216" column="41" selection-start-line="216" selection-start-column="41" selection-end-line="216" selection-end-column="41" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Guiji_naturalresources.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java">
+      <file leaf-file-name="HttpUtil.java" pinned="false" current-in-tab="false">
+        <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="646">
-              <caret line="53" column="51" selection-start-line="53" selection-start-column="51" selection-end-line="53" selection-end-column="51" />
+            <state relative-caret-position="2567">
+              <caret line="170" column="9" selection-start-line="170" selection-start-column="9" selection-end-line="170" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Guiji_naturalresources_ServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sooka-auth/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2686">
-              <caret line="175" column="23" selection-start-line="175" selection-start-column="23" selection-end-line="175" selection-end-column="23" />
+            <state relative-caret-position="238">
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="Guiji_City_Real_Estate.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="160">
+              <caret line="922" column="67" selection-start-line="922" selection-start-column="67" selection-end-line="922" selection-end-column="67" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="Guiji_City_Real_Estate_ServiceImpl.java" pinned="false" current-in-tab="false">
+        <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="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 relative-caret-position="379">
+              <caret line="1499" column="69" selection-start-line="1499" selection-start-column="69" selection-end-line="1499" selection-end-column="69" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="Guiji_City_Real_Estate_Mapper2.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_City_Real_Estate_Mapper2.java">
           <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 relative-caret-position="124">
+              <caret line="85" column="115" lean-forward="true" selection-start-line="85" selection-start-column="115" selection-end-line="85" selection-end-column="115" />
             </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">
+      <file leaf-file-name="Guiji_City_Real_Estate_Mapper2.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml">
           <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 relative-caret-position="311">
+              <caret line="1837" column="45" lean-forward="true" selection-start-line="1837" selection-start-column="45" selection-end-line="1837" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Map.java" pinned="false" current-in-tab="false">
+        <entry file="jar://$PROJECT_DIR$/../../../../../Path/Java/src.zip!/java/util/Map.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1751">
+              <caret line="129" column="18" selection-start-line="129" selection-start-column="18" selection-end-line="129" selection-end-column="18" />
             </state>
           </provider>
         </entry>
@@ -104,16 +123,16 @@
         <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" />
+              <caret line="11" column="17" 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">
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
         <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 relative-caret-position="357">
+              <caret line="21" column="16" lean-forward="true" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
             </state>
           </provider>
         </entry>
@@ -140,6 +159,10 @@
       <find>政务网</find>
       <find>t_u_g</find>
       <find>互联网使用 政务外网需要注释掉 不然报错</find>
+      <find>互联网</find>
+      <find>server-addr: 172.18.128.78</find>
+      <find>paramJsonToMap</find>
+      <find>select_real_estate_housing_commercial</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -149,7 +172,6 @@
     <option name="CHANGED_PATHS">
       <list>
         <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_Library.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" />
@@ -158,6 +180,10 @@
         <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/src/main/java/com/sooka/utils/HttpUtil.java" />
+        <option value="$PROJECT_DIR$/sooka-auth/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml" />
         <option value="$PROJECT_DIR$/test-api/5522xml/application-dev.yml" />
       </list>
     </option>
@@ -188,10 +214,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
     <option name="width" value="1280" />
-    <option name="height" value="798" />
+    <option name="height" value="800" />
   </component>
   <component name="ProjectId" id="2SI37n8izTL0C4P2MfpyxdJJFU2" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -200,6 +224,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -288,6 +314,16 @@
               <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" />
+              <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" />
+              <item name="sooka" type="462c0819:PsiDirectoryNode" />
               <item name="api_pagefile" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,15 +332,23 @@
               <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" />
+              <item name="utils" 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="resources" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -313,7 +357,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
-    <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="SearchEverywhereHistoryKey" value="Guiji_Housingconstruction&#9;PSI&#9;JAVA://com.sooka.api.Guiji_Housingconstruction&#10;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_cloud_internet" />
@@ -376,6 +420,9 @@
       <workItem from="1689063426471" duration="625000" />
       <workItem from="1689124950243" duration="582000" />
       <workItem from="1689150067370" duration="5056000" />
+      <workItem from="1689236410358" duration="741000" />
+      <workItem from="1689304858036" duration="2049000" />
+      <workItem from="1689308787934" duration="1947000" />
     </task>
     <task id="LOCAL-00001" summary="2111121">
       <option name="closed" value="true" />
@@ -460,18 +507,26 @@
       <option name="project" value="LOCAL" />
       <updated>1689043417048</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="1">
+      <created>1689236544250</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1689236544250</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="20691000" />
+    <option name="totallyTimeSpent" value="25428000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <editor active="true" />
     <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.11353944" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.07356077" />
       <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" />
@@ -487,10 +542,10 @@
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <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" weight="0.3817382" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.28162816" />
       <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.21268657" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23614073" />
       <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" />
@@ -545,41 +600,7 @@
     <option name="LAST_COMMIT_MESSAGE" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="23" lean-forward="true" 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="340">
-          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="22" column="10" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4（政务外网）.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" column="34" lean-forward="true" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4（政务外网）.yml" />
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/base/BaseService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
@@ -601,13 +622,6 @@
         </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">
-          <caret line="105" column="25" selection-start-line="105" selection-start-column="25" selection-end-line="105" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Medicine_ServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="442">
@@ -692,13 +706,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/GetYbNsrInfo_Api.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
@@ -846,62 +853,101 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java">
+    <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="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 relative-caret-position="646">
+          <caret line="57" column="29" 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/api/Guiji_Library.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet（互联网使用）.yml" />
+    <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" 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/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="3281">
+          <caret line="216" column="41" selection-start-line="216" selection-start-column="41" selection-end-line="216" selection-end-column="41" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet（互联网使用）.yml">
+    <entry file="jar://$PROJECT_DIR$/../../../../../Path/Java/src.zip!/java/util/Map.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1751">
+          <caret line="129" column="18" selection-start-line="129" selection-start-column="18" selection-end-line="129" 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="2567">
+          <caret line="170" column="9" selection-start-line="170" selection-start-column="9" selection-end-line="170" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sooka-auth/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java">
       <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 relative-caret-position="160">
+          <caret line="922" column="67" selection-start-line="922" selection-start-column="67" selection-end-line="922" selection-end-column="67" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sooka-auth/src/main/resources/application-dev.yml">
+    <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="289">
-          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
+        <state relative-caret-position="379">
+          <caret line="1499" column="69" selection-start-line="1499" selection-start-column="69" selection-end-line="1499" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_City_Real_Estate_Mapper2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="85" column="115" lean-forward="true" selection-start-line="85" selection-start-column="115" selection-end-line="85" selection-end-column="115" />
         </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" />
+          <caret line="11" column="17" 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">
+    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
       <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 relative-caret-position="357">
+          <caret line="21" column="16" lean-forward="true" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml">
       <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 relative-caret-position="311">
+          <caret line="1837" column="45" lean-forward="true" selection-start-line="1837" selection-start-column="45" selection-end-line="1837" selection-end-column="45" />
         </state>
       </provider>
     </entry>

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

@@ -8,14 +8,16 @@ spring:
   # jdbc_config   datasource
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-  # 互联网
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    # 互联网
+    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
-    url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: thsjzt4e009fa5
+#    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:

sooka-auth/target/classes/application-dev.yml

@@ -8,15 +8,16 @@ 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
-  # 政务网 dzzw
-    url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    # 互联网
+    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
+#    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:

sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.4 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.532 s - in com.sooka.AuthApplicationTests

sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.874 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.751 s - in com.sooka.gateway.GatewayApplicationTests

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

@@ -11,7 +11,7 @@ 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

test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java

@@ -1491,9 +1491,11 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         log.put("interfaceinfoId", "5216d910-6fb2-4ffc-96d0-50d6adb3253d");
         log.put("interfaceinfoName", "共享（市）-市房地产-商品房信息");
         try {
-            if(bean.getMSRXM() == null){
+//            if(bean.getMSRXM() == null){
+            if(bean.getHTH() == null){
                 r.setCode(99999);
-                r.setMessage("买受人姓名"+check_required);
+//                r.setMessage("买受人姓名"+check_required);
+                r.setMessage("合同号"+check_required);
             } else {
                 List ls = guiji_city_real_estate_mapper2.select_real_estate_housing_commercial(bean);
                 r.setData(ls);

test-api/src/main/java/com/sooka/utils/HttpUtil.java

@@ -145,7 +145,17 @@ public class HttpUtil {
             // 发�?�请求参�?
 //            out.print(param);
             out.print(param);
-            System.out.println("接口ID：" + paramJsonToMap(param).get("interfaceId") + " 接口名称：" + paramJsonToMap(param).get("interfaceName") + " " + paramJsonToMap(param).get("status") + "##################################");
+            Map jsonMap = paramJsonToMap(param);
+            if(jsonMap != null){
+                Object interfaceId = jsonMap.get("interfaceId");
+                Object interfaceName = jsonMap.get("interfaceName");
+                Object status = jsonMap.get("status");
+                if(interfaceId != null && interfaceName != null && status != null){
+                    System.out.println("接口ID：" + interfaceId + " 接口名称：" + interfaceName + " " + status + "##################################");
+                }
+            }
+
+
             // flush输出流的缓冲
             out.flush();
             // 定义BufferedReader输入流来读取URL的响应

test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml

@@ -1835,6 +1835,9 @@
         <if test="MSRXM != null and MSRXM != ''">
             and MSRXM = #{MSRXM}
         </if>
+        <if test="HTH != null and HTH != ''">
+            and HTH = #{HTH}
+        </if>
     </select>
 
     <select id="select_real_estate_housing_relocation" resultType="com.sooka.model.bo.Guiji_City_Real_Estate4_housing_relocation_Bean" parameterType="com.sooka.model.bo.Guiji_City_Real_Estate4_housing_relocation_Bean">

test-api/target/classes/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
 

test-api/target/classes/mapper/Guiji_City_Real_Estate_Mapper2.xml

@@ -1835,6 +1835,9 @@
         <if test="MSRXM != null and MSRXM != ''">
             and MSRXM = #{MSRXM}
         </if>
+        <if test="HTH != null and HTH != ''">
+            and HTH = #{HTH}
+        </if>
     </select>
 
     <select id="select_real_estate_housing_relocation" resultType="com.sooka.model.bo.Guiji_City_Real_Estate4_housing_relocation_Bean" parameterType="com.sooka.model.bo.Guiji_City_Real_Estate4_housing_relocation_Bean">

test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.ZsjApiApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.28 s - in com.sooka.ZsjApiApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.922 s - in com.sooka.ZsjApiApplicationTests