Merge branch 'staging' into main-design
This commit is contained in:
@@ -1,58 +0,0 @@
|
||||
spring:
|
||||
jta:
|
||||
enabled: true
|
||||
|
||||
|
||||
jpa:
|
||||
properties:
|
||||
hibernate:
|
||||
show_sql: true
|
||||
format_sql: true
|
||||
use_sql_comments: true
|
||||
devtools:
|
||||
restart:
|
||||
enabled: false
|
||||
livereload:
|
||||
enabled: true
|
||||
thymeleaf:
|
||||
cache: false
|
||||
|
||||
ems:
|
||||
datasource:
|
||||
serverName: 192.168.240.177
|
||||
portNumber: 3306
|
||||
databaseName: apims
|
||||
username: apims
|
||||
password: apims
|
||||
|
||||
# serverName: 172.20.160.59
|
||||
# portNumber: 3317
|
||||
# databaseName: ndapims
|
||||
# username: api_app
|
||||
# password: Tapiapp*17
|
||||
|
||||
gateway:
|
||||
datasource:
|
||||
serverName: 192.168.240.177
|
||||
portNumber: 3306
|
||||
databaseName: apigw
|
||||
username: apigw
|
||||
password: apigw
|
||||
|
||||
# serverName: 172.20.160.59
|
||||
# portNumber: 3317
|
||||
# databaseName: ndapigw
|
||||
# username: api_app
|
||||
# password: Tapiapp*17
|
||||
|
||||
|
||||
proxy:
|
||||
targets:
|
||||
stg: http://localhost:10000/monitoring
|
||||
prod: http://localhost:10000/monitoring
|
||||
|
||||
# stg: http://inter-ndapiap01.k-bank.com:7090/monitoring
|
||||
# prod: http://inter-ndapiap01.k-bank.com:7090/monitoring
|
||||
timeout:
|
||||
connect: 5000
|
||||
read: 5000
|
||||
@@ -34,6 +34,9 @@ gateway:
|
||||
username: AGWAPP
|
||||
password: AGWAPP123!
|
||||
|
||||
portal:
|
||||
auth-virtual-code: 654321
|
||||
|
||||
proxy:
|
||||
targets:
|
||||
stg: http://localhost:10000/monitoring
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
server.port: '30200'
|
||||
|
||||
spring:
|
||||
jta:
|
||||
enabled: true
|
||||
jpa:
|
||||
properties:
|
||||
hibernate:
|
||||
show_sql: true
|
||||
show_sql: false
|
||||
format_sql: true
|
||||
use_sql_comments: true
|
||||
devtools:
|
||||
@@ -33,6 +35,8 @@ gateway:
|
||||
password: AGWAPP123!
|
||||
schema: AGWADM
|
||||
|
||||
portal:
|
||||
auth-virtual-code: 654321
|
||||
|
||||
proxy:
|
||||
targets:
|
||||
|
||||
@@ -24,6 +24,9 @@ ems:
|
||||
password: EMSAPP123!
|
||||
schema: EMSADM
|
||||
|
||||
portal:
|
||||
auth-virtual-code: 654321
|
||||
|
||||
gateway:
|
||||
datasource:
|
||||
serverName: 192.168.240.177
|
||||
|
||||
@@ -52,6 +52,7 @@ sample-code-path: classpath:/templates/sample_code
|
||||
|
||||
portal:
|
||||
auth-ttl: 300
|
||||
|
||||
user-approval: true
|
||||
password-expiration-days: 90
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<configuration>
|
||||
<configuration scan="true" scanPeriod="5 seconds">
|
||||
<property name="LOG_PATH" value="/Log/App/eapim/${inst.Name:-devSvr00}"/>
|
||||
<property name="LOG_FILE" value="${LOG_PATH}/portal.log"/>
|
||||
<property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger{5} - %msg %n" />
|
||||
<!-- <property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger{5} - %msg %n" />-->
|
||||
<property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger - %msg %n" />
|
||||
|
||||
|
||||
<appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${LOG_FILE}</file>
|
||||
<file>${LOG_PATH}/portal.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${LOG_PATH}/portal.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<maxHistory>7</maxHistory>
|
||||
@@ -16,9 +16,7 @@
|
||||
</appender>
|
||||
|
||||
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<Pattern>${CONSOLE_PATTERN}</Pattern>
|
||||
</encoder>
|
||||
<encoder><Pattern>${CONSOLE_PATTERN}</Pattern></encoder>
|
||||
</appender>
|
||||
|
||||
|
||||
@@ -27,25 +25,72 @@
|
||||
<appender-ref ref="ROLLING"/>
|
||||
</root>
|
||||
|
||||
|
||||
<springProfile name="stage">
|
||||
<springProfile name="dev">
|
||||
<root level="DEBUG">
|
||||
<appender-ref ref="ROLLING"/>
|
||||
</root>
|
||||
</springProfile>
|
||||
|
||||
<springProfile name="dev,gf63">
|
||||
<logger name="org.springframework" level="WARN" additivity="false"/>
|
||||
<logger name="org.hibernate" level="INFO" additivity="false"/>
|
||||
<logger name="org.apache" level="INFO" additivity="false"/>
|
||||
<logger name="sun.rmi" level="WARN" additivity="false"/>
|
||||
<logger name="javax" level="WARN" additivity="false"/>
|
||||
<logger name="jdk.event.security" level="WARN" additivity="false"/>
|
||||
<springProfile name="stage">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="ROLLING"/>
|
||||
</root>
|
||||
</springProfile>
|
||||
|
||||
|
||||
<springProfile name="gf63">
|
||||
<property name="LOG_PATH" value="d:/kjb-logs/${inst.Name:-devSvr00}"/>
|
||||
|
||||
<appender name="HIBERNATE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${LOG_PATH}/hibernate.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${LOG_PATH}/hibernate.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<maxHistory>7</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${LOG_PATH}/portal.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${LOG_PATH}/portal.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<maxHistory>7</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
|
||||
<logger name="sun.rmi" level="INFO" additivity="false"/>
|
||||
|
||||
<logger name="javax" level="INFO" additivity="false"/>
|
||||
|
||||
<logger name="jdk.event.security" level="INFO" additivity="false"/>
|
||||
|
||||
<logger name="com.zaxxer.hikari" level="INFO" additivity="false"/>
|
||||
<logger name="_org.springframework.web" level="INFO" additivity="false"/>
|
||||
<logger name="com.atomikos" level="INFO" additivity="false"/>
|
||||
|
||||
<root level="DEBUG">
|
||||
<logger name="org.apache" level="INFO" additivity="false"/>
|
||||
<logger name="org.codehaus.groovy.vmplugin.VMPluginFactory" level="INFO" additivity="false"/>
|
||||
<!-- <logger name="org.hibernate" level="INFO" additivity="false"/>-->
|
||||
<logger name="org.thymeleaf.TemplateEngine" level="INFO" additivity="false"/>
|
||||
<logger name="org.springframework" level="INFO" additivity="false"/>
|
||||
<logger name="_org.springframework.web" level="INFO" additivity="false"/>
|
||||
|
||||
|
||||
<logger name="org.hibernate.SQL" level="DEBUG" additivity="false">
|
||||
<appender-ref ref="HIBERNATE_APPENDER" />
|
||||
</logger>
|
||||
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" additivity="false">
|
||||
<appender-ref ref="HIBERNATE_APPENDER" />
|
||||
</logger>
|
||||
<logger name="ccom.eactive.eapim" level="DEBUG" additivity="false"/>
|
||||
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="ROLLING"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</root>
|
||||
|
||||
Reference in New Issue
Block a user