瀏覽代碼

修改日志判断空

wangzhe 1 年之前
父節點
當前提交
dc3a06b97d

+ 95 - 197
.idea/workspace.xml

@@ -4,10 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f5b29ce0-57fe-4bf7-aba4-d141b149854d" name="Changes" comment="1">
+    <list default="true" id="f5b29ce0-57fe-4bf7-aba4-d141b149854d" name="Changes" comment="住建对接房地产试运行">
       <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$/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" />
@@ -16,15 +14,13 @@
       <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/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/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/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/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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/application.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/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" />
@@ -47,8 +43,8 @@
       <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="3281">
-              <caret line="216" column="41" selection-start-line="216" selection-start-column="41" selection-end-line="216" selection-end-column="41" />
+            <state relative-caret-position="3791">
+              <caret line="246" column="35" selection-start-line="246" selection-start-column="35" selection-end-line="246" selection-end-column="35" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -56,11 +52,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HttpUtil.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="HttpUtil.java" pinned="false" current-in-tab="true">
         <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 relative-caret-position="229">
+              <caret line="153" column="72" lean-forward="true" selection-start-line="153" selection-start-column="72" selection-end-line="153" selection-end-column="72" />
             </state>
           </provider>
         </entry>
@@ -68,71 +64,35 @@
       <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="238">
-              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+            <state relative-caret-position="221">
+              <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <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="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_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="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="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="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="Guiji_City_Real_Estate_Mapper2.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Guiji_City_Real_Estate_Mapper2.xml" pinned="false" current-in-tab="false">
         <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="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 relative-caret-position="31229">
+              <caret line="1837" column="45" selection-start-line="1837" selection-start-column="45" selection-end-line="1837" selection-end-column="45" />
             </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">
+        <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="187">
-              <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+            <state relative-caret-position="442">
+              <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="221">
+              <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
             </state>
           </provider>
         </entry>
@@ -159,10 +119,12 @@
       <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>
+      <find>互联网使用</find>
+      <find>互联网</find>
+      <find>发出POST请求出现异常</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -176,15 +138,16 @@
         <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/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/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
+        <option value="$PROJECT_DIR$/sooka-auth/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/test-api/5522xml/application-dev.yml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/HttpUtil.java" />
       </list>
     </option>
   </component>
@@ -224,6 +187,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="ProjectPane">
@@ -236,32 +200,6 @@
             <path>
               <item name="cloud_show" type="b2602c69:ProjectViewProjectNode" />
               <item name="cloud_show" 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="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" />
             </path>
             <path>
@@ -295,60 +233,12 @@
               <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" />
-              <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" />
-            </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" 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>
-              <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="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="Scope" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -423,6 +313,8 @@
       <workItem from="1689236410358" duration="741000" />
       <workItem from="1689304858036" duration="2049000" />
       <workItem from="1689308787934" duration="1947000" />
+      <workItem from="1689555338001" duration="2464000" />
+      <workItem from="1689563757208" duration="2120000" />
     </task>
     <task id="LOCAL-00001" summary="2111121">
       <option name="closed" value="true" />
@@ -514,15 +406,21 @@
       <option name="project" value="LOCAL" />
       <updated>1689236544250</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="住建对接房地产试运行">
+      <created>1689555466251</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1689555466251</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25428000" />
+    <option name="totallyTimeSpent" value="30012000" />
   </component>
   <component name="ToolWindowManager">
     <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" />
@@ -542,14 +440,13 @@
       <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" visible="true" weight="0.28162816" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.41914192" />
       <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.23614073" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23134328" />
       <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" />
@@ -557,6 +454,7 @@
       <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">
@@ -597,17 +495,10 @@
     <MESSAGE value="初始化项目" />
     <MESSAGE value="2111121" />
     <MESSAGE value="1" />
-    <option name="LAST_COMMIT_MESSAGE" value="1" />
+    <MESSAGE value="住建对接房地产试运行" />
+    <option name="LAST_COMMIT_MESSAGE" value="住建对接房地产试运行" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="28" column="54" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Funeral_ServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="246">
@@ -857,97 +748,104 @@
       <provider selected="true" editor-type-id="text-editor">
         <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_pagefile/application-dev-internet(互联网使用).yml" />
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.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="306">
-          <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+        <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$/sooka-auth/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="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="15436">
+          <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$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
+    <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="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 relative-caret-position="25245">
+          <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="jar://$PROJECT_DIR$/../../../../../Path/Java/src.zip!/java/util/Map.java">
+    <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="1751">
-          <caret line="129" column="18" selection-start-line="129" selection-start-column="18" selection-end-line="129" selection-end-column="18" />
+        <state relative-caret-position="1377">
+          <caret line="85" column="115" 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/src/main/java/com/sooka/utils/HttpUtil.java">
+    <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="2567">
-          <caret line="170" column="9" selection-start-line="170" selection-start-column="9" selection-end-line="170" selection-end-column="9" />
+        <state relative-caret-position="31229">
+          <caret line="1837" column="45" selection-start-line="1837" selection-start-column="45" selection-end-line="1837" selection-end-column="45" />
+        </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="3791">
+          <caret line="246" column="35" selection-start-line="246" selection-start-column="35" selection-end-line="246" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        <state relative-caret-position="221">
+          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java">
+    <entry file="file://$PROJECT_DIR$/test-api/5511xml/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="187">
+          <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/service/impl/Guiji_City_Real_Estate_ServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-prod.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="221">
+          <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_City_Real_Estate_Mapper2.java">
+    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
       <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 relative-caret-position="272">
