diff --git a/.gitignore b/.gitignore index 91dab9e..5e12703 100644 --- a/.gitignore +++ b/.gitignore @@ -8,43 +8,45 @@ application.yml -# User-specific situff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml +.idea + +## User-specific situff +#.idea/**/workspace.xml +#.idea/**/tasks.xml +#.idea/**/usage.statistics.xml +#.idea/**/dictionaries +#.idea/**/shelf +# +## AWS User-specific +#.idea/**/aws.xml +# +## Generated files +#.idea/**/contentModel.xml +# +## Sensitive or high-churn files +#.idea/**/dataSources/ +#.idea/**/dataSources.ids +#.idea/**/dataSources.local.xml +#.idea/**/sqlDataSources.xml +#.idea/**/dynamic.xml +#.idea/**/uiDesigner.xml +#.idea/**/dbnavigator.xml +# +## Gradle +#.idea/**/gradle.xml +#.idea/**/libraries +# +## Gradle and Maven with auto-import +## When using Gradle or Maven with auto-import, you should exclude module files, +## since they will be recreated, and may cause churn. Uncomment if using +## auto-import. +## .idea/artifacts +## .idea/compiler.xml +## .idea/jarRepositories.xml +## .idea/modules.xml +## .idea/*.iml +## .idea/modules +## *.iml # *.ipr # CMake diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 80ceeff..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index b84376c..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://database-1.cksxigummbi6.ap-northeast-2.rds.amazonaws.com:3306 - $ProjectFileDir$ - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://database-2.cksxigummbi6.ap-northeast-2.rds.amazonaws.com:3306 - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 614d3a2..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml deleted file mode 100644 index d08f400..0000000 --- a/.idea/jpa-buddy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3f7765a..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/com/example/UserService/config/RedisConfig.java b/src/main/java/com/example/UserService/config/RedisConfig.java index 5da8ffe..6f546fa 100644 --- a/src/main/java/com/example/UserService/config/RedisConfig.java +++ b/src/main/java/com/example/UserService/config/RedisConfig.java @@ -13,10 +13,10 @@ @EnableRedisRepositories public class RedisConfig { - @Value("${spring.data.redis.host}") + @Value("${spring.redis.host}") private String redisHost; - @Value("${spring.data.redis.port}") + @Value("${spring.redis.port}") private int redisPort; @Bean diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index ff1d73d..55306e7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -6,10 +6,9 @@ spring: activate: on-profile: prod - data: - redis: - host: 52.78.155.253 - port: 6379 + redis: # Redis 접속 정보 + host: redis + port: 6379 application: name: User-Service