Commit 6cf81dde by 姜海波

普罗米修斯

parent f2b8142f
...@@ -100,21 +100,18 @@ ...@@ -100,21 +100,18 @@
</dependency> </dependency>
<!-- promtheus --> <!-- promtheus -->
<dependency> <dependency>
<groupId>io.prometheus</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>simpleclient_spring_boot</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
<version>0.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId> <artifactId>micrometer-spring-legacy</artifactId>
<version>0.12.0.RELEASE</version> <version>1.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-spring-legacy</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<version>0.8.0.RELEASE</version> <version>1.1.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -14,8 +14,6 @@ package cn.freemud; ...@@ -14,8 +14,6 @@ package cn.freemud;
import cn.freemud.utils.LogTreadLocal; import cn.freemud.utils.LogTreadLocal;
import feign.RequestInterceptor; import feign.RequestInterceptor;
import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
import org.jasypt.encryption.StringEncryptor; import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
...@@ -45,8 +43,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; ...@@ -45,8 +43,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
@EnableAspectJAutoProxy @EnableAspectJAutoProxy
@ComponentScan({"cn.freemud","com.freemud"}) @ComponentScan({"cn.freemud","com.freemud"})
@EnableFeignClients @EnableFeignClients
@EnablePrometheusEndpoint
@EnableSpringBootMetricsCollector
@EnableAutoConfiguration @EnableAutoConfiguration
public class ApiApplication { public class ApiApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.cluster=pre-release apollo.cluster=pre-release
apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service apollo.bootstrap.namespaces=i_callback_service,micro_progeram_commons
\ No newline at end of file \ No newline at end of file
...@@ -293,17 +293,6 @@ ...@@ -293,17 +293,6 @@
<!-- promtheus --> <!-- promtheus -->
<dependency> <dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-spring-legacy</artifactId>
</dependency>
<!-- promtheus -->
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment