Browse Source

test branch init

yangzian 3 years ago
parent
commit
900ef6be9d

+ 57 - 0
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application-test.yml

@@ -0,0 +1,57 @@
+server:
+  port: 8848
+  servlet:
+    contextPath: /nacos
+  tomcat:
+    accesslog:
+      enabled: true
+      pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
+    basedir: ''
+spring:
+  profiles:
+    active: @profile.name@
+  datasource:
+    platform: mysql
+db:
+  num: 1
+  password:
+    '0': hcst@2020
+  url:
+    '0': jdbc:mysql://139.186.165.84:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+  user:
+    '0': hcst
+management:
+  metrics:
+    export:
+      elastic:
+        enabled: false
+      influx:
+        enabled: false
+nacos:
+  core:
+    auth:
+      caching:
+        enabled: true
+      default:
+        token:
+          expire:
+            seconds: 18000
+          secret:
+            key: SecretKey012345678901234567890123456789012345678901234567890123456789
+      enabled: false
+      system:
+        type: nacos
+  istio:
+    mcp:
+      server:
+        enabled: false
+  naming:
+    empty-service:
+      auto-clean: true
+      clean:
+        initial-delay-ms: 50000
+        period-time-ms: 30000
+  security:
+    ignore:
+      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+  standalone: true

+ 2 - 0
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml

@@ -8,6 +8,8 @@ server:
       pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
     basedir: ''
 spring:
+  profiles:
+    active: @profile.name@
   datasource:
     platform: mysql
 db:

+ 8 - 0
jeecg-cloud-module/jeecg-cloud-system-start/pom.xml

@@ -33,6 +33,14 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-hystrix</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
 
         <!--rabbitmq消息队列-->
 <!--        <dependency>-->

+ 0 - 1
jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java

@@ -7,7 +7,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;