.
This commit is contained in:
@@ -2,43 +2,44 @@
|
|||||||
|
|
||||||
<application port="5002">
|
<application port="5002">
|
||||||
|
|
||||||
<!-- 详细配置说明见: http://redkale.org/redkale.html#redkale_confxml -->
|
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<listener value="com.lxyer.redim.RedbbsListener"/>
|
<listener value="com.lxyer.redim.RedbbsListener"/>
|
||||||
<!--<group name="ALL">
|
|
||||||
<node addr="192.168.124.6" port="7070"/>
|
|
||||||
<node addr="192.168.227.138" port="7070"/>
|
|
||||||
<node addr="120.24.230.60" port="7070"/>
|
|
||||||
</group>-->
|
|
||||||
<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
|
<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
|
||||||
<node addr="redishost" port="6379" password="hello"/>
|
|
||||||
|
<node addr="redishost" password="hello" port="6379"/>
|
||||||
|
|
||||||
</source>
|
</source>
|
||||||
|
|
||||||
<properties load="conf.txt">
|
<properties load="conf.txt"/>
|
||||||
|
|
||||||
</properties>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
<server protocol="HTTP" host="0.0.0.0" port="80" root="root">
|
<server host="0.0.0.0" port="80" protocol="HTTP" root="root">
|
||||||
|
|
||||||
<services autoload="true"/>
|
<services autoload="true"/>
|
||||||
|
|
||||||
<!--<filters autoload="true"/>-->
|
<rest autoload="true" base="com.lxyer.bbs.base.BaseServlet" path="os"/>
|
||||||
|
|
||||||
<rest path="os" base="com.lxyer.bbs.base.BaseServlet" autoload="true"/>
|
|
||||||
|
|
||||||
<request>
|
<request>
|
||||||
<!--从X-Real-IP参数中获取IP-->
|
|
||||||
<remoteaddr value="request.headers.X-Real-IP"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<servlets path="" autoload="true"/>
|
<remoteaddr value="request.headers.X-Real-IP"/>
|
||||||
|
|
||||||
|
</request>
|
||||||
|
<response>
|
||||||
|
<defcookie domain="" path=""/>
|
||||||
|
<addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" />
|
||||||
|
<setheader name="Access-Control-Allow-Headers" value="request.headers.Access-Control-Request-Headers"/>
|
||||||
|
<setheader name="Access-Control-Allow-Credentials" value="true"/>
|
||||||
|
<options auto="true" />
|
||||||
|
</response>
|
||||||
|
|
||||||
|
<servlets autoload="true" path=""/>
|
||||||
|
|
||||||
<render value="com.lxyer.bbs.base.EnjoyRender"/>
|
<render value="com.lxyer.bbs.base.EnjoyRender"/>
|
||||||
|
|
||||||
</server>
|
</server>
|
||||||
|
|
||||||
<!-- SNCP 监听 Server -->
|
|
||||||
<!--<server protocol="SNCP" port="7070">
|
|
||||||
<services autoload="true" groups="ALL"/>
|
|
||||||
</server>-->
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
package com.lxyer.bbs.base.user;
|
package com.lxyer.bbs.base.user;
|
||||||
|
|
||||||
|
import com.jfinal.kit.Kv;
|
||||||
import com.lxyer.bbs.base.BaseService;
|
import com.lxyer.bbs.base.BaseService;
|
||||||
import com.lxyer.bbs.base.kit.LxyKit;
|
import com.lxyer.bbs.base.kit.LxyKit;
|
||||||
import com.lxyer.bbs.base.kit.RetCodes;
|
import com.lxyer.bbs.base.kit.RetCodes;
|
||||||
@@ -37,15 +38,11 @@ public class UserService extends BaseService {
|
|||||||
UserRecord user = source.find(UserRecord.class, "username", loginBean.getUsername());
|
UserRecord user = source.find(UserRecord.class, "username", loginBean.getUsername());
|
||||||
if (user == null || !Objects.equals(user.getPassword(), loginBean.getPassword())){
|
if (user == null || !Objects.equals(user.getPassword(), loginBean.getPassword())){
|
||||||
//log(null, 0, "用户或密码错误");
|
//log(null, 0, "用户或密码错误");
|
||||||
return RetCodes.retResult(RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL, "用户或密码错误");
|
return RetCodes.retResult(RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL, "用户名或密码错误");
|
||||||
}
|
}
|
||||||
|
sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), (long)user.getUserid());
|
||||||
//log(user, 0, "用户登录成功.");
|
|
||||||
UserInfo userInfo = user.createUserInfo();
|
|
||||||
|
|
||||||
sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), (long)userInfo.getUserid());
|
|
||||||
retResult.setRetcode(0);
|
retResult.setRetcode(0);
|
||||||
retResult.setResult(userInfo);
|
retResult.setResult(Kv.by("token", loginBean.getSessionid()));
|
||||||
retResult.setRetinfo("登录成功.");
|
retResult.setRetinfo("登录成功.");
|
||||||
return retResult;
|
return retResult;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user