diff --git a/pom.xml b/pom.xml
index 471daa5..c782f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
WechatTicketSystem
love.sola.netsupport
WechatTicketSystem
- 1.1-SNAPSHOT
+ 1.2-SNAPSHOT
war
diff --git a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java
index 5320d26..6ae5b31 100644
--- a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java
+++ b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java
@@ -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);
diff --git a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
index bc39149..c1b775a 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
@@ -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();
}
diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml
index 2ffb60b..4d2578d 100644
--- a/src/main/resources/lang.yml
+++ b/src/main/resources/lang.yml
@@ -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: '您尚未进行微信绑定, 请点击这里进行微信绑定操作。'
+User_Register_Link: "您尚未进行微信绑定。\n>点击这里进行微信绑定操作<"
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: '> 点此修改资料 <'
Result_Page: 'http://topaz.sinaapp.com/nm/v1/result.html'
Operator_Home_Page: 'CLICK HERE'
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: '维修描述: '