aboutsummaryrefslogtreecommitdiff
path: root/server-core/src/main/java/com/juick/service/UserServiceImpl.java
diff options
context:
space:
mode:
Diffstat (limited to 'server-core/src/main/java/com/juick/service/UserServiceImpl.java')
-rw-r--r--server-core/src/main/java/com/juick/service/UserServiceImpl.java52
1 files changed, 26 insertions, 26 deletions
diff --git a/server-core/src/main/java/com/juick/service/UserServiceImpl.java b/server-core/src/main/java/com/juick/service/UserServiceImpl.java
index b681e3c8..63785cff 100644
--- a/server-core/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/server-core/src/main/java/com/juick/service/UserServiceImpl.java
@@ -32,9 +32,9 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
@Override
public User mapRow(ResultSet rs, int rowNum) throws SQLException {
User user = new User();
- user.setUID(rs.getInt(1));
- user.setUName(rs.getString(2));
- user.Banned = rs.getBoolean(3);
+ user.setUid(rs.getInt(1));
+ user.setName(rs.getString(2));
+ user.setBanned(rs.getBoolean(3));
return user;
}
}
@@ -172,8 +172,8 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
+ "WHERE jids.jid IN (\"" + StringUtils.arrayToDelimitedString(jids.toArray(), "\",\"") + "\")",
(rs, rowNum) -> {
com.juick.User user = new com.juick.User();
- user.setUID(rs.getInt(1));
- user.setUName(rs.getString(2));
+ user.setUid(rs.getInt(1));
+ user.setName(rs.getString(2));
user.setJID(rs.getString(3));
return user;
});
@@ -260,7 +260,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
if (realPassword.equals(password)) {
User user = getUserByName(username);
if (user != null) {
- return user.getUID();
+ return user.getUid();
} else {
return -1;
}
@@ -275,7 +275,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
@Transactional
@Override
public boolean updatePassword(final User user, final String newPassword) {
- return user.getUID() > 0 && getJdbcTemplate().update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUID()) > 0;
+ return user.getUid() > 0 && getJdbcTemplate().update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUid()) > 0;
}
@Transactional
@@ -284,7 +284,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
String newHash = UserUtils.generateHash(16);
if (getJdbcTemplate().update(
"INSERT INTO mail(user_id,hash) VALUES (?,?) ON DUPLICATE KEY UPDATE hash=?",
- user.getUID(),
+ user.getUid(),
newHash,
newHash) > 0) {
return newHash;
@@ -320,7 +320,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
info.setUrl(rs.getString(3));
info.setDescription(rs.getString(4));
return info;
- }), user.getUID());
+ }), user.getUid());
} catch (EmptyResultDataAccessException e) {
return new UserInfo();
}
@@ -332,7 +332,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
return getJdbcTemplate().update(
"INSERT INTO usersinfo(user_id,fullname,country,url,descr) VALUES (?,?,?,?,?) " +
"ON DUPLICATE KEY UPDATE fullname=?,country=?,url=?,descr=?",
- user.getUID(),
+ user.getUid(),
info.getFullName(),
info.getCountry(),
info.getUrl(),
@@ -435,8 +435,8 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
"ON subscr_users.user_id=users.id ORDER BY cnt LIMIT ?",
(rs, num) -> {
com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
},
uid,
@@ -452,8 +452,8 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
"WHERE subscr_users.user_id=? ORDER BY users.nick",
(rs, num) -> {
com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
},
uid);
@@ -469,8 +469,8 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
"ORDER BY users.nick",
(rs, num) -> {
com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
},
uid,
@@ -484,8 +484,8 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
"ON(bl_users.bl_user_id=users.id) WHERE bl_users.user_id=? ORDER BY users.nick",
(rs, num) -> {
com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
}, uid);
}
@@ -497,9 +497,9 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
if (getJdbcTemplate().update("INSERT INTO twitter(user_id,access_token,access_token_secret,uname) " +
"VALUES (?,?,?,?)" +
" ON DUPLICATE KEY UPDATE access_token=?,access_token_secret=?,uname=?",
- user.getUID(), accessToken, accessTokenSecret, screenName, accessToken, accessTokenSecret, screenName) > 0) {
+ user.getUid(), accessToken, accessTokenSecret, screenName, accessToken, accessTokenSecret, screenName) > 0) {
return getJdbcTemplate().update("INSERT INTO subscr_users(user_id,suser_id,jid) " +
- "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUID()) > 0;
+ "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUid()) > 0;
}
return false;
@@ -555,7 +555,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
"UPDATE jids SET active=? WHERE user_id=? AND jid=?");
int newStatus = jidStatus == UserService.ActiveStatus.Active ? 1 : 0;
preparedStatement.setInt(1, newStatus);
- preparedStatement.setInt(2, user.getUID());
+ preparedStatement.setInt(2, user.getUid());
preparedStatement.setString(3, JID);
return preparedStatement;
@@ -568,7 +568,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
@Override
public List<String> getAllJIDs(final User user) {
return getJdbcTemplate().queryForList(
- "SELECT jid FROM jids WHERE user_id=?", String.class, user.getUID());
+ "SELECT jid FROM jids WHERE user_id=?", String.class, user.getUid());
}
@Transactional(readOnly = true)
@@ -577,13 +577,13 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
return getJdbcTemplate().query(
"SELECT account,authcode FROM auth WHERE user_id=? AND protocol='xmpp'",
(rs, num) -> new Auth(rs.getString(1), rs.getString(2)),
- user.getUID());
+ user.getUid());
}
@Transactional(readOnly = true)
@Override
public List<String> getEmails(final User user) {
- return getJdbcTemplate().queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUID());
+ return getJdbcTemplate().queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUid());
}
@Transactional(readOnly = true)
@@ -592,7 +592,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
try {
return getJdbcTemplate().queryForObject(
"SELECT email,subscr_hour FROM emails WHERE user_id=? AND subscr_hour IS NOT NULL",
- (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUID());
+ (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUid());
} catch (EmptyResultDataAccessException e) {
return null;
}
@@ -605,7 +605,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
return getJdbcTemplate().queryForObject(
"SELECT hash FROM mail WHERE user_id=?",
String.class,
- user.getUID())
+ user.getUid())
+ "@mail.juick.com";
} catch (EmptyResultDataAccessException e) {
return "";
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 01:45:38 +0000