merge

boot-service/src/main/java/com/xwbing/service/rest/QRCodeZipService.java

@@ -1,7 +1,7 @@
 package com.xwbing.service.rest;
 
 import com.xwbing.exception.BusinessException;
-import com.xwbing.util.QRCodeUtils;
+import com.xwbing.util.QRCodeUtil;
 import com.xwbing.util.RestMessage;
 import com.xwbing.util.ZipUtil;
 import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class QRCodeZipService {
         RestMessage result = new RestMessage();
         String path = getPath();
         File output = new File(path + File.separator + name + ".png");
-        QRCodeUtils.createCode(text, output);
+        QRCodeUtil.createCode(text, output);
         result.setSuccess(true);
         result.setMessage("生成二维码成功");
         return result;
@@ -52,7 +52,7 @@ public class QRCodeZipService {
     public RestMessage decode(File file) {
         RestMessage result = new RestMessage();
         try {
-            String decode = QRCodeUtils.decode(file);
+            String decode = QRCodeUtil.decode(file);
             result.setData(decode);
             result.setSuccess(true);
             result.setMessage("解析二维码成功");

boot-service/src/main/java/com/xwbing/util/QRCodeUtil.java

@@ -26,9 +26,9 @@ import java.util.Map;
  * 作者: xiangwb
  * 说明: 二维码工具类
  */
-public class QRCodeUtils {
-    private static QRCodeUtils.Internal internal = new QRCodeUtils.Internal();
-    private static final Logger LOGGER = LoggerFactory.getLogger(QRCodeUtils.class);
+public class QRCodeUtil {
+    private static QRCodeUtil.Internal internal = new QRCodeUtil.Internal();
+    private static final Logger LOGGER = LoggerFactory.getLogger(QRCodeUtil.class);
 
     /***
      * 生成默认尺寸不带logo的二维码

boot-service/src/main/java/com/xwbing/util/RestMessage.java

@@ -19,7 +19,7 @@ public class RestMessage implements Serializable {
     @ApiModelProperty(value = "成功、错误返回提示信息")
     private String message;
     @ApiModelProperty(value = "返回的数据")
-    private Object data;// 返回的数据
+    private Object data;
     @ApiModelProperty(value = "新增、修改主鍵返回id")
     private String id;
 }