From 39911b42646a80338709b2527c708b571f94f59d Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Wed, 26 Aug 2020 07:34:54 +0800 Subject: [PATCH] FIX --- .../service/JdbcSocialsAssociateService.java | 10 +++++----- .../org/maxkey/web/contorller/AppListController.java | 2 +- .../main/resources/templates/views/passwordExpired.ftl | 2 +- .../main/resources/templates/views/passwordInitial.ftl | 2 +- .../resources/templates/views/safe/changePassword.ftl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java index c475d30e8..6b7bbfe9c 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java @@ -31,15 +31,15 @@ import org.springframework.jdbc.core.RowMapper; public class JdbcSocialsAssociateService implements SocialsAssociateService{ private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialsAssociateService.class); - private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "INSERT INTO SOCIALS_ASSOCIATE(ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE )VALUES( ? , ? , ? , ? , ?, ? , ? , ?)"; + private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "INSERT INTO MXK_SOCIALS_ASSOCIATE(ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE )VALUES( ? , ? , ? , ? , ?, ? , ? , ?)"; - private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALS_ASSOCIATE WHERE PROVIDER = ? AND SOCIALUID = ?"; + private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM MXK_SOCIALS_ASSOCIATE WHERE PROVIDER = ? AND SOCIALUID = ?"; - private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALS_ASSOCIATE WHERE UID = ?" ; + private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM MXK_SOCIALS_ASSOCIATE WHERE UID = ?" ; - private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "DELETE FROM SOCIALS_ASSOCIATE WHERE UID = ? AND PROVIDER = ?"; + private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "DELETE FROM MXK_SOCIALS_ASSOCIATE WHERE UID = ? AND PROVIDER = ?"; - private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "UPDATE SOCIALS_ASSOCIATE SET ACCESSTOKEN = ? , SOCIALUSERINFO = ? , EXATTRIBUTE = ? ,UPDATEDDATE = ? WHERE ID = ?"; + private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "UPDATE MXK_SOCIALS_ASSOCIATE SET ACCESSTOKEN = ? , SOCIALUSERINFO = ? , EXATTRIBUTE = ? ,UPDATEDDATE = ? WHERE ID = ?"; private final JdbcTemplate jdbcTemplate; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index 47c1e3d62..b3bda6bbb 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -76,7 +76,7 @@ public class AppListController { if (gridList != null && !gridList.equals("")) { int intGridList = Integer.parseInt(gridList); - jdbcTemplate.update("UPDATE USERINFO SET GRIDLIST = ? WHERE ID = ?", intGridList, + jdbcTemplate.update("UPDATE MXK_USERINFO SET GRIDLIST = ? WHERE ID = ?", intGridList, WebContext.getUserInfo().getId()); WebContext.getUserInfo().setGridList(intGridList); } diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl index 676585404..531410e60 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl @@ -16,7 +16,7 @@
-
+ diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl index e6b6f97f4..c05189226 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl @@ -16,7 +16,7 @@
- + diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl index 7ba0113d0..047ea3a77 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl @@ -11,7 +11,7 @@
- +