联调修改

web/benchmarking-web-hb/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 10.83.68.94
-    host: 192.168.2.202
+    host: 10.83.68.94
+#    host: 192.168.2.202
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:

web/consumer/src/main/java/com/gyee/consumer/controller/benching/BenchmarkingController.java

@@ -368,7 +368,7 @@ public class BenchmarkingController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R dbmainbottom(@RequestParam(value = "timetype",required = true)String timetype,
                           @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
-        return restTemplate.getForObject(BENCHMARKING_URL+"/benchmarking/djhxdbbottom?timetype="+timetype+"&foreigntype="+foreigntype,R.class);
+        return restTemplate.getForObject(BENCHMARKING_URL+"/benchmarking/dbmainbottom?timetype="+timetype+"&foreigntype="+foreigntype,R.class);
     }
 
 

web/consumer/target/classes/application.yml

@@ -0,0 +1,87 @@
+server:
+  port: 8020
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+#    host: 10.83.68.94
+    host: 192.168.2.202
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 1
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+    username: gdprod
+    password: gd123
+    oracle-schema=:
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+url:
+  benchmaring: http://192.168.2.216:8081
+  analysis: http://192.168.2.216:8082
+
+

web/consumer/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Feb 11 17:58:09 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee
+artifactId=consumer

web/consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,8 @@
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\AlgorithmController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\config\RestTemplateConfig.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\benching\BenchmarkingController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\config\CorsConfig.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\ConsumerMain.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\analysis\AnalysisController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\specific\SpecificController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\threerate\ThreerateController.java