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 c1b775a..67a2b9f 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
@@ -35,7 +35,7 @@ public class ProfileHandler implements WxMpMessageHandler {
session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName());
session.setAttribute(Attribute.USER, u);
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()));
+ out.content(format("Profile_Modify", 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/java/love/sola/netsupport/wechat/handler/RegisterHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java
index b54d8db..c416748 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java
@@ -17,7 +17,6 @@ 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;
/**
* ***********************************************
@@ -33,14 +32,17 @@ public class RegisterHandler implements WxMpMessageHandler {
TextBuilder out = WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName());
String fromUser = wxMessage.getFromUserName();
User u = TableUser.getByWechat(fromUser);
+ String id = WechatSession.genId();
+ WxSession session = WechatSession.get(id, true);
if (u != null) {
- out.content(lang("Already_Registered"));
+ session.setAttribute(Attribute.AUTHORIZED, Command.PROFILE);
+ session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName());
+ session.setAttribute(Attribute.USER, u);
+ out.content(format("Already_Registered", format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone())));
} else {
- String id = WechatSession.genId();
- WxSession session = WechatSession.get(id, true);
session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER);
session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName());
- out.content(format("User_Register_Link", id));
+ out.content(format("User_Register", format("User_Register_Link", id)));
}
return out.build();
}
diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml
index 4d2578d..4c79f07 100644
--- a/src/main/resources/lang.yml
+++ b/src/main/resources/lang.yml
@@ -16,7 +16,8 @@ Event_Subscribe: "欢迎使用电子科技大学中山学院网络维护科微
Invalid_Operation: 'Whoops,报修姬找不到你想要的东西啦 (╯‵□′)╯︵┻━┻。'
Message_Spam: '你的打字速度太快了,喝一杯82年的Java压压惊吧。'
#Register
-Already_Registered: "您已进行过微信绑定。如果需要更改个人信息,请发送 '修改资料'(xgzl) 。"
+User_Register: "您尚未进行微信绑定。\n>点击这里进行微信绑定操作<"
+Already_Registered: '您已进行过微信绑定。若是需要更改个人信息,请 >点击此处<。'
#Query
Query_Title: '最近一次报修记录:'
More_Details: '>>> 查询更早的报修信息,请点击 <<<'
@@ -37,17 +38,17 @@ Cancel_Title: '报修已取消:'
User_Cancel_Remark: '用户手动取消报修。'
Cancel_Failed: '取消失败。'
#Modify
-Modify_Title: ''
+Profile_Modify: '> 点此修改资料 <'
#Login
Not_Operator: '嘟嘟嘟……'
No_Login: 'Permission Denied.'
Internal_Error: '啊哦,登录失败了哦。'
#URL
-User_Register_Link: "您尚未进行微信绑定。\n>点击这里进行微信绑定操作<"
+User_Register_Link: 'http://topaz.sinaapp.com/nm/v1/reg.html?token={0}'
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: '> 点此修改资料 <'
+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,#}'
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}'