Merge pull request #60 from kookmin-sw/dev/back/admin

Implement Inquire System

.gitignore

@@ -2,51 +2,13 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
-.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
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
 # File-based project format
 *.iws
 
@@ -59,24 +21,12 @@ out/
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
 ### Java template
 # Compiled class file
 *.class

README.md

@@ -1,79 +1,124 @@
 
 # 매듭 창고
+
+이 프로젝트는 2023년 '캡스톤디자인1'에서 시간은행 개념을 도입하여 만든 기존의 '타임뱅크(45조)' 어플의 단점을 개선하여 성북구 정릉동에 특화되도록 만든 '매듭창고' 어플이다.
 
-> 허지은(팀장), 오선정, 윤서영, 성예린, 송수인  
-> 개발기간 : 2024.03.05
+> 개발기간 : 2024.03.12~ present.  
+> ⭐최신자료 **PPT**: https://drive.google.com/file/d/1cGouAPiH7Ox7-vjiIIpCrIVyBsddgzHc/view?usp=sharing   
+> ⭐최신자료 **중간보고서**: https://drive.google.com/file/d/1qVue3BUVo_C4eGvTRo2KZVz8kvaErVCa/view?usp=sharing   
 
 
 <br>
 
-## Introduction 
-
-**2023년 캡스톤디자인1에서 시간은행 개념을 도입하여 만든 기존의 ‘타임뱅크’ 어플의 단점을 개선하여 성북구 정릉동에 특화된 ‘매듭창고’ 어플을 만들고자 합니다.** 
-
-### 시간은행이란?
+## 프로젝트 소개
+### 📌시간은행이란?
 <img width="539" alt="image" src="https://github.com/Heo-jieun/read_me_clone/assets/65994153/d1f0abd1-b9e1-4949-892f-23711ad70cd6">
-<br>
-서로 도움을 주고 받으면 생긴 "시간"이라는 단위를 보관하고, 교환을 도와 줌으로써 사람들이 좀 더 안전하고, 편하게 도움을 교환할 수 있도록 해주는 은행으로 "같이"의 "가치"를 중요시합니다. 
 
-<br>
-<br>
+시간은행의 역할은 서로 도움을 주고 받으면서 생긴 '시간(이 어플에서는 **매듭**)' 단위를 보관하고, 거래를 도와주며 기록하는 것이다.  
 
-**'매듭창고'는 사용자 편의를 고려해 제작된 앱입니다.**
+시간은행에서는 "같이" 의 "가치"를 중요시 한다.  
+
+### 📌개선한 기능
 
-1. 블루투스 기능을 이용한 송금
- - 블루투스 기술을 이용하여 내 주변인을 찾아 계좌번호 없는 간편한 송금이 가능.
+**1. 블루투스 기능을 이용한 송금**
+  - 계좌번호 없이 간편한 송금이 가능.
 
-2. 구어체 사용
+**2. 구어체 사용**
  - 중장년층 이상이 주로 사용할 것을 고려하여 이해하기 쉬운 구어체 사용.
-
-3. 음성 녹음으로 관리자에게 문의
- - 앱의 주 사용자인 노년층을 위해 음성 녹음하기 기능을 추가하여 편의성을 제공.
 
-4. 기업계좌 추가, 1인 다계좌 허용
+**3. 기업계좌 추가, 1인 다계좌 허용**
  - 기존 타임 뱅크와 달리 1인 다계좌 개설을 허용하여 기업용 계좌를 보유하면서도 개인 계좌를 사용 가능.
 
-5. 오송금 거래 취소 기능 간편화 및 관리자 로그 추가
+**4. 오송금 거래 취소 기능 간편화 및 관리자 로그 추가**
  - 관리자가 환불 버튼을 클릭 시, 해당 거래와 반대되는 거래를 발생시켜 환불진행.
  - 관리자가 발생하는 거래에는 항상 관리자 이름과 거래를 만든 이유를 적게 하여 권한 남용을 방지.
 
