qizu
/
2112-cloud-market
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
sy200 2024-08-23 18:56:04 +08:00
parent 9fc9640d19 1aa45c06c6
commit 5b7e09c250
9 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java → cloud-market-server/src/main/java/com/muyu/market/controller/DefinedController.java
View File

@ -1,4 +1,4 @@
package com.muyu.master.controller; package com.muyu.market.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.dtflys.forest.springboot.annotation.ForestScannerRegister;
@ -6,10 +6,9 @@ import com.muyu.common.core.domain.Result;
import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.market.domian.Defined; import com.muyu.market.domian.Defined;
import com.muyu.market.domian.Logs;
import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.config.PageParam;
import com.muyu.market.domian.req.DefinedReq; 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.micrometer.common.util.StringUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

7
cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java → cloud-market-server/src/main/java/com/muyu/market/controller/LogsController.java
View File

@ -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.common.core.domain.Result;
import com.muyu.market.domian.Logs; import com.muyu.market.domian.Logs;
import com.muyu.market.domian.config.PageParam; import com.muyu.market.service.LogsService;
import com.muyu.master.service.LogsService;
import io.micrometer.common.util.StringUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;

2
cloud-market-server/src/main/java/com/muyu/master/mapper/DefinedMapper.java → cloud-market-server/src/main/java/com/muyu/market/mapper/DefinedMapper.java
View File

@ -1,4 +1,4 @@
package com.muyu.master.mapper; package com.muyu.market.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.market.domian.Defined; import com.muyu.market.domian.Defined;

2
cloud-market-server/src/main/java/com/muyu/master/mapper/LogsMapper.java → cloud-market-server/src/main/java/com/muyu/market/mapper/LogsMapper.java
View File

@ -1,4 +1,4 @@
package com.muyu.master.mapper; package com.muyu.market.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.market.domian.Logs; import com.muyu.market.domian.Logs;

2
cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java → cloud-market-server/src/main/java/com/muyu/market/service/DefinedService.java
View File

@ -1,4 +1,4 @@
package com.muyu.master.service; package com.muyu.market.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.market.domian.Defined; import com.muyu.market.domian.Defined;

2
cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java → cloud-market-server/src/main/java/com/muyu/market/service/LogsService.java
View File

@ -1,4 +1,4 @@
package com.muyu.master.service; package com.muyu.market.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.market.domian.Logs; import com.muyu.market.domian.Logs;

6
cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java → cloud-market-server/src/main/java/com/muyu/market/service/impl/DefinedServiceImpl.java
View File

@ -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.market.domian.Defined; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java → cloud-market-server/src/main/java/com/muyu/market/service/impl/LogsServiceImpl.java
View File

@ -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.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.market.domian.Logs; import com.muyu.market.domian.Logs;
import com.muyu.master.mapper.LogsMapper; import com.muyu.market.mapper.LogsMapper;
import com.muyu.master.service.LogsService; import com.muyu.market.service.LogsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
logs/cloud-pay/error.log
View File

@ -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:1363)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352) at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
at com.muyu.MuYuMarketApplication.main(MuYuMarketApplication.java:19) 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.checkCandidate(ClassPathBeanDefinitionScanner.java:361)
at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.doScan(ClassPathBeanDefinitionScanner.java:288) at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.doScan(ClassPathBeanDefinitionScanner.java:288)
at org.springframework.context.annotation.ComponentScanAnnotationParser.parse(ComponentScanAnnotationParser.java:128) at org.springframework.context.annotation.ComponentScanAnnotationParser.parse(ComponentScanAnnotationParser.java:128)