From c5a873f70239f30158c6ab67b3e55de71413de9a Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 18:05:47 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/resources/config/application-dev.yml | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/pamapi/src/main/resources/config/application-dev.yml b/pamapi/src/main/resources/config/application-dev.yml
index e93ffa8..1f86d06 100644
--- a/pamapi/src/main/resources/config/application-dev.yml
+++ b/pamapi/src/main/resources/config/application-dev.yml
@@ -32,9 +32,9 @@
indent-output: true
datasource:
type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:postgresql://localhost:5432/pamapi
- username: pamapi
- password:
+ url: jdbc:postgresql://dev.pollex.com.tw:5433/pam
+ username: pamadmin
+ password: pamadmin
hikari:
poolName: Hikari
auto-commit: false
@@ -76,15 +76,14 @@
ehcache: # Ehcache configuration
time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache
max-entries: 100 # Number of objects in each cache entry
- # CORS is only enabled by default with the "dev" profile
- cors:
- # Allow Ionic for JHipster by default (* no longer allowed in Spring Boot 2.4+)
- allowed-origins: 'http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000'
- allowed-methods: '*'
- allowed-headers: '*'
- exposed-headers: 'Authorization,Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params'
- allow-credentials: true
- max-age: 1800
+# cors:
+# # Allow Ionic for JHipster by default (* no longer allowed in Spring Boot 2.4+)
+# allowed-origins: 'http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000'
+# allowed-methods: '*'
+# allowed-headers: '*'
+# exposed-headers: 'Authorization,Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params'
+# allow-credentials: true
+# max-age: 1800
security:
authentication:
jwt:
--
Gitblit v1.8.0