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.

Sign up for GitHub

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

Main 변경점 develop에 merge #82

Merged
merged 4 commits into from
Apr 3, 2024
Merged

Main 변경점 develop에 merge #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41f9016
Docs: README.md 수정
don9m1n Mar 26, 2024
7f9e870
Merge pull request #81 from reading-log/develop
don9m1n Apr 3, 2024
9df0258
Update README.md
don9m1n Apr 3, 2024
868891a
Update RedisConfig.java
don9m1n Apr 3, 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
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# 📚 Reading Log (리딩로그)
- `프로젝트 소개:` 내가 읽은 책들을 기록하는 독서 기록 서비스.
- `개발 기간:` 2024.03.03. ~
- 프로젝트 소개: 내가 읽은 책들을 기록하는 독서 기록 서비스.
- 개발 기간: 2024.03.03 ~
___

## 🧑🏻‍💻 개발 환경

|구분|스택|
|:--:|--|
|`Develop`|<img src="https://img.shields.io/badge/Java 17-FF9E0F?style=flat-square&logo=Java&logoColor=white"> <img src="https://img.shields.io/badge/gradle-02303A?style=flat-square&logo=gradle&logoColor=white"> <img src="https://img.shields.io/badge/Spring Boot-6DB33F?style=flat-square&logo=Spring Boot&logoColor=white"> <img src="https://img.shields.io/badge/Spring Security-6DB33F?style=flat-square&logo=Spring Security&logoColor=white"> <img src="https://img.shields.io/badge/Spring Data JPA-20336B?style=flat-square&logo=spring&logoColor=white"> |
|`Database`|<img src="https://img.shields.io/badge/MySQL-4479A1?style=flat-square&logo=MySQL&logoColor=white"> <img src="https://img.shields.io/badge/Redis-DC382D?style=flat-square&logo=redis&logoColor=white"> |
|`Collaboration`|<img src="https://img.shields.io/badge/git-F05032?style=flat-square&logo=git&logoColor=white"> <img src="https://img.shields.io/badge/github-181717?style=flat-square&logo=github&logoColor=white"> <img src="https://img.shields.io/badge/discord-5865F2?style=flat-square&logo=discord&logoColor=white">|
|`Document`| <img src="https://img.shields.io/badge/Swagger UI-569A31?style=flat-square&logo=swagger&logoColor=white"> <img src="https://img.shields.io/badge/notion-000000?style=flat-square&logo=notion&logoColor=white"> |
|`Tools`|<img src="https://img.shields.io/badge/intellij idea-003366?style=flat-square&logo=intellijidea&logoColor=white"> <img src="https://img.shields.io/badge/postman-FF6C37?style=flat-square&logo=postman&logoColor=white"> <img src="https://img.shields.io/badge/gitkraken-179287?style=flat-square&logo=gitkraken&logoColor=white"> <img src="https://img.shields.io/badge/figma-F24E1E?style=flat-square&logo=figma&logoColor=white">|
|Develop|<img src="https://img.shields.io/badge/Java 17-FF9E0F?style=flat-square&logo=Java&logoColor=white"> <img src="https://img.shields.io/badge/gradle-02303A?style=flat-square&logo=gradle&logoColor=white"> <img src="https://img.shields.io/badge/Spring Boot-6DB33F?style=flat-square&logo=Spring Boot&logoColor=white"> <img src="https://img.shields.io/badge/Spring Security-6DB33F?style=flat-square&logo=Spring Security&logoColor=white"> <img src="https://img.shields.io/badge/Spring Data JPA-20336B?style=flat-square&logo=spring&logoColor=white"> |
|Database|<img src="https://img.shields.io/badge/MySQL-4479A1?style=flat-square&logo=MySQL&logoColor=white"> <img src="https://img.shields.io/badge/Redis-DC382D?style=flat-square&logo=redis&logoColor=white"> |
|Collaboration|<img src="https://img.shields.io/badge/git-F05032?style=flat-square&logo=git&logoColor=white"> <img src="https://img.shields.io/badge/github-181717?style=flat-square&logo=github&logoColor=white"> <img src="https://img.shields.io/badge/discord-5865F2?style=flat-square&logo=discord&logoColor=white">|
|Document| <img src="https://img.shields.io/badge/Swagger UI-569A31?style=flat-square&logo=swagger&logoColor=white"> <img src="https://img.shields.io/badge/notion-000000?style=flat-square&logo=notion&logoColor=white"> |
|Tools|<img src="https://img.shields.io/badge/intellij idea-003366?style=flat-square&logo=intellijidea&logoColor=white"> <img src="https://img.shields.io/badge/postman-FF6C37?style=flat-square&logo=postman&logoColor=white"> <img src="https://img.shields.io/badge/gitkraken-179287?style=flat-square&logo=gitkraken&logoColor=white"> <img src="https://img.shields.io/badge/figma-F24E1E?style=flat-square&logo=figma&logoColor=white">|
___
4 changes: 2 additions & 2 deletions src/main/java/com/api/readinglog/common/redis/config/RedisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
@EnableRedisRepositories
public class RedisConfig {

@Value("${spring.redis.host}")
@Value("${spring.data.redis.host}")
private String redisHost;

@Value("${spring.redis.port}")
@Value("${spring.data.redis.port}")
private int redisPort;

@Bean
Expand Down
Loading