diff --git a/src/main/java/org/ccalm/main/engine/EngineController.java b/src/main/java/org/ccalm/main/engine/EngineController.java index f29d5ea..dafe44e 100644 --- a/src/main/java/org/ccalm/main/engine/EngineController.java +++ b/src/main/java/org/ccalm/main/engine/EngineController.java @@ -4,11 +4,7 @@ import java.io.FileInputStream; import java.security.KeyFactory; import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.Base64; import java.util.List; import java.util.Properties; @@ -65,6 +61,7 @@ public class EngineController implements ServletContextAware { @Autowired public EngineController(NamedParameterJdbcTemplate jdbcTemplate) { this.jdbcTemplate = jdbcTemplate; + this.m_props = new Properties(); } private PublicKey getPublicKey(){ @@ -116,7 +113,7 @@ public class EngineController implements ServletContextAware { long country_id=0; try { String sql=""" - select language_id,country_id from main._users where id=user_id + select language_id,country_id from main._users where id=:user_id """; MapSqlParameterSource parameters = new MapSqlParameterSource(); parameters.addValue("user_id", claims.getBody().get("user_id")); @@ -354,12 +351,13 @@ public class EngineController implements ServletContextAware { }*/ //Для перевода выбираю всё что под номером 1 в переводе + try { String sql=""" - select identifier,translation from main._translations t where t.del=false and t.language_id=:language_id and translation_type_id=1 + select identifier,translation from main._translations t where t.del=false and t.language_id=:language_id and translation_type_id=1; """; MapSqlParameterSource parameters = new MapSqlParameterSource(); - parameters.addValue("language_id", language_id); + parameters.addValue("language_id", language_id, Types.INTEGER); List ret = jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper()); for (int i = 0; i < ret.size(); i++) { JSONObject obj = new JSONObject(ret.get(i)); @@ -401,9 +399,9 @@ public class EngineController implements ServletContextAware { for (int i = 0; i < ret.size(); i++) { JSONObject obj = new JSONObject(ret.get(i)); //m_props.setProperty(obj.getString("identifier"), obj.getString("translation")); - Substrate_head+=" \n"; + Substrate_head+=" \n"; - Substrate_tail+="g_Layouts[\""+obj.getString("id")+"\"] = new ol.source.XYZ({\n"; + Substrate_tail+="g_Layouts[\""+obj.getInt("id")+"\"] = new ol.source.XYZ({\n"; Substrate_tail+=" url: '"+obj.getString("path")+"',\n"; if(!obj.isNull("projection") && obj.getString("projection").indexOf("EPSG:")!=-1) Substrate_tail+=" projection: '"+obj.getString("projection")+"',\n"; diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 962c9eb..530180f 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -1,11 +1,17 @@ - + Authorization + + + + + + -
+ +