From bff0a4af7f27df4d5ed0c9b872225d374e1dc652 Mon Sep 17 00:00:00 2001 From: Sola Date: Thu, 17 Dec 2015 09:42:37 +0800 Subject: [PATCH 1/2] add login page url --- src/main/java/love/sola/netsupport/api/admin/TicketUpdate.java | 1 - .../java/love/sola/netsupport/api/admin/root/DashBoard.java | 1 - src/main/resources/lang.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/love/sola/netsupport/api/admin/TicketUpdate.java b/src/main/java/love/sola/netsupport/api/admin/TicketUpdate.java index e84a673..8bcdee3 100644 --- a/src/main/java/love/sola/netsupport/api/admin/TicketUpdate.java +++ b/src/main/java/love/sola/netsupport/api/admin/TicketUpdate.java @@ -36,7 +36,6 @@ public class TicketUpdate extends HttpServlet { doGet(request, response); } - @SuppressWarnings("Duplicates") protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); diff --git a/src/main/java/love/sola/netsupport/api/admin/root/DashBoard.java b/src/main/java/love/sola/netsupport/api/admin/root/DashBoard.java index 9ca43e8..e1ed099 100644 --- a/src/main/java/love/sola/netsupport/api/admin/root/DashBoard.java +++ b/src/main/java/love/sola/netsupport/api/admin/root/DashBoard.java @@ -36,7 +36,6 @@ public class DashBoard extends HttpServlet { doGet(request, response); } - @SuppressWarnings("Duplicates") protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index 4c95f3e..4ed621b 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -48,7 +48,7 @@ User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/rrepair.html?token={0}&name={1 User_Profile_Link: 'http://topaz.sinaapp.com/nm/v1/profile.html?token={0}&name={1}&isp={2}&account={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: '' +Operator_Login_Page: 'http://topaz.sinaapp.com/nm/v1/man/login.html?pkey={1}' #Localized #Status From a91903e6c4bc5f334f132ec9187652a26c400075 Mon Sep 17 00:00:00 2001 From: Sola Date: Thu, 17 Dec 2015 09:46:07 +0800 Subject: [PATCH 2/2] fix parameters order --- src/main/resources/lang.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index 4ed621b..c0c3ecc 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -48,7 +48,7 @@ User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/rrepair.html?token={0}&name={1 User_Profile_Link: 'http://topaz.sinaapp.com/nm/v1/profile.html?token={0}&name={1}&isp={2}&account={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={1}' +Operator_Login_Page: 'http://topaz.sinaapp.com/nm/v1/man/login.html?pkey={0}' #Localized #Status