bug修复

admin

2022-04-16 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3

 src/main/java/com/yeshi/buwan/aspect/SignAspect.java

@@ -9,21 +9,14 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
import org.yeshi.utils.StringUtil;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.*;

@@ -55,28 +48,25 @@

        //如果是Android新版本则调用新的签名方法
        //布丸3.8.7之后调用新的签名方法

        if (acceptData != null && "android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() >= 105) {
            Map<String, String[]> params = request.getParameterMap();
            List<String> list = new ArrayList<>();
            String sign = getNewSign(request, "8888B&*@-uWan88/',@@^");

            //签名
            for (Iterator<String> its = params.keySet().iterator(); its.hasNext(); ) {
                String key = its.next();
                if ("sign".equalsIgnoreCase(key))
                    continue;
                list.add(key + "=" + params.get(key)[0]);
            }

            Collections.sort(list);
            String str = StringUtil.concat(list, "&");
            String sign = StringUtil.Md5(str + "8888B&*@-uWan88/',@@^");
            if (!sign.equalsIgnoreCase(acceptData.getSign())) {
                if (out == null)
                    out = response.getWriter();
                out.print(JsonUtil.loadFalseJson("签名错误"));
                return null;
            }

        } else if ("com.hanju.video.ios".equalsIgnoreCase(acceptData.getPackage())) {
            //IOS韩剧签名方式
            String sign = getNewSign(request, "8888B&*@-hanJu88/',@@^");
            if (!sign.equalsIgnoreCase(acceptData.getSign())) {
                if (out == null)
                    out = response.getWriter();
                out.print(JsonUtil.loadFalseJson("签名错误"));
                return null;
            }
        } else {
            if (!Utils.signIsRight(request)) {
                if (out == null)
@@ -109,10 +99,29 @@
            detailSystem = systemService.getDetailSystemByPackage(acceptData.getChildPackage());
            acceptData.setChildDetailSystem(detailSystem);
        }


        return joinPoint.proceed(args);
    }


    public static String getNewSign(HttpServletRequest request, String signKey) {
        Map<String, String[]> params = request.getParameterMap();
        List<String> list = new ArrayList<>();

        //签名
        for (Iterator<String> its = params.keySet().iterator(); its.hasNext(); ) {
            String key = its.next();
            if ("sign".equalsIgnoreCase(key))
                continue;
            list.add(key + "=" + params.get(key)[0]);
        }

        Collections.sort(list);
        String str = StringUtil.concat(list, "&");
        str+=signKey;
        System.out.println("加密前字符串："+str);
        String sign = StringUtil.Md5(str );
        return sign;
    }


}