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

Merge branch 'release/1.2' into develop

Browse Source
This commit is contained in:
Sola
2015-12-23 02:24:04 +08:00
parent 29cbd4ae86 d1956bae82
commit 25ae59c5e0
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<name>WechatTicketSystem</name>
<groupId>love.sola.netsupport</groupId>
<artifactId>WechatTicketSystem</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.2-SNAPSHOT</version>
<packaging>war</packaging>
<properties>

2
src/main/java/love/sola/netsupport/wechat/WxMpServlet.java
View File

@@ -45,7 +45,7 @@ public class WxMpServlet extends HttpServlet {
config.setAppId(Settings.I.Wechat_AppId);
config.setSecret(Settings.I.Wechat_Secret);
config.setToken(Settings.I.Wechat_Token);
config.setAesKey(Settings.I.Wechat_Token);
config.setAesKey(Settings.I.Wechat_AesKey);
wxMpService = new WxMpServiceImpl();
wxMpService.setWxMpConfigStorage(config);

11
src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
View File

@@ -12,13 +12,11 @@ import me.chanjar.weixin.mp.api.WxMpMessageHandler;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder;
import java.util.Map;
import static love.sola.netsupport.config.Lang.format;
import static love.sola.netsupport.config.Lang.lang;
/**
* ***********************************************
@@ -36,11 +34,8 @@ public class ProfileHandler implements WxMpMessageHandler {
session.setAttribute(Attribute.AUTHORIZED, Command.PROFILE);
session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName());
session.setAttribute(Attribute.USER, u);
NewsBuilder out = WxMpXmlOutMessage.NEWS().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName());
WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item();
item.setTitle(lang("Modify_Title"));
item.setUrl(format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()));
out.addArticle(item);
TextBuilder out = WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName());
out.content(format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()));
return out.build();
}

18
src/main/resources/lang.yml
View File

@@ -6,20 +6,20 @@ Unknown_Encrypt_Type: 'Unknown encrypt-type.'
#Command Regex
REGEX_QUERY: '^(?i)(Query)|(查询)|(cx)$'
REGEX_REGISTER: '^(?i)(Reg(ister)?)|(注册)|(绑定)|(zc)|(bd)$'
REGEX_SUBMIT: '^(?i)(Submit)|(报修)|(bx)$'
REGEX_SUBMIT: '^(?i)(Submit)|(报修)|(保修)|(bx)$'
REGEX_CANCEL: '^(?i)(Cancel)|(取消)|(撤销)|(qx)|(cx)$'
REGEX_LOGIN: '^(?i)Authme$'
REGEX_PROFILE: '^(?i)(EditProfile)|(修改资料)|(xgzl)$'
REGEX_PROFILE: '^(?i)(EditProfile)|(修改资料)|(修改信息)|(xgzl)|(xgxx)$'
#Event
Event_Subscribe: "欢迎使用电子科技大学中山学院网络维护科微信自助报修平台。\n如您在使用中遇到任何问题，请将投诉或建议邮件至loli@sola.love.\n\n请发送'绑定'进行微信绑定"
Event_Subscribe: "欢迎使用电子科技大学中山学院网络维护科微信自助报修平台。\n\n若您尚未进行过微信绑定，请发送'绑定'(bd)进行微信绑定"
Invalid_Operation: 'Whoops，报修姬找不到你想要的东西啦 (╯‵□′)╯︵┻━┻。'
Message_Spam: '你的打字速度太快了，喝一杯82年的Java压压惊吧。'
#Register
Already_Registered: "您已进行过微信绑定。如果需要更改个人信息，请发送 '修改资料' 。"
Already_Registered: "您已进行过微信绑定。如果需要更改个人信息，请发送 '修改资料'(xgzl) 。"
#Query
Query_Title: '最近一次报修记录：'
More_Details: '查询更早的报修信息，请点击 >'
More_Details: '>>> 查询更早的报修信息，请点击 <<<'
No_Ticket_Available: '您尚未提交过任何报修。'
#Submit
Already_Opening_Ticket: "您上次提交的报修单仍在处理中. 若需要查询报修单状态，请发送 '查询' 。"
@@ -37,17 +37,17 @@ Cancel_Title: '报修已取消：'
User_Cancel_Remark: '用户手动取消报修。'
Cancel_Failed: '取消失败。'
#Modify
Modify_Title: '点此修改资料 >'
Modify_Title: ''
#Login
Not_Operator: '嘟嘟嘟……'
No_Login: 'Permission Denied.'
Internal_Error: '啊哦，登录失败了哦。'
#URL
User_Register_Link: '您尚未进行微信绑定, 请<a href="http://topaz.sinaapp.com/nm/v1/reg.html?token={0}">点击这里</a>进行微信绑定操作。'
User_Register_Link: "您尚未进行微信绑定。\n<a href=\"http://topaz.sinaapp.com/nm/v1/reg.html?token={0}\">>点击这里进行微信绑定操作<</a>"
User_Query_Link: 'http://topaz.sinaapp.com/nm/v1/list.html?token={0}'
User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}'
User_Profile_Link: 'http://topaz.sinaapp.com/nm/v1/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}'
User_Profile_Link: '<a href="http://topaz.sinaapp.com/nm/v1/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}">> 点此修改资料 <</a>'
Result_Page: 'http://topaz.sinaapp.com/nm/v1/result.html'
Operator_Home_Page: '<a href="http://topaz.sinaapp.com/nm/v1/man/home.html?token={0}">CLICK HERE</a>'
Operator_Login_Page: 'http://topaz.sinaapp.com/nm/v1/man/login.html?pkey={0}'
@@ -58,7 +58,7 @@ STATUS_UNCHECKED: '待处理'
STATUS_SOLVED: '已解决'
#Ticket
Ticket_Info_Id: '报修单号: '
Ticket_Info_Desc: '报修描述: '
Ticket_Info_Desc: ''
Ticket_Info_Submit_Time: '提交时间: '
Ticket_Info_Operator: '操作员: '
Ticket_Info_Remark: '维修描述: '