diff --git a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/BaseConfig.java b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/BaseConfig.java index c4e4016a84aaa9cfdae1236e8cd45b24ac50dbfd..ca3c48c32de3ccee879069f32784892dfd1204c5 100644 --- a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/BaseConfig.java +++ b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/BaseConfig.java @@ -27,7 +27,7 @@ public class BaseConfig { /** * repository 所在包 */ - public static final String REPOSITORY_PACKAGES = "com.muses.taoshop.repository"; + public static final String REPOSITORY_PACKAGES = "com.muses.taoshop.**.repository"; /** * mapper 所在包 @@ -37,37 +37,17 @@ public class BaseConfig { /** * 实体类 所在包 */ - public static final String ENTITY_PACKAGES = "com.muses.taoshop.dto"; - - /** - * JPA 实体管理器 - */ - public static final String ENTITY_MANAGER = "shopEntityManager"; - - /** - * JPA 实体管理器工厂 - */ - public static final String ENTITY_MANAGER_FACTORY = "shopEntityManagerFactory"; - - /** - * JPA 事务管理器 - */ - public static final String JPA_TRANSACTION_MANAGER = "shopJpaTransactionManager"; - - /** - * JPA 持久化单元 - */ - public static final String PERSISTENCE_UNIT = "shopPersistenceUnit"; + public static final String ENTITY_PACKAGES = "com.muses.taoshop.**.dto"; /** * Mybatis session 工厂 */ - public static final String SQL_SESSION_FACTORY = "shopSqlSessionFactory"; + public static final String SQL_SESSION_FACTORY = "sqlSessionFactory"; /** * Mybatis 事务管理器 */ - public static final String MYBATIS_TRANSACTION_MANAGER = "shopMybatisTransactionManager"; + public static final String MYBATIS_TRANSACTION_MANAGER = "mybatisTransactionManager"; /** * Jedis连接池 diff --git a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/DataSourceConfig.java b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/DataSourceConfig.java index 14f3b7a60799da48bbe396e98032f5b3b172e02d..8dd30c62491594073df78b154122045e83428408 100644 --- a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/DataSourceConfig.java +++ b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/DataSourceConfig.java @@ -7,7 +7,8 @@ import org.springframework.context.annotation.Configuration; import javax.sql.DataSource; -import static com.muses.taoshop.common.core.database.config.BaseConfig.*; +import static com.muses.taoshop.common.core.database.config.BaseConfig.DATA_SOURCE_NAME; +import static com.muses.taoshop.common.core.database.config.BaseConfig.DATA_SOURCE_PROPERTIES; /** diff --git a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java index 1ca8d65a100e01ba4641be3103b459137b4f4b7b..ab54d01367d23fd4d0731599992abe98a1463e12 100644 --- a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java +++ b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java @@ -4,19 +4,17 @@ import com.muses.taoshop.common.core.database.annotation.MybatisRepository; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; +import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.context.annotation.Profile; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.servlet.resource.PathResourceResolver; import javax.sql.DataSource; @@ -59,7 +57,9 @@ public class MybatisConfig { //factoryBean.setConfigLocation(new ClassPathResource("mybatis-config.xml")); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); try{ - factoryBean.setMapperLocations(resolver.getResources("classpath*:/mybatis/mapper/*Mapper.xml")); + factoryBean.setTypeAliasesPackage("com.muses.taoshop.**.dto"); + factoryBean.setVfs(SpringBootVFS.class); + factoryBean.setMapperLocations(resolver.getResources("classpath*:/mybatis/*Mapper.xml")); return factoryBean.getObject(); }catch (Exception e){ e.printStackTrace(); diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/Application.java similarity index 97% rename from src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java rename to src/taoshop-portal/src/main/java/com/muses/taoshop/Application.java index 488e13d6a0c6e5b2e0d02a3446d9c24552ffb81e..3e4e61239a4d66d2756eae2c5ed49a48e35552d3 100644 --- a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java +++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/Application.java @@ -1,4 +1,4 @@ -package com.muses.taoshop.portal; +package com.muses.taoshop; diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/config/WebConfig.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/config/WebConfig.java similarity index 94% rename from src/taoshop-portal/src/main/java/com/muses/taoshop/portal/config/WebConfig.java rename to src/taoshop-portal/src/main/java/com/muses/taoshop/config/WebConfig.java index edc5ac3a5172f93130e811da5971b3f0c457337b..d263a019344dde6094e5c59aae8d0036a39c692d 100644 --- a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/config/WebConfig.java +++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.muses.taoshop.portal.config; +package com.muses.taoshop.config; import org.springframework.context.annotation.Configuration; import org.springframework.util.ResourceUtils; diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/web/controller/IndexController.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/web/controller/IndexController.java deleted file mode 100644 index d17ef56915fe1f9a35e9e62156e99eefe95bcb8e..0000000000000000000000000000000000000000 --- a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/web/controller/IndexController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muses.taoshop.portal.web.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * 
- *  控制类
- *
- * - * @author nicky - * @version 1.00.00 - * 
- * 修改记录
- *    修改后版本:     修改人：  修改日期:     修改内容:
- *
- */ -@Controller -@RequestMapping("/portal") -public class IndexController { - - //@RequestMapping(value = "/toIndex" ,method = RequestMethod.GET) - @GetMapping(value = "/toIndex.do") - public String toIndex(){ - return "/index"; - } - - public String test(){ - - return ""; - } - -} diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/IndexController.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/IndexController.java new file mode 100644 index 0000000000000000000000000000000000000000..f4f26eea0b4a62374e5f7f7c0d299d955e13971c --- /dev/null +++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/IndexController.java @@ -0,0 +1,51 @@ +package com.muses.taoshop.web.controller; + +import com.alibaba.fastjson.JSON; +import com.muses.taoshop.item.dto.ItemBrand; +import com.muses.taoshop.item.service.IItemBrankService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 
+ *  控制类
+ *
+ * + * @author nicky + * @version 1.00.00 + * 
+ * 修改记录
+ *    修改后版本:     修改人：  修改日期:     修改内容:
+ *
+ */ +@Controller +@RequestMapping("/portal") +public class IndexController { + + @Autowired + IItemBrankService iItemBrankService; + + //@RequestMapping(value = "/toIndex" ,method = RequestMethod.GET) + @GetMapping(value = "/toIndex.do") + public String toIndex(){ + return "/index"; + } + + public String test(){ + + return ""; + } + + @GetMapping(value = "/doTest") + @ResponseBody + public String doTest(){ + List itemBrands = iItemBrankService.listItemBrand(); + String str = JSON.toJSON(itemBrands).toString(); + return str; + } + +} diff --git a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemBrankService.java b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemBrankService.java index 77dceafbb3988a72b9051b642695ff60ff7bad46..6ce64bc40096ab64ec305a4c38b0ab3d34dd9c5d 100644 --- a/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemBrankService.java +++ b/src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemBrankService.java @@ -1,5 +1,9 @@ package com.muses.taoshop.item.service; +import com.muses.taoshop.item.dto.ItemBrand; + +import java.util.List; + /** * 
  *  TODO 类说明
@@ -13,4 +17,5 @@ package com.muses.taoshop.item.service;
  *
*/ public interface IItemBrankService { + List listItemBrand(); } diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandRepository.java b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandMapper.java similarity index 87% rename from src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandRepository.java rename to src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandMapper.java index 0b8e263061726ac3d9b1db9b72d0535898d94532..1b3f17d94357a72f09f0e53826a5c93354ef6e0d 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandRepository.java +++ b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemBrandMapper.java @@ -4,8 +4,10 @@ import com.muses.taoshop.common.core.database.annotation.MybatisRepository; import com.muses.taoshop.item.dto.ItemBrand; +import java.util.List; + @MybatisRepository -public interface ItemBrandRepository { +public interface ItemBrandMapper { int deleteByPrimaryKey(Long id); @@ -22,4 +24,6 @@ public interface ItemBrandRepository { int updateByPrimaryKeySelective(ItemBrand record); int updateByPrimaryKey(ItemBrand record); + + List listItemBrand(); } \ No newline at end of file diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryRepository.java b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java similarity index 94% rename from src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryRepository.java rename to src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java index b9dc9351e2f319fb46d8e58798538aaaa406f748..3d2938e442dbd05d263fe1b62aaa85c6e53fb40b 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryRepository.java +++ b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java @@ -4,7 +4,7 @@ import com.muses.taoshop.common.core.database.annotation.MybatisRepository; import com.muses.taoshop.item.dto.ItemCategory; @MybatisRepository -public interface ItemCategoryRepository { +public interface ItemCategoryMapper { int deleteByPrimaryKey(Long id); diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemBrankServiceImpl.java b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemBrankServiceImpl.java index 2d6111e75a33b3e3ba5543f0bec20863eb972463..8bbbd227ec407aaea82755fc39e1784a64d14e5e 100644 --- a/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemBrankServiceImpl.java +++ b/src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemBrankServiceImpl.java @@ -1,7 +1,12 @@ package com.muses.taoshop.item.service; +import com.muses.taoshop.item.dto.ItemBrand; +import com.muses.taoshop.item.mapper.ItemBrandMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 
  *  TODO 类说明
@@ -17,6 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ItemBrankServiceImpl implements IItemBrankService{
 
+    @Autowired
+    ItemBrandMapper itemBrandMapper;
+
+    @Override
+    public List listItemBrand() {
+        return itemBrandMapper.listItemBrand();
+    }
+
 
 
 }
diff --git a/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemBrandMapper.xml b/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemBrandMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef957146deb73f716d995e0ee618da922355f639
--- /dev/null
+++ b/src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemBrandMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+  
+    
+    
+    
+    
+  
+
+  
+
+
\ No newline at end of file