+**5. 음성 녹음으로 관리자에게 문의**
+ - 앱의 주 사용자인 노년층을 위해 음성 녹음하기 기능을 추가하여 편의성을 제공.
+
+
+
+
+### 📌프로토 영상 - 송금 기능
+이미지 클릭 시 유튜브로 이동합니다.  
+
+[![매듭창고 프로토 영상](https://github.com/kookmin-sw/capstone-2024-45/assets/102743371/a054e323-09b8-4c05-b41d-4a380d6116d4)](https://www.youtube.com/watch?v=fODQUL5DCpY)
 
-<br>  
 
 
 
 ## 시스템 구조도
 
-<br>
-<img width="612" alt="image" src="https://github.com/Heo-jieun/read_me_clone/assets/65994153/73b6cf80-cd96-46a5-91d3-d9084bb5cd74">
-<br>
+<img width="612" alt="image" src="https://github.com/kookmin-sw/capstone-2024-45/assets/102743371/267d0e05-d15c-4b31-a7c0-4f54f50832d3">
+
+
+## 팀 소개
+
+```
+허지은(팀장)
+Role : Frontend, UI/UX
+Student ID : ****
+E-mail : @kookmin.ac.kr
+```
+
+```
+성예린
+Role : Frontend
+Student ID : ****1634
+E-mail : hbgraph@kookmin.ac.kr
+```
+
+```
+오선정
+Role : Frontend, UI/UX
+Student ID : ****2697
+E-mail : sspure123@kookmin.ac.kr
+```
+
+```
+송수인
+Role : Backend
+Student ID : ****3086
+E-mail : ingenieur_song@kookmin.ac.kr
+```
+
+```
+윤서영
+Role : Backend
+Student ID : ****0153
+E-mail : ytjdud01@kookmin.ac.kr
+```
 
 
 ## Stacks 
 
-
-<br>
-<div align=center> 
-<img src="https://img.shields.io/badge/DART-339AF0?style=for-the-badge&logo=DART&logoColor=white">
-<img src="https://img.shields.io/badge/Android%20Studio-3DDC84.svg?style=for-the-badge&logo=android-studio&logoColor=white">
-<img src="https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white">
-<img src="https://img.shields.io/badge/flutter-02569B?style=for-the-badge&logo=flutter&logoColor=white">
 <br>
-
-
-<img src="https://img.shields.io/badge/Visual%20Studio%20Code-0078d7.svg?style=for-the-badge&logo=visual-studio-code&logoColor=white">
-<!-- <img src="https://img.shields.io/badge/flask-000000?style=for-the-badge&logo=flask&logoColor=white"> -->
-<img src="https://img.shields.io/badge/Spring-6DB33F?style=flat-square&logo=Spring&logoColor=white"/>
-<img src="https://img.shields.io/badge/django-092E20?style=flat-square&logo=django&logoColor=white"/>
-<img src="https://img.shields.io/badge/MySQL-4479A1?style=flat-square&logo=MySQL&logoColor=white"/>
+<img width="612" alt="image" src="https://github.com/Heo-jieun/read_me_clone/assets/65994153/73b6cf80-cd96-46a5-91d3-d9084bb5cd74">
 <br>
 
-<img src="https://img.shields.io/badge/github-181717?style=for-the-badge&logo=github&logoColor=white">
-<img src="https://img.shields.io/badge/git-F05032?style=for-the-badge&logo=git&logoColor=white">
 <br>
 
-<img src="https://img.shields.io/badge/Notion-%23000000.svg?style=for-the-badge&logo=notion&logoColor=white">
-<img src="https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white">
-<img src="https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white">
-</div>
+<!-- <div align=center> 
+ <img src="https://img.shields.io/badge/DART-339AF0?style=for-the-badge&logo=DART&logoColor=white">
+ <img src="https://img.shields.io/badge/Android%20Studio-3DDC84.svg?style=for-the-badge&logo=android-studio&logoColor=white">
+ <img src="https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white">
+ <img src="https://img.shields.io/badge/flutter-02569B?style=for-the-badge&logo=flutter&logoColor=white">
+ <br>
+ 
+ 
+ <img src="https://img.shields.io/badge/Visual%20Studio%20Code-0078d7.svg?style=for-the-badge&logo=visual-studio-code&logoColor=white">
+ <img src="https://img.shields.io/badge/flask-000000?style=for-the-badge&logo=flask&logoColor=white">
+ <img src="https://img.shields.io/badge/Spring-6DB33F?style=flat-square&logo=Spring&logoColor=white"/>
+ <img src="https://img.shields.io/badge/django-092E20?style=flat-square&logo=django&logoColor=white"/>
+ <img src="https://img.shields.io/badge/MySQL-4479A1?style=flat-square&logo=MySQL&logoColor=white"/>
+ <br>
+ 
+ <img src="https://img.shields.io/badge/github-181717?style=for-the-badge&logo=github&logoColor=white">
+ <img src="https://img.shields.io/badge/git-F05032?style=for-the-badge&logo=git&logoColor=white">
+ <br>
+ 
+ <img src="https://img.shields.io/badge/Notion-%23000000.svg?style=for-the-badge&logo=notion&logoColor=white">
+ <img src="https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white">
+ <img src="https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white">
+</div> -->
 

admin-service/.gitignore

@@ -0,0 +1,42 @@
+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/
+
+### env ###
+.env
+
+/src/test/data.sql

admin-service/Dockerfile

@@ -0,0 +1,14 @@
+FROM --platform=linux/amd64 openjdk:17-jdk
+#FROM openjdk:17-jdk
+
+LABEL maintainer="ytjdud01@kookmin.ac.kr"
+
+VOLUME /dev-admin-service
+
+EXPOSE 8081
+
+ARG JAR_FILE=build/libs/admin-service-0.0.1-SNAPSHOT.jar
+
+COPY ${JAR_FILE} admin-springboot.jar
+
+ENTRYPOINT ["java", "-jar","/admin-springboot.jar"]

admin-service/build.gradle

@@ -0,0 +1,39 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '3.1.10'
+	id 'io.spring.dependency-management' version '1.1.4'
+}
+
+group = 'com.capstone2024.sw.kmu'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	sourceCompatibility = '17'
+}
+
+configurations {
+	compileOnly {
+		extendsFrom annotationProcessor
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0"
+//	implementation 'org.springframework.boot:spring-boot-starter-security'
+//	testImplementation 'org.springframework.security:spring-security-test'
+	compileOnly 'org.projectlombok:lombok'
+	runtimeOnly 'com.mysql:mysql-connector-j'
+	annotationProcessor 'org.projectlombok:lombok'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

admin-service/docker-compose.yml

@@ -0,0 +1,39 @@
+version: "3.8"
+
+services:
+  mysql:
+    image: mysql:8.3.0
+    container_name: mysql-admin-service
+    hostname: mysql
+    restart: unless-stopped
+    environment:
+      - MYSQL_ROOT_HOST=%
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - TZ=Asia/Seoul
+    ports:
+      - 3306:3306
+    volumes:
+      - ./mysql/conf.d:/etc/dev-admin-service/mysql/conf.d
+      - ./mysql/init.sql:/docker-entrypoint-initdb.d/dev-admin-service/init.sql
+      - ./mysql/schema.sql:/docker-entrypoint-initdb.d/dev-admin-service/schema.sql
+      - ./mysql/data.sql:/docker-entrypoint-initdb.d/dev-admin-service/data.sql
+
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: dev-admin
+    hostname: dev-admin
+    ports:
+      - 80:8081
+    env_file:
+      - .env
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/admin?serverTimezone=Asia/Seoul
+      - SPRING_DATASOURCE_USERNAME=root
+      - SPRING_DATASOURCE_PASSWORD=${DATASOURCE_ADMIN_PASSWORD}
+    links:
+      - mysql
+    depends_on:
+      - mysql

admin-service/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists