From 15ee570d7b4fc5df7ed731478bce7b82cd437d58 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Wed, 1 May 2019 11:06:58 +0800
Subject: [PATCH] .

---
 conf/application.xml                         | 49 ++++++++++----------
 src/com/lxyer/bbs/base/user/UserService.java | 11 ++---
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/conf/application.xml b/conf/application.xml
index 9e170ab..71d5d94 100644
--- a/conf/application.xml
+++ b/conf/application.xml
@@ -1,44 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <application port="5002">
-    
-    <!--  详细配置说明见： http://redkale.org/redkale.html#redkale_confxml  -->
+
     <resources>
+
         <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">
-            <node addr="redishost" port="6379" password="hello"/>
+
+            <node addr="redishost" password="hello" port="6379"/>
+
         </source>
 
-        <properties load="conf.txt">
+        <properties load="conf.txt"/>
 
-        </properties>
     </resources>
-        
-    <server protocol="HTTP" host="0.0.0.0" port="80" root="root">
-              
-        <services autoload="true"/>
-        
-        <!--<filters autoload="true"/>-->
 
-        <rest path="os" base="com.lxyer.bbs.base.BaseServlet" autoload="true"/>
+    <server host="0.0.0.0" port="80" protocol="HTTP" root="root">
+
+        <services autoload="true"/>
+
+        <rest autoload="true" base="com.lxyer.bbs.base.BaseServlet" path="os"/>
 
         <request>
-            <!--从X-Real-IP参数中获取IP-->
+
             <remoteaddr value="request.headers.X-Real-IP"/>
+
         </request>
-        
-        <servlets path="" autoload="true"/>
+        <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"/>
+
     </server>
 
-    <!-- SNCP 监听 Server -->
-    <!--<server protocol="SNCP" port="7070">
-        <services autoload="true" groups="ALL"/>
-    </server>-->
 </application>
+
diff --git a/src/com/lxyer/bbs/base/user/UserService.java b/src/com/lxyer/bbs/base/user/UserService.java
index b3e4ccd..7748892 100644
--- a/src/com/lxyer/bbs/base/user/UserService.java
+++ b/src/com/lxyer/bbs/base/user/UserService.java
@@ -1,5 +1,6 @@
 package com.lxyer.bbs.base.user;
 
+import com.jfinal.kit.Kv;
 import com.lxyer.bbs.base.BaseService;
 import com.lxyer.bbs.base.kit.LxyKit;
 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());
         if (user == null || !Objects.equals(user.getPassword(), loginBean.getPassword())){
             //log(null, 0, "用户或密码错误");
-            return RetCodes.retResult(RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL, "用户或密码错误");
+            return RetCodes.retResult(RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL, "用户名或密码错误");
         }
-
-        //log(user, 0, "用户登录成功.");
-        UserInfo userInfo = user.createUserInfo();
-
-        sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), (long)userInfo.getUserid());
+        sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), (long)user.getUserid());
         retResult.setRetcode(0);
-        retResult.setResult(userInfo);
+        retResult.setResult(Kv.by("token", loginBean.getSessionid()));
         retResult.setRetinfo("登录成功.");
         return retResult;
     }