代码修改

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -33,6 +33,8 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
@@ -86,16 +88,6 @@ public class BasicZuulFilter extends ZuulFilter {
        HttpServletRequest request = ctx.getRequest();
        String url = request.getRequestURI();
        //防止SQL注入过滤器
        if(doSqlFilter(request)){
            return this.forbidden(ctx, ResultStatus.ERROR_PARA, "Illegal parameter");
        }
        //文件类型过滤器
        if(doFileFilter(request)){
            return this.forbidden(ctx, ResultStatus.ERROR_PARA, "Illegal file");
        }
        logger.info("BasicZuulFilter:"+url);
        if (!(url.contains("/open/noLogin/notify")||
@@ -122,10 +114,18 @@ public class BasicZuulFilter extends ZuulFilter {
            }
        }
        //保存操作日志
        baseMethodLogService.saveMethodLog(request);
        //防止SQL注入过滤器
        if(doSqlFilter(request)){
            return this.forbidden(ctx, ResultStatus.ERROR_PARA, "Illegal parameter");
        }
        //文件类型过滤器
        if(doFileFilter(request)){
            return this.forbidden(ctx, ResultStatus.ERROR_PARA, "Illegal file");
        }
        //保存操作日志
        baseMethodLogService.saveMethodLog(request);
        //内部微服务有不需要认证的地址请在URL上追加/open/来进行过滤，如/api/v1.0/open/**，不要在此继续追加！！！
        if (url.contains("/auth/")//验证服务
@@ -437,4 +437,122 @@ public class BasicZuulFilter extends ZuulFilter {
        }flag=false;
        return flag;
    }
    public final static Map<String, String> FILE_TYPE_MAP = new HashMap<String, String>();
    static {
            getAllFileType(); // 初始化文件类型信息
       }
    /**
      * 常用文件格式,不能上传的文件类型
      */
     private static void getAllFileType() {
//         FILE_TYPE_MAP.put("ffd8ffe000104a464946", "jpg"); // JPEG (jpg)
//         FILE_TYPE_MAP.put("89504e470d0a1a0a0000", "png"); // PNG (png)
//         FILE_TYPE_MAP.put("47494638396126026f01", "gif"); // GIF (gif)
//         FILE_TYPE_MAP.put("49492a00227105008037", "tif"); // TIFF (tif)
//         FILE_TYPE_MAP.put("424d228c010000000000", "bmp"); // 16色位图(bmp)
//         FILE_TYPE_MAP.put("424d8240090000000000", "bmp"); // 24位位图(bmp)
//         FILE_TYPE_MAP.put("424d8e1b030000000000", "bmp"); // 256色位图(bmp)
         FILE_TYPE_MAP.put("41433130313500000000", "dwg"); // CAD (dwg)
         FILE_TYPE_MAP.put("3c21444f435459504520", "html"); // HTML (html)
         FILE_TYPE_MAP.put("3c21646f637479706520", "htm"); // HTM (htm)
         FILE_TYPE_MAP.put("48544d4c207b0d0a0942", "css"); // css
         FILE_TYPE_MAP.put("696b2e71623d696b2e71", "js"); // js
//         FILE_TYPE_MAP.put("7b5c727466315c616e73", "rtf"); // Rich Text Format (rtf)
//         FILE_TYPE_MAP.put("38425053000100000000", "psd"); // Photoshop (psd)
//         FILE_TYPE_MAP.put("46726f6d3a203d3f6762", "eml"); // Email [Outlook Express 6] (eml)
//         FILE_TYPE_MAP.put("d0cf11e0a1b11ae10000", "doc"); // MS Excel 注意：word、msi 和 excel的文件头一样
//         FILE_TYPE_MAP.put("d0cf11e0a1b11ae10000", "vsd"); // Visio 绘图
//         FILE_TYPE_MAP.put("5374616E64617264204A", "mdb"); // MS Access (mdb)
//         FILE_TYPE_MAP.put("252150532D41646F6265", "ps");
//         FILE_TYPE_MAP.put("255044462d312e350d0a", "pdf"); // Adobe Acrobat (pdf)
//         FILE_TYPE_MAP.put("2e524d46000000120001", "rmvb"); // rmvb/rm相同
//         FILE_TYPE_MAP.put("464c5601050000000900", "flv"); // flv与f4v相同
//         FILE_TYPE_MAP.put("00000020667479706d70", "mp4");
//         FILE_TYPE_MAP.put("49443303000000002176", "mp3");
//         FILE_TYPE_MAP.put("000001ba210001000180", "mpg"); //
//         FILE_TYPE_MAP.put("3026b2758e66cf11a6d9", "wmv"); // wmv与asf相同
//         FILE_TYPE_MAP.put("52494646e27807005741", "wav"); // Wave (wav)
//         FILE_TYPE_MAP.put("52494646d07d60074156", "avi");
//         FILE_TYPE_MAP.put("4d546864000000060001", "mid"); // MIDI (mid)
//         FILE_TYPE_MAP.put("504b0304140000000800", "zip");
//         FILE_TYPE_MAP.put("526172211a0700cf9073", "rar");
//         FILE_TYPE_MAP.put("235468697320636f6e66", "ini");
         FILE_TYPE_MAP.put("504b03040a0000000000", "jar");
         FILE_TYPE_MAP.put("4d5a9000030000000400", "exe");// 可执行文件
         FILE_TYPE_MAP.put("3c25402070616765206c", "jsp");// jsp文件
         FILE_TYPE_MAP.put("4d616e69666573742d56", "mf");// MF文件
         FILE_TYPE_MAP.put("3c3f786d6c2076657273", "xml");// xml文件
         FILE_TYPE_MAP.put("494e5345525420494e54", "sql");// xml文件
         FILE_TYPE_MAP.put("7061636b616765207765", "java");// java文件
         FILE_TYPE_MAP.put("406563686f206f66660d", "bat");// bat文件
         FILE_TYPE_MAP.put("1f8b0800000000000000", "gz");// gz文件
         FILE_TYPE_MAP.put("6c6f67346a2e726f6f74", "properties");// bat文件
         FILE_TYPE_MAP.put("cafebabe0000002e0041", "class");// bat文件
         FILE_TYPE_MAP.put("49545346030000006000", "chm");// bat文件
         FILE_TYPE_MAP.put("04000000010000001300", "mxp");// bat文件
//         FILE_TYPE_MAP.put("504b0304140006000800", "docx");// docx文件
         FILE_TYPE_MAP.put("d0cf11e0a1b11ae10000", "wps");// WPS文字wps、表格et、演示dps都是一样的
         FILE_TYPE_MAP.put("6431303a637265617465", "torrent");
//         FILE_TYPE_MAP.put("6D6F6F76", "mov"); // Quicktime (mov)
//         FILE_TYPE_MAP.put("FF575043", "wpd"); // WordPerfect (wpd)
//         FILE_TYPE_MAP.put("CFAD12FEC5FD746F", "dbx"); // Outlook Express (dbx)
//         FILE_TYPE_MAP.put("2142444E", "pst"); // Outlook (pst)
//         FILE_TYPE_MAP.put("AC9EBD8F", "qdf"); // Quicken (qdf)
//         FILE_TYPE_MAP.put("E3828596", "pwl"); // Windows Password (pwl)
//         FILE_TYPE_MAP.put("2E7261FD", "ram"); // Real Audio (ram)
//         FILE_TYPE_MAP.put("null", null); // null
     }
    /**
     * 文件头比较
     * @param filePaht
     * @return
     */
    public static String getFileType(String filePaht) {
        String res = null;
        try {
            FileInputStream is = new FileInputStream(filePaht);
            byte[] b = new byte[10];
            is.read(b, 0, b.length);
            String fileCode = bytesToHexString(b);
            Iterator<String> keyIter = FILE_TYPE_MAP.keySet().iterator();
            while (keyIter.hasNext()) {
            String key = keyIter.next();
            // 验证前5个字符比较
            if (key.toLowerCase().startsWith(fileCode.toLowerCase().substring(0, 5))
                    || fileCode.toLowerCase().substring(0, 5).startsWith(key.toLowerCase())) {
                    res = FILE_TYPE_MAP.get(key);
                    break;
                }
            }
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return res;
    }
    /**
      * 得到上传文件的文件头
      * @param src
      * @return
     */
    public static String bytesToHexString(byte[] src) {
        StringBuilder stringBuilder = new StringBuilder();
        if (src == null || src.length <= 0) {
            return null;
        }
        for (int i = 0; i < src.length; i++) {
            int v = src[i] & 0xFF;
            String hv = Integer.toHexString(v);
            if (hv.length() < 2) {
                stringBuilder.append(0);
             }
            stringBuilder.append(hv);
        }
        return stringBuilder.toString();
    }
}

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: ag-basic
    name: ag-basic--
  cloud:
    config:
      failFast: true

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -331,8 +331,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        /*如果是移动端登陆则移除之前的token，
        在网关处通过HTTP状态码告知前端是过期（402）还是账号在别处登陆（403），
        实现同一账号只能在一处登陆*/
           /* if("1".equals(kickEachOther)){
                logger.info("");
            if("1".equals(kickEachOther)){
                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                if (request.getHeader("login-device") != null && (request.getHeader("login-device").equalsIgnoreCase("mobile")||request.getHeader("login-device").equalsIgnoreCase("pc"))) {
                    if (tokenStore.readAccessToken(token.getValue())!=null){
@@ -345,7 +344,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                if (token == null) {
                    throw new UnsupportedGrantTypeException("Unsupported grant type: " + tokenRequest.getGrantType());
                }
            }*/
            }
            WlyyUserSimple wlyyUserSimple = userDetailsService.authSuccess(parameters.get("username"));
            if ("pad".equals(parameters.get("clientType"))&&!("1".equals(wlyyUserSimple.getArchiveType())) ){//医养平板端登录限制
@@ -394,13 +393,13 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            baseLoginLogService.save(baseLoginLogDO);
            logger.info("login:登录进入10");
                  /*  //个推 clientId
                    String clientId = parameters.get("getuiClientId");
                    String getuiClientType = parameters.get("getuiClientType");
                    String padImei = parameters.get("padImei");
                    //客户端类型 app,wx,pad,pc
                    userDetailsService.updateInfo(clientId,getuiClientType,padImei,loginType,wlyyUserSimple.getId(),baseLoginLogDO);
            */
            //个推 clientId
            String clientId = parameters.get("getuiClientId");
            String getuiClientType = parameters.get("getuiClientType");
            String padImei = parameters.get("padImei");
            //客户端类型 app,wx,pad,pc
            userDetailsService.updateInfo(clientId,getuiClientType,padImei,loginType,wlyyUserSimple.getId(),baseLoginLogDO);
            return getResponse(wlyyUserSimple);
        }catch (Exception e){
            e.printStackTrace();