Skip to content

Commit

Permalink
split
Browse files Browse the repository at this point in the history
  • Loading branch information
markliu2013 committed Jan 15, 2024
1 parent dc33b73 commit f3e4905
Show file tree
Hide file tree
Showing 332 changed files with 1,188 additions and 5,293 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/docker-image-ali.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
java-version: 17
- name: Build
run: chmod +x ./gradlew && ./gradlew :moneynote-api-user:build && ls ./moneynote-api-user/build/libs/
run: chmod +x ./gradlew && ./gradlew bootJar && ls ./build/libs/
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand All @@ -33,7 +33,6 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./moneynote-api-user/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-api-user:latest
31 changes: 0 additions & 31 deletions .github/workflows/docker-image-ali.yml.v1

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/docker-image-ali.yml.v2

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
java-version: 17
- name: Build
run: chmod +x ./gradlew && ./gradlew :moneynote-api-user:build && ls ./moneynote-api-user/build/libs/
run: chmod +x ./gradlew && ./gradlew bootJar && ls ./build/libs/
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand All @@ -31,7 +31,6 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./moneynote-api-user/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: markliu2018/moneywhere-api-user:latest
32 changes: 0 additions & 32 deletions .github/workflows/docker-image.yml.v1

This file was deleted.

2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
Expand Down Expand Up @@ -36,6 +35,5 @@ out/
### VS Code ###
.vscode/


*.env
.metadata
18 changes: 0 additions & 18 deletions 1.sql

This file was deleted.

2 changes: 1 addition & 1 deletion moneynote-api-user/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM arm64v8/openjdk:17.0.1-slim
#FROM openjdk:17-slim
FROM openjdk:17-oracle
COPY ./moneynote-api-user/build/libs/moneynote-api-user-1.0.0.jar app.jar
COPY ./build/libs/moneynote-api-1.0.0.jar app.jar
ENTRYPOINT ["java", "-jar", "/app.jar"]
64 changes: 32 additions & 32 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
plugins {
id 'org.springframework.boot' version '3.0.1' apply false
id 'io.spring.dependency-management' version '1.1.0' apply false
id 'java'
id 'org.springframework.boot' version '3.2.1'
id 'io.spring.dependency-management' version '1.1.4'
}

ext {
querydslVersion = '5.0.0'
}
group = 'cn.biq'
version = '1.0.0'

subprojects {
java {
sourceCompatibility = '17'
}

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
repositories {
mavenCentral()
}

group 'cn.biq'
version '1.0.0'
sourceCompatibility = '17'
ext {
querydslVersion = '5.0.0'
}

repositories {
// mavenLocal()
// maven { url "https://maven.aliyun.com/repository/public" }
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation "org.springframework.boot:spring-boot-starter-validation"
runtimeOnly 'com.mysql:mysql-connector-j'
// lombok
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
// QueryDSL
// https://velog.io/@juhyeon1114/Spring-QueryDsl-gradle-%EC%84%A4%EC%A0%95-Spring-boot-3.0-%EC%9D%B4%EC%83%81
implementation "com.querydsl:querydsl-jpa:${querydslVersion}:jakarta"
annotationProcessor "com.querydsl:querydsl-apt:${querydslVersion}:jakarta"
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
annotationProcessor "jakarta.annotation:jakarta.annotation-api"

dependencies {
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
implementation "org.springframework.boot:spring-boot-starter-validation"
runtimeOnly "com.mysql:mysql-connector-j"
// lombok
compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok"
// QueryDSL
// https://velog.io/@juhyeon1114/Spring-QueryDsl-gradle-%EC%84%A4%EC%A0%95-Spring-boot-3.0-%EC%9D%B4%EC%83%81
implementation "com.querydsl:querydsl-jpa:${querydslVersion}:jakarta"
annotationProcessor "com.querydsl:querydsl-apt:${querydslVersion}:jakarta"
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
}
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'com.auth0:java-jwt:4.2.1'
implementation 'org.apache.poi:poi:5.2.2'
implementation 'org.apache.poi:poi-ooxml:5.2.2'

}
3 changes: 0 additions & 3 deletions build_admin.sh

This file was deleted.

3 changes: 0 additions & 3 deletions build_user.sh

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
Loading

0 comments on commit f3e4905

Please sign in to comment.