Browse Source

update application.yml logic

shjung 3 weeks ago
parent
commit
f0cc9a48b9
3 changed files with 30 additions and 9 deletions
  1. BIN
      .DS_Store
  2. 24 7
      pom.xml
  3. 6 2
      src/main/resources/application.yml

BIN
.DS_Store


+ 24 - 7
pom.xml

@@ -17,13 +17,6 @@
 
     <packaging>jar</packaging>
 
-    <!--<repositories>
-        <repository>
-            <id>oracle</id>
-            <url>http://maven.jahia.org/maven2</url>
-        </repository>
-    </repositories>-->
-
     <properties>
         <java.version>1.8</java.version>
         <netty.version>4.1.52.Final</netty.version>
@@ -36,7 +29,19 @@
         <start-class>com.tsi.api.server.TsiApiServerApplication</start-class>
 <!--        <webapp.lib>C:\java\repository</webapp.lib>-->
         <maven.test.skip>true</maven.test.skip>
+
     </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-bom</artifactId>
+                <version>${micrometer.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
 
@@ -80,6 +85,18 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Spring Boot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>2.4.13</version>
+        </dependency>
+        <!-- Micrometer Prometheus Registry -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.json-lib</groupId>
             <artifactId>json-lib</artifactId>

+ 6 - 2
src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: tsi-api-server
   profiles:
     active: prod
   config:
     import:
       - optional:file:${user.dir}/conf/tsi-api-server.yml
-  application:
-    name: tsi-api-server
   datasource:
     hikari:
       platform: mariadb
@@ -50,6 +50,8 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/tsi-api-server-prod.yml
   datasource:
     hikari:
       jdbc-url: jdbc:mariadb://10.4.4.20:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
@@ -59,6 +61,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/tsi-api-server-dev.yml
   datasource:
     hikari:
       jdbc-url: jdbc:mariadb://115.91.94.42:13306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul