diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/market/controller/DefinedController.java similarity index 96% rename from cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java rename to cloud-market-server/src/main/java/com/muyu/market/controller/DefinedController.java index 5287a63..aff6b52 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/market/controller/DefinedController.java @@ -1,14 +1,13 @@ -package com.muyu.master.controller; +package com.muyu.market.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.muyu.common.core.domain.Result; import com.muyu.market.domian.Defined; -import com.muyu.market.domian.Logs; import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.req.DefinedReq; -import com.muyu.master.service.DefinedService; +import com.muyu.market.service.DefinedService; import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java b/cloud-market-server/src/main/java/com/muyu/market/controller/LogsController.java similarity index 88% rename from cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java rename to cloud-market-server/src/main/java/com/muyu/market/controller/LogsController.java index 02a09d7..6c86970 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java +++ b/cloud-market-server/src/main/java/com/muyu/market/controller/LogsController.java @@ -1,11 +1,8 @@ -package com.muyu.master.controller; +package com.muyu.market.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; import com.muyu.market.domian.Logs; -import com.muyu.market.domian.config.PageParam; -import com.muyu.master.service.LogsService; -import io.micrometer.common.util.StringUtils; +import com.muyu.market.service.LogsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; diff --git a/cloud-market-server/src/main/java/com/muyu/master/mapper/DefinedMapper.java b/cloud-market-server/src/main/java/com/muyu/market/mapper/DefinedMapper.java similarity index 92% rename from cloud-market-server/src/main/java/com/muyu/master/mapper/DefinedMapper.java rename to cloud-market-server/src/main/java/com/muyu/market/mapper/DefinedMapper.java index 486f8db..94db1d9 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/mapper/DefinedMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/market/mapper/DefinedMapper.java @@ -1,4 +1,4 @@ -package com.muyu.master.mapper; +package com.muyu.market.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.market.domian.Defined; diff --git a/cloud-market-server/src/main/java/com/muyu/master/mapper/LogsMapper.java b/cloud-market-server/src/main/java/com/muyu/market/mapper/LogsMapper.java similarity index 86% rename from cloud-market-server/src/main/java/com/muyu/master/mapper/LogsMapper.java rename to cloud-market-server/src/main/java/com/muyu/market/mapper/LogsMapper.java index db0ecc6..8b0eaa4 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/mapper/LogsMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/market/mapper/LogsMapper.java @@ -1,4 +1,4 @@ -package com.muyu.master.mapper; +package com.muyu.market.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.market.domian.Logs; diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java b/cloud-market-server/src/main/java/com/muyu/market/service/DefinedService.java similarity index 91% rename from cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java rename to cloud-market-server/src/main/java/com/muyu/market/service/DefinedService.java index 4c0544d..8980899 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java +++ b/cloud-market-server/src/main/java/com/muyu/market/service/DefinedService.java @@ -1,4 +1,4 @@ -package com.muyu.master.service; +package com.muyu.market.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.market.domian.Defined; diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java b/cloud-market-server/src/main/java/com/muyu/market/service/LogsService.java similarity index 86% rename from cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java rename to cloud-market-server/src/main/java/com/muyu/market/service/LogsService.java index 80d17c7..6e7db4b 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java +++ b/cloud-market-server/src/main/java/com/muyu/market/service/LogsService.java @@ -1,4 +1,4 @@ -package com.muyu.master.service; +package com.muyu.market.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.market.domian.Logs; diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/market/service/impl/DefinedServiceImpl.java similarity index 82% rename from cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java rename to cloud-market-server/src/main/java/com/muyu/market/service/impl/DefinedServiceImpl.java index b83b806..4653b2e 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/market/service/impl/DefinedServiceImpl.java @@ -1,13 +1,13 @@ -package com.muyu.master.service.impl; +package com.muyu.market.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.market.domian.Defined; -import com.muyu.master.mapper.DefinedMapper; +import com.muyu.market.mapper.DefinedMapper; -import com.muyu.master.service.DefinedService; +import com.muyu.market.service.DefinedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/market/service/impl/LogsServiceImpl.java similarity index 87% rename from cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java rename to cloud-market-server/src/main/java/com/muyu/market/service/impl/LogsServiceImpl.java index 3f2ff6f..20c77ee 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/market/service/impl/LogsServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.master.service.impl; +package com.muyu.market.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.market.domian.Logs; -import com.muyu.master.mapper.LogsMapper; -import com.muyu.master.service.LogsService; +import com.muyu.market.mapper.LogsMapper; +import com.muyu.market.service.LogsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/logs/cloud-pay/error.log b/logs/cloud-pay/error.log index 6101714..670519b 100644 --- a/logs/cloud-pay/error.log +++ b/logs/cloud-pay/error.log @@ -14,7 +14,7 @@ org.springframework.beans.factory.BeanDefinitionStoreException: Failed to parse at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363) at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352) at com.muyu.MuYuMarketApplication.main(MuYuMarketApplication.java:19) -Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'definedController' for bean class [com.muyu.master.controller.DefinedController] conflicts with existing, non-compatible bean definition of same name and class [com.muyu.market.controller.DefinedController] +Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'definedController' for bean class [com.muyu.market.controller.DefinedController] conflicts with existing, non-compatible bean definition of same name and class [com.muyu.market.controller.DefinedController] at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.checkCandidate(ClassPathBeanDefinitionScanner.java:361) at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.doScan(ClassPathBeanDefinitionScanner.java:288) at org.springframework.context.annotation.ComponentScanAnnotationParser.parse(ComponentScanAnnotationParser.java:128)