Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

pcloud-common/src/main/java/com/pcloud/common/utils/QrcodeUtils.java

@@ -215,6 +215,33 @@ public class QrcodeUtils {
 	}
 
 	/**
+	 * 创建二维码
+	 *
+	 * @param url
+	 *            二维码响应地址
+	 * @return
+	 * @throws Exception
+	 */
+	public static String createWithMargin(String url, Integer marginNum) throws BizException {
+		LOGGER.info("【二维码】创建二维码,<START>.[url]=" + url);
+		Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>();
+		hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+		hints.put(EncodeHintType.ERROR_CORRECTION, level);
+		hints.put(EncodeHintType.MARGIN, marginNum); // 设置白边
+		try {
+			// 生成矩阵
+			BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, ImageConstant.QRCODE_WITH,
+					ImageConstant.QRCODE_HEIGHT, hints);
+			BufferedImage bufferedImage = toBufferedImage(bitMatrix, onColor);
+			bufferedImage.flush();
+			return uploadImage(bufferedImage);
+		} catch (Exception e) {
+			LOGGER.error("【二维码】创建二维码失败,<ERROR>:" + e.getMessage(), e);
+			throw new FileException(FileException.FILE_UPLOAD_FAILURE, "创建二维码失败");
+		}
+	}
+
+	/**
 	 * 创建带颜色的二维码
 	 * @param url
 	 * @param onColor