From 1fe546897790460b20c902eb66527f8db81f99c9 Mon Sep 17 00:00:00 2001 From: farsunset Date: Mon, 15 Sep 2014 20:14:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim_for_mina/1.5.VERSION | 1 - cim_for_mina/1.6.0.VERSION | 1 + cim_for_netty/1.0.VERSION | 1 - cim_for_netty/1.1.0.VERSION | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 cim_for_mina/1.5.VERSION create mode 100644 cim_for_mina/1.6.0.VERSION delete mode 100644 cim_for_netty/1.0.VERSION create mode 100644 cim_for_netty/1.1.0.VERSION diff --git a/cim_for_mina/1.5.VERSION b/cim_for_mina/1.5.VERSION deleted file mode 100644 index 400122e..0000000 --- a/cim_for_mina/1.5.VERSION +++ /dev/null @@ -1 +0,0 @@ -1.5 \ No newline at end of file diff --git a/cim_for_mina/1.6.0.VERSION b/cim_for_mina/1.6.0.VERSION new file mode 100644 index 0000000..ce6a70b --- /dev/null +++ b/cim_for_mina/1.6.0.VERSION @@ -0,0 +1 @@ +1.6.0 \ No newline at end of file diff --git a/cim_for_netty/1.0.VERSION b/cim_for_netty/1.0.VERSION deleted file mode 100644 index 9f8e9b6..0000000 --- a/cim_for_netty/1.0.VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0 \ No newline at end of file diff --git a/cim_for_netty/1.1.0.VERSION b/cim_for_netty/1.1.0.VERSION new file mode 100644 index 0000000..1cc5f65 --- /dev/null +++ b/cim_for_netty/1.1.0.VERSION @@ -0,0 +1 @@ +1.1.0 \ No newline at end of file From c66352072b4c7c8dca182ffe7cebd0535eb75408 Mon Sep 17 00:00:00 2001 From: farsunset Date: Mon, 15 Sep 2014 20:28:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9IDE=E8=AF=AF=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebRoot/console/webclient/LoginDialog.jsp | 8 +++++++- .../WebRoot/console/webclient/LoginDialog.jsp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cim_for_mina/ichat-server/WebRoot/console/webclient/LoginDialog.jsp b/cim_for_mina/ichat-server/WebRoot/console/webclient/LoginDialog.jsp index e75d142..91987aa 100644 --- a/cim_for_mina/ichat-server/WebRoot/console/webclient/LoginDialog.jsp +++ b/cim_for_mina/ichat-server/WebRoot/console/webclient/LoginDialog.jsp @@ -1,4 +1,10 @@ <%@ page language="java" pageEncoding="utf-8"%> + <% + String lbasePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + request.getContextPath(); + + %>