diff --git a/.classpath b/.classpath index 489f00c..35efedc 100644 --- a/.classpath +++ b/.classpath @@ -26,7 +26,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 107056a..ea9214d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.6 @@ -7,6 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index f0c4be4..3a7f9cf 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,19 +1,29 @@ - + + - + + - + + - + + - + + - + + + - + + - - + + + + diff --git a/miniproject.sql b/miniproject.sql new file mode 100644 index 0000000..61fc6d3 --- /dev/null +++ b/miniproject.sql @@ -0,0 +1,4 @@ +select * from tab; +create table test1 ( +id number(5) not null +); \ No newline at end of file diff --git a/src/main/java/com/miniproject/board/controller/NoticeBoardController.java b/src/main/java/com/miniproject/board/controller/NoticeBoardController.java new file mode 100644 index 0000000..cfe5044 --- /dev/null +++ b/src/main/java/com/miniproject/board/controller/NoticeBoardController.java @@ -0,0 +1,21 @@ +package com.miniproject.board.controller; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +public class NoticeBoardController extends HttpServlet { + + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + +} diff --git a/src/main/java/com/miniproject/connect/JDBCUtil.java b/src/main/java/com/miniproject/connect/JDBCUtil.java index 956d214..7513519 100644 --- a/src/main/java/com/miniproject/connect/JDBCUtil.java +++ b/src/main/java/com/miniproject/connect/JDBCUtil.java @@ -9,14 +9,14 @@ public class JDBCUtil { public static void main(String[] args) { - // 1단계 : 데이터 베이스 연결 + // 1단계 : 데1이터 베이스 연결 try { // 1단계 : 데이터 베이스 연결 Class.forName("oracle.jdbc.driver.OracleDriver"); // 2단계 : 연결을 관리하는 객체 생성 String url = "jdbc:oracle:thin:@localhost:1521:orcl"; - String id = "MiniProject"; + String id = "miniproject"; String pass = "1234"; Connection conn = DriverManager.getConnection(url, id, pass); diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index d39cfe5..1a03c98 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -6,7 +6,11 @@

+<<<<<<< HEAD + Hello world! 1234 +======= Hello world! 333 +>>>>>>> branch 'master' of https://github.com/jeongin9/MiniProject.git

The time on the server is ${serverTime}.

diff --git a/src/main/webapp/WEB-INF/views/test.jsp b/src/main/webapp/WEB-INF/views/test.jsp new file mode 100644 index 0000000..ce046b5 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/test.jsp @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 36952b2..5cbc57a 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -60,4 +60,14 @@ DispacherServlet *.do + + + NoticeBoardController + NoticeBoardController + com.miniproject.board.controller.NoticeBoardController + + + NoticeBoardController + /NoticeBoardController.do + \ No newline at end of file diff --git a/src/main/webapp/notice.jsp b/src/main/webapp/notice.jsp new file mode 100644 index 0000000..087e5ea --- /dev/null +++ b/src/main/webapp/notice.jsp @@ -0,0 +1,280 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + + Travel It + + + + + +
+ + +
+
+

공지사항

+

트래블 잇의 주요 소식을 안내받으세요!

+ +
+
+ +
+
+
+ +
+ + + +
+ 관리자로 글 작성 +
+
+
+ + +
+
+
+ 이미지1 +

신규 회원 이용 가이드

+

조회수: 211,445

+
+
+ 이미지2 +

관광명소, 로컬푸드 등록 시 주의사항

+

조회수: 211,445

+
+
+ 이미지3 +

스토리 작성 가이드 ver.1

+

조회수: 211,445

+
+ +
+ +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/notice2.jsp b/src/main/webapp/notice2.jsp new file mode 100644 index 0000000..27328ba --- /dev/null +++ b/src/main/webapp/notice2.jsp @@ -0,0 +1,285 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + + Travel It + + + + + +
+ + +
+
+

공지사항

+

트래블 잇의 주요 소식을 안내받으세요!

+ +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+
+
관리자로 글 작성
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
ID제목조회수
1신규 회원 이용 가이드211,445
2관광명소, 로컬푸드 등록 시 주의사항211,445
3스토리 작성 가이드 ver.1211,445
+
+ +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/resources/camp.png b/src/main/webapp/resources/camp.png new file mode 100644 index 0000000..2eecf68 Binary files /dev/null and b/src/main/webapp/resources/camp.png differ diff --git a/src/main/webapp/resources/list1.png b/src/main/webapp/resources/list1.png new file mode 100644 index 0000000..26ed11c Binary files /dev/null and b/src/main/webapp/resources/list1.png differ diff --git a/src/main/webapp/resources/list2.png b/src/main/webapp/resources/list2.png new file mode 100644 index 0000000..d623f4f Binary files /dev/null and b/src/main/webapp/resources/list2.png differ diff --git a/src/main/webapp/resources/list3.png b/src/main/webapp/resources/list3.png new file mode 100644 index 0000000..31c13a8 Binary files /dev/null and b/src/main/webapp/resources/list3.png differ diff --git a/target/classes/com/miniproject/board/controller/NoticeBoardController.class b/target/classes/com/miniproject/board/controller/NoticeBoardController.class new file mode 100644 index 0000000..80a9741 Binary files /dev/null and b/target/classes/com/miniproject/board/controller/NoticeBoardController.class differ diff --git a/target/classes/com/miniproject/connect/JDBCUtil.class b/target/classes/com/miniproject/connect/JDBCUtil.class index 1d19a60..5aee8dc 100644 Binary files a/target/classes/com/miniproject/connect/JDBCUtil.class and b/target/classes/com/miniproject/connect/JDBCUtil.class differ diff --git a/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF index 36553e3..4b7ef10 100644 --- a/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF +++ b/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: ITSC +Built-By: ↓ᅠユ↓ンᄌ Build-Jdk: 11.0.22 Created-By: Maven Integration for Eclipse diff --git a/target/m2e-wtp/web-resources/META-INF/maven/com.shoppingmall/biz/pom.properties b/target/m2e-wtp/web-resources/META-INF/maven/com.shoppingmall/biz/pom.properties index 9bb8d80..0e01532 100644 --- a/target/m2e-wtp/web-resources/META-INF/maven/com.shoppingmall/biz/pom.properties +++ b/target/m2e-wtp/web-resources/META-INF/maven/com.shoppingmall/biz/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Fri Aug 02 15:15:27 KST 2024 -m2e.projectLocation=C\:\\uiux_work\\springworkspace\\MiniProject +#Sun Aug 04 03:52:07 KST 2024 +m2e.projectLocation=C\:\\Users\\\uC815\uC778\\git\\MiniProject m2e.projectName=MiniProject groupId=com.shoppingmall artifactId=biz diff --git a/test.sql b/test.sql deleted file mode 100644 index dc6b98d..0000000 --- a/test.sql +++ /dev/null @@ -1 +0,0 @@ -select * from tab; \ No newline at end of file