Commit def182fb78215cbc6f4d35f76fb1b77ccfa3a5c8

Authored by 娄高锋
2 parents b766674b 6796a9f2

Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
@@ -750,17 +750,17 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, @@ -750,17 +750,17 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
750 public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){ 750 public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){
751 Map<String, Object> res = new HashMap<>(); 751 Map<String, Object> res = new HashMap<>();
752 InputStream in = null; 752 InputStream in = null;
753 - OutputStream out = null;  
754 SysUser user = SecurityUtils.getCurrentUser(); 753 SysUser user = SecurityUtils.getCurrentUser();
755 DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); 754 DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
756 StringBuilder url = new StringBuilder("http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?"), uri = new StringBuilder(); 755 StringBuilder url = new StringBuilder("http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?"), uri = new StringBuilder();
757 - uri.append("ddyName=").append(user == null ? "admin" : user.getUserName());  
758 - uri.append("&checkTime=").append(fmt.print(System.currentTimeMillis()));  
759 - uri.append("&nbbm=").append(param.get("nbbm"));  
760 - uri.append("&starttime=").append(fmt.print(Long.parseLong(param.get("ts").toString()))); 756 + HttpURLConnection con = null;
761 try { 757 try {
762 - url.append(URLEncoder.encode(url.toString(), "UTF-8"));  
763 - HttpURLConnection con = (HttpURLConnection)new URL(url.toString()).openConnection(); 758 + uri.append("ddyName=").append(URLEncoder.encode(user == null ? "admin" : user.getUserName(), "UTF-8"));
  759 + uri.append("&checkTime=").append(URLEncoder.encode(fmt.print(System.currentTimeMillis()), "UTF-8"));
  760 + uri.append("&nbbm=").append(URLEncoder.encode(param.get("nbbm").toString(), "UTF-8"));
  761 + uri.append("&starttime=").append(URLEncoder.encode(fmt.print(Long.parseLong(param.get("ts").toString())), "UTF-8"));
  762 + url.append(uri);
  763 + con = (HttpURLConnection)new URL(url.toString()).openConnection();
764 con.setDoInput(true); 764 con.setDoInput(true);
765 con.setRequestMethod("POST"); 765 con.setRequestMethod("POST");
766 con.setConnectTimeout(5000); 766 con.setConnectTimeout(5000);
@@ -775,6 +775,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -775,6 +775,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
775 ByteArrayOutputStream bout = new ByteArrayOutputStream(); 775 ByteArrayOutputStream bout = new ByteArrayOutputStream();
776 IOUtils.copy(in, bout); 776 IOUtils.copy(in, bout);
777 Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class); 777 Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
  778 + System.out.println(map);
778 } 779 }
779 } catch (MalformedURLException e) { 780 } catch (MalformedURLException e) {
780 // TODO Auto-generated catch block 781 // TODO Auto-generated catch block
@@ -782,6 +783,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -782,6 +783,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
782 } catch (IOException e) { 783 } catch (IOException e) {
783 // TODO Auto-generated catch block 784 // TODO Auto-generated catch block
784 e.printStackTrace(); 785 e.printStackTrace();
  786 + } finally {
  787 + if (con != null) {
  788 + con.disconnect();
  789 + }
785 } 790 }
786 791
787 return res; 792 return res;
src/main/java/com/bsth/filter/SQLInjectFilter.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
9 import java.io.IOException; 9 import java.io.IOException;
10 import java.util.Enumeration; 10 import java.util.Enumeration;
11 11
12 -@Component 12 +//@Component
13 public class SQLInjectFilter extends BaseFilter{ 13 public class SQLInjectFilter extends BaseFilter{
14 14
15 @Override 15 @Override