Skip to content

Commit 04829aa

Browse files
committed
Merge branch 'codex/refactor-java-wallet-to-monolithic-spring-boot-u25pm1'
2 parents d2c594e + e2ac873 commit 04829aa

2,072 files changed

Lines changed: 192 additions & 342 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 41 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,49 @@
1-
2-
3-
allprojects {
4-
5-
ext {
6-
querydslVersion = "5.0.0"
7-
tokenVersion = "3.0.0"
8-
}
9-
repositories {
10-
mavenLocal()
11-
maven { url 'https://maven.aliyun.com/repository/public/' }
12-
maven { url 'https://jitpack.io' }
13-
mavenCentral()
14-
}
15-
16-
tasks.withType(JavaCompile) {
17-
options.encoding = "UTF-8"
18-
}
19-
1+
plugins {
2+
id 'org.springframework.boot' version '3.1.3'
3+
id 'io.spring.dependency-management' version '1.1.4'
4+
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
5+
id 'org.jetbrains.kotlin.plugin.spring' version '1.9.10'
206
}
217

8+
group = 'com.wallet'
9+
version = '3.0.0'
2210

23-
subprojects {
24-
25-
26-
group 'com.wallet'
27-
version "$tokenVersion"
28-
29-
apply plugin: 'java'
30-
apply plugin: 'kotlin'
31-
apply plugin: 'idea'
32-
apply plugin: 'org.springframework.boot'
33-
apply plugin: "io.spring.dependency-management"
34-
35-
sourceCompatibility = 17
36-
37-
compileKotlin {
38-
kotlinOptions.jvmTarget = "17"
39-
}
40-
compileTestKotlin {
41-
kotlinOptions.jvmTarget = "17"
42-
}
43-
44-
tasks.withType(JavaCompile) {
45-
options.encoding = "UTF-8"
46-
}
47-
48-
49-
dependencies {
50-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
51-
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
52-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
53-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
54-
implementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
55-
implementation "org.springframework.boot:spring-boot-starter-cache:$springBootVersion"
56-
implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
57-
implementation 'com.zaxxer:HikariCP:5.0.1'
58-
implementation 'com.mysql:mysql-connector-j:8.2.0'
59-
implementation 'org.apache.commons:commons-lang3:3.14.0'
60-
compileOnly 'org.projectlombok:lombok:1.18.30'
61-
annotationProcessor 'org.projectlombok:lombok:1.18.30'
62-
implementation 'commons-beanutils:commons-beanutils:1.9.4'
63-
implementation 'org.web3j:core:4.10.3'
64-
implementation 'wf.bitcoin:bitcoin-rpc-client:1.2.4'
65-
66-
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
67-
implementation 'com.github.sealedtx:bitcoin-cash-converter:1.0'
68-
implementation 'com.github.galaxyscitech:tokencore:2.0.0'
69-
70-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
71-
72-
testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
73-
}
74-
11+
java { sourceCompatibility = JavaVersion.VERSION_17 }
12+
repositories {
13+
mavenLocal()
14+
maven { url 'https://maven.aliyun.com/repository/public/' }
15+
maven { url 'https://jitpack.io' }
16+
mavenCentral()
7517
}
7618

77-
buildscript {
19+
dependencies {
20+
implementation "org.jetbrains.kotlin:kotlin-stdlib"
21+
implementation "org.jetbrains.kotlin:kotlin-reflect"
22+
implementation 'org.springframework.boot:spring-boot-starter-web'
23+
implementation 'org.springframework.boot:spring-boot-starter-cache'
24+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
25+
implementation 'com.zaxxer:HikariCP:5.0.1'
26+
implementation 'com.mysql:mysql-connector-j:8.2.0'
27+
implementation 'org.apache.commons:commons-lang3:3.14.0'
28+
implementation 'commons-beanutils:commons-beanutils:1.9.4'
29+
implementation 'org.web3j:core:4.10.3'
30+
implementation 'wf.bitcoin:bitcoin-rpc-client:1.2.4'
31+
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
32+
implementation 'com.github.sealedtx:bitcoin-cash-converter:1.0'
33+
implementation 'com.github.galaxyscitech:tokencore:2.0.0'
34+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
35+
implementation 'commons-codec:commons-codec:1.16.0'
36+
implementation 'org.bitcoinj:bitcoinj-core:0.14.7'
37+
implementation 'io.github.qyvlik:io.eblock.eos-eos4j:1.0.1'
38+
implementation 'com.querydsl:querydsl-sql:5.0.0'
39+
implementation 'com.querydsl:querydsl-jpa:5.0.0'
40+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
41+
}
7842

79-
ext.kotlinVersion = '1.9.10'
80-
ext.springBootVersion = '3.1.3'
43+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
44+
kotlinOptions.jvmTarget = '17'
45+
}
8146

82-
repositories {
83-
maven { url 'https://maven.aliyun.com/repository/public/' }
84-
mavenLocal()
85-
mavenCentral()
86-
}
87-
dependencies {
88-
classpath "io.spring.gradle:dependency-management-plugin:1.1.4"
89-
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
90-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
91-
}
47+
springBoot {
48+
mainClass = 'com.wallet.WebApiApplicationKt'
9249
}

settings.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
11
rootProject.name = 'java-wallet'
2-
3-
include(
4-
"wallet-common",
5-
"wallet-entity",
6-
"wallet-webapi",
7-
"wallet-hsm"
8-
)

wallet-entity/src/main/java/com/wallet/entity/domain/Address.java renamed to src/main/java/com/wallet/entity/domain/Address.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/AddressAdmin.java renamed to src/main/java/com/wallet/entity/domain/AddressAdmin.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/BlockHeight.java renamed to src/main/java/com/wallet/entity/domain/BlockHeight.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/Config.java renamed to src/main/java/com/wallet/entity/domain/Config.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/Deposit.java renamed to src/main/java/com/wallet/entity/domain/Deposit.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/QAddress.java renamed to src/main/java/com/wallet/entity/domain/QAddress.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/QAddressAdmin.java renamed to src/main/java/com/wallet/entity/domain/QAddressAdmin.java

File renamed without changes.

wallet-entity/src/main/java/com/wallet/entity/domain/QBlockHeight.java renamed to src/main/java/com/wallet/entity/domain/QBlockHeight.java

File renamed without changes.

0 commit comments

Comments
 (0)