1、开发参数换成正式版本(域名、mysql、oss、redis)

2、寻车申请controller层去掉基本验证
3、商品列表查询接口，商品信息补充categoryone_name、categorytwo_name

.idea/workspace.xml

@@ -2,6 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)">
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/classes/org/jeecg/common/system/api/ISysBaseAPI.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/api/CommonAPI.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/api/dto/FileDownDTO.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/api/dto/FileUploadDTO.class" afterDir="false" />
@@ -174,6 +186,12 @@
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentBanner/mapper/xml/CarrentBannerMapper.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentBanner/service/ICarrentBannerService.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentBanner/service/impl/CarrentBannerServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/entity/CarrentCategory.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategoryone/controller/CarrentCategoryoneController.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategoryone/entity/CarrentCategoryone.class" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/carrentCategoryone/mapper/CarrentCategoryoneMapper.class" afterDir="false" />
@@ -255,26 +273,33 @@
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/maven-archiver/pom.properties" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/annotation/RabbitComponent.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/base/BaseMap.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/config/CommonConfig.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/config/mqtoken/UserTokenContext.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/constant/CacheConstant.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/constant/GlobalConstants.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/enums/SentinelErrorInfoEnum.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/client/JeecgRedisClient.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/config/RedisConfig.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/listener/JeecgRedisListener.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/receiver/RedisReceiver.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/util/RedisUtil.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/util/SpringContextHolder.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -347,6 +372,7 @@
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="ts.external.directory.path" value="D:\Softwares\Environments\IDEA\IntelliJ IDEA 2019.3.3\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
@@ -418,7 +444,8 @@
       <workItem from="1733103883735" duration="17631000" />
       <workItem from="1733710180531" duration="11896000" />
       <workItem from="1733968817518" duration="63976000" />
-      <workItem from="1735284739666" duration="78521000" />
+      <workItem from="1735284739666" duration="83305000" />
+      <workItem from="1736741524063" duration="31059000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1731385713383</created>
@@ -560,7 +587,21 @@
       <option name="project" value="LOCAL" />
       <updated>1736504660849</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="1、个人注册，去掉身份证号、身份证照片，补充所属公司">
+      <created>1736683418523</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1736683418523</updated>
+    </task>
+    <task id="LOCAL-00022" summary="1、分类调整-改成二级联动形式">
+      <created>1736779823832</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1736779823832</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -610,7 +651,9 @@
     <MESSAGE value="1、商品信息添加审核状态、审核备注以及年限修改&#10;2、商品发布添加修改、删除、查询详情功能&#10;3、预约订单添加修改、删除、查询详情功能" />
     <MESSAGE value="1、寻车申请，年限字段修改" />
     <MESSAGE value="1、用户实名信息添加字段【所属公司】&#10;2、添加功能模块表" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、用户实名信息添加字段【所属公司】&#10;2、添加功能模块表" />
+    <MESSAGE value="1、个人注册，去掉身份证号、身份证照片，补充所属公司" />
+    <MESSAGE value="1、分类调整-改成二级联动形式" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、分类调整-改成二级联动形式" />
   </component>
   <component name="WindowStateProjectService">
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1731382591329">
@@ -629,62 +672,62 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733992136886" />
-    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1736678765234">
+    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1736849073925">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1736678765234" />
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1736682059040">
+    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1736849073925" />
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1736849072269">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1736682059040" />
-    <state width="2517" height="312" key="GridCell.Tab.0.bottom" timestamp="1736682322915">
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1736849072269" />
+    <state width="2517" height="312" key="GridCell.Tab.0.bottom" timestamp="1736848975523">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="312" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736682322915" />
-    <state width="2517" height="312" key="GridCell.Tab.0.center" timestamp="1736682322915">
+    <state width="2517" height="312" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736848975523" />
+    <state width="2517" height="312" key="GridCell.Tab.0.center" timestamp="1736848975522">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="312" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736682322915" />
-    <state width="2517" height="312" key="GridCell.Tab.0.left" timestamp="1736682322915">
+    <state width="2517" height="312" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736848975522" />
+    <state width="2517" height="312" key="GridCell.Tab.0.left" timestamp="1736848975522">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="312" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736682322915" />
-    <state width="2517" height="312" key="GridCell.Tab.0.right" timestamp="1736682322915">
+    <state width="2517" height="312" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736848975522" />
+    <state width="2517" height="312" key="GridCell.Tab.0.right" timestamp="1736848975523">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="312" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736682322915" />
-    <state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1736680653409">
+    <state width="2517" height="312" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736848975523" />
+    <state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
-    <state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1736680653408">
+    <state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653408" />
-    <state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1736680653408">
+    <state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653408" />
-    <state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1736680653409">
+    <state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
-    <state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1736680653409">
+    <state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
-    <state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1736680653409">
+    <state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
-    <state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1736680653409">
+    <state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
-    <state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1736680653409">
+    <state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
+    <state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1736844311401">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736680653409" />
+    <state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736844311401" />
     <state x="1079" y="413" key="RollbackChangesDialog" timestamp="1736678630823">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -693,10 +736,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1732701780265" />
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1736504715087">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1736779832574">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1736504715087" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1736779832574" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1731750734819">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -722,4 +765,20 @@
     </state>
     <state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1736326185586" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java</url>
