Skip to content

Commit 3e330ec

Browse files
shuzhengshuzheng
committed
按照Alibaba Java Coding Guidelines插件扫描结果，修改代码规范
1 parent ad725a4 commit 3e330ec

File tree

140 files changed

+841
-569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+841
-569
lines changed

‎zheng-api/zheng-api-common/src/main/java/com/zheng/api/common/constant/ApiResultConstant.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
*/
77
public enum ApiResultConstant {
88

9+
/**
10+
* 成功
11+
*/
912
SUCCESS(1, "success");
1013

1114
public int code;

‎zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
*/
77
public interface ApiService {
88

9+
/**
10+
* hello
11+
* @param name
12+
* @return
13+
*/
914
String hello(String name);
1015

1116
}

‎zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiServiceMock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
*/
1010
public class ApiServiceMock implements ApiService {
1111

12-
private static Logger _log = LoggerFactory.getLogger(ApiServiceMock.class);
12+
private static final Logger LOGGER = LoggerFactory.getLogger(ApiServiceMock.class);
1313

1414
@Override
1515
public String hello(String name) {
16-
_log.info("ApiServiceMock => hello");
16+
LOGGER.info("ApiServiceMock => hello");
1717
return null;
1818
}
1919

‎zheng-api/zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/ZhengApiRpcServiceApplication.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
*/
1111
public class ZhengApiRpcServiceApplication {
1212

13-
private static Logger _log = LoggerFactory.getLogger(ZhengApiRpcServiceApplication.class);
14-
15-
public static void main(String[] args) {
16-
_log.info(">>>>> zheng-api-rpc-service 正在启动 <<<<<");
17-
new ClassPathXmlApplicationContext("classpath:META-INF/spring/*.xml");
18-
_log.info(">>>>> zheng-api-rpc-service 启动完成 <<<<<");
19-
}
13+
private static final Logger LOGGER = LoggerFactory.getLogger(ZhengApiRpcServiceApplication.class);
2014

15+
public static void main(String[] args) {
16+
LOGGER.info(">>>>> zheng-api-rpc-service 正在启动 <<<<<");
17+
new ClassPathXmlApplicationContext("classpath:META-INF/spring/*.xml");
18+
LOGGER.info(">>>>> zheng-api-rpc-service 启动完成 <<<<<");
19+
}
2120
}

‎zheng-api/zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/service/impl/ApiServiceImpl.java

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
11
package com.zheng.api.rpc.service.impl;
22

33
import com.zheng.api.rpc.api.ApiService;
4-
import com.zheng.cms.rpc.api.*;
5-
import com.zheng.upms.rpc.api.*;
64
import org.slf4j.Logger;
75
import org.slf4j.LoggerFactory;
8-
import org.springframework.beans.factory.annotation.Autowired;
96

107
/**
118
* 实现ApiService接口
129
* Created by shuzheng on 2017/2/19.
1310
*/
1411
public class ApiServiceImpl implements ApiService {
1512

16-
private static Logger _log = LoggerFactory.getLogger(ApiServiceImpl.class);
13+
private static final Logger LOGGER = LoggerFactory.getLogger(ApiServiceImpl.class);
1714

18-
// @Autowired
19-
// private UpmsSystemService upmsSystemService;
20-
//
21-
// @Autowired
22-
// private UpmsOrganizationService upmsOrganizationService;
23-
//
24-
// @Autowired
25-
// private UpmsUserService upmsUserService;
26-
//
27-
// @Autowired
28-
// private UpmsRoleService upmsRoleService;
29-
//
30-
// @Autowired
31-
// private UpmsPermissionService upmsPermissionService;
32-
//
33-
// @Autowired
34-
// private UpmsApiService upmsApiService;
35-
//
36-
// @Autowired
37-
// private CmsArticleService cmsArticleService;
38-
//
39-
// @Autowired
40-
// private CmsCategoryService cmsCategoryService;
41-
//
42-
// @Autowired
43-
// private CmsCommentService cmsCommentService;
44-
//
45-
// @Autowired
46-
// private CmsTagService cmsTagService;
47-
//
4815
@Override
4916
public String hello(String name) {
5017
return "hello," + name + "!";

‎zheng-api/zheng-api-server/src/main/java/com/zheng/api/server/controller/TestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@Api(value = "test", description = "test")
2222
public class TestController extends BaseController {
2323

24-
private static Logger _log = LoggerFactory.getLogger(TestController.class);
24+
private static final Logger LOGGER = LoggerFactory.getLogger(TestController.class);
2525

2626
@Autowired
2727
private ApiService apiService;

‎zheng-api/zheng-api-server/src/main/java/com/zheng/api/server/jms/DefaultMessageQueueListener.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@
1515
*/
1616
public class DefaultMessageQueueListener implements MessageListener {
1717

18-
private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
18+
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
1919

20-
@Autowired
21-
ThreadPoolTaskExecutor threadPoolTaskExecutor;
20+
@Autowired
21+
ThreadPoolTaskExecutor threadPoolTaskExecutor;
2222

23-
public void onMessage(final Message message) {
24-
// 使用线程池多线程处理
25-
threadPoolTaskExecutor.execute(new Runnable() {
26-
public void run() {
27-
if (message instanceof TextMessage) {
28-
TextMessage textMessage = (TextMessage) message;
29-
try {
30-
_log.info("消费：{}", textMessage.getText());
31-
} catch (Exception e){
32-
e.printStackTrace();
33-
}
34-
}
35-
}
36-
});
37-
}
23+
@Override
24+
public void onMessage(final Message message) {
25+
// 使用线程池多线程处理
26+
threadPoolTaskExecutor.execute(new Runnable() {
27+
@Override
28+
public void run() {
29+
if (message instanceof TextMessage) {
30+
TextMessage textMessage = (TextMessage) message;
31+
try {
32+
LOGGER.info("消费：{}", textMessage.getText());
33+
} catch (Exception e) {
34+
e.printStackTrace();
35+
}
36+
}
37+
}
38+
});
39+
}
3840

3941
}

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@Api(value = "后台控制器", description = "后台管理")
1919
public class ManageController extends BaseController {
2020

21-
private static Logger _log = LoggerFactory.getLogger(ManageController.class);
21+
private static final Logger LOGGER = LoggerFactory.getLogger(ManageController.class);
2222

2323
/**
2424
* 后台首页

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@RequestMapping("/manage/article")
3838
public class CmsArticleController extends BaseController {
3939

40-
private static Logger _log = LoggerFactory.getLogger(CmsArticleController.class);
40+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsArticleController.class);
4141

4242
@Autowired
4343
private CmsArticleService cmsArticleService;
@@ -67,7 +67,7 @@ public Object list(
6767
}
6868
List<CmsArticle> rows = cmsArticleService.selectByExampleForOffsetPage(cmsArticleExample, offset, limit);
6969
long total = cmsArticleService.countByExample(cmsArticleExample);
70-
Map<String, Object> result = new HashMap<>();
70+
Map<String, Object> result = new HashMap<>(2);
7171
result.put("rows", rows);
7272
result.put("total", total);
7373
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@RequestMapping("/manage/category")
3535
public class CmsCategoryController extends BaseController {
3636

37-
private static Logger _log = LoggerFactory.getLogger(CmsCategoryController.class);
37+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsCategoryController.class);
3838

3939
@Autowired
4040
private CmsCategoryService cmsCategoryService;
@@ -61,7 +61,7 @@ public Object list(
6161
}
6262
List<CmsCategory> rows = cmsCategoryService.selectByExampleForOffsetPage(cmsCategoryExample, offset, limit);
6363
long total = cmsCategoryService.countByExample(cmsCategoryExample);
64-
Map<String, Object> result = new HashMap<>();
64+
Map<String, Object> result = new HashMap<>(2);
6565
result.put("rows", rows);
6666
result.put("total", total);
6767
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@RequestMapping("/manage/comment")
3131
public class CmsCommentController extends BaseController {
3232

33-
private static Logger _log = LoggerFactory.getLogger(CmsCommentController.class);
33+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsCommentController.class);
3434

3535
@Autowired
3636
private CmsCommentService cmsCommentService;
@@ -57,7 +57,7 @@ public Object list(
5757
}
5858
List<CmsComment> rows = cmsCommentService.selectByExampleWithBLOBsForOffsetPage(cmsCommentExample, offset, limit);
5959
long total = cmsCommentService.countByExample(cmsCommentExample);
60-
Map<String, Object> result = new HashMap<>();
60+
Map<String, Object> result = new HashMap<>(2);
6161
result.put("rows", rows);
6262
result.put("total", total);
6363
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsMenuController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@RequestMapping("/manage/menu")
3535
public class CmsMenuController extends BaseController {
3636

37-
private static Logger _log = LoggerFactory.getLogger(CmsMenuController.class);
37+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsMenuController.class);
3838

3939
@Autowired
4040
private CmsMenuService cmsMenuService;
@@ -61,7 +61,7 @@ public Object list(
6161
}
6262
List<CmsMenu> rows = cmsMenuService.selectByExampleForOffsetPage(cmsMenuExample, offset, limit);
6363
long total = cmsMenuService.countByExample(cmsMenuExample);
64-
Map<String, Object> result = new HashMap<>();
64+
Map<String, Object> result = new HashMap<>(2);
6565
result.put("rows", rows);
6666
result.put("total", total);
6767
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsPageController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@RequestMapping("/manage/page")
3535
public class CmsPageController extends BaseController {
3636

37-
private static Logger _log = LoggerFactory.getLogger(CmsPageController.class);
37+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsPageController.class);
3838

3939
@Autowired
4040
private CmsPageService cmsPageService;
@@ -61,7 +61,7 @@ public Object list(
6161
}
6262
List<CmsPage> rows = cmsPageService.selectByExampleForOffsetPage(cmsPageExample, offset, limit);
6363
long total = cmsPageService.countByExample(cmsPageExample);
64-
Map<String, Object> result = new HashMap<>();
64+
Map<String, Object> result = new HashMap<>(2);
6565
result.put("rows", rows);
6666
result.put("total", total);
6767
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsSettingController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@RequestMapping("/manage/setting")
3636
public class CmsSettingController extends BaseController {
3737

38-
private static Logger _log = LoggerFactory.getLogger(CmsSettingController.class);
38+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsSettingController.class);
3939

4040
@Autowired
4141
private CmsSettingService cmsSettingService;
@@ -62,7 +62,7 @@ public Object list(
6262
}
6363
List<CmsSetting> rows = cmsSettingService.selectByExampleForOffsetPage(cmsSettingExample, offset, limit);
6464
long total = cmsSettingService.countByExample(cmsSettingExample);
65-
Map<String, Object> result = new HashMap<>();
65+
Map<String, Object> result = new HashMap<>(2);
6666
result.put("rows", rows);
6767
result.put("total", total);
6868
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@RequestMapping("/manage/tag")
3535
public class CmsTagController extends BaseController {
3636

37-
private static Logger _log = LoggerFactory.getLogger(CmsTagController.class);
37+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsTagController.class);
3838

3939
@Autowired
4040
private CmsTagService cmsTagService;
@@ -61,7 +61,7 @@ public Object list(
6161
}
6262
List<CmsTag> rows = cmsTagService.selectByExampleForOffsetPage(cmsTagExample, offset, limit);
6363
long total = cmsTagService.countByExample(cmsTagExample);
64-
Map<String, Object> result = new HashMap<>();
64+
Map<String, Object> result = new HashMap<>(2);
6565
result.put("rows", rows);
6666
result.put("total", total);
6767
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTopicController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@RequestMapping("/manage/topic")
3535
public class CmsTopicController extends BaseController {
3636

37-
private static Logger _log = LoggerFactory.getLogger(CmsTopicController.class);
37+
private static final Logger LOGGER = LoggerFactory.getLogger(CmsTopicController.class);
3838

3939
@Autowired
4040
private CmsTopicService cmsTopicService;
@@ -61,7 +61,7 @@ public Object list(
6161
}
6262
List<CmsTopic> rows = cmsTopicService.selectByExampleForOffsetPage(cmsTopicExample, offset, limit);
6363
long total = cmsTopicService.countByExample(cmsTopicExample);
64-
Map<String, Object> result = new HashMap<>();
64+
Map<String, Object> result = new HashMap<>(2);
6565
result.put("rows", rows);
6666
result.put("total", total);
6767
return result;

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/Interceptor/ManageInterceptor.java renamed to ‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/interceptor/ManageInterceptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.zheng.cms.admin.Interceptor;
1+
package com.zheng.cms.admin.interceptor;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
1414
*/
1515
public class ManageInterceptor extends HandlerInterceptorAdapter {
1616

17-
private static Logger _log = LoggerFactory.getLogger(ManageInterceptor.class);
17+
private static final Logger LOGGER = LoggerFactory.getLogger(ManageInterceptor.class);
1818

1919
@Override
2020
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

‎zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@
1515
*/
1616
public class DefaultMessageQueueListener implements MessageListener {
1717

18-
private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
18+
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
1919

2020
@Autowired
2121
ThreadPoolTaskExecutor threadPoolTaskExecutor;
2222

23-
public void onMessage(final Message message) {
23+
@Override
24+
public void onMessage(final Message message) {
2425
// 使用线程池多线程处理
2526
threadPoolTaskExecutor.execute(new Runnable() {
26-
public void run() {
27+
@Override
28+
public void run() {
2729
if (message instanceof TextMessage) {
2830
TextMessage textMessage = (TextMessage) message;
2931
try {
30-
_log.info("消费消息：{}", textMessage.getText());
32+
LOGGER.info("消费消息：{}", textMessage.getText());
3133
} catch (Exception e){
3234
e.printStackTrace();
3335
}

‎zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- 非拦截路径 -->
2020
<mvc:exclude-mapping path="/manage/login"/>
2121
<!-- 拦截器对象 -->
22-
<bean id="manageInterceptor" class="com.zheng.cms.admin.Interceptor.ManageInterceptor"/>
22+
<bean id="manageInterceptor" class="com.zheng.cms.admin.interceptor.ManageInterceptor"/>
2323
</mvc:interceptor>
2424
</mvc:interceptors>
2525

‎zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,29 @@
66
*/
77
public enum CmsResultConstant {
88

9+
/**
10+
* 失败
11+
*/
912
FAILED(0, "failed"),
13+
14+
/**
15+
* 成功
16+
*/
1017
SUCCESS(1, "success"),
1118

19+
/**
20+
* 文件类型不支持
21+
*/
1222
FILE_TYPE_ERROR(20001, "File type not supported!"),
23+
24+
/**
25+
* 无效长度
26+
*/
1327
INVALID_LENGTH(20002, "Invalid length"),
28+
29+
/**
30+
* 无效参数
31+
*/
1432
INVALID_PARAMETER(20003, "Invalid parameter");
1533

1634
public int code;

0 commit comments

Comments
 (0)