igor/org.ccalm.main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: igor:e3f93fed10c95ca13ebfca3b92004ba2748b705e
Branches Tags
igor:develop igor:main
...
compare: igor:53e7c7e158efbf9a9afef1a1faa8a08d39ea51c5
Branches Tags
igor:develop igor:main

2 Commits
e3f93fed10 ... 53e7c7e158

Author SHA1 Message Date
Igor I
53e7c7e158 Merge branch 'develop' of https://git.mesh.kz/igor/org.ccalm.main into develop 
# Conflicts:
#	src/main/java/org/ccalm/main/AcceptJSON.java
 2025-07-30 08:58:58 +05:00
Igor I
d4bfe17898 get fito 2025-07-30 08:54:13 +05:00
1 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

4
org-ccalm-main.yml
View File

@ -10,9 +10,9 @@ spring:
application: application:
name: org-ccalm-main name: org-ccalm-main
datasource: datasource:
#url: jdbc:postgresql://almaty.ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 url: jdbc:postgresql://almaty.ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
#url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 #url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 #url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
username: postgres username: postgres
password: 309A86FF65A78FB428F4E38DFE35F730 password: 309A86FF65A78FB428F4E38DFE35F730
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver