From 96b6fc23b415fe78ffa915612bd0ac302c66ef34 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Mon, 14 Jan 2019 16:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/servlet/account/Register.java
---
 src/servlet/Submit/S_TextSubmit.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servlet/Submit/S_TextSubmit.java b/src/servlet/Submit/S_TextSubmit.java
index 5a54b89..f799e8a 100644
--- a/src/servlet/Submit/S_TextSubmit.java
+++ b/src/servlet/Submit/S_TextSubmit.java
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/submit")
-public class S_Submit extends HttpServlet {
+@WebServlet("/textsubmit")
+public class S_TextSubmit extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
         String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8");