Merge remote-tracking branch 'origin/develop' into test

service-base/src/main/java/com/simuwang/base/config/DaqProperties.java

@@ -41,10 +41,6 @@ public class DaqProperties {
      */
     private SecurityRsa securityRsa;
     /**
-     * 自定义token过滤器的拦截白名单
-     */
-    private List<String> whitelist = ListUtil.list(true);
-    /**
      * shiro 过滤器配置
      */
     private List<FilterChain> shiroFilterChain = ListUtil.list(true);

service-base/src/main/java/com/simuwang/base/config/ShiroConfig.java

@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -141,12 +140,6 @@ public class ShiroConfig {
         return new AuthorizationAttributeSourceAdvisor();
     }
 
-    private Map<String, Filter> filterMap() {
-        HashMap<String, Filter> map = MapUtil.newHashMap();
-        map.put("jwt", new JwtFilter(this.properties, this.jwtContext));
-        return map;
-    }
-
     /**
      * Shiro过滤器
      */
@@ -154,14 +147,17 @@ public class ShiroConfig {
     public ShiroFilterFactoryBean shiroFilterFactoryBean() {
         ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
         shiroFilter.setSecurityManager(this.defaultWebSecurityManager());
-        shiroFilter.setFilters(this.filterMap());
+        // 新增过滤器
+        Map<String, Filter> filterMap = MapUtil.newHashMap(true);
+        filterMap.put("jwt", new JwtFilter(this.jwtContext));
+        shiroFilter.setFilters(filterMap);
         // 过滤器链配置
-        Map<String, String> map = MapUtil.newHashMap(16, true);
+        Map<String, String> filterChainMap = MapUtil.newHashMap(16, true);
         List<DaqProperties.FilterChain> shiroFilterChain = this.properties.getShiroFilterChain();
         for (DaqProperties.FilterChain filterChain : shiroFilterChain) {
-            map.put(filterChain.getPath(), String.join(",", filterChain.getFilters()));
+            filterChainMap.put(filterChain.getPath(), String.join(",", filterChain.getFilters()));
         }
-        shiroFilter.setFilterChainDefinitionMap(map);
+        shiroFilter.setFilterChainDefinitionMap(filterChainMap);
         // 去掉，防止404路由自动跳转到登录请求
 //        shiroFilter.setLoginUrl("/v1/login");
 //        shiroFilter.setUnauthorizedUrl("/v1/login");

service-base/src/main/java/com/simuwang/shiro/core/jwt/JwtFilter.java

@@ -1,10 +1,8 @@
 package com.simuwang.shiro.core.jwt;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.simuwang.base.common.util.ServletUtils;
-import com.simuwang.base.config.DaqProperties;
 import com.smppw.common.pojo.ResultVo;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
@@ -17,10 +15,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
-import org.springframework.util.AntPathMatcher;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * @author wangzaijun
@@ -29,14 +25,11 @@ import java.util.List;
  */
 @Component
 public class JwtFilter extends AccessControlFilter {
-    private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    private final DaqProperties properties;
     private final JwtContext jwtContext;
 
-    public JwtFilter(DaqProperties properties, JwtContext jwtContext) {
-        this.properties = properties;
+    public JwtFilter(JwtContext jwtContext) {
         this.jwtContext = jwtContext;
     }
 
@@ -59,17 +52,6 @@ public class JwtFilter extends AccessControlFilter {
         // 跟前端约定将jwtToken放在请求的Header的Authorization中，Authorization: token
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String requestURI = request.getRequestURI();
-        List<String> whitelist = this.properties.getWhitelist();
-        if (CollUtil.isNotEmpty(whitelist)) {
-            for (String path : whitelist) {
-                if (PATH_MATCHER.match(path, requestURI)) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("接口{} 配置了白名单，不需要签名验证！", requestURI);
-                    }
-                    return true;
-                }
-            }
-        }
         String token = request.getHeader(JwtContext.HEADER);
         if (StrUtil.isBlank(token)) {
             this.onLoginFail(servletResponse, requestURI, "请先登录后操作");

service-base/src/main/resources/mapper/DistributionMapper.xml

@@ -71,9 +71,9 @@
             ON info.trust_id = c.company_id AND c.isvalid = 1
             JOIN PPW_EMAIL.nav n
             ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
+            AND n.isvalid = 1
         WHERE d.isvalid = 1
             AND info.isvalid = 1
-            AND n.isvalid = 1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
         </if>
@@ -89,6 +89,7 @@
         <if test="endDate != null and endDate !=''">
             and d.distribute_date <![CDATA[ <= ]]> #{endDate}
         </if>
+        order by d.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countDistributionList" resultType="java.lang.Long"

service-deploy/src/main/resources/application.yml

@@ -82,11 +82,6 @@ simuwang:
   # token过期时间，单位：分钟
   token-expire: 1440
   token-secret: qwertyuiopasdfghjklzxcvbnm1234567890qwertyuiopasdfghjklzxcvbnm12
-  # jwt过滤器白名单
-  whitelist:
-    - /error
-    - /v1/login
-    - /v1/rsa-key
   # rsa 公钥私钥配置
   security-rsa:
     public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwkwNdpXpmeF7eFO/SMfkvwGM2ZWcToh/IyHjigzJgM4l68Jf+gaIKzDwxQl4S7phYTSavi4er1MfFHDqbX6XSQs9L2t3XNYvRrTxGZ9jY2cA9xpzXnQ152EPU+ENbqfqmtaQ/FFmCqaDCAVaXXsumdBPul2x7ufzrHeU1EkU7/QIDAQAB

service-manage/src/main/java/com/simuwang/manage/api/deletion/DeletionController.java

@@ -115,7 +115,8 @@ public class DeletionController {
         values.put(sheetName,dataList);
         HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(sheetName,head,values,null);
         try {
-            response.setContentType("application/vnd.ms-excel; charset=UTF-8");
+            // 不设置字符编码
+//            response.setContentType("application/vnd.ms-excel; charset=UTF-8");
             response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8("缺失明细.xls"));
             ServletOutputStream outputStream = response.getOutputStream();
             wb.write(outputStream);