lxy/redbbs-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

社区升级

Browse Source 
1、表字段统一小写，
   2、表模块划分
   3、表状态等字段统一smallint
   4、部分字段值重新定义
This commit is contained in:
lxyer
2018-06-17 20:37:12 +08:00
parent 05bcd44e97
commit 1f79682516
35 changed files with 832 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/com/lxyer/bbs/base/user/UserService.java
View File

@@ -31,7 +31,7 @@ public class UserService extends BaseService {
final RetResult retResult = new RetResult();
User user = source.find(User.class, "username", loginBean.getUsername());
UserRecord user = source.find(UserRecord.class, "username", loginBean.getUsername());
if (user == null || !Objects.equals(user.getPassword(), loginBean.getPassword())){
//log(null, 0, "用户或密码错误");
return RetCodes.retResult(RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL, "用户或密码错误");
@@ -40,7 +40,7 @@ public class UserService extends BaseService {
//log(user, 0, "用户登录成功.");
UserInfo userInfo = user.createUserInfo();
sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), userInfo.getUserId());
sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), userInfo.getUserid());
retResult.setRetcode(0);
retResult.setResult(userInfo);
retResult.setRetinfo("登录成功.");
@@ -61,7 +61,7 @@ public class UserService extends BaseService {
@RestMapping(name = "info", comment = "用户信息")
public UserInfo findUserInfo(int userid) {
User user = source.find(User.class, userid);
UserRecord user = source.find(UserRecord.class, userid);
return user == null ? null : user.createUserInfo();
}
@@ -74,8 +74,8 @@ public class UserService extends BaseService {
}
@RestMapping(name = "query", auth = false, comment = "用户数据查询")
public Sheet<User> queryUser(Flipper flipper, @RestParam(name = "bean", comment = "过滤条件") final UserBean userBean){
Sheet<User> users = source.querySheet(User.class, flipper, userBean);
public Sheet<UserRecord> queryUser(Flipper flipper, @RestParam(name = "bean", comment = "过滤条件") final UserBean userBean){
Sheet<UserRecord> users = source.querySheet(UserRecord.class, flipper, userBean);
return users;
}
@@ -84,32 +84,32 @@ public class UserService extends BaseService {
public RetResult updatePwd(@RestSessionid String sessionid, String pass, String nowpass){
UserInfo userInfo = current(sessionid);//不会为空
if (!Objects.equals(userInfo.getPassword(), User.md5IfNeed(nowpass)))
if (!Objects.equals(userInfo.getPassword(), UserRecord.md5IfNeed(nowpass)))
return RetCodes.retResult(RET_USER_ACCOUNT_PWD_ILLEGAL, "密码错误");
if (pass == null || pass.length() < 6 || Objects.equals(pass, nowpass))
return RetCodes.retResult(RET_USER_PASSWORD_ILLEGAL, "密码设置无效");
source.updateColumn(User.class, userInfo.getUserId(), "password", User.md5IfNeed(pass));
source.updateColumn(UserRecord.class, userInfo.getUserid(), "password", UserRecord.md5IfNeed(pass));
return RetResult.success();
}
@RestMapping(name = "register", auth = false, comment = "用户注册")
public RetResult register(@RestParam(name = "bean") User user){
public RetResult register(@RestParam(name = "bean") UserRecord user){
/*用户名、密码、邮箱*/
if (user.getEmail() == null) return RetCodes.retResult(RET_USER_EMAIL_ILLEGAL, "邮件地址无效");
if (user.getPassword() == null || user.getPassword().length() < 6) return RetCodes.retResult(RET_USER_PASSWORD_ILLEGAL, "密码设置无效");
User _user = source.find(User.class, FilterNode.create("email", user.getEmail()));
UserRecord _user = source.find(UserRecord.class, FilterNode.create("email", user.getEmail()));
if (_user != null) return RetCodes.retResult(RET_USER_USERNAME_EXISTS, "用户名已存在");
user.setCreateTime(System.currentTimeMillis());
user.setCreatetime(System.currentTimeMillis());
user.setPassword(user.passwordForMd5());
user.setStatus(1);
user.setStatus((short) 10);
user.setUsername(user.getEmail());
user.setAvatar("/res/images/avatar/"+ new Random().nextInt(21) +".jpg");//默认头像
int maxId = source.getNumberResult(User.class, FilterFunc.MAX, 10_0000, "userId").intValue();
int maxId = source.getNumberResult(UserRecord.class, FilterFunc.MAX, 10_0000, "userid").intValue();
if (maxId < 10_0000) maxId = 10_0000;
user.setUserId(maxId+1);
user.setUserid(maxId+1);
source.insert(user);
//记录日志
@@ -117,19 +117,19 @@ public class UserService extends BaseService {
}
@RestMapping(name = "update", comment = "用户信息修改")
public RetResult userUpdate(@RestSessionid String sessionid, @RestParam(name = "bean") User user, String[] columns){
public RetResult userUpdate(@RestSessionid String sessionid, @RestParam(name = "bean") UserRecord user, String[] columns){
String nickname = user.getNickname();
if (nickname == null && nickname.isEmpty())
return RetCodes.retResult(RET_USER_NICKNAME_ILLEGAL, "昵称无效");
nickname = nickname.replace(" ", "");
User _user = source.find(User.class, FilterNode.create("nickname", nickname));
if (_user != null && _user.getUserId() != currentUserId(sessionid))
UserRecord _user = source.find(UserRecord.class, FilterNode.create("nickname", nickname));
if (_user != null && _user.getUserid() != currentUserId(sessionid))
return RetCodes.retResult(RET_USER_NICKNAME_EXISTS, "昵称已存在");
user.setNickname(nickname);//去除昵称中的空格
source.updateColumn(user
,FilterNode.create("userId", currentUserId(sessionid))
,FilterNode.create("userid", currentUserId(sessionid))
,SelectColumn.createIncludes(columns)
);
return RetResult.success();
@@ -137,17 +137,17 @@ public class UserService extends BaseService {
//最新加入
public Sheet<UserInfo> lastReg(){
Sheet<User> users = source.querySheet(User.class
, SelectColumn.createIncludes("userId", "nickname", "avatar", "createTime")
, new Flipper().sort("createTime DESC").limit(8)
, FilterNode.create("status", 1));
Sheet<UserRecord> users = source.querySheet(UserRecord.class
, SelectColumn.createIncludes("userid", "nickname", "avatar", "createtime")
, new Flipper().sort("createtime DESC").limit(8)
, FilterNode.create("status", 10));
Sheet<UserInfo> infos = new Sheet<>();
ArrayList<UserInfo> list = new ArrayList<>();
users.forEach(x->{
UserInfo info = x.createUserInfo();
info.setTime(LxyKit.dateFmt(x.getCreateTime()));
info.setTime(LxyKit.dateFmt(x.getCreatetime()));
list.add(info);
});
@@ -167,16 +167,16 @@ public class UserService extends BaseService {
@RestMapping(name = "usercount", auth = false, comment = "用户数据统计")
public Number userCount() {
return source.getNumberResult(User.class, FilterFunc.COUNT, "userId", FilterNode.create("status", FilterExpress.NOTEQUAL, -1));
return source.getNumberResult(UserRecord.class, FilterFunc.COUNT, "userid", FilterNode.create("status", FilterExpress.NOTEQUAL, -10));
}
@RestMapping(ignore = true, comment = "判断用户是否是管理员")
public boolean isAdmin(int userId){
if (userId <= 0) return false;
public boolean isAdmin(int userid){
if (userid <= 0) return false;
List<Integer> userIds = source.queryColumnList("userId", User.class, FilterNode.create("roleId", 1));
List<Integer> userIds = source.queryColumnList("userid", UserRecord.class, FilterNode.create("roleid", 1));
for (Integer x : userIds) {
if (userId == x) {
if (userid == x) {
return true;
}
}