diff --git a/pom.xml b/pom.xml index a412b63af..8e6360e3e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 3.8.1 jlt-private-farm - 私家农场管理系统 + 私家农场管理系统(CSA,社区支持农业) 1.0.0 @@ -201,7 +201,7 @@ - com.jlt.farming + com.jlt private-farm ${private-farm.version} diff --git a/private-farm/pom.xml b/private-farm/pom.xml index 54c362aba..6e3d8e6d2 100644 --- a/private-farm/pom.xml +++ b/private-farm/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - com.jlt.farming + com.jlt private-farm 1.0.0 私家农场(社区支持农业)管理系统 diff --git a/private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java b/private-farm/src/main/java/com/jlt/crm/controller/VisitorController.java similarity index 96% rename from private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java rename to private-farm/src/main/java/com/jlt/crm/controller/VisitorController.java index 56fb46891..85619ec34 100644 --- a/private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java +++ b/private-farm/src/main/java/com/jlt/crm/controller/VisitorController.java @@ -1,10 +1,10 @@ -package com.jlt.farming.crm.controller; +package com.jlt.crm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.jlt.farming.crm.domain.Visitor; -import com.jlt.farming.crm.service.IVisitorService; +import com.jlt.crm.domain.Visitor; +import com.jlt.crm.service.IVisitorService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java b/private-farm/src/main/java/com/jlt/crm/domain/Visitor.java similarity index 98% rename from private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java rename to private-farm/src/main/java/com/jlt/crm/domain/Visitor.java index e6f8a8721..f356233b3 100644 --- a/private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java +++ b/private-farm/src/main/java/com/jlt/crm/domain/Visitor.java @@ -1,4 +1,4 @@ -package com.jlt.farming.crm.domain; +package com.jlt.crm.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java b/private-farm/src/main/java/com/jlt/crm/mapper/VisitorMapper.java similarity index 93% rename from private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java rename to private-farm/src/main/java/com/jlt/crm/mapper/VisitorMapper.java index 8bb969fdc..6ac72617a 100644 --- a/private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java +++ b/private-farm/src/main/java/com/jlt/crm/mapper/VisitorMapper.java @@ -1,7 +1,7 @@ -package com.jlt.farming.crm.mapper; +package com.jlt.crm.mapper; import java.util.List; -import com.jlt.farming.crm.domain.Visitor; +import com.jlt.crm.domain.Visitor; /** * 访客信息Mapper接口 diff --git a/private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java b/private-farm/src/main/java/com/jlt/crm/service/IVisitorService.java similarity index 93% rename from private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java rename to private-farm/src/main/java/com/jlt/crm/service/IVisitorService.java index 0bbe698d5..ddca5e407 100644 --- a/private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java +++ b/private-farm/src/main/java/com/jlt/crm/service/IVisitorService.java @@ -1,7 +1,8 @@ -package com.jlt.farming.crm.service; +package com.jlt.crm.service; import java.util.List; -import com.jlt.farming.crm.domain.Visitor; + +import com.jlt.crm.domain.Visitor; /** * 访客信息Service接口 diff --git a/private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java b/private-farm/src/main/java/com/jlt/crm/service/impl/VisitorServiceImpl.java similarity index 89% rename from private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java rename to private-farm/src/main/java/com/jlt/crm/service/impl/VisitorServiceImpl.java index a0bd9d947..854264ecd 100644 --- a/private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java +++ b/private-farm/src/main/java/com/jlt/crm/service/impl/VisitorServiceImpl.java @@ -1,10 +1,9 @@ -package com.jlt.farming.crm.service.impl; +package com.jlt.crm.service.impl; import java.util.List; -import com.jlt.farming.crm.domain.Visitor; -import com.jlt.farming.crm.mapper.VisitorMapper; -import com.jlt.farming.crm.service.IVisitorService; +import com.jlt.crm.domain.Visitor; +import com.jlt.crm.service.IVisitorService; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Service; public class VisitorServiceImpl implements IVisitorService { @Autowired - private VisitorMapper VisitorMapper; + private com.jlt.crm.mapper.VisitorMapper VisitorMapper; /** * 查询访客信息 diff --git a/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml b/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml index bc18c3152..d480a3332 100644 --- a/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml +++ b/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 53da51b2c..bb6aa4945 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -62,7 +62,7 @@ - com.jlt.farming + com.jlt private-farm diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 2e31c797f..514071cc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -4,21 +4,19 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; /** * 启动程序 - * + * * @author ruoyi */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -@ComponentScan({"com.ruoyi", "com.jlt.farming"}) -@MapperScan({"com.jlt.farming.**.mapper"}) -public class RuoYiApplication -{ - public static void main(String[] args) - { - // System.setProperty("spring.devtools.restart.enabled", "false"); +@SpringBootApplication( + exclude = {DataSourceAutoConfiguration.class}, + scanBasePackages = {"com.ruoyi", "com.jlt"}) +@MapperScan({"com.jlt.**.mapper"}) +public class RuoYiApplication { + public static void main(String[] args) { + System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 6358e5ab9..e5434a508 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/private-farm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/csa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 # 从库数据源