From e504969476dfcb7c7e555da144250b31d1707580 Mon Sep 17 00:00:00 2001
From: azkahi <azkaimtiyaz@gmail.com>
Date: Wed, 30 Nov 2016 05:00:41 +0800
Subject: [PATCH] Added database for FCM token at Chat Service
---
ChatService/src/java/org/ChatService/TokenSaver.java | 2 +-
KAA-JSP/build/web/login.jsp | 5 ++++-
KAA-JSP/web/login.jsp | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChatService/src/java/org/ChatService/TokenSaver.java b/ChatService/src/java/org/ChatService/TokenSaver.java
index a5e0eca..0b76821 100644
--- a/ChatService/src/java/org/ChatService/TokenSaver.java
+++ b/ChatService/src/java/org/ChatService/TokenSaver.java
@@ -57,7 +57,7 @@ public class TokenSaver extends HttpServlet {
else{
try (PrintWriter out = response.getWriter()) {
/* TODO output your page here. You may use following sample code. */
- out.println("<!DOCTYPE html>");
+ out.println("<!DOCTYPE html>");
out.println("<html>");
out.println("<head>");
out.println("<title>Servlet login</title>");
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index c79dbf0..09c0f81 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -18,7 +18,7 @@
String user = request.getParameter("username");
String pass = request.getParameter("password");
String urlParameter = "username=" + user + "&password=" + pass;
- //String userAgent = request.getHeader("user-agent");
+ String userAgent = request.getHeader("user-agent");
String urlRequest = "http://localhost:8080/IdentService/login?";
RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
consumer.execute();
@@ -28,6 +28,9 @@
String chattoken = (String) request.getParameter("chattoken");
Long uid = (Long) responseJSON.get("user_id");
String urlParameter2 = "chattoken=" + chattoken + "&user_id=" + uid;
+ String urlRequest2 = "http://localhost:8080/ChatService/TokenSaver?";
+ RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParameter2);
+ consumer2.execute();
/* Checking the response */
String status = (String) responseJSON.get("status");
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index c79dbf0..09c0f81 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -18,7 +18,7 @@
String user = request.getParameter("username");
String pass = request.getParameter("password");
String urlParameter = "username=" + user + "&password=" + pass;
- //String userAgent = request.getHeader("user-agent");
+ String userAgent = request.getHeader("user-agent");
String urlRequest = "http://localhost:8080/IdentService/login?";
RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
consumer.execute();
@@ -28,6 +28,9 @@
String chattoken = (String) request.getParameter("chattoken");
Long uid = (Long) responseJSON.get("user_id");
String urlParameter2 = "chattoken=" + chattoken + "&user_id=" + uid;
+ String urlRequest2 = "http://localhost:8080/ChatService/TokenSaver?";
+ RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParameter2);
+ consumer2.execute();
/* Checking the response */
String status = (String) responseJSON.get("status");
--
GitLab