20210810

4 years ago · 1b341a7f74
9 changed files with 91 additions and 39 deletions
--- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java
+++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java
@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 /**
 * @author 逗
 */
-@FeignClient(name = "tall3", path = "v3.0",fallbackFactory = Tall3FeignClientFallBack.class)
+@FeignClient(name = "tall3", path = "v3.0",fallbackFactory = Tall3FeignClientFallBack.class,configuration = FeignTokenConfig.class)
 public interface Tall3FeignClient {
    /**
     * 根据token获取userId
@ -38,7 +38,7 @@ public interface Tall3FeignClient {
    /**
     * 在tall3内保存项目信息
     */
-    @RequestMapping("/project/save")
+    @RequestMapping("project/save")
    JsonResponse saveProjectList(ProjectDto.SaveProjectDto projectDto);
 }

--- a/cloudutil/src/main/resources/application-util-prod.yml
+++ b/cloudutil/src/main/resources/application-util-prod.yml
@ -33,12 +33,60 @@ eureka:
    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
+#hystrix:
+#  threadpool:
+#    default:
+#      coreSize: 200 #并发执行的最大线程数，默认10
+#      maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1
+#      queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5
+#  command:
+#    default:
+#      execution:
+#        isolation:
+#          #SEMAPHORE 它在调用线程上执行，并发请求受信号量限制 THREAD它在单独的线程上执行，并发请求受线程池中线程数的限制
+#          strategy: THREAD
+#          thread:
+#            timeoutInMilliseconds: 60000
+#        timeouot:
+#          enabled: false
+##ribbon的超时时间
+#ribbon:
+#  ReadTimeout: 60000
+#  ConnectTimeout: 60000
+## 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.*']
 feign:
  client:
    config:
      default:
-        connectTime: 5000
-        readTimeout: 5000
+        connectTime: 60000
+        readTimeout: 60000
        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
@ -47,21 +95,15 @@ feign:
  hystrix:
    enabled: true
 hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1
-      queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5
  command:
    default:
      execution:
+        timeout:
+          enabled: true
        isolation:
-          #SEMAPHORE 它在调用线程上执行，并发请求受信号量限制 THREAD它在单独的线程上执行，并发请求受线程池中线程数的限制
-          strategy: THREAD
+          strategy: SEMAPHORE
          thread:
            timeoutInMilliseconds: 60000
-        timeouot:
-          enabled: false
 #ribbon的超时时间
 ribbon:
  ReadTimeout: 60000
@ -72,12 +114,12 @@ logging:
    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
+  #  zipkin:
+  #    base-url: http://49.233.89.188:9411
+  #  sleuth:
+  #    sampler:
+  #      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+  #      probability: 1.0
  cloud:
    inetutils:
      ignored-interfaces: ['VMware.*']
--- a/form/src/main/java/com/ccsens/form/api/DebugController.java
+++ b/form/src/main/java/com/ccsens/form/api/DebugController.java
@ -1,14 +1,20 @@
 package com.ccsens.form.api;

+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.cloudutil.feign.Tall3FeignClient;
 import com.ccsens.util.JsonResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

@Api(tags = "DEBUG" , description = "DebugController | ")
@ -16,6 +22,13 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping("/debug")
@Slf4j
 public class DebugController {
+
+
+    @Resource
+    private Tall3FeignClient tall3FeignClient;
+
+
+
    @ApiOperation(value = "/测试",notes = "")
    @ApiImplicitParams({
    })
--- a/pom.xml
+++ b/pom.xml
@ -16,6 +16,7 @@
 <!--        <module>wisdomcar</module>-->
 <!--        <module>beneficiation</module>-->
 <!--        <module>form</module>-->
+<!--        <module>ct</module>-->
        <module>signin</module>
        <module>common</module>

--- a/recovery/src/main/java/com/ccsens/recovery/api/DebugController.java
+++ b/recovery/src/main/java/com/ccsens/recovery/api/DebugController.java
@ -1,5 +1,7 @@
 package com.ccsens.recovery.api;

+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.cloudutil.feign.Tall3FeignClient;
 import com.ccsens.recovery.bean.dto.DebugDto;
 import com.ccsens.recovery.bean.dto.HospitalDto;
 import com.ccsens.util.JsonResponse;
@ -24,9 +26,13 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping("/debug")
@Slf4j
 public class DebugController {
+
+
    @Resource
    private RedisUtil redisUtil;

+
+
    @ApiOperation(value = "/测试", notes = "")
    @ApiImplicitParams({
    })
@ -37,16 +43,6 @@ public class DebugController {
    }


-    @ApiOperation(value = "/测试", notes = "")
-    @ApiImplicitParams({
-    })
-    @RequestMapping(value = "http", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse debug(HttpServletRequest request, @ApiParam @Validated @RequestBody DebugDto.A a) throws Exception {
-
-        long aaa = redisUtil.incr("aaa", 1);
-        System.out.println(aaa);
-        return JsonResponse.newInstance().ok(a);
-    }


 }
--- a/recovery/src/main/resources/application.yml
+++ b/recovery/src/main/resources/application.yml
@ -1,6 +1,6 @@
 spring:
  profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common


--- a/signin/src/main/resources/application-dev.yml
+++ b/signin/src/main/resources/application-dev.yml
@ -1,20 +1,20 @@
 server:
  port: 7130
  servlet:
-    context-path: /v1.0
+    context-path: /v3.0
 spring:
  snowflake:
    datacenterId: 1
    workerId: 1
  application:
-    name: tall
+    name: tall3
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
  rabbitmq:
-    host: 192.168.0.99
-    password: 111111
+    host: 127.0.0.1
+    password: guest
    port: 5672
-    username: admin
+    username: guest
  redis:
    database: 0
    host: 127.0.0.1
--- a/signin/src/main/resources/application-prod.yml
+++ b/signin/src/main/resources/application-prod.yml
@ -35,7 +35,7 @@ eureka:
    # www.tall.wiki
 #    ip-address: 140.143.228.3
 #    ip-address: 81.70.54.64
-    ip-address: 127.0.0.1
+    ip-address: 121.36.3.207

 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/
--- a/signin/src/main/resources/application.yml
+++ b/signin/src/main/resources/application.yml
@ -1,5 +1,5 @@
 spring:
  profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common