diff --git a/src/utils/JDBCUtils.java b/src/utils/JDBCUtils.java index 70c124e..38543ac 100644 --- a/src/utils/JDBCUtils.java +++ b/src/utils/JDBCUtils.java @@ -10,8 +10,12 @@ import java.sql.Statement; import java.util.Properties; /** +<<<<<<< HEAD <<<<<<< HEAD * Druid连接池工具类,将来dao层调用 +======= + * Druid连接池工具类,将来dao层调用-- +>>>>>>> remotes/origin/develop ======= * Druid连接池工具类,将来dao层调用-- >>>>>>> remotes/origin/develop diff --git a/src/web/servlet/admin/AddStudentInfoServlet.java b/src/web/servlet/admin/AddStudentInfoServlet.java index 0c623bc..07d6680 100644 --- a/src/web/servlet/admin/AddStudentInfoServlet.java +++ b/src/web/servlet/admin/AddStudentInfoServlet.java @@ -95,8 +95,14 @@ public class AddStudentInfoServlet extends HttpServlet { //protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { //调用service层的方法，添加学生信息 service.addStudentAllInfo(updateStudent); +<<<<<<< HEAD <<<<<<< HEAD request.setAttribute("update_msg","添加成功！"+String.format("%tT",new Date())); +======= + //将添加信息返回给客户端 + request.setAttribute("update_msg","添加成功！"+String.format("%tT",new Date()));//返回添加信息 + //将请求转发到addStudentServlet +>>>>>>> remotes/origin/develop ======= //将添加信息返回给客户端 request.setAttribute("update_msg","添加成功！"+String.format("%tT",new Date()));//返回添加信息 diff --git a/src/web/servlet/admin/AddStudentServlet.java b/src/web/servlet/admin/AddStudentServlet.java index 0d40fdb..f04b675 100644 --- a/src/web/servlet/admin/AddStudentServlet.java +++ b/src/web/servlet/admin/AddStudentServlet.java @@ -26,6 +26,9 @@ public class AddStudentServlet extends HttpServlet { ======= // 创建CDCService的实例，通常用于处理与学院、系、班级相关的业务逻辑 // 创建CDCService的实现类 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop CDCService service2 = new CDCServiceImpl(); // 调用findAllCollege方法，获取所有学院列表 diff --git a/src/web/servlet/admin/DoDeleteSelectCourseServlet.java b/src/web/servlet/admin/DoDeleteSelectCourseServlet.java index ef7bf3b..c60d6c7 100644 --- a/src/web/servlet/admin/DoDeleteSelectCourseServlet.java +++ b/src/web/servlet/admin/DoDeleteSelectCourseServlet.java @@ -26,6 +26,9 @@ public class DoDeleteSelectCourseServlet extends HttpServlet { * @throws IOException 如果输入或输出异常发生。 */ // 处理POST请求 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 设置请求编码为utf-8 diff --git a/src/web/servlet/admin/UpdateStudentInfoServlet.java b/src/web/servlet/admin/UpdateStudentInfoServlet.java index d8021d0..e966d0d 100644 --- a/src/web/servlet/admin/UpdateStudentInfoServlet.java +++ b/src/web/servlet/admin/UpdateStudentInfoServlet.java @@ -66,6 +66,9 @@ public class UpdateStudentInfoServlet extends HttpServlet { ======= //封装学生对象- // 设置学生ID +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop updateStudent.setS_id(sid); // 设置学生姓名 diff --git a/src/web/servlet/admin/UpdateStudentServlet.java b/src/web/servlet/admin/UpdateStudentServlet.java index 99d151c..434f79e 100644 --- a/src/web/servlet/admin/UpdateStudentServlet.java +++ b/src/web/servlet/admin/UpdateStudentServlet.java @@ -34,6 +34,9 @@ public class UpdateStudentServlet extends HttpServlet { ======= // 创建 CDCService 的实现类实例，用于处理与院系、系别和班级相关的业务逻辑 // 创建CDCService实例 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop CDCService service2 = new CDCServiceImpl(); // 调用findAllCollege方法获取所有学院列表 diff --git a/src/web/servlet/complaints/ComplaintServlet.java b/src/web/servlet/complaints/ComplaintServlet.java index 90e4336..14293d2 100644 --- a/src/web/servlet/complaints/ComplaintServlet.java +++ b/src/web/servlet/complaints/ComplaintServlet.java @@ -19,6 +19,9 @@ public class ComplaintServlet extends HttpServlet { ======= // 设置请求编码为UTF-8，以支持中文字符的正确处理 // 设置请求的字符编码为utf-8 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop request.setCharacterEncoding("utf-8"); // 创建ComplaintService实例 diff --git a/src/web/servlet/file/DeleteFileServlet.java b/src/web/servlet/file/DeleteFileServlet.java index 8490e77..f3ffaeb 100644 --- a/src/web/servlet/file/DeleteFileServlet.java +++ b/src/web/servlet/file/DeleteFileServlet.java @@ -22,6 +22,9 @@ public class DeleteFileServlet extends HttpServlet { * @throws IOException 如果输入或输出异常发生。 */ // 处理POST请求 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 设置请求编码为utf-8 diff --git a/src/web/servlet/file/DownloadServlet.java b/src/web/servlet/file/DownloadServlet.java index 92aa835..130383b 100644 --- a/src/web/servlet/file/DownloadServlet.java +++ b/src/web/servlet/file/DownloadServlet.java @@ -28,6 +28,9 @@ public class DownloadServlet extends HttpServlet { * @throws IOException 如果输入或输出异常发生。 */ // 处理POST请求 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 获取请求参数filename diff --git a/src/web/servlet/file/UploadServlet.java b/src/web/servlet/file/UploadServlet.java index d5dc957..cfc41b9 100644 --- a/src/web/servlet/file/UploadServlet.java +++ b/src/web/servlet/file/UploadServlet.java @@ -30,6 +30,9 @@ public class UploadServlet extends HttpServlet { * @throws IOException 如果输入或输出异常发生。 */ // 处理POST请求 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 设置请求编码为utf-8 @@ -136,6 +139,9 @@ public class UploadServlet extends HttpServlet { * 表示文件上传或下载过程中的信息类 */ // 定义一个ProcessInfo类，用于存储进程信息 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop class ProcessInfo{ // 总大小 diff --git a/src/web/servlet/login/LogoutServlet.java b/src/web/servlet/login/LogoutServlet.java index 486936c..5270894 100644 --- a/src/web/servlet/login/LogoutServlet.java +++ b/src/web/servlet/login/LogoutServlet.java @@ -21,6 +21,9 @@ public class LogoutServlet extends HttpServlet { * @throws IOException 如果输入或输出异常发生。 */ // 处理POST请求 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 设置请求编码为UTF-8 diff --git a/src/web/servlet/page/FindStudentByPageServlet.java b/src/web/servlet/page/FindStudentByPageServlet.java index 83f7a5b..5b6703c 100644 --- a/src/web/servlet/page/FindStudentByPageServlet.java +++ b/src/web/servlet/page/FindStudentByPageServlet.java @@ -40,8 +40,14 @@ public class FindStudentByPageServlet extends HttpServlet { //将PageBean对象存入request域中 request.setAttribute("pb",pb); +<<<<<<< HEAD <<<<<<< HEAD request.setAttribute("condition",condition);//存入查询条件 +======= + //将查询条件存入request域中 + request.setAttribute("condition",condition);//存入查询条件- + //设置request的字符编码为utf-8 +>>>>>>> remotes/origin/develop ======= //将查询条件存入request域中 request.setAttribute("condition",condition);//存入查询条件- diff --git a/src/web/servlet/student/StudentInfomationUpdateServlet.java b/src/web/servlet/student/StudentInfomationUpdateServlet.java index 3bb4e1d..8ced9ef 100644 --- a/src/web/servlet/student/StudentInfomationUpdateServlet.java +++ b/src/web/servlet/student/StudentInfomationUpdateServlet.java @@ -25,6 +25,9 @@ public class StudentInfomationUpdateServlet extends HttpServlet { ======= //保存输入内容- // 获取学生ID +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop String sid = request.getParameter("student-id"); // 获取学生姓名 @@ -61,6 +64,9 @@ public class StudentInfomationUpdateServlet extends HttpServlet { ======= //封装学生对象- // 设置学生ID +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop updateStudent.setS_id(sid); // 设置学生姓名 diff --git a/src/web/servlet/student/StudentPasswordUpdateServlet.java b/src/web/servlet/student/StudentPasswordUpdateServlet.java index 01a0a2f..613ca98 100644 --- a/src/web/servlet/student/StudentPasswordUpdateServlet.java +++ b/src/web/servlet/student/StudentPasswordUpdateServlet.java @@ -20,6 +20,9 @@ public class StudentPasswordUpdateServlet extends HttpServlet { ======= // 设置请求的字符编码为UTF-8，以支持中文 // 设置请求的字符编码为utf-8 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop request.setCharacterEncoding("utf-8"); // 获取当前会话 diff --git a/src/web/servlet/student/StudentSelectCourseListServlet.java b/src/web/servlet/student/StudentSelectCourseListServlet.java index 512c3be..b281e0b 100644 --- a/src/web/servlet/student/StudentSelectCourseListServlet.java +++ b/src/web/servlet/student/StudentSelectCourseListServlet.java @@ -41,6 +41,9 @@ public class StudentSelectCourseListServlet extends HttpServlet { ======= //转发到list.jsp- // 如果学生不为空，则跳转到学生选课列表页面 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop request.getRequestDispatcher("/WEB-INF/student/studentSelectCourseList.jsp").forward(request,response); } else if (admin != null && student == null) { diff --git a/src/web/servlet/teacher/TeacherPasswordUpdateServlet.java b/src/web/servlet/teacher/TeacherPasswordUpdateServlet.java index 742d262..f532f8d 100644 --- a/src/web/servlet/teacher/TeacherPasswordUpdateServlet.java +++ b/src/web/servlet/teacher/TeacherPasswordUpdateServlet.java @@ -32,6 +32,9 @@ public class TeacherPasswordUpdateServlet extends HttpServlet { ======= //3 // 获取新密码 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop String newpassword = request.getParameter("teacher-newpassword"); // 获取确认新密码 diff --git a/src/web/servlet/teacher/UpdateScoreServlet.java b/src/web/servlet/teacher/UpdateScoreServlet.java index a05ff1c..9067dd1 100644 --- a/src/web/servlet/teacher/UpdateScoreServlet.java +++ b/src/web/servlet/teacher/UpdateScoreServlet.java @@ -24,6 +24,9 @@ public class UpdateScoreServlet extends HttpServlet { ======= //中文 // 设置请求的字符编码为utf-8 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop request.setCharacterEncoding("utf-8"); // 获取请求参数cid diff --git a/src/web/servlet/teacher/UpdateTeacherInfoServlet.java b/src/web/servlet/teacher/UpdateTeacherInfoServlet.java index 6058ccb..b66ee1a 100644 --- a/src/web/servlet/teacher/UpdateTeacherInfoServlet.java +++ b/src/web/servlet/teacher/UpdateTeacherInfoServlet.java @@ -38,6 +38,9 @@ public class UpdateTeacherInfoServlet extends HttpServlet { ======= //判断输入位数是否大于数据库位数- //判断输入的姓名、学历、职称是否合法 +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop if (name.length() > 4 || education.length() > 20 || title.length()>24 || name.contains("<") || education.contains("<") || title.contains("<")) { //将错误信息存入request对象中 diff --git a/src/web/servlet/teacher/UpdateTeacherOptionalCourseServlet.java b/src/web/servlet/teacher/UpdateTeacherOptionalCourseServlet.java index f10eb74..5036944 100644 --- a/src/web/servlet/teacher/UpdateTeacherOptionalCourseServlet.java +++ b/src/web/servlet/teacher/UpdateTeacherOptionalCourseServlet.java @@ -22,6 +22,9 @@ public class UpdateTeacherOptionalCourseServlet extends HttpServlet { ======= // HttpSession session = request.getSession();- // 获取请求参数中的课程ID +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop String cid = (String)request.getParameter("cid"); // 创建TeacherService对象 diff --git a/text.iml b/text.iml index 8d1eabf..7521253 100644 --- a/text.iml +++ b/text.iml @@ -1,7 +1,10 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> remotes/origin/develop @@ -14,6 +17,9 @@ +<<<<<<< HEAD +>>>>>>> remotes/origin/develop +======= >>>>>>> remotes/origin/develop