diff --git a/litemall-admin-api/checkstyle.xml b/litemall-admin-api/checkstyle.xml
new file mode 100755
index 00000000..d1d7e584
--- /dev/null
+++ b/litemall-admin-api/checkstyle.xml
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/litemall-admin-api/pom.xml b/litemall-admin-api/pom.xml
index 5c5cc3cc..d478af4b 100644
--- a/litemall-admin-api/pom.xml
+++ b/litemall-admin-api/pom.xml
@@ -9,7 +9,12 @@
litemall
0.1.0
-
+
+ UTF-8
+ UTF-8
+ 2.17
+ 7.6
+
@@ -39,5 +44,39 @@
-
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${maven-checkstyle-plugin.version}
+
+
+ com.puppycrawl.tools
+ checkstyle
+ ${checkstyle.version}
+
+
+
+
+ ${basedir}/src/main/java
+
+
+
+
+ checkstyle
+ validate
+
+ check
+
+
+ checkstyle.xml
+ ${project.reporting.outputEncoding}
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
index 72572846..4985b48b 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
@@ -120,11 +120,11 @@ public class AdminOrderService {
wxPayRefundRequest.setTotalFee(totalFee);
wxPayRefundRequest.setRefundFee(totalFee);
- WxPayRefundResult wxPayRefundResult = null;
+ WxPayRefundResult wxPayRefundResult;
try {
wxPayRefundResult = wxPayService.refund(wxPayRefundRequest);
} catch (WxPayException e) {
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
}
if (!wxPayRefundResult.getReturnCode().equals("SUCCESS")) {
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
index 36f05929..70e5d58c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
@@ -24,10 +24,10 @@ import javax.servlet.http.HttpServletRequest;
*/
@Component
public class LogHelper {
- public final static Integer LOG_TYPE_GENERAL = 0;
- public final static Integer LOG_TYPE_AUTH = 1;
- public final static Integer LOG_TYPE_ORDER = 2;
- public final static Integer LOG_TYPE_OTHER = 3;
+ public static final Integer LOG_TYPE_GENERAL = 0;
+ public static final Integer LOG_TYPE_AUTH = 1;
+ public static final Integer LOG_TYPE_ORDER = 2;
+ public static final Integer LOG_TYPE_OTHER = 3;
@Autowired
private LitemallLogService logService;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
index 03f290a2..505f3ec4 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
@@ -12,8 +12,6 @@ import org.linlinjava.litemall.db.domain.LitemallAdmin;
import org.linlinjava.litemall.db.service.LitemallAdminService;
import org.linlinjava.litemall.db.service.LitemallPermissionService;
import org.linlinjava.litemall.db.service.LitemallRoleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -23,7 +21,6 @@ import java.util.Set;
public class AdminAuthorizingRealm extends AuthorizingRealm {
- private static final Logger log = LoggerFactory.getLogger(AdminAuthorizingRealm.class);
@Autowired
private LitemallAdminService adminService;
@Autowired
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
index 670cf126..59becab5 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
@@ -122,7 +122,7 @@ public class AdminAuthController {
data.put("roles", roles);
// NOTE
// 这里需要转换perms结构，因为对于前端而已API形式的权限更容易理解
- data.put("perms", toAPI(permissions));
+ data.put("perms", toApi(permissions));
return ResponseUtil.ok(data);
}
@@ -130,7 +130,7 @@ public class AdminAuthController {
private ApplicationContext context;
private HashMap systemPermissionsMap = null;
- private Collection toAPI(Set permissions) {
+ private Collection toApi(Set permissions) {
if (systemPermissionsMap == null) {
systemPermissionsMap = new HashMap<>();
final String basicPackage = "org.linlinjava.litemall.admin";
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
index 8ac5a841..ea7cf706 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
@@ -51,8 +51,8 @@ public class AdminCouponController {
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort
- , order);
+ List couponList = couponUserService.queryList(userId, couponId, status, page,
+ limit, sort, order);
return ResponseUtil.okList(couponList);
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
index 28a9b596..4aef604f 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
@@ -50,19 +50,19 @@ public class AdminGrouponController {
List> groupons = new ArrayList<>();
for (LitemallGroupon groupon : grouponList) {
try {
- Map RecordData = new HashMap<>();
+ Map recordData = new HashMap<>();
List subGrouponList = grouponService.queryJoinRecord(groupon.getId());
LitemallGrouponRules rules = rulesService.queryById(groupon.getRulesId());
LitemallGoods goods = goodsService.findById(rules.getGoodsId());
- RecordData.put("groupon", groupon);
- RecordData.put("subGroupons", subGrouponList);
- RecordData.put("rules", rules);
- RecordData.put("goods", goods);
+ recordData.put("groupon", groupon);
+ recordData.put("subGroupons", subGrouponList);
+ recordData.put("rules", rules);
+ recordData.put("goods", goods);
- groupons.add(RecordData);
+ groupons.add(recordData);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
}
}