From bd9ac08d666b8c51a58ebf02484758249cad404b Mon Sep 17 00:00:00 2001 From: Igor I Date: Wed, 11 Dec 2024 09:35:56 +0500 Subject: [PATCH] =?UTF-8?q?error=20code=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/ccalm/jwt/MainController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ccalm/jwt/MainController.java b/src/main/java/org/ccalm/jwt/MainController.java index 1c76f3f..66e8d7a 100644 --- a/src/main/java/org/ccalm/jwt/MainController.java +++ b/src/main/java/org/ccalm/jwt/MainController.java @@ -599,13 +599,13 @@ public class MainController implements ServletContextAware { ret = jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper()); for (int i = 0; i < ret.size(); i++) { - json = new JSONObject(ret.get(i)); + JSONObject obj = new JSONObject(ret.get(i)); //Добавляю роль перевозчика пользователю sql = """ insert into main._usersgroups(user_id,group_id)values(:id,12) RETURNING id; """; parameters = new MapSqlParameterSource(); - parameters.addValue("id",json.getLong("id")); + parameters.addValue("id",obj.getLong("id")); jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper()); } @@ -763,7 +763,7 @@ public class MainController implements ServletContextAware { //I'm trying to log in json = null; try { - sql="select * from main.p__login(:user_id,:login,:password,:ip,:fingerprint);"; + sql="select * from main.p__login_v4(:user_id,:login,:password,:ip,:fingerprint);"; parameters = new MapSqlParameterSource(); parameters.addValue("user_id", 1); parameters.addValue("login", loginModel.getLogin()); @@ -996,7 +996,7 @@ public class MainController implements ServletContextAware { //I'm trying to log in json = null; try { - sql="select * from main.p__login(:user_id,:login,:password,:ip,:fingerprint);"; + sql="select * from main.p__login_v4(:user_id,:login,:password,:ip,:fingerprint);"; parameters = new MapSqlParameterSource(); parameters.addValue("user_id", 1); parameters.addValue("login", loginModel.getLogin());