1.IP白名单相关

王通
1 parent 558a646e
Showing 6 changed files with 177 additions and 14 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/filter/WhiteIpFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/resources/application-cloud.properties
src/main/resources/datatools/config-cloud.properties
src/main/resources/dubbo/config-cloud.properties
@@ -308,8 +308,8 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
-        log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
@@ -14,9 +14,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.WebApplicationContext;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -28,21 +28,26 @@ import java.util.Map;
  * IP白名单过滤器
  * @author Hill
  */
-@Component
-@Order(1)
-public class WhiteIpFilter extends BaseFilter {
+public class WhiteIpFilter implements Filter {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	@Autowired
 	private Setting setting;
+	public Setting getSetting() {
+		return setting;
+	}
+
+	public void setSetting(Setting setting) {
+		this.setting = setting;
+	}
+
 	@Override
-	public void doFilter(HttpServletRequest request,
-			HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		HttpServletRequest req = (HttpServletRequest)request;
+		HttpServletResponse res = (HttpServletResponse)response;
-		String ip = IpUtils.getIpAddr(request);
+		String ip = IpUtils.getIpAddr(req);
 		boolean isMatch = false;
 		List<WhiteIp> whiteIps = BasicData.whiteIpList;
 		if (whiteIps != null) {
@@ -56,7 +61,7 @@ public class WhiteIpFilter extends BaseFilter {
 			chain.doFilter(request, response);
 		} else {
 			logger.info(ip + "未在白名单中，不予访问");
-			response.setStatus(404);
+			res.setStatus(404);
 			return;
 		}
 	}
 package com.bsth.security;
+import com.bsth.common.Setting;
+import com.bsth.filter.WhiteIpFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -33,11 +35,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     SecurityMetadataSourceService securityMetadataSourceService;
+    @Autowired
+    Setting setting;
     @Override
     public void configure(WebSecurity web) throws Exception {
         // 白名单
-        web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
+        web.ignoring().antMatchers(Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
                 Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
     }
@@ -70,6 +74,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .maxSessionsPreventsLogin(false)//让之前的登录过期
                 .sessionRegistry(sessionRegistry());
+        WhiteIpFilter whiteIpFilter = new WhiteIpFilter();
+        whiteIpFilter.setSetting(setting);
+        http.addFilterBefore(whiteIpFilter, FilterSecurityInterceptor.class);
         http.addFilterBefore(new LoginInterceptor(), FilterSecurityInterceptor.class);
         http.addFilter(filterSecurityInterceptor());
     }
+server.port=9088
+
+# dubbo����ʹ�ÿ���flag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= false
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://192.170.100.132/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root2jsp
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://192.170.100.252:8080/transport_server/rtgps/
+## gateway send directive
+http.send.directive = http://192.170.100.252:8080/transport_server/message/
+## rfid data
+http.rfid.url= http://114.80.178.12:29000/rfid
+## http ticketing interface
+http.ticketing.interface= http://112.64.187.3:1080/gjService/request
+## first last generate
+ms.fl.generate=true
+## dsm ack interface
+dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
+## cp ack interface
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 113252620@qq.com
+## enabled
+enabled.whiteip= false
 \ No newline at end of file
+# 配置数据导入导出用到的配置信息
+
+# 1、kettle配置文件路径（类路径）
+datatools.kettle_properties=/datatools/kettle.properties
+# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
+
+#数据库ip地址
+datatools.kvars_dbip=192.170.100.132
+#数据库用户名
+datatools.kvars_dbuname=root
+#数据库密码
+datatools.kvars_dbpwd=root2jsp
+#数据库库名
+datatools.kvars_dbdname=control
+
+# 3、上传数据配置信息
+# 上传文件目录配置（根据不同的环境需要修正）
+datatools.fileupload_dir=/home/bsth_control_u_d_files
+# ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
+datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput
+# 临时输出文件目录
+datatools.trans_tempdir=/home/bsth_control_u_d_files/temp
+# 模版文件目录
+datatools.trans_templatedir=/home/bsth_control_u_d_files/template
+
+##---------------------------- 导入数据ktr ----------------------------##
+# 车辆信息导入ktr转换
+datatools.cars_datainputktr=/datatools/ktrs/carsDataInput.ktr
+# 人员信息导入
+datatools.employees_datainputktr=/datatools/ktrs/employeesDataInput.ktr
+# 路牌信息导入
+datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
+# 时刻表基础信息导入
+datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
+# 时刻表明细信息导入（元数据）
+datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
+# 时刻表明细编辑用数据
+datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
+# 时刻表明细信息导入
+datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
+# 时刻表明细信息导入2
+datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
+# 时刻表明细信息导入2（版本化）
+datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr
+# 时刻表明细信息导入2（版本化），使用生成时刻表格式
+datatools.ttinfodetail_datainputktr2version2=/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr
+
+# 车辆配置信息导入
+datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
+# 人员配置信息导入
+datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.ktr
+
+# 排版规则信息导入
+datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
+
+# 4、数据导出配置信息
+# 导出数据文件目录配置（根据不同的环境需要修正）
+datatools.fileoutput_dir=/home/bsth_control_u_d_files
+
+##---------------------------- 导出数据ktr -----------------------------##
+# 车辆信息导出ktr转换
+datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
+# 人员信息导出ktr转换
+datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
+# 排版规则导出数据ktr转换
+datatools.schedulerule_output=/datatools/ktrs/scheduleRuleDataOutput.ktr
+
+# 车辆配置信息导出ktr转换
+datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
+# 人员配置信息导出ktr转换
+datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
+
+# 路牌信息导出
+datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
+
+##--------------------------- 数据同步ktr ------------------------##
+datatools.vehicle_datasyncktr=/datatools/ktrs/vehicleDataSync.ktr
+
+# TODO：
+# application名字
+spring.dubbo.application.name=bsth_control_v_multi_service
+# zookeeper注册中心地址
+spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
+
+#----------- dubbo:consumer 性能调优选项 -------------#
+# 远程服务调用超时时间，单位毫秒，这里设置30分钟
+spring.dubbo.consumer.timeout=1800000
+# 远程服务调用重试次数，0表示不需要重试
+spring.dubbo.consumer.retries=0
+#----------- dubbo:consumer 服务治理选项 -------------#
+# 启动不检查提供者是否存在
+spring.dubbo.consumer.check=false