Skip to content

Commit 1ea10c6

Browse files
think-gemthink-gem
committed
优化及修复
1 parent c3cf6d6 commit 1ea10c6

34 files changed

+392
-427
lines changed

‎bin/refresh-db/cms/jeesite.erm

Lines changed: 271 additions & 271 deletions
Large diffs are not rendered by default.

‎bin/refresh-db/cms/jeesite_data.xls

0 Bytes
Binary file not shown.

‎bin/refresh-db/cms/jeesite_mssql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CREATE TABLE cms_article
5151
category_id bigint NOT NULL,
5252
title varchar(255) NOT NULL,
5353
color varchar(50),
54-
thumb varchar(255),
54+
image varchar(255),
5555
keywords varchar(255),
5656
description varchar(255),
5757
weight int DEFAULT 0,

‎bin/refresh-db/cms/jeesite_mysql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CREATE TABLE cms_article
5252
category_id bigint NOT NULL COMMENT '栏目编号',
5353
title varchar(255) NOT NULL COMMENT '标题',
5454
color varchar(50) COMMENT '标题颜色（red：红色；green：绿色；blue：蓝色；yellow：黄色；orange：橙色）',
55-
thumb varchar(255) COMMENT '缩略图',
55+
image varchar(255) COMMENT '文章图片',
5656
keywords varchar(255) COMMENT '关键字',
5757
description varchar(255) COMMENT '描述、摘要',
5858
weight int DEFAULT 0 COMMENT '权重，越大越靠前',

‎bin/refresh-db/cms/jeesite_oracle.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ CREATE TABLE cms_article
7575
category_id number(19,0) NOT NULL,
7676
title varchar2(255) NOT NULL,
7777
color varchar2(50),
78-
thumb varchar2(255),
78+
image varchar2(255),
7979
keywords varchar2(255),
8080
description varchar2(255),
8181
weight number(10,0) DEFAULT 0,
@@ -245,7 +245,7 @@ COMMENT ON COLUMN cms_article.id IS '编号';
245245
COMMENT ON COLUMN cms_article.category_id IS '栏目编号';
246246
COMMENT ON COLUMN cms_article.title IS '标题';
247247
COMMENT ON COLUMN cms_article.color IS '标题颜色（red：红色；green：绿色；blue：蓝色；yellow：黄色；orange：橙色）';
248-
COMMENT ON COLUMN cms_article.thumb IS '缩略图';
248+
COMMENT ON COLUMN cms_article.image IS '文章图片';
249249
COMMENT ON COLUMN cms_article.keywords IS '关键字';
250250
COMMENT ON COLUMN cms_article.description IS '描述、摘要';
251251
COMMENT ON COLUMN cms_article.weight IS '权重，越大越靠前';

‎src/main/java/com/thinkgem/jeesite/common/service/BaseService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.hibernate.criterion.Criterion;
1313
import org.hibernate.criterion.Junction;
1414
import org.hibernate.criterion.Restrictions;
15+
import org.slf4j.Logger;
16+
import org.slf4j.LoggerFactory;
1517

