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

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

@@ -0,0 +1,60 @@
+#服务端点暴露
+management:
+  endpoints:
+    web:
+      exposure:
+        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+#        # 不暴露哪些端点
+        exclude: env,beans,configprops
+  endpoint:
+    health:
+      # 是否展示健康检查详情
+      show-details: always
+  health:
+    redis:
+      enabled: false
+#eureka注册
+eureka:
+  client:
+    service-url:
+      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+      #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
+      defaultZone: http://admin:admin@140.143.228.3:7010/eureka/
+  instance:
+    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+    prefer-ip-address: true
+    metadata-map:
+      management:
+        context-path: ${server.servlet.context-path:}/actuator
+    home-page-url-path: ${server.servlet.context-path:}/
+    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+feign:
+  client:
+    config:
+      default:
+        connectTime: 5000
+        readTimeout: 5000
+        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+        loggerLevel: basic
+  hystrix:
+    enabled: true
+# sleuth
+logging:
+  level:
+    root: info
+    org.springframework.cloud.sleuth: DEBUG
+spring:
+#  zipkin:
+#    base-url: http://140.143.228.3:9411
+#  sleuth:
+#    sampler:
+#      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+#      probability: 0.1
+  cloud:
+    inetutils:
+      ignored-interfaces: ['VMware.*']

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

@@ -0,0 +1,40 @@
+server:
+  port: 7040
+  servlet:
+    context-path:
+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
+file:
+  path: /home/cloud/ht/uploads/
+  domain: https://www.tall.wiki/gateway/ht/
+  imgDomain: https://www.tall.wiki/gateway/ht/uploads
+ht:
+  project:
+    name: 认知功能评测云平台系统
+eureka:
+  instance:
+    ip-address: 140.143.228.3

tall/src/main/resources/application-prod.yml

@@ -0,0 +1,32 @@
+server:
+  port: 7030
+  servlet:
+    context-path: /v1.0
+spring:
+  application:
+    name: tall
+  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
+eureka:
+  instance:
+    ip-address: 140.143.228.3
+gatewayUrl: https://www.tall.wiki/gateway/

util/src/test/java/com/ccsens/util/TestQrCord.java

@@ -16,7 +16,7 @@ public class TestQrCord {
      *
      * @throws Exception
      */
-    @Test
+//    @Test
     public void test01() throws Exception {
         String fileName = "zzz/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".png";
         ByteArrayOutputStream stream = QRCode.from("112233").to(ImageType.BMP).withSize(1000, 1000).stream();
@@ -42,7 +42,7 @@ public class TestQrCord {
      *
      * @throws Exception
      */
-    @Test
+//    @Test
     public void test02() throws Exception {
 //        ZipUtil.gzip(new File("F:\\home\\cloud\\tall\\uploads\\zzz"));
         ZipUtil.zip("F:\\home\\cloud\\tall\\uploads\\zzz", "F:\\home\\cloud\\tall\\uploads\\zzz.zip");