数据汇聚

dataoperation-server/src/main/java/com/zq/dataoperation/Swagger.java

@@ -17,13 +17,13 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 @EnableSwagger2
 public class Swagger {
 public class Swagger {
 
 
-    @Value("${spring.cloud.config.profile}")
+    @Value("${spring.cloud.config.profile:prod}")
     private String profile;
     private String profile;
 
 
     @Bean
     @Bean
     public Docket api() {
     public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("admin")
+                .groupName("可视化平台1")
                 .enable(!"prod".equals(profile)) //生产环境关闭
                 .enable(!"prod".equals(profile)) //生产环境关闭
                 .select()
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.zq.dataoperation.controller"))
                 .apis(RequestHandlerSelectors.basePackage("com.zq.dataoperation.controller"))
@@ -42,7 +42,7 @@ public class Swagger {
     @Bean
     @Bean
     public Docket app() {
     public Docket app() {
         return new Docket(DocumentationType.SWAGGER_2)
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("app")
+                .groupName("可视化平台12")
                 .enable(!"prod".equals(profile)) //生产环境关闭
                 .enable(!"prod".equals(profile)) //生产环境关闭
                 .select()
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.zq.dataoperation.controller.api"))
                 .apis(RequestHandlerSelectors.basePackage("com.zq.dataoperation.controller.api"))
@@ -57,4 +57,4 @@ public class Swagger {
                 .description("查看接口文档")
                 .description("查看接口文档")
                 .build();
                 .build();
     }
     }
-}
+}
\ No newline at end of file

dataoperation-server/src/main/java/com/zq/dataoperation/config/AppTokenUtils.java

+package com.zq.dataoperation.config;/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.zq.common.base.SecurityProperties;
+import com.zq.common.config.redis.RedisUtils;
+import com.zq.common.vo.AppTokenVo;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.JwtBuilder;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.DatatypeConverter;
+import java.security.Key;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author /
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AppTokenUtils implements InitializingBean {
+
+    private RedisUtils redisUtils;
+
+    private static final String APP_TOKEN_KEY = "appToken";
+    private static Key key;
+    private static SignatureAlgorithm signatureAlgorithm;
+
+    @Override
+    public void afterPropertiesSet() {
+        signatureAlgorithm = SignatureAlgorithm.HS512;
+        byte[] keyBytes = DatatypeConverter.parseBase64Binary(SecurityProperties.BASE64SECRET);
+        key = new SecretKeySpec(keyBytes, signatureAlgorithm.getJcaName());
+    }
+
+    public static String createToken(AppTokenVo tokenVo, long minutes) {
+        long nowMillis = System.currentTimeMillis();
+        Date now = new Date(nowMillis);
+
+        JwtBuilder jwtBuilder = Jwts.builder()
+                .setSubject(tokenVo.getPhone())
+                .setIssuedAt(now)
+                .claim(APP_TOKEN_KEY, tokenVo)
+                .signWith(signatureAlgorithm, key)
+                // 加入ID确保生成的 Token 都不一致
+                .setId(tokenVo.getUserId().toString());
+
+        if (minutes >= 0) {
+            long expMillis = nowMillis + (minutes * 60 * 1000);
+            Date exp = new Date(expMillis);
+            jwtBuilder.setExpiration(exp);
+        }
+
+        return jwtBuilder.compact();
+    }
+
+    public static AppTokenVo getAppTokenVo(String token) {
+        try {
+            Claims claims = Jwts.parser()
+                    .setSigningKey(DatatypeConverter.parseBase64Binary(SecurityProperties.BASE64SECRET))
+                    .parseClaimsJws(token)
+                    .getBody();
+
+            // fix bug: 当前用户如果没有任何权限时，在输入用户名后，刷新验证码会抛IllegalArgumentException
+            return JSON.parseObject(JSON.toJSONString(claims.get(APP_TOKEN_KEY)), AppTokenVo.class);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * @param token 需要检查的token
+     */
+    public void checkRenewal(String token) {
+        // 判断是否续期token,计算token的过期时间
+        long time = redisUtils.getExpire(SecurityProperties.ONLINEKEY + token) * 1000;
+        Date expireDate = DateUtil.offset(new Date(), DateField.MILLISECOND, (int) time);
+        // 判断当前时间与过期时间的时间差
+        long differ = expireDate.getTime() - System.currentTimeMillis();
+        // 如果在续期检查的范围内，则续期
+        if (differ <= SecurityProperties.DETECT) {
+            long renew = time + SecurityProperties.RENEW;
+            redisUtils.expire(SecurityProperties.ONLINEKEY + token, renew, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    public static String resolveToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(SecurityProperties.HEADER);
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(SecurityProperties.getTokenStartWith())) {
+            // 去掉令牌前缀
+            return bearerToken.replace(SecurityProperties.getTokenStartWith(), "");
+        }
+        return null;
+    }
+}

dataoperation-server/src/main/java/com/zq/dataoperation/config/security/JwtAccessDeniedHandler.java → dataoperation-server/src/main/java/com/zq/dataoperation/config/JwtAccessDeniedHandler.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *  limitations under the License.
  */
  */
-package com.zq.dataoperation.config.security;
+package com.zq.dataoperation.config;
 
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.security.web.access.AccessDeniedHandler;

dataoperation-server/src/main/java/com/zq/dataoperation/config/security/JwtAuthenticationEntryPoint.java → dataoperation-server/src/main/java/com/zq/dataoperation/config/JwtAuthenticationEntryPoint.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *  limitations under the License.
  */
  */
-package com.zq.dataoperation.config.security;
+package com.zq.dataoperation.config;
 
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.AuthenticationEntryPoint;

dataoperation-server/src/main/java/com/zq/dataoperation/config/ProjectConfig.java

+package com.zq.dataoperation.config;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.system.OsInfo;
+import cn.hutool.system.SystemUtil;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wilmiam
+ * @since 2021/11/12 11:19
+ */
+@Component
+@ConfigurationProperties(prefix = "project")
+public class ProjectConfig {
+
+    public static String version = "v1.1";
+
+    public static String windowsPath = "D:\\jcy-file";
+
+    public static String linuxPath = "/instrument";
+
+    public static final String MAPPER_PATH = "/instrument/**";
+
+    public static final String HOME_URL = "http://" + NetUtil.getLocalhostStr() + ":9679/";
+
+    public static final String SALT = "MaiLu/1301";
+
+    public static final String SYSTEM_TAG = "oa-instrument";
+
+    public void setVersion(String version) {
+        ProjectConfig.version = version;
+    }
+
+    public void setWindowsPath(String windowsPath) {
+        ProjectConfig.windowsPath = windowsPath;
+        if (FileUtil.exist(windowsPath)) {
+            FileUtil.mkdir(windowsPath);
+        }
+    }
+
+    public void setLinuxPath(String linuxPath) {
+        ProjectConfig.linuxPath = linuxPath;
+        if (FileUtil.exist(linuxPath)) {
+            FileUtil.mkdir(linuxPath);
+        }
+    }
+
+    /**
+     * 获取当前系统路径
+     *
+     * @return
+     */
+    public static String getSysPath() {
+        OsInfo osInfo = SystemUtil.getOsInfo();
+        if (osInfo.isWindows()) {
+            return windowsPath;
+        } else if (osInfo.isLinux()) {
+            return linuxPath;
+        }
+        return linuxPath;
+    }
+
+}

dataoperation-server/src/main/java/com/zq/dataoperation/config/SecurityConfig.java

+package com.zq.dataoperation.config;
+
+import com.zq.common.annotation.AnonymousAccess;
+import com.zq.common.config.redis.RedisUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.core.GrantedAuthorityDefaults;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Zheng Jie
+ */
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    private final TokenProvider tokenProvider;
+    private RedisUtils redisUtils;
+    private final JwtAuthenticationEntryPoint authenticationErrorHandler;
+    private final JwtAccessDeniedHandler jwtAccessDeniedHandler;
+    private final ApplicationContext applicationContext;
+
+    @Bean
+    public GrantedAuthorityDefaults grantedAuthorityDefaults() {
+        // 去除 ROLE_ 前缀
+        return new GrantedAuthorityDefaults("");
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        // 密码加密方式
+        return new BCryptPasswordEncoder();
+    }
+
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        // 搜寻匿名标记 url： @AnonymousAccess
+        Map<RequestMappingInfo, HandlerMethod> handlerMethodMap = applicationContext.getBean(RequestMappingHandlerMapping.class).getHandlerMethods();
+        Set<String> anonymousUrls = new HashSet<>();
+        anonymousUrls.add("/data/**/**");
+        for (Map.Entry<RequestMappingInfo, HandlerMethod> infoEntry : handlerMethodMap.entrySet()) {
+            HandlerMethod handlerMethod = infoEntry.getValue();
+            AnonymousAccess anonymousAccess = handlerMethod.getMethodAnnotation(AnonymousAccess.class);
+            if (null != anonymousAccess) {
+                anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+            }
+        }
+        httpSecurity
+                // 禁用 CSRF
+                .csrf().disable()
+                // .addFilterBefore(new CorsConfig(), UsernamePasswordAuthenticationFilter.class) //在指定过滤器前添加过滤器
+                // 授权异常
+                .exceptionHandling()
+                .authenticationEntryPoint(authenticationErrorHandler)
+                .accessDeniedHandler(jwtAccessDeniedHandler)
+
+                // 防止iframe 造成跨域
+                .and()
+                .headers()
+                .frameOptions()
+                .disable()
+
+                // 不创建会话
+                .and()
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+
+                .and()
+                .authorizeRequests()
+                // 静态资源等等
+                .antMatchers(
+                        HttpMethod.GET,
+                        "/*.html",
+                        "/**/*.html",
+                        "/**/*.css",
+                        "/**/*.js",
+                        "/**/*.xlxs",
+                        "/webSocket/**"
+                ).permitAll()
+                // swagger 文档
+                .antMatchers("/swagger-ui.html").permitAll()
+                .antMatchers("/swagger-resources/**").permitAll()
+                .antMatchers("/webjars/**").permitAll()
+                .antMatchers("/*/api-docs").permitAll()
+                // 文件
+                .antMatchers("/avatar/**").permitAll()
+                .antMatchers("/file/**").permitAll()
+                // 阿里巴巴 druid
+                .antMatchers("/druid/**").permitAll()
+                .antMatchers("/test/**").permitAll()
+                // 放行OPTIONS请求
+                .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+                // 自定义匿名访问所有url放行 ： 允许匿名和带权限以及登录用户访问
+                .antMatchers(anonymousUrls.toArray(new String[0])).permitAll()
+                .antMatchers("/instrument/notSueCaseReview/getUnReviewNotSueCase/**").authenticated()
+                .antMatchers("/instrument/notSueCaseReview/getReviewNotSueCaseHistory/**").authenticated()
+                .antMatchers("/instrument/handling/getNotSueCase/**").authenticated()
+                // 所有请求都需要认证
+                .anyRequest().authenticated()
+                .and().apply(securityConfigurerAdapter());
+    }
+
+    private TokenConfigurer securityConfigurerAdapter() {
+        return new TokenConfigurer(tokenProvider);
+    }
+}

dataoperation-server/src/main/java/com/zq/dataoperation/config/TokenConfigurer.java

+package com.zq.dataoperation.config;/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+import com.zq.common.config.redis.RedisUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.DefaultSecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+/**
+ * @author /
+ */
+@RequiredArgsConstructor
+public class TokenConfigurer extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity> {
+
+    private final TokenProvider tokenProvider;
+    private RedisUtils redisUtils;
+
+    @Override
+    public void configure(HttpSecurity http) {
+        TokenFilter customFilter = new TokenFilter(tokenProvider, redisUtils);
+        http.addFilterBefore(customFilter, UsernamePasswordAuthenticationFilter.class);
+    }
+}

dataoperation-server/src/main/java/com/zq/dataoperation/config/TokenFilter.java

+package com.zq.dataoperation.config;/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import cn.hutool.core.util.StrUtil;
+import com.zq.common.base.SecurityProperties;
+import com.zq.common.config.redis.RedisUtils;
+import com.zq.common.utils.TokenUtils;
+import com.zq.common.vo.OnlineUserDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.GenericFilterBean;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author /
+ */
+@Slf4j
+public class
+TokenFilter extends GenericFilterBean {
+
+    private final TokenProvider tokenProvider;
+    private RedisUtils redisUtils;
+
+    public TokenFilter(TokenProvider tokenProvider, RedisUtils redisUtils) {
+        this.tokenProvider = tokenProvider;
+        this.redisUtils = redisUtils;
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+            throws IOException, ServletException {
+        HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
+        String token = TokenProvider.resolveToken(httpServletRequest);
+        // 对于 Token 为空的不需要去查 Redis
+        if (StrUtil.isNotBlank(token)) {
+            OnlineUserDto onlineUserDto = null;
+            try {
+                onlineUserDto = redisUtils.getObj(SecurityProperties.ONLINEKEY + token, OnlineUserDto.class);
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+            if (onlineUserDto != null && StringUtils.hasText(token)) {
+                Authentication authentication = tokenProvider.getAuthentication(token);
+                SecurityContextHolder.getContext().setAuthentication(authentication);
+                // Token 续期
+                tokenProvider.checkRenewal(token);
+                // 存到线程上下文
+                TokenUtils.setAdminContext(onlineUserDto);
+            }
+        }
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+}

dataoperation-server/src/main/java/com/zq/dataoperation/config/TokenProvider.java

+package com.zq.dataoperation.config;/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.zq.common.base.SecurityProperties;
+import com.zq.common.config.redis.RedisUtils;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.DatatypeConverter;
+import java.security.Key;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @author /
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class TokenProvider implements InitializingBean {
+
+    private RedisUtils redisUtils;
+
+    private static final String AUTHORITIES_KEY = "auth";
+    private static Key key;
+    private static SignatureAlgorithm signatureAlgorithm;
+
+    @Override
+    public void afterPropertiesSet() {
+        signatureAlgorithm = SignatureAlgorithm.HS512;
+        byte[] keyBytes = DatatypeConverter.parseBase64Binary(SecurityProperties.BASE64SECRET);
+        key = new SecretKeySpec(keyBytes, signatureAlgorithm.getJcaName());
+    }
+
+    public static String createToken(Authentication authentication) {
+        String authorities = authentication.getAuthorities().stream()
+                .map(GrantedAuthority::getAuthority)
+                .collect(Collectors.joining(","));
+
+        return Jwts.builder()
+                .setSubject(authentication.getName())
+                .claim(AUTHORITIES_KEY, authorities)
+                .signWith(signatureAlgorithm, key)
+                // 加入ID确保生成的 Token 都不一致
+                .setId(IdUtil.simpleUUID())
+                .compact();
+    }
+
+    public Authentication getAuthentication(String token) {
+        Claims claims = Jwts.parser()
+                .setSigningKey(DatatypeConverter.parseBase64Binary(SecurityProperties.BASE64SECRET))
+                .parseClaimsJws(token)
+                .getBody();
+
+        // fix bug: 当前用户如果没有任何权限时，在输入用户名后，刷新验证码会抛IllegalArgumentException
+        Object authoritiesStr = claims.get(AUTHORITIES_KEY);
+        Collection<? extends GrantedAuthority> authorities =
+                ObjectUtil.isNotEmpty(authoritiesStr) ?
+                        Arrays.stream(authoritiesStr.toString().split(","))
+                                .map(SimpleGrantedAuthority::new)
+                                .collect(Collectors.toList()) : Collections.emptyList();
+
+        User principal = new User(claims.getSubject(), "", authorities);
+
+        return new UsernamePasswordAuthenticationToken(principal, token, authorities);
+    }
+
+    /**
+     * @param token 需要检查的token
+     */
+    public void checkRenewal(String token) {
+        // 判断是否续期token,计算token的过期时间
+        long time = redisUtils.getExpire(SecurityProperties.ONLINEKEY + token) * 1000;
+        Date expireDate = DateUtil.offset(new Date(), DateField.MILLISECOND, (int) time);
+        // 判断当前时间与过期时间的时间差
+        long differ = expireDate.getTime() - System.currentTimeMillis();
+        // 如果在续期检查的范围内，则续期
+        if (differ <= SecurityProperties.DETECT) {
+            long renew = time + SecurityProperties.RENEW;
+            redisUtils.expire(SecurityProperties.ONLINEKEY + token, renew, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    public static String resolveToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(SecurityProperties.HEADER);
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(SecurityProperties.getTokenStartWith())) {
+            // 去掉令牌前缀
+            return bearerToken.replace(SecurityProperties.getTokenStartWith(), "");
+        }
+        return null;
+    }
+}

dataoperation-server/src/main/java/com/zq/dataoperation/controller/CommonQueryController.java

@@ -48,8 +48,8 @@ public class CommonQueryController {
 
 
     @ApiOperation("运行查询")
     @ApiOperation("运行查询")
     @PostMapping("/run/{queryId}")
     @PostMapping("/run/{queryId}")
-    public ResultVo run(@PathVariable("queryId") Long queryId, @RequestBody String body) throws SQLException {
+    public ResultVo run(@PathVariable("queryId") Long queryId, @RequestBody String body) throws Exception {
         System.out.println(body);
         System.out.println(body);
         return ResultVo.success(commonQueryService.run(queryId, body));
         return ResultVo.success(commonQueryService.run(queryId, body));
     }
     }
-}
+}
\ No newline at end of file

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCollect.java

@@ -9,10 +9,14 @@ import lombok.NoArgsConstructor;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
+/**
+ * @author Administrator
+ */
 @Data
 @Data
 @Builder
 @Builder
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
+@TableName(value = "data_collect_setting")
 public class DataCollect {
 public class DataCollect {
 
 
     /**
     /**

dataoperation-server/src/main/java/com/zq/dataoperation/service/CommonQueryService.java

@@ -53,7 +53,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
         }
         }
     }
     }
 
 
-    public List<Map> run(Long queryId, String body) throws SQLException {
+    public List<Map> run(Long queryId, String body) throws Exception {
         CommonQuerySetting querySetting = getById(queryId);
         CommonQuerySetting querySetting = getById(queryId);
         QueryDb queryDb = queryDbDao.selectById(querySetting.getQueryDbId());
         QueryDb queryDb = queryDbDao.selectById(querySetting.getQueryDbId());
         String sql = querySetting.getQuerySql();
         String sql = querySetting.getQuerySql();
@@ -61,24 +61,33 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
         JSONObject jsonObject = JSONUtil.parseObj(body);
         JSONObject jsonObject = JSONUtil.parseObj(body);
         Pattern pattern = Pattern.compile("\\{([^}]+)}");
         Pattern pattern = Pattern.compile("\\{([^}]+)}");
         Matcher matcher = pattern.matcher(sql);
         Matcher matcher = pattern.matcher(sql);
-        while (matcher.find()){
+        while (matcher.find()) {
             String group = matcher.group(1);
             String group = matcher.group(1);
-            if(jsonObject.containsKey(group)){
+            if (jsonObject.containsKey(group)) {
                 sql = sql.replace("{" + group + "}", jsonObject.getStr(group));
                 sql = sql.replace("{" + group + "}", jsonObject.getStr(group));
             }
             }
         }
         }
 
 
-        DruidPooledConnection connection = connectionHolder.get(queryDb.getId());
-        ResultSet resultSet = connection.prepareStatement(sql).executeQuery();
-        int columnCount = resultSet.getMetaData().getColumnCount();
-        List<Map> results = new ArrayList<>();
-        while (resultSet.next()){
-            Map<String, String> map = new HashMap<>(columnCount);
-            for (int i = 1; i <= columnCount; i++) {
-                map.put(resultSet.getMetaData().getColumnName(i), resultSet.getString(i));
+        ResultSet resultSet = null;
+        try {
+            DruidPooledConnection connection = connectionHolder.get(queryDb.getId());
+            resultSet = connection.prepareStatement(sql).executeQuery();
+            int columnCount = resultSet.getMetaData().getColumnCount();
+            List<Map> results = new ArrayList<>();
+            while (resultSet.next()) {
+                Map<String, String> map = new HashMap<>(columnCount);
+                for (int i = 1; i <= columnCount; i++) {
+                    map.put(resultSet.getMetaData().getColumnName(i), resultSet.getString(i));
+                }
+                results.add(map);
+            }
+            return results;
+        } catch (Exception e) {
+            throw new Exception(e);
+        } finally {
+            if (resultSet != null) {
+                resultSet.close();
             }
             }
-            results.add(map);
         }
         }
-        return results;
     }
     }
-}
+}
\ No newline at end of file

model-server/pom.xml

@@ -108,6 +108,18 @@
             <scope>compile</scope>
             <scope>compile</scope>
         </dependency>
         </dependency>
 
 
+        <!--swagger-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
         <!--若此依赖下载失败则手动安装到本地仓库mvn install:install-file -Dfile=D:\nnjcy-data-model\model-server\src\main\resources\lib\aspose-words-19.5.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.5 -Dpackaging=jar-->
         <!--若此依赖下载失败则手动安装到本地仓库mvn install:install-file -Dfile=D:\nnjcy-data-model\model-server\src\main\resources\lib\aspose-words-19.5.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.5 -Dpackaging=jar-->
         <dependency>
         <dependency>
             <groupId>com.aspose</groupId>
             <groupId>com.aspose</groupId>