+          <caret line="16" column="27" lean-forward="true" selection-start-line="14" selection-start-column="11" selection-end-line="16" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/5511xml/application-dev.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="187">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        <state relative-caret-position="-85">
+          <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/5522xml/application-dev.yml">
+    <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="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 relative-caret-position="442">
+          <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_City_Real_Estate_Mapper2.xml">
+    <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="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 relative-caret-position="229">
+          <caret line="153" column="72" lean-forward="true" selection-start-line="153" selection-start-column="72" selection-end-line="153" selection-end-column="72" />
         </state>
       </provider>
     </entry>

二進制
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar


二進制
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original


文件差異過大導致無法顯示
+ 4 - 4
sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml


+ 1 - 1
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: 9.532 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.088 s - in com.sooka.AuthApplicationTests

二進制
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar


二進制
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original


文件差異過大導致無法顯示
+ 3 - 3
sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml


+ 1 - 1
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: 12.751 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.471 s - in com.sooka.gateway.GatewayApplicationTests

+ 2 - 2
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);

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

@@ -96,9 +96,11 @@ public class HttpUtil {
         Map map = new HashMap();
         map.put("interfaceId", jsonObject.get("interfaceinfoId"));
         map.put("interfaceName", jsonObject.get("interfaceinfoName"));
-        String results = jsonObject.get("results").toString();
+        Object results = jsonObject.get("results");
         if(results != null && !results.equals("")){
-            map.put("status", JSON.parseObject(results).get("message"));
+            String resultsStr = "" + results;
+            JSONObject resultsObj = JSON.parseObject(resultsStr);
+            map.put("status", resultsObj.get("message"));
         }
         return map;
     }
@@ -145,13 +147,15 @@ public class HttpUtil {
             // 发�?�请求参�?
 //            out.print(param);
             out.print(param);
-            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 + "##################################");
+            if(param != null && !param.equals("")){ //政务网使用 接口调用详情日志
+                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 + "##################################");
+                    }
                 }
             }
 
@@ -167,7 +171,7 @@ public class HttpUtil {
             System.out.println("result========"+result);
         } catch (Exception e) {
             System.out.println("发出POST请求出现异常 " + e);
-//            e.printStackTrace();
+            e.printStackTrace();
         }
         // 使用finally块来关闭输出流和输入流
         finally {

+ 4 - 161
test-api/src/main/resources/application-dev.yml

@@ -11,12 +11,9 @@ spring:
       primary: db1
       datasource:
         db1:
-          # 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://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&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:
@@ -35,160 +32,6 @@ spring:
         # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-#            # 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
   jersey:
     application-path: api
 
@@ -229,4 +72,4 @@ xd:
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
 project:
   setting:
-    env: local
+    env: internate

+ 2 - 2
test-api/src/main/resources/application.yml

@@ -9,8 +9,8 @@ spring:
 #vpn
 #       server-addr: 172.17.5.4:8848
 #政务外网使用
-         server-addr: 172.18.128.78
+#         server-addr: 172.18.128.78
 #互联网使用
-#        server-addr: 10.0.51.4:8848
+        server-addr: 10.0.51.4:8848
 
 

+ 2 - 2
test-api/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
 #vpn
 #       server-addr: 172.17.5.4:8848
 #政务外网使用
-         server-addr: 172.18.128.78
+#         server-addr: 172.18.128.78
 #互联网使用
-#        server-addr: 10.0.51.4:8848
+        server-addr: 10.0.51.4:8848
 
 

二進制
test-api/target/classes/com/sooka/api/Guiji_Housingconstruction.class


二進制
test-api/target/classes/com/sooka/utils/HttpUtil.class


文件差異過大導致無法顯示
+ 4 - 4
test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml


+ 1 - 1
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: 11.922 s - in com.sooka.ZsjApiApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.345 s - in com.sooka.ZsjApiApplicationTests

二進制
test-api/target/test-api-0.0.1-SNAPSHOT.jar.original