From 9a3abd65d9618789ba8093e68a912e668c683ba8 Mon Sep 17 00:00:00 2001 From: Wanda Date: Wed, 11 Jun 2025 09:22:09 +0700 Subject: [PATCH] update --- build.gradle | 2 +- .../span/api/controllers/UserController.java | 4 ++-- .../java/id/co/anaheim/span/api/models/UserDto.java | 1 + src/main/resources/application.properties | 13 +++++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 2aa1808..f8206d6 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { group = 'id.co.anaheim' //version = '0.0.2-SNAPSHOT' -version = '0.0.3' +version = '0.0.8-Prod' java { toolchain { diff --git a/src/main/java/id/co/anaheim/span/api/controllers/UserController.java b/src/main/java/id/co/anaheim/span/api/controllers/UserController.java index 4e5cb2c..b67c2c4 100644 --- a/src/main/java/id/co/anaheim/span/api/controllers/UserController.java +++ b/src/main/java/id/co/anaheim/span/api/controllers/UserController.java @@ -40,7 +40,7 @@ public class UserController { user.setName(userDto.getName()); user.setUsername(userDto.getUsername()); user.setPassword(userDto.getPassword()); - user.setRole("USER"); + user.setRole(userDto.getRole()); String bcryptHashString = BCrypt.withDefaults().hashToString(12, user.getPassword().toCharArray()); user.setPassword(bcryptHashString); @@ -59,7 +59,7 @@ public class UserController { user.setName(userDto.getName()); user.setUsername(userDto.getUsername()); user.setPassword(userDto.getPassword()); - user.setRole("USER"); + user.setRole(userDto.getRole()); int saved; if (!user.getPassword().isBlank()) { diff --git a/src/main/java/id/co/anaheim/span/api/models/UserDto.java b/src/main/java/id/co/anaheim/span/api/models/UserDto.java index 14d7990..2c3c728 100644 --- a/src/main/java/id/co/anaheim/span/api/models/UserDto.java +++ b/src/main/java/id/co/anaheim/span/api/models/UserDto.java @@ -7,4 +7,5 @@ public class UserDto { private String name; private String username; private String password; + private String role; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 925590e..86d2676 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,8 +3,13 @@ spring.application.name=span-user-api server.port=8989 #dev #server.port=8779 -spring.datasource.url=jdbc:oracle:thin:@//10.216.100.100:1521/pdbsoadev +#spring.datasource.url=jdbc:oracle:thin:@//10.216.100.100:1521/pdbsoauat +#spring.datasource.url=jdbc:oracle:thin:@//10.216.100.100:1521/pdbsoadev +#spring.datasource.url=jdbc:oracle:thin:@//soadb:1521/pdbsoauat +spring.datasource.url=jdbc:oracle:thin:@//dbmsoascan.kemenkeu.go.id:1521/pdbsoaprod.kemenkeu.go.id #spring.datasource.url=jdbc:oracle:thin:@localhost:1521:oracle -spring.datasource.username=gateway -spring.datasource.password=welcome1 -#spring.datasource.password=gateway \ No newline at end of file +spring.datasource.username=master_user +#spring.datasource.username=gateway +spring.datasource.password=m4sterPassw0rd1 +#spring.datasource.password=gateway +spring.datasource.hikari.schema=gateway \ No newline at end of file