Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/1.0.9 snapshot #646

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion api-rest/pom-oracle9i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github</groupId>
<artifactId>db2rest-parent</artifactId>
<version>1.0.8</version>
<version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>

<!-- lookup parent from repository -->
Expand All @@ -30,6 +30,15 @@
</distributionManagement>

<dependencies>

<!--
<dependency>
<groupId>com.github</groupId>
<artifactId>auth-sureness</artifactId>
<version>${project.parent.version}</version>
</dependency>
-->

<dependency>
<groupId>com.github</groupId>
<artifactId>rest-common</artifactId>
Expand Down Expand Up @@ -108,6 +117,15 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-datadog</artifactId>
<scope>runtime</scope>
</dependency>





</dependencies>

Expand Down
10 changes: 4 additions & 6 deletions api-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github</groupId>
<artifactId>db2rest-parent</artifactId>
<version>1.0.8</version>
<version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>

<!-- lookup parent from repository -->
Expand All @@ -32,12 +32,13 @@
<dependencies>



<!--
<dependency>
<groupId>com.github</groupId>
<artifactId>auth</artifactId>
<artifactId>auth-sureness</artifactId>
<version>${project.parent.version}</version>
</dependency>
-->

<dependency>
<groupId>com.github</groupId>
Expand Down Expand Up @@ -216,9 +217,6 @@
<scope>runtime</scope>
</dependency>




</dependencies>

<build>
Expand Down
71 changes: 71 additions & 0 deletions api-rest/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
app:
version: @project.version@
name: @project.name@

databases:
- id: ${DB_ID:db}
url: ${DB_URL:}
username: ${DB_USER:}
password: ${DB_PASSWORD:}

server:
port: ${SERVER_PORT:8080}
forward-headers-strategy: framework

compression:
enabled: ${GZIP_ENABLED:false}
mime-types: application/json
min-response-size: {GZIP_MIN_RESPONSE_SIZE:1024}
# excluded-user-agents: MSIE 6.0,UCBrowser


spring:

threads:
virtual:
enabled: true

banner:
location: classpath:banner.txt

thymeleaf:
check-template-location: false
cache: true



db2rest:

dateTime:
enableDataTimeFormatting: ${ENABLE_DATETIME_FORMATTING:false}
timeFormat: ${TIME_FORMAT:HH:mm:ss}
dateFormat: ${DATE_FORMAT:yyyy-MM-dd}
dateTimeFormat: ${DATE_TIME_FORMAT:yyyy-MM-dd HH:mm:ss}
defaultFetchLimit: ${DEFAULT_FETCH_LIMIT:100}
allowSafeDelete : ${ALLOW_SAFE_DELETE:true}

multiTenancy:
enabled: ${MULTI_TENANCY_ENABLED:false}
mode: ${MULTI_TENANCY_MODE:'NONE'}

logging:
level:
com.homihq.db2rest:
rest: INFO
jdbc.service: INFO
org.springframework.web : INFO
org.springframework.beans : INFO
org.springframework.jdbc: INFO




management:
datadog:
metrics:
export:
enabled: ${DATADOG_EXPORT_ENABLED:false}
api-key: ${DATADOG_API_KEY}
application-key: ${DATADOG_APPLICATION_KEY}
uri: ${DATADOG_EXPORT_URI}
step: ${DATADOG_EXPORT_INTERVAL:30s}
1 change: 0 additions & 1 deletion api-rest/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ db2rest:
timeFormat: ${TIME_FORMAT:HH:mm:ss}
dateFormat: ${DATE_FORMAT:yyyy-MM-dd}
dateTimeFormat: ${DATE_TIME_FORMAT:yyyy-MM-dd HH:mm:ss}

defaultFetchLimit: ${DEFAULT_FETCH_LIMIT:100}

auth:
Expand Down
33 changes: 33 additions & 0 deletions auth-sureness/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
19 changes: 19 additions & 0 deletions auth-sureness/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
Loading