diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96e90e7..3af9c78 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,12 +2,14 @@ + - + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 20ec4b5..2fa0e92 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -9,5 +9,7 @@ + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index a8fc129..9dc782b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/logs/weight-loss-camp-service-api.log b/logs/weight-loss-camp-service-api.log index fbe37b9..93b6c83 100644 --- a/logs/weight-loss-camp-service-api.log +++ b/logs/weight-loss-camp-service-api.log @@ -34,3 +34,46 @@ 2025-04-11 11:08:56.669 [http-nio-8080-exec-7] [6d5d8acc-c6c7-4af2-aad0-c65c46c5e804] ERROR com.wjbl.weightlosscamp.api.base.web.GlobalExceptionHandler - MethodArgumentNotValidException 参数校验异常: name:营地名称不能为空;longitude:经度不能为空;address:地址不能为空;latitude:纬度不能为空;mainImage:主图不能为空 2025-04-11 11:08:56.794 [http-nio-8080-exec-7] [6d5d8acc-c6c7-4af2-aad0-c65c46c5e804] INFO com.wjbl.weightlosscamp.api.base.filter.WebLogFilter - [请求] {"method":"POST","params":{},"body":"{\"name\":\"\",\"longitude\":\"\",\"latitude\":\"\",\"address\":\"\",\"mainImage\":\"\"}","uri":"/weight-loss-camp-service-api/camp/info/update"} 2025-04-11 11:08:56.795 [http-nio-8080-exec-7] [6d5d8acc-c6c7-4af2-aad0-c65c46c5e804] INFO com.wjbl.weightlosscamp.api.base.filter.WebLogFilter - [响应] {"duration":"194ms","body":"{\"code\":400,\"msg\":\"name:营地名称不能为空;longitude:经度不能为空;address:地址不能为空;latitude:纬度不能为空;mainImage:主图不能为空\",\"data\":null}","status":200} +2025-04-11 11:11:47.588 [Thread-2] [] WARN com.alibaba.nacos.common.executor.ThreadPoolManager - [ThreadPoolManager] Start destroying ThreadPool +2025-04-11 11:11:47.588 [Thread-10] [] WARN com.alibaba.nacos.common.http.HttpClientBeanHolder - [HttpClientBeanHolder] Start destroying common HttpClient +2025-04-11 11:11:47.589 [Thread-2] [] WARN com.alibaba.nacos.common.executor.ThreadPoolManager - [ThreadPoolManager] Destruction of the end +2025-04-11 11:11:47.588 [Thread-8] [] WARN com.alibaba.nacos.common.notify.NotifyCenter - [NotifyCenter] Start destroying Publisher +2025-04-11 11:11:47.589 [Thread-8] [] WARN com.alibaba.nacos.common.notify.NotifyCenter - [NotifyCenter] Destruction of the end +2025-04-11 11:11:47.589 [Thread-10] [] WARN com.alibaba.nacos.common.http.HttpClientBeanHolder - [HttpClientBeanHolder] Destruction of the end +2025-04-11 11:11:47.600 [SpringApplicationShutdownHook] [] INFO com.alibaba.cloud.nacos.registry.NacosServiceRegistry - De-registering from Nacos Server now... +2025-04-11 11:11:47.642 [SpringApplicationShutdownHook] [] INFO com.alibaba.cloud.nacos.registry.NacosServiceRegistry - De-registration finished. +2025-04-11 11:11:55.135 [main] [] INFO com.alibaba.nacos.client.logging.NacosLogging - Nacos Logging Adapter Builder: com.alibaba.nacos.logger.adapter.logback12.LogbackNacosLoggingAdapterBuilder +2025-04-11 11:11:55.135 [background-preinit] [] INFO org.hibernate.validator.internal.util.Version - HV000001: Hibernate Validator 8.0.2.Final +2025-04-11 11:11:55.140 [main] [] WARN com.alibaba.nacos.client.logging.NacosLogging - Build Nacos Logging Adapter failed: ch/qos/logback/classic/spi/LoggerContextListener +2025-04-11 11:11:55.140 [main] [] INFO com.alibaba.nacos.client.logging.NacosLogging - Nacos Logging Adapter Builder: com.alibaba.nacos.logger.adapter.logback14.LogbackNacosLoggingAdapterBuilder +2025-04-11 11:11:55.142 [main] [] WARN com.alibaba.nacos.client.logging.NacosLogging - Build Nacos Logging Adapter failed: ch/qos/logback/classic/spi/LoggerContextListener +2025-04-11 11:11:55.142 [main] [] INFO com.alibaba.nacos.client.logging.NacosLogging - Nacos Logging Adapter Builder: com.alibaba.nacos.logger.adapter.log4j2.Log4j2NacosLoggingAdapterBuilder +2025-04-11 11:11:55.143 [main] [] INFO com.alibaba.nacos.client.logging.NacosLogging - Nacos Logging Adapter: com.alibaba.nacos.logger.adapter.log4j2.Log4J2NacosLoggingAdapter match org.apache.logging.slf4j.Log4jLogger success. +2025-04-11 11:11:55.331 [main] [] INFO com.wjbl.weightlosscamp.service.api.WeightLossCampServiceApiApplication - Starting WeightLossCampServiceApiApplication using Java 21.0.6 with PID 19408 (C:\kevin\PROJECT\weigtht-loss-camp\code\service\weight-loss-camp\weight-loss-camp-service-api\target\classes started by Administrator in C:\kevin\PROJECT\weigtht-loss-camp\code\service\weight-loss-camp) +2025-04-11 11:11:55.334 [main] [] INFO com.wjbl.weightlosscamp.service.api.WeightLossCampServiceApiApplication - No active profile set, falling back to 1 default profile: "default" +2025-04-11 11:11:56.316 [main] [] INFO org.springframework.cloud.context.scope.GenericScope - BeanFactory id=d0cf9a2e-f1b7-3e4c-9f96-2847714319c9 +2025-04-11 11:11:56.688 [main] [] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port 8080 (http) +2025-04-11 11:11:56.701 [main] [] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8080"] +2025-04-11 11:11:56.703 [main] [] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] +2025-04-11 11:11:56.704 [main] [] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/10.1.39] +2025-04-11 11:11:56.754 [main] [] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/weight-loss-camp-service-api] - Initializing Spring embedded WebApplicationContext +2025-04-11 11:11:56.757 [main] [] INFO org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1381 ms +2025-04-11 11:11:58.468 [main] [] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname +2025-04-11 11:11:59.642 [main] [] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname +2025-04-11 11:11:59.722 [main] [] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8080"] +2025-04-11 11:11:59.753 [main] [] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port 8080 (http) with context path '/weight-loss-camp-service-api' +2025-04-11 11:11:59.817 [main] [] INFO com.alibaba.nacos.plugin.auth.spi.client.ClientAuthPluginManager - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +2025-04-11 11:11:59.817 [main] [] INFO com.alibaba.nacos.plugin.auth.spi.client.ClientAuthPluginManager - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +2025-04-11 11:12:00.683 [main] [] INFO com.alibaba.nacos.common.ability.AbstractAbilityControlManager - Ready to get current node abilities... +2025-04-11 11:12:00.685 [main] [] INFO com.alibaba.nacos.common.ability.AbstractAbilityControlManager - Ready to initialize current node abilities, support modes: [SDK_CLIENT] +2025-04-11 11:12:00.686 [main] [] INFO com.alibaba.nacos.common.ability.AbstractAbilityControlManager - Initialize current abilities finish... +2025-04-11 11:12:00.686 [main] [] INFO com.alibaba.nacos.common.ability.discover.NacosAbilityManagerHolder - [AbilityControlManager] Successfully initialize AbilityControlManager +2025-04-11 11:12:00.789 [main] [] INFO com.alibaba.cloud.nacos.registry.NacosServiceRegistry - nacos registry, weight-loss-camp weight-loss-camp-service-api 192.168.137.1:8080 register finished +2025-04-11 11:12:01.798 [main] [] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname +2025-04-11 11:12:01.804 [main] [] INFO com.wjbl.weightlosscamp.service.api.WeightLossCampServiceApiApplication - Started WeightLossCampServiceApiApplication in 8.041 seconds (process running for 8.779) +2025-04-11 11:12:06.924 [http-nio-8080-exec-1] [] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/weight-loss-camp-service-api] - Initializing Spring DispatcherServlet 'dispatcherServlet' +2025-04-11 11:12:06.924 [http-nio-8080-exec-1] [] INFO org.springframework.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet' +2025-04-11 11:12:06.926 [http-nio-8080-exec-1] [] INFO org.springframework.web.servlet.DispatcherServlet - Completed initialization in 1 ms +2025-04-11 11:12:07.086 [http-nio-8080-exec-1] [ae234a64-61df-41c8-87db-d2509f961c6f] ERROR com.wjbl.weightlosscamp.api.base.web.GlobalExceptionHandler - MethodArgumentNotValidException 参数校验异常: latitude:纬度不能为空;name:营地名称不能为空;address:地址不能为空;longitude:经度不能为空;mainImage:主图不能为空 +2025-04-11 11:12:07.238 [http-nio-8080-exec-1] [ae234a64-61df-41c8-87db-d2509f961c6f] INFO com.wjbl.weightlosscamp.api.base.filter.WebLogFilter - [请求] {"method":"POST","params":{},"body":"{\"name\":\"\",\"longitude\":\"\",\"latitude\":\"\",\"address\":\"\",\"mainImage\":\"\"}","uri":"/weight-loss-camp-service-api/camp/info/update"} +2025-04-11 11:12:07.240 [http-nio-8080-exec-1] [ae234a64-61df-41c8-87db-d2509f961c6f] INFO com.wjbl.weightlosscamp.api.base.filter.WebLogFilter - [响应] {"duration":"302ms","body":"{\"code\":400,\"msg\":\"latitude:纬度不能为空;name:营地名称不能为空;address:地址不能为空;longitude:经度不能为空;mainImage:主图不能为空\",\"data\":null}","status":200} diff --git a/pom.xml b/pom.xml index 3b6212d..e68d7c8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ weight-loss-camp-api-base weight-loss-camp-api-data weight-loss-camp-service-api + weight-loss-camp-work-api diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/constant/WebParamConstant.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/constant/WebParamConstant.class index 914678d..8780cc1 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/constant/WebParamConstant.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/constant/WebParamConstant.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiErrorCode.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiErrorCode.class index ad92df0..34c5ef8 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiErrorCode.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiErrorCode.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiResult.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiResult.class index 327e5ec..334c751 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiResult.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/ApiResult.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/IdParam.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/IdParam.class index fb162b1..e571993 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/IdParam.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/IdParam.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/PageParam.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/PageParam.class index 943035e..97c22ea 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/PageParam.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/core/PageParam.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/entity/BaseEntity.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/entity/BaseEntity.class index 192b910..da66522 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/entity/BaseEntity.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/entity/BaseEntity.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/exception/ApiException.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/exception/ApiException.class index 8baf578..1a234b2 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/exception/ApiException.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/exception/ApiException.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebLogFilter.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebLogFilter.class index a677c00..30565b0 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebLogFilter.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebLogFilter.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebParamFilter.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebParamFilter.class index 5bf895d..7d98861 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebParamFilter.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/filter/WebParamFilter.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/util/ApiAssert.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/util/ApiAssert.class index 57235c2..a93f1d0 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/util/ApiAssert.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/util/ApiAssert.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/GlobalExceptionHandler.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/GlobalExceptionHandler.class index f9322e8..022dd39 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/GlobalExceptionHandler.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/GlobalExceptionHandler.class differ diff --git a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/WebContextHolder.class b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/WebContextHolder.class index 0488af9..8302227 100644 Binary files a/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/WebContextHolder.class and b/weight-loss-camp-api-base/target/classes/com/wjbl/weightlosscamp/api/base/web/WebContextHolder.class differ diff --git a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/CustomTenantHandler.class b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/CustomTenantHandler.class index e7173ee..951d0d1 100644 Binary files a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/CustomTenantHandler.class and b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/CustomTenantHandler.class differ diff --git a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusConfig.class b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusConfig.class index 3cdc51f..d638c6f 100644 Binary files a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusConfig.class and b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusConfig.class differ diff --git a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusFieldFillConfig.class b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusFieldFillConfig.class index 14d89df..573222e 100644 Binary files a/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusFieldFillConfig.class and b/weight-loss-camp-api-data/target/classes/com/wjbl/weightlosscamp/api/data/config/MybatisPlusFieldFillConfig.class differ diff --git a/weight-loss-camp-service-api/pom.xml b/weight-loss-camp-service-api/pom.xml index e38e40f..21ba0c0 100644 --- a/weight-loss-camp-service-api/pom.xml +++ b/weight-loss-camp-service-api/pom.xml @@ -55,5 +55,20 @@ com.alibaba.fastjson2 fastjson2 + + + + com.baomidou + mybatis-plus-generator + test + + + org.freemarker + freemarker + test + + + + \ No newline at end of file diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/controller/CampInfoController.java similarity index 89% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/controller/CampInfoController.java index 189283d..f763e36 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/controller/CampInfoController.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.controller; +package com.wjbl.weightlosscamp.service.api.module.camp.controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wjbl.weightlosscamp.api.base.core.ApiResult; import com.wjbl.weightlosscamp.api.base.core.IdParam; import com.wjbl.weightlosscamp.api.base.core.PageParam; -import com.wjbl.weightlosscamp.service.api.dto.CampInfoDTO; -import com.wjbl.weightlosscamp.service.api.service.CampInfoService; +import com.wjbl.weightlosscamp.service.api.module.camp.dto.CampInfoDTO; +import com.wjbl.weightlosscamp.service.api.module.camp.service.CampInfoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampClassroomDTO.java similarity index 90% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampClassroomDTO.java index 41b633d..ecab267 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampClassroomDTO.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.dto; +package com.wjbl.weightlosscamp.service.api.module.camp.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampInfoDTO.java similarity index 92% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampInfoDTO.java index 7d0d553..93363e5 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/dto/CampInfoDTO.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.dto; +package com.wjbl.weightlosscamp.service.api.module.camp.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroom.java similarity index 90% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroom.java index e5f2a9d..0a17580 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroom.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.entity; +package com.wjbl.weightlosscamp.service.api.module.camp.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.wjbl.weightlosscamp.api.base.entity.BaseEntity; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroomImage.java similarity index 89% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroomImage.java index 25767b4..0af9436 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampClassroomImage.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.entity; +package com.wjbl.weightlosscamp.service.api.module.camp.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.wjbl.weightlosscamp.api.base.entity.BaseEntity; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampImage.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampImage.java similarity index 89% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampImage.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampImage.java index 0c57b93..61885f6 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampImage.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampImage.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.entity; +package com.wjbl.weightlosscamp.service.api.module.camp.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.wjbl.weightlosscamp.api.base.entity.BaseEntity; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampInfo.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampInfo.java similarity index 91% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampInfo.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampInfo.java index 0721358..41e936e 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/entity/CampInfo.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/entity/CampInfo.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.entity; +package com.wjbl.weightlosscamp.service.api.module.camp.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.wjbl.weightlosscamp.api.base.entity.BaseEntity; diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomImageMapper.java similarity index 60% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomImageMapper.java index 99a733a..6b275e9 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomImageMapper.java @@ -1,7 +1,7 @@ -package com.wjbl.weightlosscamp.service.api.mapper; +package com.wjbl.weightlosscamp.service.api.module.camp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wjbl.weightlosscamp.service.api.entity.CampClassroomImage; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampClassroomImage; import org.apache.ibatis.annotations.Mapper; /** diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomMapper.java similarity index 60% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomMapper.java index 8a4fa69..a3dd043 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampClassroomMapper.java @@ -1,7 +1,7 @@ -package com.wjbl.weightlosscamp.service.api.mapper; +package com.wjbl.weightlosscamp.service.api.module.camp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wjbl.weightlosscamp.service.api.entity.CampClassroom; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampClassroom; import org.apache.ibatis.annotations.Mapper; /** diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampImageMapper.java similarity index 60% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampImageMapper.java index ebb475f..b15feb6 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampImageMapper.java @@ -1,7 +1,7 @@ -package com.wjbl.weightlosscamp.service.api.mapper; +package com.wjbl.weightlosscamp.service.api.module.camp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wjbl.weightlosscamp.service.api.entity.CampImage; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampImage; import org.apache.ibatis.annotations.Mapper; /** diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampInfoMapper.java similarity index 60% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampInfoMapper.java index 6a21bb8..c2e699e 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/mapper/CampInfoMapper.java @@ -1,7 +1,7 @@ -package com.wjbl.weightlosscamp.service.api.mapper; +package com.wjbl.weightlosscamp.service.api.module.camp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wjbl.weightlosscamp.service.api.entity.CampInfo; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/CampInfoService.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/CampInfoService.java similarity index 80% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/CampInfoService.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/CampInfoService.java index f181db2..2b7b85e 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/CampInfoService.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/CampInfoService.java @@ -1,12 +1,12 @@ -package com.wjbl.weightlosscamp.service.api.service; +package com.wjbl.weightlosscamp.service.api.module.camp.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.wjbl.weightlosscamp.api.base.core.ApiResult; import com.wjbl.weightlosscamp.api.base.core.IdParam; import com.wjbl.weightlosscamp.api.base.core.PageParam; -import com.wjbl.weightlosscamp.service.api.dto.CampInfoDTO; -import com.wjbl.weightlosscamp.service.api.entity.CampInfo; +import com.wjbl.weightlosscamp.service.api.module.camp.dto.CampInfoDTO; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampInfo; /** * 营地信息服务接口 diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/impl/CampInfoServiceImpl.java similarity index 86% rename from weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.java rename to weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/impl/CampInfoServiceImpl.java index 1bc24d1..7315621 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/camp/service/impl/CampInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.wjbl.weightlosscamp.service.api.service.impl; +package com.wjbl.weightlosscamp.service.api.module.camp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wjbl.weightlosscamp.api.base.core.ApiResult; import com.wjbl.weightlosscamp.api.base.core.IdParam; import com.wjbl.weightlosscamp.api.base.core.PageParam; -import com.wjbl.weightlosscamp.service.api.dto.CampInfoDTO; -import com.wjbl.weightlosscamp.service.api.entity.CampInfo; -import com.wjbl.weightlosscamp.service.api.mapper.CampInfoMapper; -import com.wjbl.weightlosscamp.service.api.service.CampInfoService; +import com.wjbl.weightlosscamp.service.api.module.camp.dto.CampInfoDTO; +import com.wjbl.weightlosscamp.service.api.module.camp.entity.CampInfo; +import com.wjbl.weightlosscamp.service.api.module.camp.mapper.CampInfoMapper; +import com.wjbl.weightlosscamp.service.api.module.camp.service.CampInfoService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/WeightLossCampServiceApiApplication.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/WeightLossCampServiceApiApplication.class index 5b23492..308e8b6 100644 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/WeightLossCampServiceApiApplication.class and b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/WeightLossCampServiceApiApplication.class differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.class deleted file mode 100644 index 44199ef..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/controller/CampInfoController.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.class deleted file mode 100644 index bc164f6..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampClassroomDTO.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.class deleted file mode 100644 index b893e1e..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/dto/CampInfoDTO.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.class deleted file mode 100644 index 29463b6..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroom.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.class deleted file mode 100644 index ba12cb3..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampClassroomImage.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampImage.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampImage.class deleted file mode 100644 index 684d62b..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampImage.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampInfo.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampInfo.class deleted file mode 100644 index 95864df..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/entity/CampInfo.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.class deleted file mode 100644 index 1dce9ae..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomImageMapper.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.class deleted file mode 100644 index 0e882a3..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampClassroomMapper.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.class deleted file mode 100644 index aff8001..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampImageMapper.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.class deleted file mode 100644 index d98a7c0..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/mapper/CampInfoMapper.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/CampInfoService.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/CampInfoService.class deleted file mode 100644 index 3a368fa..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/CampInfoService.class and /dev/null differ diff --git a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.class b/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.class deleted file mode 100644 index 2a842e0..0000000 Binary files a/weight-loss-camp-service-api/target/classes/com/wjbl/weightlosscamp/service/api/service/impl/CampInfoServiceImpl.class and /dev/null differ