工具类整理 日志fix

src/main/java/com/gogirl/application/xcx/impl/QRCodeServiceImpl.java

@@ -3,7 +3,7 @@ package com.gogirl.application.xcx.impl;
 import com.github.binarywang.utils.qrcode.MatrixToImageWriter;
 import com.gogirl.application.xcx.QRCodeService;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
-import com.gogirl.infrastructure.util.ImageUtil;
+import com.gogirl.infrastructure.util.ImageUtils;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
@@ -41,7 +41,7 @@ public class QRCodeServiceImpl implements QRCodeService {
 
         MatrixToImageWriter.writeToFile(bitMatrix, "PNG", file);
 
-        return ImageUtil.qiniuUpload(file);
+        return ImageUtils.qiniuUpload(file);
     }
 
 }

src/main/java/com/gogirl/infrastructure/feign/wx/WxPayControllerFeign.java

@@ -5,7 +5,6 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
@@ -18,11 +17,8 @@ public interface WxPayControllerFeign {
      * @param <T>     请使用{@link com.github.binarywang.wxpay.bean.order}包下的类
      * @return 返回 {@link com.github.binarywang.wxpay.bean.order}包下的类对象
      */
-    //@ApiOperation(value = "统一下单，并组装所需支付参数")
-    @PostMapping("/pay/createOrder")
     WxPayMpOrderResult createJsapiOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException;
 
-    @PostMapping("/pay/refund")
     WxPayRefundResult refund(@RequestBody WxPayRefundRequest request) throws WxPayException;
 
 }

src/main/java/com/gogirl/infrastructure/interceptor/LogAspect.java

@@ -76,10 +76,13 @@ public class LogAspect {
         HttpServletRequest request = attributes.getRequest();
         // 会打印出一个对象，想打印出具体内容需要在定义模型处加上toString()
         //logger.info( "result:{}", object.toString() );
-        JsonResult jsonResult = JsonUtilByJackson.readValue(JsonUtilByJackson.writeValueAsString(object), JsonResult.class);
-        jsonResult.setData("hidden data");
-        logger.info("result:{}", JsonUtilByJackson.writeValueAsString(jsonResult));
-        ;
+        try {
+            JsonResult jsonResult = JsonUtilByJackson.readValue(JsonUtilByJackson.writeValueAsString(object), JsonResult.class);
+            jsonResult.setData("hidden data");
+            logger.info("result:{}", JsonUtilByJackson.writeValueAsString(jsonResult));
+        } catch (Exception ignore) {
+
+        }
     }
 
     /**

src/main/java/com/gogirl/infrastructure/util/AESUtil.java → src/main/java/com/gogirl/infrastructure/util/AesUtils.java

@@ -16,7 +16,7 @@ import java.security.spec.InvalidParameterSpecException;
  *
  * @author robbendev
  */
