Administrator 3 éve
szülő
commit
19bde5f1b1

+ 58 - 131
.idea/workspace.xml

@@ -2,44 +2,17 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="dd929402-2229-45b9-b0b5-26b38816b73a" name="Default" comment="">
     <list default="true" id="dd929402-2229-45b9-b0b5-26b38816b73a" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/Test.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/utils/UnicodeUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" 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/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/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-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-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-common/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar" 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" 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/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/TEST-com.sooka.gateway.GatewayApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-jersey/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-jersey/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_ysljc_Bean.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_ysljc_Bean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" 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/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_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/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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/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/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>
     </list>
     <ignored path="$PROJECT_DIR$/sooka-auth/target/" />
     <ignored path="$PROJECT_DIR$/sooka-auth/target/" />
     <ignored path="$PROJECT_DIR$/sooka-common/target/" />
     <ignored path="$PROJECT_DIR$/sooka-common/target/" />
@@ -91,20 +64,20 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="Guiji_naturalresources_Mapper.xml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Guiji_naturalresources_Mapper.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4683">
-              <caret line="296" selection-start-line="296" selection-end-line="296" />
+            <state relative-caret-position="298">
+              <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="Guiji_naturalresources_Mapper2.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Guiji_naturalresources_Mapper2.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" />
+            <state relative-caret-position="160">
+              <caret line="320" column="17" lean-forward="true" selection-start-line="320" selection-start-column="17" selection-end-line="320" selection-end-column="17" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -121,8 +94,8 @@
       <file leaf-file-name="Guiji_naturalresources_ServiceImpl.java" pinned="false" current-in-tab="false">
       <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">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="342">
-              <caret line="75" column="70" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="81" />
+            <state relative-caret-position="252">
+              <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -139,8 +112,8 @@
       <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
       <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">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3150">
-              <caret line="105" column="28" selection-end-line="197" />
+            <state relative-caret-position="1507">
+              <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -154,15 +127,6 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="Guiji_naturalresources_qlrjbxx_Bean.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3120">
-              <caret line="106" column="16" selection-start-line="106" selection-start-column="16" selection-end-line="106" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
     </leaf>
   </component>
   </component>
   <component name="FileTemplateManagerImpl">
   <component name="FileTemplateManagerImpl">
@@ -175,8 +139,6 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
-      <find>GGFS</find>
-      <find>GG</find>
       <find>com.sooka.mapper.Guiji_Library_Mapper2</find>
       <find>com.sooka.mapper.Guiji_Library_Mapper2</find>
       <find>resultMap</find>
       <find>resultMap</find>
       <find>select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,</find>
       <find>select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,</find>
@@ -205,6 +167,8 @@
       <find>TSDW</find>
       <find>TSDW</find>
       <find>update_guiji_naturalresources_bdcdjxx</find>
       <find>update_guiji_naturalresources_bdcdjxx</find>
       <find>add_guiji_naturalresources_qlrjbxx</find>
       <find>add_guiji_naturalresources_qlrjbxx</find>
+      <find>ggui</find>
+      <find>FDZL</find>
     </findStrings>
     </findStrings>
     <dirStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\thsjzt_cloud</dir>
       <dir>E:\首佳工作目录\thsjzt_cloud</dir>
@@ -272,8 +236,8 @@
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" />
-        <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -373,16 +337,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="thsjzt_cloud" 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" />
               <item name="api_pagefile" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -393,48 +347,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="thsjzt_cloud" 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="model" type="462c0819:PsiDirectoryNode" />
-              <item name="bo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="thsjzt_cloud" 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="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="thsjzt_cloud" 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="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="thsjzt_cloud" 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" />
               <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -702,7 +614,7 @@
       <workItem from="1632362591381" duration="14480000" />
       <workItem from="1632362591381" duration="14480000" />
       <workItem from="1632445032397" duration="10654000" />
       <workItem from="1632445032397" duration="10654000" />
       <workItem from="1632617293039" duration="876000" />
       <workItem from="1632617293039" duration="876000" />
-      <workItem from="1632813327613" duration="2338000" />
+      <workItem from="1632813327613" duration="5322000" />
     </task>
     </task>
     <task id="LOCAL-00001" summary="1">
     <task id="LOCAL-00001" summary="1">
       <created>1627002165670</created>
       <created>1627002165670</created>
@@ -823,14 +735,29 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1631779440331</updated>
       <updated>1631779440331</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="1">
+      <created>1632817537118</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1632817537118</updated>
+    </task>
+    <task id="LOCAL-00019" summary="1">
+      <created>1632822778471</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1632822778471</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="282529000" />
+    <option name="totallyTimeSpent" value="285513000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.1748401" side_tool="true" weight="0.4488889" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.1748401" side_tool="true" weight="0.4488889" />
@@ -850,7 +777,7 @@
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run Dashboard" order="8" sideWeight="0.8251599" weight="0.36222222" />
       <window_info anchor="bottom" id="Run Dashboard" order="8" sideWeight="0.8251599" weight="0.36222222" />
       <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.4989339" />
       <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.4989339" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.70255864" weight="0.13555555" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.70255864" visible="true" weight="0.027777778" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4989339" weight="0.39222223" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4989339" weight="0.39222223" />
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49888888" visible="true" weight="0.24253732" />
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49888888" visible="true" weight="0.24253732" />
@@ -991,13 +918,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_civiladministration_Mapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="22" column="83" lean-forward="true" selection-start-line="21" selection-start-column="8" selection-end-line="22" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_civiladministration_Mapper2.java">
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_civiladministration_Mapper2.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
         <state relative-caret-position="432">
@@ -1201,13 +1121,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3150">
-          <caret line="105" column="28" selection-end-line="197" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java">
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="107">
         <state relative-caret-position="107">
@@ -1215,13 +1128,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4683">
-          <caret line="296" selection-start-line="296" selection-end-line="296" />
-        </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/api/Guiji_Housingconstruction.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-150">
         <state relative-caret-position="-150">
@@ -1236,10 +1142,10 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="75" column="70" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="81" />
+        <state relative-caret-position="1507">
+          <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -1250,10 +1156,31 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
     <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" />
+        <state relative-caret-position="160">
+          <caret line="320" column="17" lean-forward="true" selection-start-line="320" selection-start-column="17" selection-end-line="320" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_civiladministration_Mapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="34" column="38" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 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
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.14 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.24 s - in com.sooka.AuthApplicationTests

BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar


BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 4 - 4
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
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.952 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.586 s - in com.sooka.gateway.GatewayApplicationTests

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 517 - 4
test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 29 - 1
test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt