diff --git a/pom.xml b/pom.xml index bb143ff..c101a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ me.chanjar weixin-java-mp - 1.3.1 + 1.3.3 com.mchange diff --git a/src/main/java/love/sola/netsupport/Index.java b/src/main/java/love/sola/netsupport/Index.java index b4a5ef3..32bf21f 100644 --- a/src/main/java/love/sola/netsupport/Index.java +++ b/src/main/java/love/sola/netsupport/Index.java @@ -26,7 +26,7 @@ public class Index extends HttpServlet { response.addHeader("Content-type", "text/plain;charset=utf-8"); response.setCharacterEncoding("utf-8"); PrintWriter out = response.getWriter(); - out.println("Wechat Ticket System (WTS) 0.1 Copyright 2015 Sola & LiuYue all rights reserved. | Commercial license for ZSC Network Support Department (ZSCNSD)."); + out.println("Wechat Ticket System (WTS) 0.1 Copyright 2015-2016 Sola & LiuYue all rights reserved. | Commercial license for ZSC Network Support Department (ZSCNSD)."); out.println("For any problem, Please contact loli@sola.love."); if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) { out.println("\nError 404: Page not found."); diff --git a/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java b/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java index 5c39694..189cd8f 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java @@ -61,7 +61,7 @@ public class TicketLookup extends HttpServlet { } else { block = op.getBlock(); } - if (block == 0 && op.getAccess() > Access.LEADER) { + if (block == 0 && op.getAccess() > Access.MEMBER) { return new Response(Response.ResponseCode.PERMISSION_DENIED); } List list = TableTicket.unsolvedByBlock(block); diff --git a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java index f40dff2..7caa86a 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java @@ -2,7 +2,9 @@ package love.sola.netsupport.wechat.handler; import love.sola.netsupport.api.user.Register; import love.sola.netsupport.enums.Attribute; +import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.sql.TableOperator; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.WechatSession; @@ -39,7 +41,13 @@ public class SubscribeHandler implements WxMpMessageHandler { session.setAttribute(Attribute.WECHAT, fromUser); session.setAttribute(Attribute.USER, u); out.content(format("Event_Subscribe", format("Already_Registered", format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone())))); - Register.converterWithRetry(u); + + Operator op = TableOperator.get(fromUser); + if (op != null) { + wxMpService.userUpdateGroup(fromUser, 100L); + } else { + Register.converterWithRetry(u); //TODO remove me + } } else { session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER); session.setAttribute(Attribute.WECHAT, fromUser); diff --git a/src/main/resources/menu-op.json b/src/main/resources/menu-op.json index 42ea9e3..839a3a1 100644 --- a/src/main/resources/menu-op.json +++ b/src/main/resources/menu-op.json @@ -42,6 +42,6 @@ } ], "matchrule": { - "group_id": "100", + "group_id": "100" } } \ No newline at end of file