-public final class AESUtil {
+public final class AesUtils {
 
     public static boolean initialized = false;
 

src/main/java/com/gogirl/infrastructure/util/Base64Util.java → src/main/java/com/gogirl/infrastructure/util/Base64Utils.java

@@ -9,7 +9,7 @@ import java.io.*;
  * Base64工具类
  * BASE64DecodedMultipartFileUtil
  */
-public final class Base64Util {
+public final class Base64Utils {
 
 
     /**

src/main/java/com/gogirl/infrastructure/util/ImageUtil.java → src/main/java/com/gogirl/infrastructure/util/ImageUtils.java

@@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.IOException;
 
-public class ImageUtil {
+public class ImageUtils {
 
     public static String saveImage(String picturePath, MultipartFile multipartFile) throws IOException {
         String fileName = multipartFile.getOriginalFilename();

src/main/java/com/gogirl/infrastructure/util/PrefixUtil.java → src/main/java/com/gogirl/infrastructure/util/PrefixUtils.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
 /**
  * Java8求笛卡尔积
  */
-public class PrefixUtil {
+public class PrefixUtils {
 
     /**
      * 求笛卡尔积

src/main/java/com/gogirl/infrastructure/util/QRCodeUtil.java

-package com.gogirl.infrastructure.util;
-
-
-import com.github.binarywang.utils.qrcode.BufferedImageLuminanceSource;
-import com.google.zxing.*;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.HybridBinarizer;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.OutputStream;
-import java.util.Hashtable;
-
-public class QRCodeUtil {
-
-    private static final String CHARSET = "utf-8";
-    private static final String FORMAT_NAME = "JPG";
-    // 二维码尺寸
-    private static final int QRCODE_SIZE = 300;
-    // LOGO宽度
-    private static final int WIDTH = 60;
-    // LOGO高度
-    private static final int HEIGHT = 60;
-
-    private static BufferedImage createImage(String content, String imgPath, boolean needCompress) throws Exception {
-        Hashtable hints = new Hashtable();
-        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-        hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
-        hints.put(EncodeHintType.MARGIN, 1);
-        BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE,
-                hints);
-        int width = bitMatrix.getWidth();
-        int height = bitMatrix.getHeight();
-        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
-            }
-        }
-        if (imgPath == null || "".equals(imgPath)) {
-            return image;
-        }
-        // 插入图片
-        QRCodeUtil.insertImage(image, imgPath, needCompress);
-        return image;
-    }
-
-    private static void insertImage(BufferedImage source, String imgPath, boolean needCompress) throws Exception {
-        File file = new File(imgPath);
-        if (!file.exists()) {
-            System.err.println("" + imgPath + "   该文件不存在！");
-            return;
-        }
-        Image src = ImageIO.read(new File(imgPath));
-        int width = src.getWidth(null);
-        int height = src.getHeight(null);
-        if (needCompress) { // 压缩LOGO
-            if (width > WIDTH) {
-                width = WIDTH;
-            }
-            if (height > HEIGHT) {
-                height = HEIGHT;
-            }
-            Image image = src.getScaledInstance(width, height, Image.SCALE_SMOOTH);
-            BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            Graphics g = tag.getGraphics();
-            g.drawImage(image, 0, 0, null); // 绘制缩小后的图
-            g.dispose();
-            src = image;
-        }
-        // 插入LOGO
-        Graphics2D graph = source.createGraphics();
-        int x = (QRCODE_SIZE - width) / 2;
-        int y = (QRCODE_SIZE - height) / 2;
-        graph.drawImage(src, x, y, width, height, null);
-        Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6);
-        graph.setStroke(new BasicStroke(3f));
-        graph.draw(shape);
-        graph.dispose();
-    }
-
-    public static void encode(String content, String imgPath, String destPath, boolean needCompress) throws Exception {
-        BufferedImage image = QRCodeUtil.createImage(content, imgPath, needCompress);
-        mkdirs(destPath);
-        // String file = new Random().nextInt(99999999)+".jpg";
-        // ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file));
-        ImageIO.write(image, FORMAT_NAME, new File(destPath));
-    }
-
-    public static BufferedImage encode(String content, String imgPath, boolean needCompress) throws Exception {
-        BufferedImage image = QRCodeUtil.createImage(content, imgPath, needCompress);
-        return image;
-    }
-
-    public static void mkdirs(String destPath) {
-        File file = new File(destPath);
-        // 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
-        if (!file.exists() && !file.isDirectory()) {
-            file.mkdirs();
-        }
-    }
-
-    public static void encode(String content, String imgPath, String destPath) throws Exception {
-        QRCodeUtil.encode(content, imgPath, destPath, false);
-    }
-
-    public static void encode(String content, String destPath) throws Exception {
-        QRCodeUtil.encode(content, null, destPath, false);
-    }
-
-    public static void encode(String content, String imgPath, OutputStream output, boolean needCompress)
-            throws Exception {
-        BufferedImage image = QRCodeUtil.createImage(content, imgPath, needCompress);
-        ImageIO.write(image, FORMAT_NAME, output);
-    }
-
-    public static void encode(String content, OutputStream output) throws Exception {
-        QRCodeUtil.encode(content, null, output, false);
-    }
-
-    public static String decode(File file) throws Exception {
-        BufferedImage image;
-        image = ImageIO.read(file);
-        if (image == null) {
-            return null;
-        }
-        BufferedImageLuminanceSource source = new BufferedImageLuminanceSource(image);
-        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-        Result result;
-        Hashtable hints = new Hashtable();
-        hints.put(DecodeHintType.CHARACTER_SET, CHARSET);
-        result = new MultiFormatReader().decode(bitmap, hints);
-        String resultStr = result.getText();
-        return resultStr;
-    }
-
-    public static String decode(String path) throws Exception {
-        return QRCodeUtil.decode(new File(path));
-    }
-
-}

src/main/java/com/gogirl/infrastructure/util/RandomUtils.java

-package com.gogirl.infrastructure.util;
-
-import java.util.Random;
-
-/**
- * Created by yinyong on 2018/9/28.
- */
-public class RandomUtils {
-
-    public static String random(String prefix) {
-        StringBuffer buffer = new StringBuffer();
-        /*SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");*/
-        Random random = new Random();
-        for (int i = 0; i < 8; i++) {
-            buffer.append(random.nextInt(10));
-        }
-        return prefix + buffer.toString();
-    }
-}

src/main/java/com/gogirl/infrastructure/util/SessionUtils.java

@@ -3,39 +3,74 @@ package com.gogirl.infrastructure.util;
 import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.infrastructure.common.exception.RRException;
 
+/**
+ * 应用会话管理工具类
+ */
 public class SessionUtils {
 
-
+    /*美甲师会话线程变量*/
     private static final ThreadLocal<GogirlToken> technicianTokenThreadLocal = new ThreadLocal<>();
+    /*用户会员线程变量*/
     private static final ThreadLocal<GogirlToken> customerTokenThreadLocal = new ThreadLocal<>();
+    /*请求来源线程变量*/
     private static final ThreadLocal<String> sourceFromThreadLocal = new ThreadLocal<>();
 
-
+    /**
+     * 保存美甲师登录信息到本地线程变量
+     *
+     * @param gogirlToken 美甲师登录信息
+     */
     public static void putTechnicianToken(GogirlToken gogirlToken) {
         technicianTokenThreadLocal.set(gogirlToken);
     }
 
+    /**
+     * 获取美甲师登录信息
+     *
+     * @return 美甲师登录信息
+     */
     public static GogirlToken getTechnicianToken() {
         return technicianTokenThreadLocal.get();
     }
 
+    /**
+     * 清除美甲师登录信息
+     */
     public static void removeTechnicianToken() {
         technicianTokenThreadLocal.remove();
     }
 
+    /**
+     * 保存用户登录信息到本地线程变量
+     *
+     * @param gogirlToken 用户登录信息
+     */
     public static void putCustomerToken(GogirlToken gogirlToken) {
         customerTokenThreadLocal.set(gogirlToken);
     }
 
+    /**
+     * 获取用户登录信息
+     *
+     * @return 用户登录信息
+     */
     public static GogirlToken getCustomerToken() {
         return customerTokenThreadLocal.get();
     }
 
+    /**
+     * 清除用户登录信息
+     */
     public static void removeCustomerToken() {
         customerTokenThreadLocal.remove();
     }
 
 
+    /**
+     * 获取当前登录美甲师id
+     *
+     * @return 美甲师id
+     */
     public static Integer getTechnicianId() {
         GogirlToken gogirlToken = technicianTokenThreadLocal.get();
         if (gogirlToken == null) {
@@ -44,26 +79,58 @@ public class SessionUtils {
         return gogirlToken.getTechnicianId();
     }
 
+    /**
+     * 获取当前登录用户id
+     *
+     * @return 客户id
+     */
     public static Integer getCustomerId() {
-        return customerTokenThreadLocal.get().getCustomerId();
+        GogirlToken gogirlToken = customerTokenThreadLocal.get();
+        if (gogirlToken == null) {
+            throw new RRException(2000, "token已经失效，请重新登陆");
+        }
+        return gogirlToken.getCustomerId();
     }
 
+    /**
+     * 设置当前请求来源到线程变量
+     *
+     * @param sourceFrom 来源：客户：customer ；美甲师:technician ；H5：h5。
+     */
     public static void putSourceFrom(String sourceFrom) {
         sourceFromThreadLocal.set(sourceFrom);
     }
 
-    public static String getSourceFrom(String sourceFrom) {
+    /**
+     * 获取当前请求来源
+     *
+     * @return 请求来源
+     */
+    public static String getSourceFrom() {
         return sourceFromThreadLocal.get();
     }
 
+    /**
+     * 清空请求来源
+     */
     public static void removeSourceFrom() {
         sourceFromThreadLocal.remove();
     }
 
+    /**
+     * 当前请求是否来自客户
+     *
+     * @return bool
+     */
     public static boolean isSourceFromCustomer() {
         return sourceFromThreadLocal.get().equals("customer");
     }
 
+    /**
+     * 当前请求是否来自美甲师
+     *
+     * @return bool
+     */
     public static boolean isSourceFromTechnician() {
         return sourceFromThreadLocal.get().equals("technician");
     }

src/main/java/com/gogirl/infrastructure/util/WXCore.java

@@ -23,7 +23,7 @@ public class WXCore {
                                      String sessionKey,
                                      String iv) throws InvalidAlgorithmParameterException {
         String result;
-        AESUtil aes = new AESUtil();
+        AesUtils aes = new AesUtils();
         byte[] resultByte = aes.decrypt(Base64.decodeBase64(encryptedData),
                 Base64.decodeBase64(sessionKey), Base64.decodeBase64(iv));
         if (null != resultByte && resultByte.length > 0) {

src/main/java/com/gogirl/interfaces/xcx/XcxController.java

@@ -9,8 +9,8 @@ import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
-import com.gogirl.infrastructure.util.Base64Util;
-import com.gogirl.infrastructure.util.ImageUtil;
+import com.gogirl.infrastructure.util.Base64Utils;
+import com.gogirl.infrastructure.util.ImageUtils;
 import com.gogirl.shared.user.query.qry.CustomerQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -95,7 +95,7 @@ public class XcxController {
     @PostMapping("/customer/xcx/upload")
     public JsonResult<String> upload(MultipartFile file) throws Exception {
         log.info("图片上传");
-        String imgUrl = ImageUtil.saveImage(gogirlProperties.getPicturePath(), file);
+        String imgUrl = ImageUtils.saveImage(gogirlProperties.getPicturePath(), file);
         return JsonResult.success(imgUrl);
     }
 
@@ -103,8 +103,8 @@ public class XcxController {
     @PostMapping("/customer/xcx/no_base64Upload")
     public JsonResult<String> base64Upload(@RequestBody String base64) throws Exception {
         log.info("图片上传");
-        MultipartFile multipartFile = Base64Util.base64ToMultipart(base64);
-        String imgUrl = ImageUtil.saveImage(gogirlProperties.getPicturePath(), multipartFile);
+        MultipartFile multipartFile = Base64Utils.base64ToMultipart(base64);
+        String imgUrl = ImageUtils.saveImage(gogirlProperties.getPicturePath(), multipartFile);
         return JsonResult.success(imgUrl);
     }
 
@@ -146,7 +146,7 @@ public class XcxController {
     @ApiOperation(value = "图片上传")
     @RequestMapping("/technician/xcx/upload")
     public JsonResult<String> techUpload(MultipartFile file) throws Exception {
-        String imgUrl = ImageUtil.saveImage(gogirlProperties.getPicturePath(), file);
+        String imgUrl = ImageUtils.saveImage(gogirlProperties.getPicturePath(), file);
         return JsonResult.success(imgUrl);
     }