+          <line>195</line>
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java</url>
+          <line>159</line>
+          <option name="timeStamp" value="24" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/
+//VUE_APP_API_BASE_URL=https://carrentadmin.jthj8.com/carrent-admin/
 VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-hanhai-vue/.env.production

@@ -1,5 +1,5 @@
 NODE_ENV=production
-//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/
+//VUE_APP_API_BASE_URL=https://carrentadmin.jthj8.com/carrent-admin/
 VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java

@@ -41,27 +41,7 @@ public class ApplyController {
     @ApiOperation(value="寻车申请-添加申请", notes="寻车申请-添加申请")
     @RequestMapping(value = "/addApply", method = {RequestMethod.POST})
     public Result<?> addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply){
-
-        String message = "";
-        //申请信息验证
-        if(StringUtils.isEmpty(carrentApply.getCategorytwoId())){
-            message = "车辆分类id未填写，请填写车辆分类id";
-        }else if(StringUtils.isEmpty(carrentApply.getModel())){
-            message = "车辆型号未填写，请填写车辆型号";
-        }else if(null == carrentApply.getCarTime() || "".equals(carrentApply.getCarTime())){
-            message = "车辆年限未填写，请填写车辆年限";
-        }else if(null == carrentApply.getMileage() || "".equals(carrentApply.getMileage())){
-            message = "车辆公里数未填写，请填写车辆公里数";
-        }else if(StringUtils.isEmpty(carrentApply.getName())){
-            message = "联系人未填写，请填写联系人";
-        }else if(StringUtils.isEmpty(carrentApply.getPhone())){
-            message = "联系人电话未填写，填写联系人电话";
-        }else {
-            return applyService.addApply(token, carrentApply);
-        }
-
-        return Result.error(message);
-
+        return applyService.addApply(token, carrentApply);
     }
 
 //    @ApiOperation(value="寻车申请-删除申请", notes="寻车申请-删除申请")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
 import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java

@@ -111,6 +111,17 @@ public class GoodsServiceImpl implements GoodsService {
                 message = "商品列表信息为空";
             }
 
+            //商品列表添加分类名称
+            for (CarrentGoods record : pageList.getRecords()) {
+                //获取一级分类信息
+                CarrentCategory categoryone = carrentCategoryService.getById(record.getCartypeId());
+                record.setCategoryoneName(categoryone.getName());
+
+                //获取二级分类信息
+                CarrentCategory categorytwo = carrentCategoryService.getById(record.getCategorytwoId());
+                record.setCategorytwoName(categorytwo.getName());
+            }
+
             //返回执行结果
             return Result.OK(message, pageList);
 

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,9 +134,9 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://8.138.162.67:3306/carrent?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://1.14.193.89:3306/carrent?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: Fk4q*h@V
+          password: jthj8.123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 10
-    host: 8.138.162.67
+    host: 1.14.193.89
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@@ -155,7 +155,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 1000ms
-    password: 'gmmGMM@2024'
+    password: 'jthj8.123456'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
@@ -199,11 +199,11 @@ jeecg :
 #    staticDomain: https://img.augcl.com
 
   oss:
-    accessKey: LTAI5tQSs47izVy8DLVdwUU9
-    secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq
-    endpoint: oss-cn-shenzhen.aliyuncs.com
-    bucketName: hanhaiimage
-    staticDomain: https://image.hhlm1688.com/
+    accessKey: LTAI5tMJitfHeQ8jNAikvEu7
+    secretKey: GodE2mPZiW2WhiMtEkPhNNOThLlSRj
+    endpoint: oss-cn-guangzhou.aliyuncs.com
+    bucketName: jthj8
+    staticDomain: https://image.jthj8.com
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES