owrainfo/confirms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict fixed

Browse Source
This commit is contained in:
jjstyle
2025-12-22 13:45:11 +09:00
parent 465a82093e
commit ef4ae0b5f2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.env
View File

@@ -12,7 +12,7 @@
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# ENVIRONMENT # ENVIRONMENT
#-------------------------------------------------------------------- #--------------------------------------------------------------------
APP_SERVER_NAME = "TEST-SERVER-01" APP_SERVER_NAME = "DEV-LOCAL-01"
CI_ENVIRONMENT = development CI_ENVIRONMENT = development
# CI_ENVIRONMENT = production # CI_ENVIRONMENT = production
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@@ -23,6 +23,8 @@ app.baseURL = 'http://test2-admin.confirms.co.kr/'
# app_baseURL = '' # app_baseURL = ''
# app.forceGlobalSecureRequests = false # app.forceGlobalSecureRequests = false
# app.CSPEnabled = false # app.CSPEnabled = false
app.forceGlobalSecureRequests = false
app.appTimezone = 'Asia/Seoul'
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# DATABASE # DATABASE
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@@ -33,6 +35,9 @@ database.default.password = zjsvjatm
database.default.DBDriver = MySQLi database.default.DBDriver = MySQLi
database.default.DBPrefix = database.default.DBPrefix =
database.default.port = 3306 database.default.port = 3306
database.default.timezone = '+09:00'
database.tests.charset = utf8mb4
database.tests.DBCollat = utf8mb4_general_ci
# If you use MySQLi as tests, first update the values of Config\Database::$tests. # If you use MySQLi as tests, first update the values of Config\Database::$tests.
# database.tests.hostname = localhost # database.tests.hostname = localhost
# database.tests.database = ci4_test # database.tests.database = ci4_test

1
.gitignore vendored
View File

@@ -170,3 +170,4 @@ _modules/*
/build/ /build/
/dist/ /dist/
/node_modules/ /node_modules/
.env