config and message

hoangtien2k3 · Aug 21, 2024 · 8b62f87 · 8b62f87
1 parent 72703c3
commit 8b62f87
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 484 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,12 @@ This README provides quickstart instructions on running [`fw-commons`]() on bare
 
 ### ⬇️ [Download From Gradle and Maven Central](https://central.sonatype.com/artifact/cn.ponfee/commons-core/1.4)
 
+#### Gradle
+
+```kotlin
+implementation("io.github.hoangtien2k3:fw-commons:1.1.0")
+```
+
 #### Maven
 
 ```xml
@@ -23,12 +29,6 @@ This README provides quickstart instructions on running [`fw-commons`]() on bare
 </dependency>
 ```
 
-#### Gradle
-
-```kotlin
-implementation("io.github.hoangtien2k3:fw-commons:1.1.0")
-```
-
 ## Installation and Getting Started
 
 1. Correct and complete setup to start the program `application.yml` or `application.properties`

diff --git a/src/main/java/io/hoangtien2k3/commons/constants/MessageConstant.java b/src/main/java/io/hoangtien2k3/commons/constants/MessageConstant.java
@@ -19,17 +19,17 @@ public class MessageConstant {
     public static final String FAIL = "fail";
     public static final String ERROR_CODE_SUCCESS = "0";
 
-    public static final String PARAMS_INVALID = "params.invalid";
-    public static final String QUERY_CART_ITEM_NOT_FOUND = "query.cartItem.not.found";
-    public static final String ORGANIZATION_INVALID = "organization.invalid";
-    public static final String ORGANIZATION_NOT_FOUND = "organization.notFound";
-    public static final String USER_NOT_IN_ORGANIZATION = "user.notFound.in.organization";
-    public static final String ORGANIZATION_LEVEL1_NOT_FOUND = "organization.level1.notFound";
-    public static final String POSITION_NOT_EXISTS = "postion.not.exists";
-    public static final String USER_NAME_NOT_EXISTS = "user.name.not.exists";
-    public static final String CODE_NOT_EXISTS = "employee.code.not.exists";
-    public static final String ORGANIZATION_NOT_EXISTS = "organization.not.exists";
-    public static final String MANAGER_NOT_EXISTS = "manager.not.exists";
-    public static final String EMPLOYEE_ORGANIZATION_IS_EXISTS = "employee.organization.is.exists";
-    public static final String EMPLOYEE_ORGANIZATION_NOT_EXISTS = "organization.employee.is.exists";
+//    public static final String PARAMS_INVALID = "params.invalid";
+//    public static final String QUERY_CART_ITEM_NOT_FOUND = "query.cartItem.not.found";
+//    public static final String ORGANIZATION_INVALID = "organization.invalid";
+//    public static final String ORGANIZATION_NOT_FOUND = "organization.notFound";
+//    public static final String USER_NOT_IN_ORGANIZATION = "user.notFound.in.organization";
+//    public static final String ORGANIZATION_LEVEL1_NOT_FOUND = "organization.level1.notFound";
+//    public static final String POSITION_NOT_EXISTS = "postion.not.exists";
+//    public static final String USER_NAME_NOT_EXISTS = "user.name.not.exists";
+//    public static final String CODE_NOT_EXISTS = "employee.code.not.exists";
+//    public static final String ORGANIZATION_NOT_EXISTS = "organization.not.exists";
+//    public static final String MANAGER_NOT_EXISTS = "manager.not.exists";
+//    public static final String EMPLOYEE_ORGANIZATION_IS_EXISTS = "employee.organization.is.exists";
+//    public static final String EMPLOYEE_ORGANIZATION_NOT_EXISTS = "organization.employee.is.exists";
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -8,9 +8,6 @@ logging:
     org.springframework.r2dbc: DEBUG
     io.r2dbc.postgresql.QUERY: DEBUG
     io.r2dbc.postgresql.PARAM: DEBUG
-dotenv:
-  enabled: true
-  active: true
 
 # spring config
 spring:
@@ -87,12 +84,12 @@ client:
     name: keycloak
     auth:
       client-id: ezbuy-client
-      client-secret: mI92QDfvi20tZgFtjpRAPWu8TR6eMHmw
+      client-secret: #clientSecret
 
 #keycloak client config
 keycloak:
   clientId: ezbuy-client
-  clientSecret: mI92QDfvi20tZgFtjpRAPWu8TR6eMHmw
+  clientSecret: #clientSecret
   realm: ezbuy-server
   serverUrl: http://localhost:8080
   grantType: password
@@ -104,15 +101,15 @@ minio:
   enabled: true
   baseUrl: http://localhost:9000
   publicUrl: http://localhost:9000/ezbuy-bucket
-  accessKey: 4DoaZ0KdzpXdDlVK104t
-  secretKey: nuRiQUIJNVygMOHhmtR4LT1etAa7F8PQOsRGP5oj
+  accessKey: #accessKey
+  secretKey: #secretKey
   private:
     bucket: ezbuy-private
 
 #generate public key
 hashing-password:
-  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5e+CZbXbC8SRbrp+X9O4QRrKQWRu2zJpYGmGtP3bdS6NtsVBaJz2hHwF1KeEzZTnlW/jy7NOYYR5Rp5nD1RfAJooxZxgO7BcZZKbsnBNe+KLUQrxNOgkx2ZpMs60UdzToz0IvIN5L5NFaiKq5/WwRpG4aIM8iV/ME1L/QQw0FDD7m/2PUxDlANXJl5hZgXfZ1hpo/31HXkBofJTWJ/MdTAnxR4u5y+mXYUsf9GmCmA5exPpPZZv1qT1D7AWv0CXi5Ftd2ylbD6jAtF5MC1ngO4FEGZh9uTwXQh2x8FJmc2U7KKTQMWuhbXtkANVVLMg+GPx7lTxDTwQpKmldf5UDuuzcBQIDAQAB
+  public-key: #public-key
 #config proxy
 proxy-client:
-  host: 10.207.156.52
-  port: 3128
+  host: 10.207.157.50
+  port: 3129
diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties
@@ -0,0 +1,8 @@
+#Common EN
+success=Success
+common.success=Success
+common.fail=Failure
+data.notFound=Data does not exist
+params.invalid=Invalid input
+params.invalid.format=Invalid input data format
+permission.info=Permission information