Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
smileNicky
taoshop
提交
daf209da
T
taoshop
项目概览
smileNicky
/
taoshop
通知
4
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
2
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
T
taoshop
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
daf209da
编写于
6月 18, 2018
作者:
N
Nicky
提交者:
u014427391
6月 18, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug#springboot扫描不到通配符表示的typeAliasesPackage名称,mybatis默认typeAliasesPackage是不支持正则扫描package
上级
2b255ccc
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
39 addition
and
137 deletion
+39
-137
src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java
...es/taoshop/common/core/database/config/MybatisConfig.java
+6
-7
src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java
...java/com/muses/taoshop/web/controller/BaseController.java
+17
-13
src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java
.../muses/taoshop/web/controller/portal/IndexController.java
+2
-7
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java
...main/java/com/muses/taoshop/item/entity/ItemCategory.java
+5
-0
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java
...va/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java
+0
-86
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java
...java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java
+0
-16
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java
.../com/muses/taoshop/item/service/IItemCategoryService.java
+1
-2
src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java
...ava/com/muses/taoshop/item/mapper/ItemCategoryMapper.java
+1
-2
src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java
...m/muses/taoshop/item/service/ItemCategoryServiceImpl.java
+1
-2
src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml
...er-item/src/main/resources/mybatis/ItemCategoryMapper.xml
+6
-2
未找到文件。
src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/database/config/MybatisConfig.java
浏览文件 @
daf209da
...
...
@@ -58,10 +58,10 @@ import static com.muses.taoshop.common.core.database.config.BaseConfig.*;
)
@EnableTransactionManagement
@Configuration
@ConditionalOnClass
({
SqlSessionFactory
.
class
,
SqlSessionFactoryBean
.
class
})
@ConditionalOnBean
(
DataSource
.
class
)
@EnableConfigurationProperties
(
MybatisProperties
.
class
)
@AutoConfigureAfter
(
DataSourceAutoConfiguration
.
class
)
//
@ConditionalOnClass({ SqlSessionFactory.class, SqlSessionFactoryBean.class })
//
@ConditionalOnBean(DataSource.class)
//
@EnableConfigurationProperties(MybatisProperties.class)
//
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
public
class
MybatisConfig
{
@Bean
(
name
=
DATA_SOURCE_NAME
)
...
...
@@ -81,7 +81,6 @@ public class MybatisConfig {
//factoryBean.setConfigLocation(new ClassPathResource("mybatis-config.xml"));
ResourcePatternResolver
resolver
=
new
PathMatchingResourcePatternResolver
();
try
{
//factoryBean.setVfs(SpringBootVFS.class);
factoryBean
.
setMapperLocations
(
resolver
.
getResources
(
"classpath*:/mybatis/*Mapper.xml"
));
//factoryBean.setVfs(SpringBootVFS.class);
String
typeAliasesPackage
=
setTypeAliasesPackage
(
ENTITY_PACKAGES
);
...
...
@@ -118,7 +117,7 @@ public class MybatisConfig {
metadataReader
=
metadataReaderFactory
.
getMetadataReader
(
resource
);
try
{
//
System.out.println(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
//
System.out.println(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
result
.
add
(
Class
.
forName
(
metadataReader
.
getClassMetadata
()
...
...
@@ -135,7 +134,7 @@ public class MybatisConfig {
result
.
clear
();
result
.
addAll
(
h
);
typeAliasesPackage
=
String
.
join
(
","
,(
String
[])
result
.
toArray
(
new
String
[
0
]));
System
.
out
.
println
(
typeAliasesPackage
);
//
System.out.println(typeAliasesPackage);
}
else
{
throw
new
RuntimeException
(
"mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:"
...
...
src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/BaseController.java
浏览文件 @
daf209da
package
com.muses.taoshop.web.controller
;
import
org.apache.log4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* <pre>
*
TODO 类说明
*
基础控制类
* </pre>
*
* @author nicky
...
...
@@ -17,16 +17,20 @@ import org.slf4j.LoggerFactory;
*/
public
class
BaseController
{
public
Logger
log
=
null
;
/**
* 获取日志对象
* @return
*/
public
Logger
getInstance
(){
if
(
log
==
null
){
log
=
(
Logger
)
LoggerFactory
.
getLogger
(
BaseController
.
class
);
}
return
log
;
public
Logger
log
=
Logger
.
getLogger
(
getClass
());
public
void
debug
(
String
message
,
Exception
e
){
log
.
debug
(
message
,
e
);
}
public
void
info
(
String
message
,
Exception
e
){
log
.
info
(
message
,
e
);
}
public
void
error
(
String
message
,
Exception
e
){
log
.
error
(
message
,
e
);
}
}
src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/IndexController.java
浏览文件 @
daf209da
...
...
@@ -3,18 +3,14 @@ package com.muses.taoshop.web.controller.portal;
import
com.alibaba.fastjson.JSON
;
import
com.muses.taoshop.item.entity.ItemBrand
;
import
com.muses.taoshop.item.entity.ItemCategory
;
import
com.muses.taoshop.item.entity.dto.ItemCategoryDTO
;
import
com.muses.taoshop.item.service.IItemBrankService
;
import
com.muses.taoshop.item.service.IItemCategoryService
;
import
com.muses.taoshop.web.controller.BaseController
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
/**
...
...
@@ -60,12 +56,11 @@ public class IndexController extends BaseController{
@GetMapping
(
value
=
"/listRootCategory"
)
@ResponseBody
public
String
listRootCategory
(){
List
<
ItemCategoryDTO
>
categories
=
new
ArrayList
<
ItemCategoryDTO
>();
categories
=
iItemCategoryService
.
listCategory
();
List
<
ItemCategory
>
categories
=
iItemCategoryService
.
listCategory
();
String
jsonString
=
""
;
if
(!
CollectionUtils
.
isEmpty
(
categories
)){
jsonString
=
JSON
.
toJSON
(
categories
).
toString
();
//log.debug("商品品类信息json数据
:"+jsonString);
log
.
debug
(
"get root category info
:"
+
jsonString
);
return
jsonString
;
}
return
jsonString
;
...
...
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/ItemCategory.java
浏览文件 @
daf209da
package
com.muses.taoshop.item.entity
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -33,11 +36,13 @@ public class ItemCategory {
/**
* 上次修改时间
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
lastModifyTime
;
/**
* 创建时间
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
createTime
;
/**
...
...
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/dto/ItemCategoryDTO.java
已删除
100644 → 0
浏览文件 @
2b255ccc
package
com.muses.taoshop.item.entity.dto
;
import
com.muses.taoshop.item.entity.ItemCategory
;
import
java.util.Date
;
import
java.util.List
;
/**
* <pre>
* 商品品类
* </pre>
* @author nicky
* @version 1.00.00
* <pre>
* 修改记录
* 修改后版本: 修改人: 修改日期: 2018.06.09 21:49 修改内容:
* </pre>
*/
public
class
ItemCategoryDTO
{
/**
* 商品品类id
*/
private
Long
id
;
/**
* 商品品类名称
*/
private
String
categoryName
;
/**
* 上级id
*/
private
Long
sjid
;
/**
* 上次修改时间
*/
private
Date
lastModifyTime
;
/**
* 创建时间
*/
private
Date
createTime
;
public
Long
getId
()
{
return
id
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
String
getCategoryName
()
{
return
categoryName
;
}
public
void
setCategoryName
(
String
categoryName
)
{
this
.
categoryName
=
categoryName
==
null
?
null
:
categoryName
.
trim
();
}
public
Long
getSjid
()
{
return
sjid
;
}
public
void
setSjid
(
Long
sjid
)
{
this
.
sjid
=
sjid
;
}
public
Date
getLastModifyTime
()
{
return
lastModifyTime
;
}
public
void
setLastModifyTime
(
Date
lastModifyTime
)
{
this
.
lastModifyTime
=
lastModifyTime
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
}
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/entity/vo/ItemCategoryVO.java
已删除
100644 → 0
浏览文件 @
2b255ccc
package
com.muses.taoshop.item.entity.vo
;
/**
* <pre>
* TODO 类说明
* </pre>
*
* @author nicky
* @version 1.00.00
* <pre>
* 修改记录
* 修改后版本: 修改人: 修改日期: 2018.06.18 00:06 修改内容:
* </pre>
*/
public
class
ItemCategoryVO
{
}
src/taoshop-provider-api/taoshop-provider-api-item/src/main/java/com/muses/taoshop/item/service/IItemCategoryService.java
浏览文件 @
daf209da
package
com.muses.taoshop.item.service
;
import
com.muses.taoshop.item.entity.ItemCategory
;
import
com.muses.taoshop.item.entity.dto.ItemCategoryDTO
;
import
java.util.List
;
...
...
@@ -22,5 +21,5 @@ public interface IItemCategoryService {
* 查询根级商品品类信息
* @return
*/
List
<
ItemCategory
DTO
>
listCategory
();
List
<
ItemCategory
>
listCategory
();
}
src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/mapper/ItemCategoryMapper.java
浏览文件 @
daf209da
...
...
@@ -2,13 +2,12 @@ package com.muses.taoshop.item.mapper;
import
com.muses.taoshop.common.core.database.annotation.MybatisRepository
;
import
com.muses.taoshop.item.entity.ItemCategory
;
import
com.muses.taoshop.item.entity.dto.ItemCategoryDTO
;
import
java.util.List
;
@MybatisRepository
public
interface
ItemCategoryMapper
{
List
<
ItemCategory
DTO
>
listRootCategory
();
List
<
ItemCategory
>
listRootCategory
();
}
\ No newline at end of file
src/taoshop-provider/taoshop-provider-item/src/main/java/com/muses/taoshop/item/service/ItemCategoryServiceImpl.java
浏览文件 @
daf209da
package
com.muses.taoshop.item.service
;
import
com.muses.taoshop.item.entity.ItemCategory
;
import
com.muses.taoshop.item.entity.dto.ItemCategoryDTO
;
import
com.muses.taoshop.item.mapper.ItemCategoryMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -32,7 +31,7 @@ public class ItemCategoryServiceImpl implements IItemCategoryService{
* @return
*/
@Override
public
List
<
ItemCategory
DTO
>
listCategory
()
{
public
List
<
ItemCategory
>
listCategory
()
{
return
itemCategoryMapper
.
listRootCategory
();
}
}
src/taoshop-provider/taoshop-provider-item/src/main/resources/mybatis/ItemCategoryMapper.xml
浏览文件 @
daf209da
...
...
@@ -10,10 +10,14 @@
</resultMap>
<sql
id=
"BaseColumnList"
>
id, category_name, sjid, last_modify_time, create_time
id,
category_name as categoryName,
sjid,
last_modify_time as lastModifyTime,
create_time as createTime
</sql>
<!-- 获取所有的根据品类信息-->
<select
id=
"listRootCategory"
resultType=
"ItemCategory"
>
<select
id=
"listRootCategory"
resultType=
"ItemCategory"
>
SELECT
<include
refid=
"BaseColumnList"
/>
FROM item_category t
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录