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

Merge branch 'develop'

Browse Source
This commit is contained in:
Sola
2015-12-18 01:06:19 +08:00
parent 931c3f6c0d 2d2ec438a7
commit 3a6a2428a2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -4,7 +4,7 @@
<name>WechatTicketSystem</name> <name>WechatTicketSystem</name>
<groupId>love.sola.netsupport</groupId> <groupId>love.sola.netsupport</groupId>
<artifactId>WechatTicketSystem</artifactId> <artifactId>WechatTicketSystem</artifactId>
<version>1.0.1-SNAPSHOT</version> <version>1.1-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
@@ -65,7 +65,6 @@
<version>3.1.0</version> <version>3.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
@@ -147,7 +146,8 @@
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId> <artifactId>hibernate-envers</artifactId>
<version>5.0.3.Final</version> <version>5.0.3.Final</version>
</dependency><dependency> </dependency>
<dependency>
<groupId>de.svenkubiak</groupId> <groupId>de.svenkubiak</groupId>
<artifactId>jBCrypt</artifactId> <artifactId>jBCrypt</artifactId>
<version>0.4</version> <version>0.4</version>

3
src/main/java/love/sola/netsupport/api/admin/Login.java
View File

@@ -80,6 +80,9 @@ public class Login extends HttpServlet {
User u = TableUser.getById(Long.parseLong(request.getParameter("bypassuser"))); User u = TableUser.getById(Long.parseLong(request.getParameter("bypassuser")));
session.setAttribute(Attribute.USER, u); session.setAttribute(Attribute.USER, u);
} }
if (request.getParameter("bypasswechat") != null) {
session.setAttribute(Attribute.WECHAT, request.getParameter("bypasswechat"));
}
return new Response(Response.ResponseCode.OK, sid); return new Response(Response.ResponseCode.OK, sid);
} catch (Exception e) { } catch (Exception e) {