Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/logout2 #62

Open
wants to merge 107 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
9641a84
#1-백엔드 폴더,스프링, mysql 연동
chaerin05 Sep 29, 2024
41d508c
Merge pull request #2 from pknu-wap/feature/backend-setup
chaerin05 Sep 29, 2024
f6408e3
bookmark domain 수정
chaerin05 Oct 3, 2024
6a927cc
Merge pull request #4 from pknu-wap/fix/bookmark-entity-relationship
chaerin05 Oct 3, 2024
4ed10e3
#5-/api/post/info/{postId} 구현완료
chaerin05 Oct 5, 2024
fc46a96
Merge branch 'develop' of https://github.com/pknu-wap/2024_2_WEB3 int…
chaerin05 Oct 6, 2024
73974e4
#5-api/post/bookmark/{id} 구현완료, 토큰 구현 후 다시 테스트 필요
chaerin05 Oct 6, 2024
08ea9c6
Merge pull request #6 from pknu-wap/feature/#5-detailpage
chaerin05 Oct 6, 2024
e5089fe
#7-system.properties
Ksuwon Oct 7, 2024
ee0df4c
Merge pull request #8 from pknu-wap/feature/#7-system.properties
Ksuwon Oct 7, 2024
72865ee
#9-사용자지정 에러코드 작성 후 그에맞게 구조 변경
chaerin05 Oct 8, 2024
fcfde0c
Merge pull request #10 from pknu-wap/feature/#9-error-handling
chaerin05 Oct 10, 2024
f19a240
Feature/main-page (#11)
yeeeon02 Oct 29, 2024
afd7e3c
환경 변수를 사용하도록 application.properties 수정
chaerin05 Oct 29, 2024
24db373
Merge pull request #14 from pknu-wap/feature/application-config
chaerin05 Oct 29, 2024
3009429
url 수정
chaerin05 Oct 29, 2024
9d3107f
Merge pull request #15 from pknu-wap/feature/application-config2
chaerin05 Oct 29, 2024
ceb0f5b
username에서 user로 수정
chaerin05 Oct 29, 2024
c05cb21
Revert "username에서 user로 수정"
chaerin05 Oct 29, 2024
223c12a
username에서 user로 수정
chaerin05 Oct 29, 2024
81dd323
feat: 로그인 페이지 (#17)
yeeeon02 Oct 29, 2024
917b852
gradle 버전 변경
chaerin05 Oct 29, 2024
a15057e
Merge pull request #18 from pknu-wap/feature/application-config3
chaerin05 Oct 29, 2024
f614fc6
gradle버전 돌리기
chaerin05 Oct 29, 2024
c72c7bd
Merge pull request #19 from pknu-wap/feature/application-config2
chaerin05 Oct 29, 2024
92c1186
Front (#20)
yeeeon02 Oct 29, 2024
0a25d3f
json 파일 삭제
chaerin05 Oct 29, 2024
7a72eb2
Merge pull request #21 from pknu-wap/feature/jsonDelete
chaerin05 Oct 29, 2024
b484c9f
images속 한글제목 삭제
chaerin05 Oct 29, 2024
814d9df
Merge pull request #22 from pknu-wap/fearute/OPENDelete
chaerin05 Oct 29, 2024
29836e4
Rose 기호로 된거 삭제
chaerin05 Oct 29, 2024
9db45be
Merge pull request #23 from pknu-wap/feature/RoseDelete
chaerin05 Oct 29, 2024
49b6446
Feature/list page (#24)
yeeeon02 Oct 30, 2024
15a22fe
Feature/sign up (#25)
yeeeon02 Oct 30, 2024
80faf01
배포 준비
yeeeon02 Oct 30, 2024
9a6ddc8
update netlify.toml
yeeeon02 Oct 30, 2024
0cd8e39
Remove sensitive information from application.properties
Ksuwon Oct 30, 2024
7ed3bad
Merge pull request #26 from pknu-wap/feature/#13-search
chaerin05 Oct 30, 2024
c81581e
백엔드 프론트엔드 백엔드쪽 연동
Ksuwon Oct 30, 2024
8587739
Merge branch 'develop' of https://github.com/pknu-wap/2024_2_WEB3 int…
Ksuwon Oct 30, 2024
ac284eb
Merge pull request #27 from pknu-wap/feature/WebConfig
Ksuwon Oct 30, 2024
e2d6378
webfig localhost와 프론트배포링크 분리
chaerin05 Oct 31, 2024
abc72e4
Merge pull request #28 from pknu-wap/fix/webconfig
chaerin05 Oct 31, 2024
ac31d6a
fix:securityConfig수정 webconfig를 securityConfig로 이동
chaerin05 Oct 31, 2024
f6dbd2d
Merge pull request #29 from pknu-wap/fix/securityconfig
chaerin05 Oct 31, 2024
e848af7
fix/postservice수정
chaerin05 Oct 31, 2024
964e2fd
Merge pull request #30 from pknu-wap/fix/Imagelink
Ksuwon Oct 31, 2024
1b78f35
fix: securityconfig에 images경로 추가
chaerin05 Nov 1, 2024
fdc8146
/api/post/search중복코드 삭제
chaerin05 Nov 1, 2024
7480ef5
Merge pull request #37 from pknu-wap/fix/allow-images-access
chaerin05 Nov 1, 2024
3663b48
feat: /api/mypage/info 구현(테스트x)
chaerin05 Nov 3, 2024
54fda50
feat: /api/mypage/bookmarks 구현
chaerin05 Nov 4, 2024
5de1c93
feat: /api/mypage/updateInfo 구현
chaerin05 Nov 5, 2024
a2bfb4b
feat: userDto에 preferenceLevel 추가
chaerin05 Nov 5, 2024
f063bb6
feat: /api/mypage/updatePreference 구현
chaerin05 Nov 5, 2024
6ebcb34
Feature/list page add api (#38)
yeeeon02 Nov 6, 2024
fa9c3cb
Merge branch 'develop' of https://github.com/pknu-wap/2024_2_WEB3 int…
chaerin05 Nov 7, 2024
07c512c
feature: search
StarrySnowy Nov 7, 2024
9790c5a
feature: search
StarrySnowy Nov 7, 2024
af52971
Merge branch 'develop' of https://github.com/pknu-wap/2024_2_WEB3 int…
chaerin05 Nov 12, 2024
277b14a
feat: /api/mypage/updateProfileImage 구현
chaerin05 Nov 12, 2024
f336e0a
login/signup 기능구현
Ksuwon Nov 12, 2024
e42e063
image에 대한 경로 허용 누락 수정
Ksuwon Nov 12, 2024
114e1b3
Merge pull request #39 from pknu-wap/feature/login
Ksuwon Nov 12, 2024
a9a6224
reissue 경로 허용
Ksuwon Nov 12, 2024
f3ad7c5
Merge pull request #40 from pknu-wap/feature/login
Ksuwon Nov 12, 2024
0c69281
feature: mypage, searchbar
StarrySnowy Nov 13, 2024
bac9740
로그인 비밀키 수정
Ksuwon Nov 13, 2024
13171ba
Merge pull request #42 from pknu-wap/feature/login
Ksuwon Nov 13, 2024
6b7c66d
fix:cors지워진 설정 한줄 다시 추가
chaerin05 Nov 14, 2024
52bcb1c
Merge pull request #43 from pknu-wap/fix/cors
chaerin05 Nov 14, 2024
0822a16
fix:충돌해결
chaerin05 Nov 14, 2024
68ca0f4
fix : 테스트 후 코드수정
chaerin05 Nov 15, 2024
5142407
Merge pull request #44 from pknu-wap/feature/mypage
chaerin05 Nov 15, 2024
52dc716
fix: mypageinfo 수정
chaerin05 Nov 15, 2024
2d5d5d0
Merge pull request #45 from pknu-wap/Fix/mypageinfo
chaerin05 Nov 15, 2024
f105e93
프론트 백엔드 연동 오류1
Ksuwon Nov 15, 2024
c2f642b
Merge pull request #46 from pknu-wap/fix/loginapi
Ksuwon Nov 15, 2024
8aa52c2
feat:별점 기능 구현
chaerin05 Nov 17, 2024
1622182
feat : 별점 기능 구현
chaerin05 Nov 17, 2024
7c375f0
fix: rating userId 관련 수정
chaerin05 Nov 17, 2024
f7d666e
Merge pull request #47 from pknu-wap/Fix/rating_userid
chaerin05 Nov 17, 2024
c98478a
userName과 userId 형식 변환
Ksuwon Nov 18, 2024
3eeb157
Merge pull request #49 from pknu-wap/feature/loginfix
Ksuwon Nov 18, 2024
9dfbad3
password 수정
Ksuwon Nov 18, 2024
1448e20
password fix
Ksuwon Nov 18, 2024
1e0405f
fix password
Ksuwon Nov 18, 2024
595e9a1
Merge pull request #50 from pknu-wap/fix/password
Ksuwon Nov 18, 2024
723fdb8
list page fix
Ksuwon Nov 18, 2024
e7c081b
Merge pull request #51 from pknu-wap/fix/password
Ksuwon Nov 18, 2024
b2c6bcb
feat: comment 기능
chaerin05 Nov 19, 2024
f34f91d
Merge branch 'develop' of https://github.com/pknu-wap/2024_2_WEB3 int…
chaerin05 Nov 19, 2024
903775d
fix:테스트 후 수정
chaerin05 Nov 19, 2024
026398e
Merge pull request #52 from pknu-wap/feature/comment
chaerin05 Nov 19, 2024
ce13033
login 수정
Ksuwon Nov 19, 2024
a830281
Fix login
Ksuwon Nov 19, 2024
12ed695
Merge pull request #53 from pknu-wap/fix/loginsignup
Ksuwon Nov 19, 2024
2766e79
Feature/main page (#54)
yeeeon02 Nov 20, 2024
c9f54d8
feature
StarrySnowy Nov 21, 2024
37329eb
Merge pull request #55 from pknu-wap/feature/search
StarrySnowy Nov 21, 2024
410d539
chore:이미지 누끼 교체
chaerin05 Nov 22, 2024
c7d8999
Merge pull request #57 from pknu-wap/chore/images
chaerin05 Nov 22, 2024
aac4775
filter 기능
Ksuwon Nov 22, 2024
fa63c8d
Merge pull request #58 from pknu-wap/feature/filter
Ksuwon Nov 22, 2024
2d9599a
로그아웃 연동 오류
Ksuwon Nov 25, 2024
de9e2b2
Merge pull request #60 from pknu-wap/fix/logout
Ksuwon Nov 25, 2024
7427ead
login fix
Ksuwon Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
38 changes: 38 additions & 0 deletions Backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea/
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

54 changes: 54 additions & 0 deletions Backend/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.3.4'
id 'io.spring.dependency-management' version '1.1.6'
}

group = 'org.example'
version = '0.0.1-SNAPSHOT'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-web-services'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'mysql:mysql-connector-java:8.0.33' // MySQL Connector/J
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Spring Data JPA
runtimeOnly 'mysql:mysql-connector-java' // MySQL 연결 드라이버
implementation 'mysql:mysql-connector-java:8.0.33'

implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.webjars:webjars-locator-core:0.48'

implementation 'io.github.classgraph:classgraph:4.8.47'
implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
}

tasks.named('test') {
useJUnitPlatform()
}
Binary file added Backend/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
8 changes: 8 additions & 0 deletions Backend/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

252 changes: 252 additions & 0 deletions Backend/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################

# Attempt to set APP_HOME

# Resolve links: $0 may be a link
app_path=$0

# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done

# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

warn () {
echo "$*"
} >&2

die () {
echo
echo "$*"
echo
exit 1
} >&2

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi

# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

JAVACMD=$( cygpath --unix "$JAVACMD" )

# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#

eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
Loading