backendTeam/WechatTicketSystem
1
0
Fork 0
mirror of https://github.com/ZSCNetSupportDept/WechatTicketSystem.git synced 2025-10-29 08:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4827621cc2a5548d2f942d46de91555d14385d5f'

Browse Source
This commit is contained in:
Sola
2016-03-03 13:49:49 +08:00
parent 496827b152 4827621cc2
commit 035d07e7b4
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -110,7 +110,7 @@
<dependency> <dependency>
<groupId>me.chanjar</groupId> <groupId>me.chanjar</groupId>
<artifactId>weixin-java-mp</artifactId> <artifactId>weixin-java-mp</artifactId>
<version>1.3.1</version> <version>1.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mchange</groupId> <groupId>com.mchange</groupId>

2
src/main/java/love/sola/netsupport/Index.java
View File

@@ -26,7 +26,7 @@ public class Index extends HttpServlet {
response.addHeader("Content-type", "text/plain;charset=utf-8"); response.addHeader("Content-type", "text/plain;charset=utf-8");
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");
PrintWriter out = response.getWriter(); 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."); out.println("For any problem, Please contact loli@sola.love.");
if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) { if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
out.println("\nError 404: Page not found."); out.println("\nError 404: Page not found.");

2
src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java
View File

@@ -61,7 +61,7 @@ public class TicketLookup extends HttpServlet {
} else { } else {
block = op.getBlock(); block = op.getBlock();
} }
if (block == 0 && op.getAccess() > Access.LEADER) { if (block == 0 && op.getAccess() > Access.MEMBER) {
return new Response(Response.ResponseCode.PERMISSION_DENIED); return new Response(Response.ResponseCode.PERMISSION_DENIED);
} }
List<Ticket> list = TableTicket.unsolvedByBlock(block); List<Ticket> list = TableTicket.unsolvedByBlock(block);

10
src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java
View File

@@ -2,7 +2,9 @@ package love.sola.netsupport.wechat.handler;
import love.sola.netsupport.api.user.Register; import love.sola.netsupport.api.user.Register;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.Operator;
import love.sola.netsupport.pojo.User; import love.sola.netsupport.pojo.User;
import love.sola.netsupport.sql.TableOperator;
import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import love.sola.netsupport.wechat.WechatSession; import love.sola.netsupport.wechat.WechatSession;
@@ -39,7 +41,13 @@ public class SubscribeHandler implements WxMpMessageHandler {
session.setAttribute(Attribute.WECHAT, fromUser); session.setAttribute(Attribute.WECHAT, fromUser);
session.setAttribute(Attribute.USER, u); 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())))); 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 { } else {
session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER); session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER);
session.setAttribute(Attribute.WECHAT, fromUser); session.setAttribute(Attribute.WECHAT, fromUser);

2
src/main/resources/menu-op.json
View File

@@ -42,6 +42,6 @@
} }
], ],
"matchrule": { "matchrule": {
"group_id": "100", "group_id": "100"
} }
} }