diff --git a/conf/application.properties b/conf/application.properties new file mode 100644 index 0000000..ad2336a --- /dev/null +++ b/conf/application.properties @@ -0,0 +1,29 @@ +redkale.name=app_local +redkale.port=2060 +redkale.excludelibs.value=^.*mysql.*$;^.*google.*$ +redkale.properties.load=config.properties +# --- executor --- +# redkale.executor.threads = 32 +# redkale.executor.hash = true +# --- listener --- +# redkale.listener[0].value = +# ========================== server =============================== +redkale.server[0].protocol=HTTP +redkale.server[0].port=6060 +redkale.server[0].host=0.0.0.0 +redkale.server[0].maxbody=2m +redkale.server[0].services[0].autoload=true +# --- rest --- +redkale.server[0].rest.path=os +redkale.server[0].rest.autoload=true +redkale.server[0].rest.base=net.tccn.bbs.base.BaseServlet +# --- request --- +redkale.server[0].request.remoteaddr=request.headers.X-Real-IP +# --- servlets --- +redkale.server[0].servlets.autoload=true +redkale.server[0].render.value=net.tccn.bbs.base.TplRender +#redkale.server[0].render.suffixs = .html +# --- response --- +# redkale.server[0].response.addheader[0].name = X-Node +# redkale.server[0].response.addheader[0].value = system.property.APP_NODE +# ================================================================= \ No newline at end of file diff --git a/conf/application.xml b/conf/application.xml deleted file mode 100644 index 77c6b26..0000000 --- a/conf/application.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/conf.txt b/conf/config.properties similarity index 71% rename from conf/conf.txt rename to conf/config.properties index 70499d3..7edf0cb 100644 --- a/conf/conf.txt +++ b/conf/config.properties @@ -1,3 +1,3 @@ ------------ file conf ---------- +# upload config file.upload_dir=${APP_HOME}/root/upload/ file.view_path=http://127.0.0.1/upload/ diff --git a/conf/persistence.xml b/conf/persistence.xml deleted file mode 100644 index 50274f2..0000000 --- a/conf/persistence.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ALL - - - - - - - - diff --git a/conf/source.properties b/conf/source.properties new file mode 100644 index 0000000..01075f0 --- /dev/null +++ b/conf/source.properties @@ -0,0 +1,9 @@ +############ DataSource @Resource(name="redbbs") ############ +# redbbs +redkale.datasource[redbbs].url=jdbc:mysql://127.0.0.1:3306/redbbs +redkale.datasource[redbbs].user=root +redkale.datasource[redbbs].password=123456 +############ CacheSource @Resource(name="redis_cache") ############ +redkale.cachesource[redis_cache].node[0].url=redis://127.0.0.1:6379 +redkale.cachesource[redis_cache].node[0].password=123456 +redkale.cachesource[redis_cache].node[0].db=0 diff --git a/pom.xml b/pom.xml index 0004fce..541095d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,12 +17,12 @@ org.redkale redkale - 2.2.0 + 2.8.0-dev org.redkalex redkale-plugins - 2.2.0 + 2.8.0-dev @@ -40,6 +40,7 @@ org.projectlombok lombok 1.18.22 + compile @@ -52,8 +53,8 @@ maven-compiler-plugin 3.11.0 - 1.8 - 1.8 + 17 + 17 diff --git a/src/net/tccn/bbs/base/BaseService.java b/src/net/tccn/bbs/base/BaseService.java index f46d836..d92e78d 100644 --- a/src/net/tccn/bbs/base/BaseService.java +++ b/src/net/tccn/bbs/base/BaseService.java @@ -15,17 +15,12 @@ public class BaseService implements Service { protected final int sessionExpireSeconds = 7 * 24 * 60 * 60; - protected static final RetResult RET_SUCCESS = RetResult.success(); + protected final static RetResult RET_SUCCESS = RetResult.success(); @Resource(name = "redbbs") protected DataSource dataSource; - /* 使用redis 代码中配置此处即可 - @Resource(name = "redis")*/ - @Resource(name = "cacheSource") - protected CacheSource sessions; - - @Resource(name = "cacheSource") + @Resource(name = "redis_cache") protected CacheSource cacheSource; protected static final boolean winos = System.getProperty("os.name").contains("Window"); @@ -38,4 +33,5 @@ public class BaseService implements Service { protected RetResult retError(String info) { return new RetResult<>(-1, info); } + } diff --git a/src/net/tccn/bbs/base/BaseServlet.java b/src/net/tccn/bbs/base/BaseServlet.java index 5f4a13b..51ed586 100644 --- a/src/net/tccn/bbs/base/BaseServlet.java +++ b/src/net/tccn/bbs/base/BaseServlet.java @@ -46,7 +46,6 @@ public class BaseServlet extends HttpServlet { @Override protected void preExecute(HttpRequest request, HttpResponse response) throws IOException { - String sessionid = request.getSessionid(true); int currentid = 0; if (sessionid != null) { @@ -64,6 +63,10 @@ public class BaseServlet extends HttpServlet { response.finish(HttpScope.refer(uri)); return; } + if (uri.startsWith("/upload/")) { + response.finish(HttpScope.refer(uri)); + return; + } //异步记录访问日志 final int userid = currentid; @@ -74,9 +77,7 @@ public class BaseServlet extends HttpServlet { para.set(key, request.getParameter(key)); } Kv headers = Kv.create(); - request.getHeaders().forEach((k, v) -> { - headers.set(k, request.getHeader(k)); - }); + request.getHeaders().forEach((k, v) -> headers.set(k, request.getHeader(k))); VisLog visLog = new VisLog(); visLog.setIp(request.getRemoteAddr()); @@ -99,7 +100,7 @@ public class BaseServlet extends HttpServlet { @Override protected void authenticate(HttpRequest request, HttpResponse response) throws IOException { - if (request.currentUser() == null) { + if (request.currentIntUserid() == 0) { if ("XMLHttpRequest".equals(request.getHeader("X-Requested-With"))) { response.finish(RetCodes.retResult(RET_USER_UNLOGIN, "未登录，登录后重试").toString()); } else { @@ -141,10 +142,6 @@ public class BaseServlet extends HttpServlet { return para == null || "".equals(para) ? defaultValue : para; } - public int getParaToInt(HttpRequest request, int index, int defaultValue) { - String para = getPara(request, index); - return para == null || "".equals(para) ? defaultValue : Integer.parseInt(para); - } public int getParaToInt(HttpRequest request, int index) { int n = 0; @@ -155,19 +152,19 @@ public class BaseServlet extends HttpServlet { try { n = Integer.parseInt(para); } catch (Exception e) { - + //throw new RuntimeException(e); } return n; } //设置私密帖子过滤 protected FilterNode setPrivate(HttpRequest request, FilterNode node) { - UserInfo user = request.currentUser(); - if (user == null) { + UserInfo userInfo = request.currentUser(); + if (userInfo == null) { node.and("status", FilterExpress.NOTEQUAL, 30); - } else if (!userService.isAdmin(user.getUserid())) { + } else if (!userService.isAdmin(userInfo.getUserid())) { //select * from content c where c.status != -1 and (c.status!=30 or (c.status=30 and c.userid=100001)) - node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", user.getUserid()))); + node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", userInfo.getUserid()))); } return node; diff --git a/src/net/tccn/bbs/base/TplRender.java b/src/net/tccn/bbs/base/TplRender.java index 13494b8..f16f9f5 100644 --- a/src/net/tccn/bbs/base/TplRender.java +++ b/src/net/tccn/bbs/base/TplRender.java @@ -17,7 +17,7 @@ import java.util.Map; /** * Created by JUECHENG at 2018/1/30 0:18. */ -public class TplRender implements HttpRender { +public class TplRender implements HttpRender { @Resource(name = "SERVER_ROOT") protected File webroot; @@ -37,25 +37,17 @@ public class TplRender implements HttpRender { @Override public void renderTo(HttpRequest request, HttpResponse response, Convert convert, HttpScope scope) { - //UserInfo mine = request.currentUser();//当前登录人 + String sessionid = request.getSessionid(false); + UserInfo mine = userService.current(sessionid);//当前登录人 Template template = engine.getTemplate(scope.getReferid()); Map attr = scope.getAttributes(); - if (attr == null) { - attr = Kv.create(); - } - - UserInfo userInfo = userService.find(request.currentUserid(int.class)); - attr.put("mine", userInfo); - attr.put("token", request.getSessionid(false)); + if (attr == null) attr = Kv.create(); + attr.put("mine", mine); + attr.put("token", sessionid); String str = template.renderToString(attr); response.setContentType("text/html; charset=UTF-8"); response.finish(str); } - - @Override - public Class getType() { - return HttpScope.class; - } } diff --git a/src/net/tccn/bbs/base/Utils.java b/src/net/tccn/bbs/base/Utils.java index e76b99b..9586c59 100644 --- a/src/net/tccn/bbs/base/Utils.java +++ b/src/net/tccn/bbs/base/Utils.java @@ -6,9 +6,6 @@ package net.tccn.bbs.base; import net.tccn.bbs.base.util.Kv; -import org.redkale.source.DataJdbcSource; -import org.redkale.source.DataSource; -import org.redkale.source.Flipper; import org.redkale.util.Comment; import org.redkale.util.Reproduce; import org.redkale.util.Sheet; @@ -42,7 +39,7 @@ public final class Utils { } public static String dateFmt(long time) { - /** + /* * 刚刚 60秒内 60 * 1000 * x分钟前 1小时候内 60 * 60*1000 * x小时前 1天内 24 * 60*60*1000 @@ -86,15 +83,15 @@ public final class Utils { } public static T[] listToArray(List list, T[] ts) { - for (int i = 0; i < list.size(); i++) { - ts[0] = (T) list.get(i); + for (Object o : list) { + ts[0] = (T) o; } return ts; } public static int[] listToArray(List list, int[] ts) { - for (int i = 0; i < list.size(); i++) { - ts[0] = (int) list.get(i); + for (Object o : list) { + ts[0] = (int) o; } return ts; } @@ -121,7 +118,7 @@ public final class Utils { return false; } - private static Map reproduceMap = new HashMap<>(); + private static final Map reproduceMap = new HashMap<>(); /** * @param d 目标对象 @@ -135,9 +132,7 @@ public final class Utils { Reproduce reproduce = reproduceMap.get(reproductKey); if (reproduce == null) { - if (reproduce == null) { - reproduceMap.put(reproductKey, reproduce = (Reproduce) Reproduce.create(d.getClass(), s.getClass())); - } + reproduceMap.put(reproductKey, reproduce = (Reproduce) Reproduce.create(d.getClass(), s.getClass())); } return reproduce.apply(d, s); @@ -169,6 +164,7 @@ public final class Utils { Kv row = Kv.of(); for (int i = 1; i <= count; i++) { String columnTypeName = metaData.getColumnTypeName(i); + //String columnName = metaData.getColumnName(i); String columnLabel = metaData.getColumnLabel(i); row.put(columnLabel, null); @@ -231,7 +227,6 @@ public final class Utils { */ public static List mix(List list) { int len = list.size(); - Random random = new Random(); for (int i = 0; i < len; i++) { int r = random.nextInt(len); if (i == r) continue; @@ -255,7 +250,6 @@ public final class Utils { @Comment("获取随机数字符") public static String randomNumber(int len) { StringBuilder sb = new StringBuilder(); - Random random = new Random(); for (int i = 0; i < len; i++) { sb.append(random.nextInt(9)); } @@ -265,7 +259,6 @@ public final class Utils { @Comment("获取随机数集合") private static List getRandoms(int max, int len) { Set randoms = new HashSet<>(); - Random random = new Random(); while (randoms.size() < len && randoms.size() < max) { randoms.add(random.nextInt(max)); } @@ -298,7 +291,7 @@ public final class Utils { */ public static int strLength(String value) { int valueLength = 0; - String chinese = "[\u4e00-\u9fa5]"; + String chinese = "[一-龥]"; for (int i = 0; i < value.length(); i++) { String temp = value.substring(i, i + 1); if (temp.matches(chinese)) { @@ -552,9 +545,9 @@ public final class Utils { @Comment("对象转GET请求参数转换为字符，结果：p1=v1&p2=v2&p3=v3") public static String convertHttpParams(Object o, List removeFields, boolean encode) { - Class c = o.getClass(); + Class c = o.getClass(); Field[] fields = c.getDeclaredFields(); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (Field field : fields) { field.setAccessible(true); String name = field.getName(); @@ -579,13 +572,13 @@ public final class Utils { if (map == null || map.isEmpty()) { return ""; } - Set sortSet = new TreeSet(); + Set sortSet = new TreeSet<>(); for (Map.Entry entry : map.entrySet()) { sortSet.add(entry.getKey()); } // 参数名按ASCII码从小到大排序（字典序）,然后使用( & )连接排好序的key=value集合 - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean isFirst = true; for (String key : sortSet) { if (isFirst) { @@ -601,7 +594,7 @@ public final class Utils { @Comment("对象转map") public static Map convertToMap(Object o, List removeFields) { - Class c = o.getClass(); + Class c = o.getClass(); List fields = Stream.of(c.getDeclaredFields()).collect(Collectors.toList()); if (c.getSuperclass() != null) { Field[] superFields = c.getSuperclass().getDeclaredFields(); @@ -654,32 +647,6 @@ public final class Utils { return String.format("{%s}", builder.deleteCharAt(builder.length() - 1).toString()); } - public static Sheet querySheetBySql(DataSource dataSource, String sql, Flipper flipper, Class type) { - DataJdbcSource jdbcSource = (DataJdbcSource) dataSource; - //总条数 - int total = jdbcSource.directQuery("select count(0) c from (" + sql + ") c", rs -> { - int result = 0; - try { - while (rs.next()) { - result = rs.getInt(1); - } - } catch (SQLException e) { - e.printStackTrace(); - } - return result; - }); - - if (total == 0) { - return new Sheet<>(0, new ArrayList<>()); - } - - if (flipper != null) { - sql = String.format("%s %s limit %s,%s ", sql, Utils.isEmpty(flipper.getSort()) ? "" : "order by " + flipper.getSort(), flipper.getOffset(), flipper.getLimit()); - } - List dataList = jdbcSource.directQuery(sql, rs -> Utils.queryList(rs, type)); - return new Sheet<>(total, dataList); - } - @Comment("获取次日0点0分0秒时间戳") public static long getNextDayZero() { LocalDate localDate = LocalDate.now(); @@ -710,7 +677,7 @@ public final class Utils { return count; } - private static Random random = new Random(); + private static final Random random = new Random(); public static int randomNum(int len) { int rs = random.nextInt(9); diff --git a/src/net/tccn/bbs/comment/CommentInfo.java b/src/net/tccn/bbs/comment/CommentInfo.java index 598dfe4..b81730a 100644 --- a/src/net/tccn/bbs/comment/CommentInfo.java +++ b/src/net/tccn/bbs/comment/CommentInfo.java @@ -13,7 +13,7 @@ import javax.persistence.*; @Setter @Getter @Cacheable(interval = 5 * 60) -@Table(catalog = "redbbs", name = "commentinfo", comment = "[评论表]") +@Table(comment = "[评论表]") public class CommentInfo extends BaseEntity { @Id @@ -44,9 +44,6 @@ public class CommentInfo extends BaseEntity { @Column(comment = "[状态]1正常，-1删除") private short status = 10; - /*@Transient - private CommentBean pCommentInfo;*/ - @Transient private String title; @Transient @@ -55,19 +52,4 @@ public class CommentInfo extends BaseEntity { @Transient private UserInfo user; - - /*public CommentBean createInfo() { - CommentBean info = new CommentBean(); - info.setCommentid(commentid); - info.setUserid(userid); - info.setPid(pid); - info.setCate(cate); - info.setContentid(contentid); - info.setContent(content); - info.setSupportnum(supportnum); - info.setStatus(status); - - info.setCreatetime(Utils.dateFmt(createtime)); - return info; - }*/ } diff --git a/src/net/tccn/bbs/comment/CommentService.java b/src/net/tccn/bbs/comment/CommentService.java index 9ac051a..2ccba60 100644 --- a/src/net/tccn/bbs/comment/CommentService.java +++ b/src/net/tccn/bbs/comment/CommentService.java @@ -85,9 +85,7 @@ public class CommentService extends BaseService { List commentids = Utils.toList(comments, x -> x.getCommentid()); FilterNode node = FilterNode.create("cate", 10).and("status", 10).and("userid", userid).and("tid", IN, (Serializable) commentids); List supports = dataSource.queryColumnList("tid", ActLog.class, node); - comments.forEach(x -> { - x.setHadsupport(supports.contains(x.getCommentid()) ? 1 : 0); - }); + comments.forEach(x -> x.setHadsupport(supports.contains(x.getCommentid()) ? 1 : 0)); return comments; } @@ -138,17 +136,10 @@ public class CommentService extends BaseService { return RetResult.success(); } - /** - * todo:用户评论榜 待完成 - * - * @return - */ @Comment("用户评论榜") public Map commentRank() { dataSource.querySheet(CommentInfo.class, new Flipper(8), FilterNode.create("userid", IN)); - Map numberMap = dataSource.getNumberMap(CommentInfo.class, FilterFuncColumn.create(FilterFunc.DISTINCTCOUNT, "userid")); - - return numberMap; + return dataSource.getNumberMap(CommentInfo.class, FilterFuncColumn.create(FilterFunc.DISTINCTCOUNT, "userid")); } } diff --git a/src/net/tccn/bbs/content/ContentInfo.java b/src/net/tccn/bbs/content/ContentInfo.java index 41d508f..fe3e94d 100644 --- a/src/net/tccn/bbs/content/ContentInfo.java +++ b/src/net/tccn/bbs/content/ContentInfo.java @@ -14,7 +14,7 @@ import javax.persistence.*; @Setter @Getter @Cacheable(interval = 5 * 60) -@Table(catalog = "redbbs", name = "contentinfo", comment = "[内容表]") +@Table(comment = "[内容表]") public class ContentInfo extends BaseEntity { @Id @@ -72,24 +72,4 @@ public class ContentInfo extends BaseEntity { private static final Kv types = Kv.by(10, "求助").set(20, "分享").set(30, "讨论").set(40, "公告").set(50, "动态"); - - /*public ContentInfo createInfo() { - ContentInfo info = new ContentInfo(); - info.setContentid(contentid); - info.setUserid(userid); - info.setTitle(title); - info.setContent(content); - info.setCate(cate); - info.setType(type); - info.setViewnum(viewnum); - info.setReplynum(replynum); - info.setWonderful(wonderful); - info.setTop(top); - info.setSolved(solved); - info.setStatus(status); - - info.setTypename(types.getOrDefault((int) type, "其他").toString()); - info.setCreatetime(Utils.dateFmt(createtime)); - return info; - }*/ } diff --git a/src/net/tccn/bbs/content/ContentService.java b/src/net/tccn/bbs/content/ContentService.java index 899e34c..d6c8098 100644 --- a/src/net/tccn/bbs/content/ContentService.java +++ b/src/net/tccn/bbs/content/ContentService.java @@ -27,6 +27,7 @@ import static org.redkale.source.FilterExpress.NOTEQUAL; /** * Created by Lxy at 2017/11/26 9:33. */ +@SuppressWarnings("Convert2MethodRef") @RestService(name = "content", comment = "文章帖子服务") public class ContentService extends BaseService { diff --git a/src/net/tccn/bbs/user/UserDetail.java b/src/net/tccn/bbs/user/UserDetail.java index b78fb70..4123f8d 100644 --- a/src/net/tccn/bbs/user/UserDetail.java +++ b/src/net/tccn/bbs/user/UserDetail.java @@ -16,7 +16,7 @@ import javax.persistence.Table; @Setter @Getter @Cacheable(interval = 5 * 60) -@Table(catalog = "redbbs", name = "userdetail") +@Table(comment = "用户表") public class UserDetail implements java.io.Serializable { @Id @@ -47,7 +47,7 @@ public class UserDetail implements java.io.Serializable { @Column(length = 32, comment = "[邮箱]") private String email = ""; - @Column(comment = "") + @Column() private int roleid; @Column(length = 128, comment = "[个人博客地址]") @@ -77,24 +77,24 @@ public class UserDetail implements java.io.Serializable { //------ public UserInfo createUserInfo() { - UserInfo user = new UserInfo(); - user.setUserid(userid); - user.setUsername(username); - user.setSex(sex); - user.setPassword(password); - user.setPhone(phone); - user.setNickname(nickname); - user.setAvatar(avatar); - user.setRelaname(realname); - user.setEmail(email); - user.setRoleid(roleid); - user.setSite(site); - user.setGit(git); - user.setCreatetime(createtime); - user.setSign(sign); - user.setCity(city); - user.setStatus(getStatus()); - return user; + UserInfo info = new UserInfo(); + info.setUserid(userid); + info.setUsername(username); + info.setSex(sex); + info.setPassword(password); + info.setPhone(phone); + info.setNickname(nickname); + info.setAvatar(avatar); + info.setRelaname(realname); + info.setEmail(email); + info.setRoleid(roleid); + info.setSite(site); + info.setGit(git); + info.setCreatetime(createtime); + info.setSign(sign); + info.setCity(city); + info.setStatus(getStatus()); + return info; } public String passwordForMd5() { diff --git a/src/net/tccn/bbs/user/UserInfo.java b/src/net/tccn/bbs/user/UserInfo.java index 4408034..cbafcdd 100644 --- a/src/net/tccn/bbs/user/UserInfo.java +++ b/src/net/tccn/bbs/user/UserInfo.java @@ -35,15 +35,4 @@ public class UserInfo extends BaseEntity { private int status = 1; private String time = ""; - /** - * 检查用户权限 - * - * @param moduleid - * @param actionid - * @return - */ - public boolean checkAuth(int moduleid, int actionid) { - - return !(moduleid == 2 && actionid == 1); - } } diff --git a/src/net/tccn/bbs/user/UserService.java b/src/net/tccn/bbs/user/UserService.java index cf376b3..a021aa4 100644 --- a/src/net/tccn/bbs/user/UserService.java +++ b/src/net/tccn/bbs/user/UserService.java @@ -26,7 +26,7 @@ import static net.tccn.bbs.base.util.RetCodes.RET_USER_ACCOUNT_PWD_ILLEGAL; public class UserService extends BaseService { @RestMapping(name = "login", auth = false, comment = "登录校验") - public RetResult login(LoginBean bean) { + public RetResult login(LoginBean bean) { if (bean == null || bean.emptyUsername()) { return retError("参数错误"); } @@ -38,7 +38,7 @@ public class UserService extends BaseService { //log(null, 0, "用户或密码错误"); return RetCodes.retResult(RET_USER_ACCOUNT_PWD_ILLEGAL, "用户名或密码错误"); } - sessions.setAsync(sessionExpireSeconds, bean.getSessionid(), (long) user.getUserid()); + cacheSource.setexLongAsync(bean.getSessionid(), sessionExpireSeconds, user.getUserid()); retResult.setRetcode(0); retResult.setResult(Kv.by("token", bean.getSessionid())); retResult.setRetinfo("登录成功."); @@ -50,9 +50,10 @@ public class UserService extends BaseService { if (sessionid == null) return 0; long userid = 0; try { - userid = sessions.getLong(sessionid, 0); + userid = cacheSource.getLong(sessionid, 0); } catch (Exception e) { - e.printStackTrace(); + //e.printStackTrace(); + return 0; } return (int) userid; } @@ -64,8 +65,7 @@ public class UserService extends BaseService { long userid = 0; try { - userid = sessions.getLong(sessionid, 0); - sessions.getAndRefresh(sessionid, sessionExpireSeconds); + userid = cacheSource.getLongAndRefresh(sessionid, sessionExpireSeconds, 0L); } catch (Exception e) { e.printStackTrace(); } @@ -73,8 +73,7 @@ public class UserService extends BaseService { if (userid == 0) { return null; } - UserInfo user = find((int) userid); - return user; + return find((int) userid); } @RestMapping(name = "info", comment = "用户信息") @@ -83,8 +82,7 @@ public class UserService extends BaseService { return null; } UserDetail user = dataSource.find(UserDetail.class, userid); - UserInfo bean = user.createUserInfo(); - return bean; + return user.createUserInfo(); } @Comment("根据用户ID, 批量查询一批用户信息") @@ -95,13 +93,12 @@ public class UserService extends BaseService { FilterNode node = FilterNode.create("userid", (Serializable) userids); List records = dataSource.queryList(UserDetail.class, node); - Map map = Utils.toMap(records, x -> x.getUserid(), x -> x.createUserInfo()); - return map; + return Utils.toMap(records, x -> x.getUserid(), x -> x.createUserInfo()); } @RestMapping(name = "logout", auth = false, comment = "退出登录") public RetResult logout(@RestSessionid String sessionid) { - sessions.remove(sessionid); + cacheSource.remove(sessionid); return RetResult.success(); //return new HttpResult().header("Location", "/").status(302); @@ -109,9 +106,7 @@ public class UserService extends BaseService { @RestMapping(name = "query", auth = false, comment = "用户数据查询") public Sheet query(Flipper flipper, @RestParam(name = "bean", comment = "过滤条件") final UserBean userBean) { - Sheet users = dataSource.querySheet(UserDetail.class, flipper, userBean); - - return users; + return dataSource.querySheet(UserDetail.class, flipper, userBean); } @RestMapping(name = "changepwd", comment = "修改密码") diff --git a/src/net/tccn/redim/impl/ImFriendServiceImpl.java b/src/net/tccn/redim/impl/ImFriendServiceImpl.java index 0730f72..5edcc1c 100644 --- a/src/net/tccn/redim/impl/ImFriendServiceImpl.java +++ b/src/net/tccn/redim/impl/ImFriendServiceImpl.java @@ -81,12 +81,12 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService true, this.getClass(), new InetSocketAddress("192.168.227.1", 7070));*/ - TransportFactory sncpTransportFactory = application.getSncpTransportFactory(); + /*TransportFactory sncpTransportFactory = application.getSncpTransportFactory(); TransportGroupInfo groupInfo = sncpTransportFactory.findGroupInfo("ALL"); System.out.println(groupInfo.toString()); - groupInfo.putAddress(new InetSocketAddress("120.24.230.60", 7070)); + groupInfo.putAddress(new InetSocketAddress("120.24.230.60", 7070));*/ //sncpTransportFactory.addGroupInfo(groupInfo);