列表

# Conflicts:
#	cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java

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;

cloud-market-server/src/main/java/com/muyu/market/controller/LogsController.java

@@ -1,18 +1,16 @@
-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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-
 @Log4j2
 @RestController
 @RequestMapping("/logs")
@@ -28,7 +26,7 @@ public class LogsController {
      */
     @Operation(summary = "查询日志列表",description = "查询用户操作日志列表")
     @GetMapping("/list")
-    public Result<PageParam<Logs>> show(PageParam<Logs>page,String getLogsId){
+    public Result<PageParam<Logs>> show(PageParam<Logs>page){
         LambdaQueryWrapper<Logs> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Logs::getLogsId);//根据用户id查询
         PageParam<Logs> pageDTO=service.page(page,queryWrapper);
@@ -47,6 +45,7 @@ public class LogsController {
         return Result.success(null,"操作成功");
     }
 
+
     /**
      * 通过id查询信息
      * @param logsId

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;

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;

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;

cloud-market-server/src/main/java/com/muyu/market/service/LogsService.java

@@ -1,10 +1,8 @@
-package com.muyu.master.service;
+package com.muyu.market.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.market.domian.Logs;
 
-import java.util.List;
-
 
 public interface LogsService extends IService<Logs> {
 

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;

cloud-market-server/src/main/java/com/muyu/market/service/impl/LogsServiceImpl.java

@@ -1,16 +1,12 @@
-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;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 public class LogsServiceImpl
         extends ServiceImpl<LogsMapper, Logs>

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)