diff --git a/org_ccalm_main.yml b/org_ccalm_main.yml index f741d62..cadd1b7 100644 --- a/org_ccalm_main.yml +++ b/org_ccalm_main.yml @@ -10,9 +10,9 @@ spring: application: name: org.ccalm.main datasource: - url: jdbc:postgresql://91.201.214.156:5432/CCALM + url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 username: postgres - password: PasSecrKey1 + password: 309A86FF65A78FB428F4E38DFE35F730 driver-class-name: org.postgresql.Driver hikari: maximum-pool-size: 10 diff --git a/src/main/java/org/ccalm/main/AcceptASDCController.java b/src/main/java/org/ccalm/main/AcceptASDCController.java index e4b0d1d..a25c268 100644 --- a/src/main/java/org/ccalm/main/AcceptASDCController.java +++ b/src/main/java/org/ccalm/main/AcceptASDCController.java @@ -35,6 +35,7 @@ import org.json.JSONObject; //import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; //import org.springframework.core.io.FileSystemResource; import org.springframework.stereotype.Controller; @@ -60,6 +61,15 @@ public class AcceptASDCController implements ServletContextAware { private static final Logger logger = LoggerFactory.getLogger(AcceptASDCController.class); private ServletContext context; + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + public static final String md5(final String str) { try { @@ -131,22 +141,6 @@ public class AcceptASDCController implements ServletContextAware { result.put("error_code", 0); result.put("error_message", ""); - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -246,22 +240,6 @@ public class AcceptASDCController implements ServletContextAware { result.put("error_code", 0); result.put("error_message", ""); - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - String uid=null; Connection conn = null; try { @@ -919,22 +897,6 @@ public class AcceptASDCController implements ServletContextAware { result.put("error_code", 0); result.put("error_message", ""); - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -1100,23 +1062,6 @@ public class AcceptASDCController implements ServletContextAware { String result=""; //boolean error=false; - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - //Create temporary directory String dataDir = data_dir; String tmpDir = "temp"+File.separator; @@ -2567,25 +2512,6 @@ public class AcceptASDCController implements ServletContextAware { return result; } - //String metadata_file = ""; - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - - //Connect to database Connection conn = null; try { @@ -2794,25 +2720,6 @@ public class AcceptASDCController implements ServletContextAware { if(reqData==null) return "OK"; - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error:",ex); - result.put("error_code",1); - result.put("error_message", ex.getMessage()); - return result.toString(); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -3168,23 +3075,6 @@ public class AcceptASDCController implements ServletContextAware { String result="Результат
"; - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); - } - //Connect to database Connection conn = null; try { diff --git a/src/main/java/org/ccalm/main/AcceptEXCEL.java b/src/main/java/org/ccalm/main/AcceptEXCEL.java index ea3c66d..049d722 100644 --- a/src/main/java/org/ccalm/main/AcceptEXCEL.java +++ b/src/main/java/org/ccalm/main/AcceptEXCEL.java @@ -24,6 +24,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import jakarta.servlet.ServletContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; //import org.apache.commons.io.FileUtils; //import org.springframework.core.io.FileSystemResource; @@ -50,6 +51,15 @@ public class AcceptEXCEL implements ServletContextAware { private ServletContext context; + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + @Override public void setServletContext(ServletContext context) { this.context=context; @@ -58,23 +68,6 @@ public class AcceptEXCEL implements ServletContextAware { @RequestMapping(value = "/AcceptCSV", method = { RequestMethod.GET, RequestMethod.POST }) public String acceptCSV(@ModelAttribute User user, Model model,@RequestParam(required=false,name="file") MultipartFile file,@RequestParam(required=false,name="skip",defaultValue = "0") Boolean skip) { - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/AcceptJSON.java b/src/main/java/org/ccalm/main/AcceptJSON.java index 68c2032..6def497 100644 --- a/src/main/java/org/ccalm/main/AcceptJSON.java +++ b/src/main/java/org/ccalm/main/AcceptJSON.java @@ -38,6 +38,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -67,6 +68,15 @@ public class AcceptJSON implements ServletContextAware { private ServletContext context; private static final int BUFFER_SIZE = 4096; + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + //If not created object "user", create him. //@ModelAttribute("user") //public User populatePerson() { @@ -95,22 +105,6 @@ public class AcceptJSON implements ServletContextAware { if(user.id==null || user.id.equals("null") || user.id.isBlank()) return "Please log in!"; - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -413,22 +407,6 @@ public class AcceptJSON implements ServletContextAware { @RequestMapping(value = "/AcceptJSON_RUS", method = { RequestMethod.GET, RequestMethod.POST }) public String acceptCSV(@ModelAttribute User user, Model model,@RequestParam(required=false,name="file") MultipartFile file,@RequestParam(required=false,name="skip",defaultValue = "0") Boolean skip) { - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/DataJSON.java b/src/main/java/org/ccalm/main/DataJSON.java index 1861f80..0415574 100644 --- a/src/main/java/org/ccalm/main/DataJSON.java +++ b/src/main/java/org/ccalm/main/DataJSON.java @@ -24,6 +24,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; @@ -47,7 +48,16 @@ public class DataJSON implements ServletContextAware { private static final Logger logger = LoggerFactory.getLogger(DataJSON.class); private ServletContext context; - + + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + //If not created object "user", create him. //@ModelAttribute("user") //public User populatePerson() { @@ -61,23 +71,6 @@ public class DataJSON implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/DownloadWeather.java b/src/main/java/org/ccalm/main/DownloadWeather.java index fda8619..b518a6b 100644 --- a/src/main/java/org/ccalm/main/DownloadWeather.java +++ b/src/main/java/org/ccalm/main/DownloadWeather.java @@ -16,6 +16,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import jakarta.servlet.ServletContext; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -40,7 +41,16 @@ public class DownloadWeather implements ServletContextAware { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(DownloadWeather.class); private ServletContext context; - + + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + @RequestMapping(value = "/DownloadWeather",method = RequestMethod.GET,produces = "text/html;charset=UTF-8") @ResponseBody public Object ajaxTamer(@RequestParam(required=false,name="forecast") String forecast,@RequestParam(required=false,name="date") String date) { @@ -52,26 +62,10 @@ public class DownloadWeather implements ServletContextAware { TimeZone.setDefault(TimeZone.getTimeZone("UTC")); - //Load DB configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); + String tmp_dir=data_dir+"temp"+File.separator; - data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - data_dir+="temp"+File.separator; - File dir = new File(data_dir); + File dir = new File(tmp_dir); if (!dir.exists()) dir.mkdirs(); //response.getWriter().append("Served at: ").append(request.getContextPath()); @@ -111,7 +105,7 @@ public class DownloadWeather implements ServletContextAware { //Build URL to download String URL = "https://www.ftp.ncep.noaa.gov/data/nccf/com/gfs/prod/gfs."+date+"/"+time+"/atmos/gfs.t"+time+"z.pgrb2.0p25.f"+forecast; - File f = new File(data_dir+"text.idx"); + File f = new File(tmp_dir+"text.idx"); if(f.exists()) { if (!f.delete()) { System.out.println("Failed to delete the file."); @@ -119,15 +113,15 @@ public class DownloadWeather implements ServletContextAware { } WeatherDownload wd = new WeatherDownload(); - if(wd.download(URL+".idx", data_dir+"text.idx", "0", "")) + if(wd.download(URL+".idx", tmp_dir+"text.idx", "0", "")) { - result+="Download "+URL+".idx"+" to "+data_dir+"text.idx"+"
"; + result+="Download "+URL+".idx"+" to "+tmp_dir+"text.idx"+"
"; String strPos1=""; String strPos2=""; //Read file and find required line. try { - BufferedReader br = new BufferedReader(new FileReader(data_dir+"text.idx")); + BufferedReader br = new BufferedReader(new FileReader(tmp_dir+"text.idx")); String line; while ((line = br.readLine()) != null) { @@ -159,11 +153,11 @@ public class DownloadWeather implements ServletContextAware { posEnd=String.valueOf(Long.parseLong(posEnd)-1); } - wd.download(URL, data_dir+"text.f000", String.valueOf(posStart), String.valueOf(posEnd)); + wd.download(URL, tmp_dir+"text.f000", String.valueOf(posStart), String.valueOf(posEnd)); } }else { - result+="Not download "+URL+".idx"+" to "+data_dir+"text.idx"+"
"; + result+="Not download "+URL+".idx"+" to "+tmp_dir+"text.idx"+"
"; } Array dataArrayLat=null; @@ -172,7 +166,7 @@ public class DownloadWeather implements ServletContextAware { try { // open netcdf/grib/grib2 file from argument - NetcdfDataset gid = NetcdfDataset.openDataset(data_dir+"text.f000"); + NetcdfDataset gid = NetcdfDataset.openDataset(tmp_dir+"text.f000"); //logger.info("Desc: " + gid.getDescription()); logger.info(gid.getDetailInfo()); @@ -366,23 +360,6 @@ public class DownloadWeather implements ServletContextAware { boolean error=false; String result=""; - //Load DB configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/GeoGSON.java b/src/main/java/org/ccalm/main/GeoGSON.java index d95d8a5..acae0ba 100644 --- a/src/main/java/org/ccalm/main/GeoGSON.java +++ b/src/main/java/org/ccalm/main/GeoGSON.java @@ -17,6 +17,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import jakarta.servlet.ServletContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +37,16 @@ public class GeoGSON implements ServletContextAware { private static final Logger logger = LoggerFactory.getLogger(GeoGSON.class); private ServletContext context; - + + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + @RequestMapping(value = "/geojson", method = RequestMethod.GET) @ResponseBody public Object home(@RequestParam(required=false,name="table") String table,@RequestParam(required=false,name="id") String id) @@ -44,22 +54,6 @@ public class GeoGSON implements ServletContextAware { boolean error=false; String result=""; - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -123,22 +117,6 @@ public class GeoGSON implements ServletContextAware { boolean error=false; String result="OK
"; - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/Integration.java b/src/main/java/org/ccalm/main/Integration.java index 88b50d5..ba10685 100644 --- a/src/main/java/org/ccalm/main/Integration.java +++ b/src/main/java/org/ccalm/main/Integration.java @@ -24,6 +24,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,6 +49,15 @@ public class Integration implements ServletContextAware { private static final Logger logger = LoggerFactory.getLogger(Integration.class); private ServletContext context; + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + @Value("${data.dir}") + String data_dir = ""; + @RequestMapping(value = "/integration/getByTime", method = RequestMethod.GET,produces = "application/json; charset=utf-8") @ResponseBody public Object getByTime(@RequestParam(required=true,name="token") String token,@RequestParam(required=true,name="timeBegin") String timeBegin,@RequestParam(required=false,name="timeEnd") String timeEnd,@RequestParam(required=false,name="type") String type) @@ -86,22 +96,6 @@ public class Integration implements ServletContextAware { return obj.toString(); } - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -318,22 +312,6 @@ public class Integration implements ServletContextAware { return obj.toString(); } - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -569,23 +547,6 @@ public class Integration implements ServletContextAware { return obj.toString(); } - String db_url=""; - String db_login=""; - String db_password=""; - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - - data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/Products.java b/src/main/java/org/ccalm/main/Products.java index bf04765..a43e4f8 100644 --- a/src/main/java/org/ccalm/main/Products.java +++ b/src/main/java/org/ccalm/main/Products.java @@ -21,6 +21,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import jakarta.servlet.ServletContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; @@ -48,7 +49,16 @@ public class Products implements ServletContextAware { private static final Logger logger = LoggerFactory.getLogger(Products.class); private ServletContext context; - + + + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + + //If not created object "user", create him. //@ModelAttribute("user") //public User populatePerson() { @@ -62,21 +72,6 @@ public class Products implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -390,21 +385,6 @@ public class Products implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -683,23 +663,6 @@ public class Products implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -842,23 +805,6 @@ public class Products implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -949,23 +895,6 @@ public class Products implements ServletContextAware { int errorCode=0; String errorMessage=""; - //Load configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/main/java/org/ccalm/main/QGIS.java b/src/main/java/org/ccalm/main/QGIS.java index e3d7fb2..f502414 100644 --- a/src/main/java/org/ccalm/main/QGIS.java +++ b/src/main/java/org/ccalm/main/QGIS.java @@ -23,6 +23,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpEntity; @@ -51,7 +52,14 @@ public class QGIS implements ServletContextAware { private Properties m_props=null; private String m_props_loc=""; public String m_locale="ru"; - + + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + //If not created object "user", create him. //@ModelAttribute("user") //public User populatePerson() { @@ -66,22 +74,6 @@ public class QGIS implements ServletContextAware { logger.info("user.id="+user.id+" user.name="+user.name+" user.language_id="+user.language_id); m_locale=user.language_id; - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - Connection conn = null; try { Class.forName("org.postgresql.Driver"); @@ -414,7 +406,7 @@ public class QGIS implements ServletContextAware { } //Send data - fileAsString=getText(conn,fileAsString,user); + fileAsString=trts(conn,fileAsString,user); return new HttpEntity(fileAsString.getBytes(), headers); } @@ -473,7 +465,7 @@ public class QGIS implements ServletContextAware { } //Translate text by patterns - public String getText(Connection conn,String text,User user) { + public String trts(Connection conn,String text,User user) { int pos1 = 0; while (true) { pos1 = text.indexOf("trt('", pos1); diff --git a/src/main/java/org/ccalm/main/SendMail.java b/src/main/java/org/ccalm/main/SendMail.java index f10a14b..3be443d 100644 --- a/src/main/java/org/ccalm/main/SendMail.java +++ b/src/main/java/org/ccalm/main/SendMail.java @@ -10,6 +10,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; import jakarta.servlet.ServletContext; +import org.springframework.beans.factory.annotation.Value; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -43,6 +44,22 @@ public class SendMail implements ServletContextAware { //private Properties m_props=null; public String m_locale="en"; + @Value("${spring.datasource.url}") + String db_url=""; + @Value("${spring.datasource.username}") + String db_login=""; + @Value("${spring.datasource.password}") + String db_password=""; + + @Value("${mail.host}") + String mail_host = ""; + @Value("${mail.port}") + String mail_port = ""; + @Value("${mail.login}") + String mail_login = ""; + @Value("${mail.password}") + String mail_password = ""; + //private HashMap m_props = new HashMap< String, Properties>(); //If not created object "user", create him. @@ -62,31 +79,6 @@ public class SendMail implements ServletContextAware { String result=""; - //Load DB configuration from "config.xml" - String db_url=""; - String db_login=""; - String db_password=""; - //String data_dir = ""; - String mail_host = ""; - String mail_port = ""; - String mail_login = ""; - String mail_password = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - db_url = prop.getProperty("spring.datasource.url"); - db_login = prop.getProperty("spring.datasource.username"); - db_password = prop.getProperty("spring.datasource.password"); - //data_dir = prop.getProperty("data.dir"); - mail_host = prop.getProperty("mail.host"); - mail_port = prop.getProperty("mail.port"); - mail_login = prop.getProperty("mail.login"); - mail_password = prop.getProperty("mail.password"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",e); - } - //Connect to database try{ Class.forName("org.postgresql.Driver"); @@ -462,7 +454,7 @@ public class SendMail implements ServletContextAware { } //--------------------------------------------------------------------------- //Translate text by patterns - public String getText(String text) { + public String trts(String text) { int pos1 = 0; while (true) { pos1 = text.indexOf("trt('", pos1); diff --git a/src/main/java/org/ccalm/main/TestFiles.java b/src/main/java/org/ccalm/main/TestFiles.java index 17c6a88..478c173 100644 --- a/src/main/java/org/ccalm/main/TestFiles.java +++ b/src/main/java/org/ccalm/main/TestFiles.java @@ -39,7 +39,7 @@ public class TestFiles implements ServletContextAware { { String result=""; - //Load DB configuration from "config.xml" + /*//Load DB configuration from "config.xml" String db_url=""; String db_login=""; String db_password=""; @@ -171,7 +171,7 @@ public class TestFiles implements ServletContextAware { } catch (SQLException e) { e.printStackTrace(); - } + }*/ return result; diff --git a/src/main/resources/templates/engine/index.html b/src/main/resources/templates/engine/index.html index 8180eaa..a4ceba4 100644 --- a/src/main/resources/templates/engine/index.html +++ b/src/main/resources/templates/engine/index.html @@ -189,6 +189,10 @@ var g_user=null; //var m_FrmLocustDel=null; var g_FrmCheckpoints=null; +var g_WeaLegend=null; //Legends +var g_AirLegend=null; +var g_PreLegend=null; +var g_HTCLegend=null; //Decode URL parameters. var GET = {}; @@ -376,7 +380,7 @@ function onLoadPage() - + @@ -403,14 +407,12 @@ function onLoadPage()
- - + @@ -574,7 +576,7 @@ if(field!=null) - + @@ -1164,15 +1166,16 @@ new Calendar({ @@ -1825,6 +1828,16 @@ map.on('singleclick', function(evt){ //map.on('click', function(evt){ //$(element).popover('destroy'); //popup.setPosition(coordinate); //$(popup.getElement()).show(); + + { + let center = ol.proj.transform(coordinate, 'EPSG:3857', 'EPSG:4326') + if (g_WeaLegend!=null && g_WeaLegend.visible) alert("g_WeaLegend"); + if (g_AirLegend!=null && g_AirLegend.visible) alert("g_AirLegend"); + if (g_PreLegend!=null && g_PreLegend.visible) alert("g_PreLegend"); + + + //alert("lat = "+center[1]+" lon = "+center[0]) + } if(g_FrmCheckpoints!=null){ let center = ol.proj.transform(coordinate, 'EPSG:3857', 'EPSG:4326')

@@ -438,7 +440,7 @@ function onLoadPage()
Method_filling_form
PDA_registered
Method_filling_form
PDA_registered
Year - + + - - - - + + + + +