Sfoglia il codice sorgente

Merge branch 'huangzqa-fix-git-20210621' into 'master'

Huangzqa fix git 20210621

See merge request dcuc-tjdsj/approve-gateway!17
黄资权 4 anni fa
parent
commit
ac1fbdc991
100 ha cambiato i file con 0 aggiunte e 94 eliminazioni
  1. BIN
      target/approve-gateway-1.0.0-SNAPSHOT.jar
  2. BIN
      target/approve-gateway-1.0.0-SNAPSHOT.tar.gz
  3. BIN
      target/classes/META-INF/approve-gateway.kotlin_module
  4. 0 94
      target/classes/application.yml
  5. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/ApproveGatewayApplication.class
  6. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/controller/ApproveErrorController.class
  7. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/controller/LoginDemoController.class
  8. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/filter/DcucJwtTokenPreFilter.class
  9. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/filter/HwTokenPreFilter.class
  10. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/pojo/OauthUserVo.class
  11. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/util/ApiGwUtils$1.class
  12. BIN
      target/classes/com/dragonsoft/dcuc/approvegateway/util/ApiGwUtils.class
  13. 0 0
      target/dependency-maven-plugin-markers/com.dragonsoft-duceap-base-jar-2.1.0-SNAPSHOT-1283250307
  14. BIN
      target/lib/HdrHistogram-2.1.9.jar
  15. BIN
      target/lib/LatencyUtils-2.0.3.jar
  16. BIN
      target/lib/accessors-smart-1.2.jar
  17. BIN
      target/lib/android-json-0.0.20131108.vaadin1.jar
  18. BIN
      target/lib/aopalliance-1.0.jar
  19. BIN
      target/lib/apiguardian-api-1.1.0.jar
  20. BIN
      target/lib/apollo-client-1.2.0-SNAPSHOT.jar
  21. BIN
      target/lib/apollo-core-1.2.0-SNAPSHOT.jar
  22. BIN
      target/lib/apollo-openapi-1.2.0-SNAPSHOT.jar
  23. BIN
      target/lib/approve-common-1.0.0-SNAPSHOT.jar
  24. BIN
      target/lib/archaius-core-0.7.6.jar
  25. BIN
      target/lib/asm-3.1.jar
  26. BIN
      target/lib/asm-5.0.4.jar
  27. BIN
      target/lib/aspectjweaver-1.9.5.jar
  28. BIN
      target/lib/assertj-core-3.16.1.jar
  29. BIN
      target/lib/author-dragon-3.0.2.jar
  30. BIN
      target/lib/bcpkix-jdk15on-1.64.jar
  31. BIN
      target/lib/bcprov-jdk15on-1.56.jar
  32. BIN
      target/lib/byte-buddy-1.10.11.jar
  33. BIN
      target/lib/byte-buddy-agent-1.10.11.jar
  34. BIN
      target/lib/caffeine-2.8.4.jar
  35. BIN
      target/lib/cglib-2.2.jar
  36. BIN
      target/lib/checker-qual-3.4.0.jar
  37. BIN
      target/lib/classmate-1.5.1.jar
  38. BIN
      target/lib/commons-beanutils-1.8.3.jar
  39. BIN
      target/lib/commons-codec-1.14.jar
  40. BIN
      target/lib/commons-collections-3.2.jar
  41. BIN
      target/lib/commons-collections4-4.1.jar
  42. BIN
      target/lib/commons-configuration-1.8.jar
  43. BIN
      target/lib/commons-fileupload-1.2.1.jar
  44. BIN
      target/lib/commons-io-2.5.jar
  45. BIN
      target/lib/commons-lang-2.3.jar
  46. BIN
      target/lib/commons-lang3-3.10.jar
  47. BIN
      target/lib/commons-logging-1.1.1.jar
  48. BIN
      target/lib/core-3.1.0.jar
  49. BIN
      target/lib/curvesapi-1.04.jar
  50. BIN
      target/lib/dom4j-1.6.1.jar
  51. BIN
      target/lib/duceap-base-2.1.0-SNAPSHOT.jar
  52. BIN
      target/lib/duceap-boot-autoconfigure-2.1.0-SNAPSHOT.jar
  53. BIN
      target/lib/duceap-cloud-config-apollo-2.1.0-SNAPSHOT.jar
  54. BIN
      target/lib/duceap-cloud-openfeign-2.1.0-SNAPSHOT.jar
  55. BIN
      target/lib/duceap-cloud-starter-2.1.0-SNAPSHOT.jar
  56. BIN
      target/lib/duceap-cloud-starter-config-apollo-2.1.0-SNAPSHOT.jar
  57. BIN
      target/lib/duceap-commons-2.1.0-SNAPSHOT.jar
  58. BIN
      target/lib/duceap-core-service-2.1.0-SNAPSHOT.jar
  59. BIN
      target/lib/duceap-extension-restclient-2.1.0-SNAPSHOT.jar
  60. BIN
      target/lib/duceap-security-jwt-2.1.0-SNAPSHOT.jar
  61. BIN
      target/lib/duceap-support-license-2.1.0-SNAPSHOT.jar
  62. BIN
      target/lib/easyexcel-2.2.4.jar
  63. BIN
      target/lib/error_prone_annotations-2.3.4.jar
  64. BIN
      target/lib/ezmorph-1.0.6.jar
  65. BIN
      target/lib/fastjson-1.2.57.jar
  66. BIN
      target/lib/feign-core-10.10.1.jar
  67. BIN
      target/lib/feign-form-3.8.0.jar
  68. BIN
      target/lib/feign-form-spring-3.8.0.jar
  69. BIN
      target/lib/feign-hystrix-10.10.1.jar
  70. BIN
      target/lib/feign-slf4j-10.10.1.jar
  71. BIN
      target/lib/gentlyWEB-utils-1.1.GA.jar
  72. BIN
      target/lib/gson-2.8.6.jar
  73. BIN
      target/lib/guava-2.8.4.jar
  74. BIN
      target/lib/guava-20.0.jar
  75. BIN
      target/lib/guice-4.1.0.jar
  76. BIN
      target/lib/hamcrest-2.2.jar
  77. BIN
      target/lib/hibernate-validator-6.1.5.Final.jar
  78. BIN
      target/lib/httpclient-4.5.12.jar
  79. BIN
      target/lib/httpcore-4.4.13.jar
  80. BIN
      target/lib/hutool-all-4.4.5.jar
  81. BIN
      target/lib/hystrix-core-1.5.18.jar
  82. BIN
      target/lib/hystrix-javanica-1.5.18.jar
  83. BIN
      target/lib/hystrix-metrics-event-stream-1.5.18.jar
  84. BIN
      target/lib/hystrix-serialization-1.5.18.jar
  85. BIN
      target/lib/jackson-annotations-2.11.0.jar
  86. BIN
      target/lib/jackson-core-2.11.0.jar
  87. BIN
      target/lib/jackson-databind-2.11.0.jar
  88. BIN
      target/lib/jackson-datatype-jdk8-2.11.0.jar
  89. BIN
      target/lib/jackson-datatype-jsr310-2.11.0.jar
  90. BIN
      target/lib/jackson-module-afterburner-2.11.0.jar
  91. BIN
      target/lib/jackson-module-parameter-names-2.11.0.jar
  92. BIN
      target/lib/jakarta.activation-api-1.2.2.jar
  93. BIN
      target/lib/jakarta.annotation-api-1.3.5.jar
  94. BIN
      target/lib/jakarta.el-3.0.3.jar
  95. BIN
      target/lib/jakarta.validation-api-2.0.2.jar
  96. BIN
      target/lib/jakarta.xml.bind-api-2.3.3.jar
  97. BIN
      target/lib/javassist-3.24.0-GA.jar
  98. BIN
      target/lib/javax.el-3.0.0.jar
  99. BIN
      target/lib/javax.inject-1.jar
  100. BIN
      target/lib/javax.servlet-api-4.0.1.jar

