Merge remote-tracking branch 'origin/main'

mens-api/src/main/resources/config/application-prod.yml

@@ -5,12 +5,12 @@ spring:
   datasource:
     hikari:
       # 9 server
-      maria:
+      primary:
         driver-class-name: org.mariadb.jdbc.Driver
         # jdbc:mariadb://127.0.0.1:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true
-        jdbc-url: ENC(QrsIhXG/ZgD5a1SYaf+1CaZYkLxuMP4s7//+NXV1SlLHKXRFm7FFA8iP10Dlak3VOFjFSaWEkchSWcNQ4+4m94fSWW7uy+/4nW3jBq4aHuvVVCqy2rfgInqYbYMlno91vUmWkMbKuX8T5nF7UltaAuQOXH/ImCT8whPxAE+VOM1onyuIr0fbVg==)
-        username: ENC(L8Xp+ZuLxlXahupxYDWzgA==)
-        password: ENC(eDCxblnWkDHhJEEXMdkzww==)
+        jdbc-url: ENC(kAl+fUJ2Ji2mTe6cGcu6eMKssVC2Qa6TdVg/zSktSTOht+sx55dYf3NT5kzZ/MKwuJjtIokcaOUqwRevUCmLNkl/M17S/XrghDRaps8Kcnxlwqu5rhXADoPGKQ8U3+l6oVs+AZo/Z3146ZdnrGqkN4JC0OQpH4ER8fx5uofXWjj4ml1xTtR45g==)
+        username: ENC(qaaUzuf32JpJapRSely4iQ==)
+        password: ENC(ALh6T8ABTu7Uhl3kI2a50A==)
         read-only: false
 
   devtools:

mens-batch/src/main/resources/config/application-prod.yml

@@ -7,12 +7,12 @@ spring:
     #password: xit1807
     hikari:
       # 9 server
-      maria:
+      primary:
         driver-class-name: org.mariadb.jdbc.Driver
         # jdbc:mariadb://127.0.0.1:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true
-        jdbc-url: ENC(QrsIhXG/ZgD5a1SYaf+1CaZYkLxuMP4s7//+NXV1SlLHKXRFm7FFA8iP10Dlak3VOFjFSaWEkchSWcNQ4+4m94fSWW7uy+/4nW3jBq4aHuvVVCqy2rfgInqYbYMlno91vUmWkMbKuX8T5nF7UltaAuQOXH/ImCT8whPxAE+VOM1onyuIr0fbVg==)
-        username: ENC(L8Xp+ZuLxlXahupxYDWzgA==)
-        password: ENC(eDCxblnWkDHhJEEXMdkzww==)
+        jdbc-url: ENC(kAl+fUJ2Ji2mTe6cGcu6eMKssVC2Qa6TdVg/zSktSTOht+sx55dYf3NT5kzZ/MKwuJjtIokcaOUqwRevUCmLNkl/M17S/XrghDRaps8Kcnxlwqu5rhXADoPGKQ8U3+l6oVs+AZo/Z3146ZdnrGqkN4JC0OQpH4ER8fx5uofXWjj4ml1xTtR45g==)
+        username: ENC(qaaUzuf32JpJapRSely4iQ==)
+        password: ENC(ALh6T8ABTu7Uhl3kI2a50A==)
         read-only: false
 
   devtools: