isky/backend-springboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
heyethereum
2024-07-12 08:21:13 +08:00
parent 937bbaf3a7 7627c676fc
commit 41b02824cd
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -4,6 +4,9 @@ target/
!**/src/main/**/target/
!**/src/test/**/target/
.DS_Store
*/.DS_Store
**/.DS_Store
### STS ###
.apt_generated
.classpath
@@ -35,3 +38,5 @@ build/
### VS Code ###
.vscode/

1
src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
View File

@@ -61,4 +61,5 @@ public class QRCodeTypeController {
public ResponseEntity<RedirectCountResponse> checkRedirects(@RequestBody QRCodePayload payload) {
return ResponseEntity.ok(redirectCountService.countRedirects(payload).block());
}
}

21
src/main/resources/application-prod.properties
View File

@@ -1,21 +0,0 @@
http.port=${HTTP_PORT}
server.port=${SERVER_PORT}
server.ssl.enabled=true
server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE}
server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION}
server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD}
server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS}
trust.store=${SERVER_SSL_TRUST_STORE_LOCATION}
trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD}
spring.datasource.url=${SERVER_DB_URL}
spring.datasource.username=${SERVER_DB_USERNAME}
spring.datasource.password=${SERVER_DB_PASSWORD}
spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME}
#spring.jpa.database-platform=${SERVER_DB_DIALECT}
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true
google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY}
virustotal.api.key=${VIRUSTOTAL_API_KEY}

23
src/main/resources/application.properties
View File

@@ -1,2 +1,23 @@
spring.application.name=SafeQR-app
spring.profiles.active=prod
spring.profiles.active=local
http.port=${HTTP_PORT}
server.port=${SERVER_PORT}
server.ssl.enabled=true
server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE}
server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION}
server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD}
server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS}
trust.store=${SERVER_SSL_TRUST_STORE_LOCATION}
trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD}
spring.datasource.url=${SERVER_DB_URL}
spring.datasource.username=${SERVER_DB_USERNAME}
spring.datasource.password=${SERVER_DB_PASSWORD}
spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME}
#spring.jpa.database-platform=${SERVER_DB_DIALECT}
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true
google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY}
virustotal.api.key=${VIRUSTOTAL_API_KEY}

4
src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java
View File

@@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
public class SafeQrAppApplicationTests {
class SafeQrAppApplicationTests {
@Test
public void contextLoads() {
void contextLoads() {
}
}