BIN
target/approve-gateway-1.0.0-SNAPSHOT.jar


BIN
target/approve-gateway-1.0.0-SNAPSHOT.tar.gz


BIN
target/classes/META-INF/approve-gateway.kotlin_module


+ 0 - 94
target/classes/application.yml

@@ -1,94 +0,0 @@
-server:
-  port: 8866
-  servlet:
-    context-path: /approve-gateway
-
-spring:
-  application:
-    name: approve-gateway
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-
-zuul:
-  retryable: true
-  # 这个配置必须保留,才会传递Authorization,cookie等
-  sensitive-headers:
-  host:
-    connect-timeout-millis: 60000
-    socket-timeout-millis: 60000
-
-ribbon:
-  ConnectTimeout: 60000 # 连接超时时间(ms)
-  ReadTimeout: 60000 # 通信超时时间(ms)
-  OkToRetryOnAllOperations: true # 是否对所有操作重试
-  MaxAutoRetriesNextServer: 2 # 同一服务不同实例的重试次数
-  MaxAutoRetries: 1 # 同一实例的重试次数
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMillisecond: 60000 # 熔断超时时长:6000ms
-
-duceap:
-  license:
-    dataCacheMethod: apollo
-    #配置用来指定license对接的后端项目地址(格式:ip:port/context,如http://10.10.10.10:8080/ctx),默认使用HttpServletRequest.getLocalAddr()方法获取ip地址,应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
-    #address: http://10.10.10.10:8080/ctx
-    enabled: false
-  apollo:
-    client:
-      host: http://192.168.10.27:8070 #配置中心地址(portal端)
-  security:
-    ##配置登陆方式,dids、dssoac、dcuc
-    type: dids
-    ##dids登录配置#
-    dids2:
-      ##应用代码
-      appCode: YHZX0000000000000001
-      useSSO: true
-      ##单点登录服务器地址
-      SSOLoginUrl: http://10.201.7.30:9090/didsserver/login
-      ##单点登录服务接口地址
-      SSOValidateUrl: http://10.201.7.30:9090/didsserver/serviceValidate
-      ##对接系统地址(ip:端口/上下文/login) 开发环境中, ip端口需要配置成代理的前端地址(请全程使用真实的ip 而不是localhost或者127.0.0.1,否则会导致登录失败)
-      SSOServiceUrl: http://10.11.0.240:1645/approve-gateway/login
-      accessType: 1
-      ##单点登录服务接口地址
-      webServiceUrl: http://10.201.7.30:9090/didsserver/webservices/
-      jndi: JDBC/DIDS
-      filterType: 1
-      ##若匹配该地址,则无须过滤
-      noFilterUrl: /v2/api-docs,/api/v1/process-types,api/v1/process-type,api/v1/apply,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
-    dcuc:
-      casServerUrlPrefix: http://192.168.10.2:8877/sso
-      serverName: http://10.11.0.240:1645
-      ignorePattern: /js/*|/img/*|/css/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/api/v1
-      ApiUrl: http://192.168.10.2:8860/dcuc
-      appCode: YHZX0000000000000001
-#=========================apollo配置信息============================#
-apollo:
-  bootstrap:
-    enabled: false #是否启用apollo
-    namespaces: application, dragonsoft.approve-common #命名空间,默认application
-  cluster: default #集群,默认default
-  meta: http://192.168.10.27:8080 #配置中心地址(服务端)
-
-approve:
-  filter:
-    hw:
-      app:
-        secret: test
-        key: test
-      # 华为网关地址
-      host: http://10.11.1.164:11480
-      # 过滤器开关
-      enabled: false
-    dcuc:
-      # dcuc主机地址
-      host: http://192.168.10.2:8870
-      # 过滤器开关
-      enabled: true

BIN
target/classes/com/dragonsoft/dcuc/approvegateway/ApproveGatewayApplication.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/controller/ApproveErrorController.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/controller/LoginDemoController.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/filter/DcucJwtTokenPreFilter.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/filter/HwTokenPreFilter.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/pojo/OauthUserVo.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/util/ApiGwUtils$1.class


BIN
target/classes/com/dragonsoft/dcuc/approvegateway/util/ApiGwUtils.class


+ 0 - 0
target/dependency-maven-plugin-markers/com.dragonsoft-duceap-base-jar-2.1.0-SNAPSHOT-1283250307


BIN
target/lib/HdrHistogram-2.1.9.jar


BIN
target/lib/LatencyUtils-2.0.3.jar


BIN
target/lib/accessors-smart-1.2.jar


BIN
target/lib/android-json-0.0.20131108.vaadin1.jar


BIN
target/lib/aopalliance-1.0.jar


BIN
target/lib/apiguardian-api-1.1.0.jar


BIN
target/lib/apollo-client-1.2.0-SNAPSHOT.jar


BIN
target/lib/apollo-core-1.2.0-SNAPSHOT.jar


BIN
target/lib/apollo-openapi-1.2.0-SNAPSHOT.jar


BIN
target/lib/approve-common-1.0.0-SNAPSHOT.jar


BIN
target/lib/archaius-core-0.7.6.jar


BIN
target/lib/asm-3.1.jar


BIN
target/lib/asm-5.0.4.jar


BIN
target/lib/aspectjweaver-1.9.5.jar


BIN
target/lib/assertj-core-3.16.1.jar


BIN
target/lib/author-dragon-3.0.2.jar


BIN
target/lib/bcpkix-jdk15on-1.64.jar


BIN
target/lib/bcprov-jdk15on-1.56.jar


BIN
target/lib/byte-buddy-1.10.11.jar


BIN
target/lib/byte-buddy-agent-1.10.11.jar


BIN
target/lib/caffeine-2.8.4.jar


BIN
target/lib/cglib-2.2.jar


BIN
target/lib/checker-qual-3.4.0.jar


BIN
target/lib/classmate-1.5.1.jar


BIN
target/lib/commons-beanutils-1.8.3.jar


BIN
target/lib/commons-codec-1.14.jar


BIN
target/lib/commons-collections-3.2.jar


BIN
target/lib/commons-collections4-4.1.jar


BIN
target/lib/commons-configuration-1.8.jar


BIN
target/lib/commons-fileupload-1.2.1.jar


BIN
target/lib/commons-io-2.5.jar


BIN
target/lib/commons-lang-2.3.jar


BIN
target/lib/commons-lang3-3.10.jar


BIN
target/lib/commons-logging-1.1.1.jar


BIN
target/lib/core-3.1.0.jar


BIN
target/lib/curvesapi-1.04.jar


BIN
target/lib/dom4j-1.6.1.jar


BIN
target/lib/duceap-base-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-boot-autoconfigure-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-cloud-config-apollo-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-cloud-openfeign-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-cloud-starter-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-cloud-starter-config-apollo-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-commons-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-core-service-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-extension-restclient-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-security-jwt-2.1.0-SNAPSHOT.jar


BIN
target/lib/duceap-support-license-2.1.0-SNAPSHOT.jar


BIN
target/lib/easyexcel-2.2.4.jar


BIN
target/lib/error_prone_annotations-2.3.4.jar


BIN
target/lib/ezmorph-1.0.6.jar


BIN
target/lib/fastjson-1.2.57.jar


BIN
target/lib/feign-core-10.10.1.jar


BIN
target/lib/feign-form-3.8.0.jar


BIN
target/lib/feign-form-spring-3.8.0.jar


BIN
target/lib/feign-hystrix-10.10.1.jar


BIN
target/lib/feign-slf4j-10.10.1.jar


BIN
target/lib/gentlyWEB-utils-1.1.GA.jar


BIN
target/lib/gson-2.8.6.jar


BIN
target/lib/guava-2.8.4.jar


BIN
target/lib/guava-20.0.jar


BIN
target/lib/guice-4.1.0.jar


BIN
target/lib/hamcrest-2.2.jar


BIN
target/lib/hibernate-validator-6.1.5.Final.jar


BIN
target/lib/httpclient-4.5.12.jar


BIN
target/lib/httpcore-4.4.13.jar


BIN
target/lib/hutool-all-4.4.5.jar


BIN
target/lib/hystrix-core-1.5.18.jar


BIN
target/lib/hystrix-javanica-1.5.18.jar


BIN
target/lib/hystrix-metrics-event-stream-1.5.18.jar


BIN
target/lib/hystrix-serialization-1.5.18.jar


BIN
target/lib/jackson-annotations-2.11.0.jar


BIN
target/lib/jackson-core-2.11.0.jar


BIN
target/lib/jackson-databind-2.11.0.jar


BIN
target/lib/jackson-datatype-jdk8-2.11.0.jar


BIN
target/lib/jackson-datatype-jsr310-2.11.0.jar


BIN
target/lib/jackson-module-afterburner-2.11.0.jar


BIN
target/lib/jackson-module-parameter-names-2.11.0.jar


BIN
target/lib/jakarta.activation-api-1.2.2.jar


BIN
target/lib/jakarta.annotation-api-1.3.5.jar


BIN
target/lib/jakarta.el-3.0.3.jar


BIN
target/lib/jakarta.validation-api-2.0.2.jar


BIN
target/lib/jakarta.xml.bind-api-2.3.3.jar


BIN
target/lib/javassist-3.24.0-GA.jar


BIN
target/lib/javax.el-3.0.0.jar


BIN
target/lib/javax.inject-1.jar


BIN
target/lib/javax.servlet-api-4.0.1.jar


Some files were not shown because too many files changed in this diff