Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

cloudutil/src/main/resources/application-util-dev.yml

@@ -20,7 +20,7 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
+      defaultZone: http://admin:admin@127.0.0.1:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

ht/src/main/resources/application-test.yml

@@ -5,5 +5,33 @@ server:
 spring:
   application:
     name: ht
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    rabbitmq:
+      host: api.ccsens.com
+      password: 111111
+      port: 5672
+      username: admin
+    redis:
+      database: 0
+      host: 127.0.0.1
+      jedis:
+        pool:
+          max-active: 200
+          max-idle: 10
+          max-wait: -1ms
+          min-idle: 0
+      password: ''
+      port: 6379
+      timeout: 1000ms
+
+
 swagger:
-  enable: false
+  enable: false
+file:
+  path: /home/www-test/
+  #domain: https://api.ccsens.com/test/
+  domain: http://localhost:7971/
+ht:
+  project:
+    name: HT  pro项目管理