From 6bee6d601debdecb848a5990b02b939b591007c2 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Fri, 8 Mar 2024 11:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 249 ++++++++++++--------------------------------
 bcapi/pom.xml       |   6 +-
 pom.xml             |  15 ++-
 3 files changed, 80 insertions(+), 190 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b0a97ef..225f5d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="48484101-7a18-4278-bdb7-e43b4204d542" name="Default Changelist" comment="jpa模式的dao">
-      <change afterPath="$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    <list default="true" id="48484101-7a18-4278-bdb7-e43b4204d542" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bcapi/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/bcapi/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -30,80 +26,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/ICountryService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="8" column="34" lean-forward="true" selection-start-line="8" selection-start-column="34" selection-end-line="8" selection-end-column="34" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bcapi/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="594">
-              <caret line="27" column="30" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="30" />
+            <state relative-caret-position="286">
+              <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bccommon/src/main/java/bc/mm/mis/common/utils/AjaxResult.java">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="9" column="23" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="23" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="566">
+              <caret line="42" column="21" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -150,12 +86,12 @@
         <option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java" />
         <option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CrudDao.java" />
         <option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/ICountryService.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/bcapi/pom.xml" />
         <option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" />
         <option value="$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java" />
         <option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/bcapi/pom.xml" />
       </list>
     </option>
   </component>
@@ -166,6 +102,17 @@
       </MavenImportingSettings>
     </option>
   </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="bcws" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
+  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="2224" />
     <option name="y" value="109" />
@@ -239,80 +186,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" 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="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="dao" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bccore" 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>
@@ -388,8 +261,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Spring Boot.BcTaskApplication" />
         <item itemvalue="Spring Boot.BcApiApplication" />
+        <item itemvalue="Spring Boot.BcTaskApplication" />
       </list>
     </recent_temporary>
   </component>
@@ -403,7 +276,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1709705326078</updated>
-      <workItem from="1709705327787" duration="17025000" />
+      <workItem from="1709705327787" duration="17541000" />
     </task>
     <task id="LOCAL-00001" summary="补充springboot 结构">
       <created>1709706040716</created>
@@ -482,11 +355,25 @@
       <option name="project" value="LOCAL" />
       <updated>1709867732133</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="调整代码">
+      <created>1709868628702</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1709868628702</updated>
+    </task>
+    <task id="LOCAL-00013" summary="api端控制器代码">
+      <created>1709868660824</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1709868660824</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17025000" />
+    <option name="totallyTimeSpent" value="17541000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-7" width="1936" height="1056" extended-state="6" />
@@ -516,7 +403,7 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Maven" />
+      <window_info anchor="right" id="Maven" weight="0.21055438" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
@@ -542,7 +429,9 @@
     <MESSAGE value="配置定时任务" />
     <MESSAGE value="创建bc核心jar" />
     <MESSAGE value="jpa模式的dao" />
-    <option name="LAST_COMMIT_MESSAGE" value="jpa模式的dao" />
+    <MESSAGE value="调整代码" />
+    <MESSAGE value="api端控制器代码" />
+    <option name="LAST_COMMIT_MESSAGE" value="api端控制器代码" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/bcws/pom.xml">
@@ -893,16 +782,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="652">
-          <caret line="52" column="39" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bccommon/src/main/java/bc/mm/mis/common/utils/AjaxResult.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
+        <state relative-caret-position="198">
           <caret line="9" column="23" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="23" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -910,16 +792,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bcapi/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="27" column="30" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="207">
           <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -927,40 +802,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java">
+    <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/ICountryService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
+        <state relative-caret-position="184">
+          <caret line="8" column="34" selection-start-line="8" selection-start-column="34" selection-end-line="8" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/ICountryService.java">
+    <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="34" lean-forward="true" selection-start-line="8" selection-start-column="34" selection-end-line="8" selection-end-column="34" />
+        <state relative-caret-position="396">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="330">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
+        <state relative-caret-position="566">
+          <caret line="42" column="21" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bcapi/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
         </state>
       </provider>
     </entry>
diff --git a/bcapi/pom.xml b/bcapi/pom.xml
index 53da764..c15d37a 100644
--- a/bcapi/pom.xml
+++ b/bcapi/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>bcapi</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${springboot.version}</version>
-        </dependency>
         <dependency>
             <groupId>bc.mm</groupId>
             <artifactId>bccommon</artifactId>
@@ -27,6 +22,7 @@
             <groupId>bc.mm</groupId>
             <artifactId>bccore</artifactId>
             <version>1.0.01</version>
+            <scope>compile</scope>
         </dependency>
 
 
diff --git a/pom.xml b/pom.xml
index 122bde4..ea80f46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,15 @@
             <artifactId>spring-boot-starter</artifactId>
             <version>${springboot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${springboot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -42,11 +51,7 @@
             <artifactId>HikariCP</artifactId>
             <version>2.7.9</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>2.0.9.RELEASE</version>
-        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>