1618
import com.google.common.collect.Lists;
1719
import com.thinkgem.jeesite.modules.sys.entity.Role;
@@ -23,6 +25,11 @@
2325
* @version 2013-05-15
2426
*/
2527
public abstract class BaseService {
28+
29+
/**
30+
* 日志对象
31+
*/
32+
protected Logger logger = LoggerFactory.getLogger(getClass());
2633

2734
/**
2835
* 数据范围过滤

‎src/main/java/com/thinkgem/jeesite/common/web/BaseController.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import javax.validation.Validator;
1414

1515
import org.apache.commons.lang3.StringEscapeUtils;
16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
1618
import org.springframework.beans.factory.annotation.Autowired;
1719
import org.springframework.ui.Model;
1820
import org.springframework.web.bind.WebDataBinder;
@@ -29,6 +31,11 @@
2931
*/
3032
public abstract class BaseController {
3133

34+
/**
35+
* 日志对象
36+
*/
37+
protected Logger logger = LoggerFactory.getLogger(getClass());
38+
3239
/**
3340
* 验证Bean实例对象
3441
*/

‎src/main/java/com/thinkgem/jeesite/modules/cms/entity/Article.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class Article extends DataEntity {
5757
private Category category;// 分类编号
5858
private String title; // 标题
5959
private String color; // 标题颜色（red：红色；green：绿色；blue：蓝色；yellow：黄色；orange：橙色）
60-
private String thumb; // 缩略图
60+
private String image; // 文章图片
6161
private String keywords;// 关键字
6262
private String description;// 描述、摘要
6363
private Integer weight; // 权重，越大越靠前
@@ -127,12 +127,12 @@ public void setColor(String color) {
127127
}
128128

129129
@Length(min=0, max=255)
130-
public String getThumb() {
131-
return thumb;
130+
public String getImage() {
131+
return image;
132132
}
133133

134-
public void setThumb(String thumb) {
135-
this.thumb = thumb;
134+
public void setImage(String image) {
135+
this.image = image;
136136
}
137137

138138
@Length(min=0, max=255)

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/ArticleService.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import org.hibernate.criterion.DetachedCriteria;
2121
import org.hibernate.criterion.Order;
2222
import org.hibernate.criterion.Restrictions;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
2523
import org.springframework.beans.factory.annotation.Autowired;
2624
import org.springframework.stereotype.Service;
2725
import org.springframework.transaction.annotation.Transactional;
@@ -45,9 +43,6 @@
4543
@Service
4644
@Transactional(readOnly = true)
4745
public class ArticleService extends BaseService {
48-
49-
@SuppressWarnings("unused")
50-
private static Logger logger = LoggerFactory.getLogger(ArticleService.class);
5146

5247
@Autowired
5348
private ArticleDao articleDao;
@@ -82,8 +77,8 @@ public Page<Article> find(Page<Article> page, Article article, boolean isDataSco
8277
if (StringUtils.isNotEmpty(article.getPosid())){
8378
dc.add(Restrictions.like("posid", "%,"+article.getPosid()+",%"));
8479
}
85-
if (StringUtils.isNotEmpty(article.getThumb())&&"1".equals(article.getThumb())){
86-
dc.add(Restrictions.and(Restrictions.isNotNull("thumb"),Restrictions.ne("thumb","")));
80+
if (StringUtils.isNotEmpty(article.getImage())&&Article.YES.equals(article.getImage())){
81+
dc.add(Restrictions.and(Restrictions.isNotNull("image"),Restrictions.ne("image","")));
8782
}
8883
if (article.getCreateBy()!=null && article.getCreateBy().getId()>0){
8984
dc.add(Restrictions.eq("createBy.id", article.getCreateBy().getId()));

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/CategoryService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import org.hibernate.criterion.DetachedCriteria;
1212
import org.hibernate.criterion.Order;
1313
import org.hibernate.criterion.Restrictions;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1614
import org.springframework.beans.factory.annotation.Autowired;
1715
import org.springframework.stereotype.Service;
1816
import org.springframework.transaction.annotation.Transactional;
@@ -35,9 +33,6 @@
3533
@Service
3634
@Transactional(readOnly = true)
3735
public class CategoryService extends BaseService {
38-
39-
@SuppressWarnings("unused")
40-
private static Logger logger = LoggerFactory.getLogger(CategoryService.class);
4136

4237
public static final String CACHE_CATEGORY_LIST = "categoryList";
4338

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/CommentService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.hibernate.criterion.DetachedCriteria;
1010
import org.hibernate.criterion.Order;
1111
import org.hibernate.criterion.Restrictions;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.stereotype.Service;
1614
import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +26,6 @@
2826
@Service
2927
@Transactional(readOnly = true)
3028
public class CommentService extends BaseService {
31-
32-
@SuppressWarnings("unused")
33-
private static Logger logger = LoggerFactory.getLogger(CommentService.class);
3429

3530
@Autowired
3631
private CommentDao commentDao;

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/GuestbookService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.hibernate.criterion.DetachedCriteria;
1010
import org.hibernate.criterion.Order;
1111
import org.hibernate.criterion.Restrictions;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.stereotype.Service;
1614
import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +26,6 @@
2826
@Service
2927
@Transactional(readOnly = true)
3028
public class GuestbookService extends BaseService {
31-
32-
@SuppressWarnings("unused")
33-
private static Logger logger = LoggerFactory.getLogger(GuestbookService.class);
3429

3530
@Autowired
3631
private GuestbookDao guestbookDao;

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/LinkService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import org.hibernate.criterion.DetachedCriteria;
1313
import org.hibernate.criterion.Order;
1414
import org.hibernate.criterion.Restrictions;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
1715
import org.springframework.beans.factory.annotation.Autowired;
1816
import org.springframework.stereotype.Service;
1917
import org.springframework.transaction.annotation.Transactional;
@@ -39,9 +37,6 @@
3937
@Transactional(readOnly = true)
4038
public class LinkService extends BaseService {
4139

42-
@SuppressWarnings("unused")
43-
private static Logger logger = LoggerFactory.getLogger(LinkService.class);
44-
4540
@Autowired
4641
private LinkDao linkDao;
4742

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/SiteService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.apache.commons.lang3.StringUtils;
1010
import org.hibernate.criterion.DetachedCriteria;
1111
import org.hibernate.criterion.Restrictions;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.stereotype.Service;
1614
import org.springframework.transaction.annotation.Transactional;
@@ -29,9 +27,6 @@
2927
@Service
3028
@Transactional(readOnly = true)
3129
public class SiteService extends BaseService {
32-
33-
@SuppressWarnings("unused")
34-
private static Logger logger = LoggerFactory.getLogger(SiteService.class);
3530

3631
@Autowired
3732
private SiteDao siteDao;

‎src/main/java/com/thinkgem/jeesite/modules/cms/service/StatsService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.stereotype.Service;
1614
import org.springframework.transaction.annotation.Transactional;
@@ -33,9 +31,6 @@
3331
@Transactional(readOnly = true)
3432
public class StatsService extends BaseService {
3533

36-
@SuppressWarnings("unused")
37-
private static Logger logger = LoggerFactory.getLogger(StatsService.class);
38-
3934
@Autowired
4035
private ArticleDao articleDao;
4136

‎src/main/java/com/thinkgem/jeesite/modules/cms/utils/CmsUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static Article getArticle(long articleId){
125125
* @param number 获取数目
126126
* @param param 预留参数，例： key1:'value1', key2:'value2' ...
127127
* posid 推荐位（1：首页焦点图；2：栏目页文章推荐；）
128-
* thumb 缩略图（1：有缩略图的文章）
128+
* image 文章图片（1：有文章图片的文章）
129129
* @return
130130
*/
131131
public static List<Article> getArticleList(long siteId, long categoryId, int number, String param){
@@ -137,8 +137,8 @@ public static List<Article> getArticleList(long siteId, long categoryId, int num
137137
if (new Integer(1).equals(map.get("posid")) || new Integer(2).equals(map.get("posid"))){
138138
article.setPosid(String.valueOf(map.get("posid")));
139139
}
140-
if (new Integer(1).equals(map.get("thumb"))){
141-
article.setThumb("1");
140+
if (new Integer(1).equals(map.get("image"))){
141+
article.setImage(Article.YES);
142142
}
143143
}
144144
article.setDelFlag(Article.DEL_FLAG_NORMAL);

‎src/main/java/com/thinkgem/jeesite/modules/oa/service/LeaveModifyProcessor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,26 @@
77
import org.activiti.engine.delegate.TaskListener;
88
import org.activiti.engine.runtime.ProcessInstance;
99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.stereotype.Component;
10+
import org.springframework.stereotype.Service;
1111
import org.springframework.transaction.annotation.Transactional;
1212

1313
import com.thinkgem.jeesite.modules.oa.dao.LeaveDao;
1414
import com.thinkgem.jeesite.modules.oa.entity.Leave;
1515

1616
/**
1717
* 调整请假内容处理器
18-
*
1918
* @author liuj
2019
*/
21-
@Component
20+
@Service
2221
@Transactional
2322
public class LeaveModifyProcessor implements TaskListener {
2423

2524
private static final long serialVersionUID = 1L;
2625

2726
@Autowired
28-
LeaveDao leaveDao;
29-
27+
private LeaveDao leaveDao;
3028
@Autowired
31-
RuntimeService runtimeService;
29+
private RuntimeService runtimeService;
3230

3331
public void notify(DelegateTask delegateTask) {
3432
String processInstanceId = delegateTask.getProcessInstanceId();

‎src/main/java/com/thinkgem/jeesite/modules/oa/service/LeaveReportProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.activiti.engine.delegate.TaskListener;
88
import org.activiti.engine.runtime.ProcessInstance;
99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.stereotype.Component;
10+
import org.springframework.stereotype.Service;
1111
import org.springframework.transaction.annotation.Transactional;
1212

1313
import com.thinkgem.jeesite.modules.oa.dao.LeaveDao;
@@ -20,7 +20,7 @@
2020
*
2121
* @author liuj
2222
*/
23-
@Component
23+
@Service
2424
@Transactional
2525
public class LeaveReportProcessor implements TaskListener {
2626

‎src/main/java/com/thinkgem/jeesite/modules/oa/service/LeaveService.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
import org.hibernate.criterion.DetachedCriteria;
2121
import org.hibernate.criterion.Order;
2222
import org.hibernate.criterion.Restrictions;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
2523
import org.springframework.beans.factory.annotation.Autowired;
26-
import org.springframework.stereotype.Component;
24+
import org.springframework.stereotype.Service;
2725
import org.springframework.transaction.annotation.Transactional;
2826

2927
import com.google.common.collect.Lists;
@@ -40,12 +38,10 @@
4038
* @author liuj
4139
* @version 2013-04-05
4240
*/
43-
@Component
41+
@Service
4442
@Transactional(readOnly = true)
4543
public class LeaveService extends BaseService {
4644

47-
private static Logger logger = LoggerFactory.getLogger(LeaveService.class);
48-
4945
@Autowired
5046
private LeaveDao leaveDao;
5147
@Autowired

‎src/main/java/com/thinkgem/jeesite/modules/sys/service/AreaService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import java.util.List;
99

10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
1210
import org.springframework.beans.factory.annotation.Autowired;
1311
import org.springframework.stereotype.Service;
1412
import org.springframework.transaction.annotation.Transactional;
@@ -27,9 +25,6 @@
2725
@Transactional(readOnly = true)
2826
public class AreaService extends BaseService {
2927

30-
@SuppressWarnings("unused")
31-
private static Logger logger = LoggerFactory.getLogger(AreaService.class);
32-
3328
@Autowired
3429
private AreaDao areaDao;
3530

‎src/main/java/com/thinkgem/jeesite/modules/sys/service/DictService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import org.hibernate.criterion.DetachedCriteria;
1212
import org.hibernate.criterion.Order;
1313
import org.hibernate.criterion.Restrictions;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1614
import org.springframework.beans.factory.annotation.Autowired;
1715
import org.springframework.stereotype.Service;
1816
import org.springframework.transaction.annotation.Transactional;
@@ -33,9 +31,6 @@
3331
@Transactional(readOnly = true)
3432
public class DictService extends BaseService {
3533

36-
@SuppressWarnings("unused")
37-
private static Logger logger = LoggerFactory.getLogger(DictService.class);
38-
3934
@Autowired
4035
private DictDao dictDao;
4136

0 commit comments

Comments
 (0)