diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..dd84ea782
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..bbcbbe7d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index aa241b3bd..4768dab35 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -1,4 +1,4 @@
-name: Deploy OPEX - Dev
+name: Push images on dev branch update
on:
push:
@@ -6,14 +6,35 @@ on:
- dev
jobs:
- jenkinsJob:
- name: Build OPEX new dev version
- runs-on: ubuntu-latest
+ build:
+ runs-on: ubuntu-20.04
+ strategy:
+ matrix:
+ java: [ 11 ]
+ name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- - name: Trigger opex-build-job on jenkins
- uses: appleboy/jenkins-action@master
+ - name: Checkout Source Code
+ uses: actions/checkout@v2
+ - name: Setup Java
+ uses: actions/setup-java@v2
with:
- url: ${{ secrets.JENKINS_URL }}
- user: ${{ secrets.JENKINS_USER }}
- token: ${{ secrets.JENKINS_TOKEN }}
- job: "opex-core-dev-deploy"
+ distribution: 'adopt'
+ java-package: jdk
+ java-version: ${{ matrix.java }}
+ cache: maven
+ - name: Build
+ run: mvn -B -T 1C clean install
+ - name: Build Docker images
+ env:
+ TAG: dev
+ run: docker-compose -f docker-compose.build.yml build
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Push images to GitHub Container Registry
+ env:
+ TAG: dev
+ run: docker-compose -f docker-compose.build.yml push
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 74a80f71d..a4eed9c0a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Deploy OPEX - Demo
+name: Push images on main branch update
on:
push:
@@ -6,14 +6,35 @@ on:
- main
jobs:
- jenkinsJob:
- name: Deploy OPEX new demo version
- runs-on: ubuntu-latest
+ build:
+ runs-on: ubuntu-20.04
+ strategy:
+ matrix:
+ java: [ 11 ]
+ name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- - name: Trigger opex-build-job on jenkins
- uses: appleboy/jenkins-action@master
+ - name: Checkout Source Code
+ uses: actions/checkout@v2
+ - name: Setup Java
+ uses: actions/setup-java@v2
with:
- url: ${{ secrets.JENKINS_URL }}
- user: ${{ secrets.JENKINS_USER }}
- token: ${{ secrets.JENKINS_TOKEN }}
- job: "opex-core-demo-deploy"
+ distribution: 'adopt'
+ java-package: jdk
+ java-version: ${{ matrix.java }}
+ cache: maven
+ - name: Build
+ run: mvn -B -T 1C clean install
+ - name: Build Docker images
+ env:
+ TAG: latest
+ run: docker-compose -f docker-compose.build.yml build
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Push images to GitHub Container Registry
+ env:
+ TAG: latest
+ run: docker-compose -f docker-compose.build.yml push
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5d69ee53d..c2ca70829 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,4 +1,4 @@
-name: Build on pull request
+name: Build and test on pull request
on:
pull_request:
@@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
java: [ 11 ]
- name: Opex with java ${{ matrix.java }} build
+ name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
@@ -21,6 +21,9 @@ jobs:
java-package: jdk
java-version: ${{ matrix.java }}
cache: maven
- - name: Build OPEX-Core
- working-directory: .
- run: mvn -B clean install
+ - name: Build
+ run: mvn -B -T 1C clean install
+ - name: Build Docker images
+ env:
+ TAG: latest
+ run: docker-compose -f docker-compose.build.yml build
diff --git a/.gitignore b/.gitignore
index 8ccbd2f56..19d7407a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,45 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### Other files ###
-.env
-docker-compose.local.yml
-application-local.yml
-mvnw
-mvnw.cmd
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.mvn/
-
-.DS_Store
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### Other files ###
+.env
+docker-compose.local.yml
+docker-compose.legacy.yml
+application-local.yml
+mvnw
+mvnw.cmd
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+!/.mvn/
+
+.DS_Store
+resources
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index b8af7f8c9..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,72 +0,0 @@
-pipeline {
- agent any
-
- stages('Deploy') {
- stage('Build') {
- steps {
- setBuildStatus("?", "PENDING")
- withMaven(
- maven: 'maven-3.6.3'
- ) {
- sh 'mvn -T 1C -B clean install'
- }
- }
- }
- stage('Deliver') {
- environment {
- DATA = '/var/opex/demo-core'
- PANEL_PASS = credentials("v-panel-secret")
- BACKEND_USER = credentials("v-backend-secret")
- SMTP_PASS = credentials("smtp-secret")
- DB_USER = 'opex'
- DB_PASS = credentials("db-secret")
- DB_BACKUP_USER = 'opex_backup'
- DB_BACKUP_PASS = credentials("db-backup-secret")
- KEYCLOAK_ADMIN_URL = 'https://demo.opex.dev/auth'
- KEYCLOAK_FRONTEND_URL = 'https://demo.opex.dev/auth'
- KEYCLOAK_ADMIN_USERNAME = credentials("keycloak-admin-username")
- KEYCLOAK_ADMIN_PASSWORD = credentials("keycloak-admin-password")
- OPEX_ADMIN_KEYCLOAK_CLIENT_SECRET = credentials("opex-admin-keycloak-client-secret")
- VANDAR_API_KEY = credentials("vandar-api-key")
- COMPOSE_PROJECT_NAME = 'demo-core'
- DEFAULT_NETWORK_NAME = 'demo-opex'
- }
- steps {
- sh 'docker-compose up -d --build --remove-orphans'
- sh 'docker image prune -f'
- sh 'docker network prune -f'
- }
- }
- }
-
- post {
- always {
- echo 'One way or another, I have finished'
- }
- success {
- echo ':)'
- setBuildStatus(":)", "SUCCESS")
- }
- unstable {
- echo ':/'
- setBuildStatus(":/", "UNSTABLE")
- }
- failure {
- echo ':('
- setBuildStatus(":(", "FAILURE")
- }
- changed {
- echo 'Things were different before...'
- }
- }
-}
-
-void setBuildStatus(String message, String state) {
- step([
- $class : "GitHubCommitStatusSetter",
- reposSource : [$class: "ManuallyEnteredRepositorySource", url: "https://github.com/opexdev/OPEX-Core"],
- contextSource : [$class: "ManuallyEnteredCommitContextSource", context: "ci/jenkins/build-status"],
- errorHandlers : [[$class: "ChangingBuildStatusErrorHandler", result: "UNSTABLE"]],
- statusResultSource: [$class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]]]
- ])
-}
diff --git a/README.md b/README.md
index f40dc44c6..e80064a0a 100644
--- a/README.md
+++ b/README.md
@@ -1,82 +1,126 @@
-
-
-
+
+ 
+
+
-
- 
-
-
- 
-
-
- 
-
-
- 
-
+Core is a Kotlin based cryptocurrency exchange and matching engine from the OPEX project. This extendable and
+microservice project work as a vanilla core for running cryptocurrency exchanges.
-**OPEX** Core is a Kotlin based cryptocurrency exchange and matching engine from the OPEX project. This extendable and
-microservice architectured project work as a vanilla core for running cryptocurrency exchanges.
+
+
+
+
+
+
+
+
+ 
+
+
+ 
+
+
+ 
+
+
## Contents
-- [Install](#Install)
+- [Build and Run](#build-and-run)
+- [Live Demo](#live-demo)
- [Architecture Overview](#overview)
-- [Demo](#demo)
-- [Documentation](#documentation)
- [How to Contribute](#how-to-contribute)
- [License](#license)
-- [Additional Info](#info)
-## Install
+## Build and Run
You need to have [Maven](https://maven.apache.org) and [Docker](https://www.docker.com) installed.
-1. Clone this repository or [download the latest zip](https://github.com/opexdev/Back-end).
-2. Build each module using `mvn clean install` command.
-3. Change directory to `./Deployment` and build docker containers using `docker-compose build`.
-4. In `./Deployment` directory, run docker containers which you've built in previous step by
- using `docker-compose up -d` and wait for modules to be up and running.
-5. You can make sure each module is running correctly by typing `http://localhost:8500` to your browser and check module
- health.
-6. You can also make sure middlewares (kafka, consule, etc) are running correctly by using `docker ps`.
-
-## Architecture Overview
-
-
-
-