修改配置

histroy/analysis-histroy-hb/target/classes/application-hf.yml

@@ -0,0 +1,63 @@
+server:
+  port: 8092
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+
+  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:@10.0.118.71: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
+
+#    model和风meterpoint 去掉最后两个字段
+#                        windpowerinfoday 去掉test1
+

web/analysis-web-hb/target/classes/application-hf.yml

@@ -0,0 +1,99 @@
+server:
+  port: 8084
+  servlet:
+    context-path: /
+
+
+spring:
+  application:
+    name: analysis-provider
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.118.73:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #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:@10.83.68.165:1521:gdsj
+    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    username: gdprod
+    password: gd123
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    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
+
+

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

@@ -0,0 +1,97 @@
+server:
+  port: 8081
+  servlet:
+    context-path: /
+
+
+spring:
+  application:
+    name: benchmarking-provider
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.81.3.155:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 10.81.3.155
+#    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: 19
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://10.81.3.151:5432/wisdom
+    username: gdprod
+    password: gd123
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    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
+
+

web/consumer/target/classes/application-hf.yml

@@ -0,0 +1,101 @@
+server:
+  port: 8020
+  servlet:
+    context-path: /
+
+
+spring:
+  application:
+    name: consumer
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.118.73:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #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:@10.0.118.71: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
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
+
+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
+
+

web/consumer/target/classes/application-jn.yml

@@ -0,0 +1,99 @@
+server:
+  port: 8020
+  servlet:
+    context-path: /
+
+spring:
+  application:
+    name: consumer
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.81.3.155:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 10.81.3.155
+#    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: 19
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://10.81.3.151:5432/wisdom
+    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
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
+
+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
+
+
+

web/monitor-web-hbnew/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,199 @@
+{
+  "groups": [
+    {
+      "name": "exportcode",
+      "type": "com.gyee.frame.common.conf.ExportConfig",
+      "sourceType": "com.gyee.frame.common.conf.ExportConfig"
+    },
+    {
+      "name": "gyee",
+      "type": "com.gyee.frame.common.conf.V2Config",
+      "sourceType": "com.gyee.frame.common.conf.V2Config"
+    },
+    {
+      "name": "spring.datasource.druid.master",
+      "type": "javax.sql.DataSource",
+      "sourceType": "com.gyee.frame.common.conf.MybatisConfig",
+      "sourceMethod": "masterDataSource()"
+    },
+    {
+      "name": "spring.datasource.druid.slave",
+      "type": "javax.sql.DataSource",
+      "sourceType": "com.gyee.frame.common.conf.MybatisConfig",
+      "sourceMethod": "slaveDataSource()"
+    },
+    {
+      "name": "spring.datasource.druid.ticket",
+      "type": "javax.sql.DataSource",
+      "sourceType": "com.gyee.frame.common.conf.MybatisConfig",
+      "sourceMethod": "ticketDataSource()"
+    },
+    {
+      "name": "spring.redis.pool",
+      "type": "redis.clients.jedis.JedisPoolConfig",
+      "sourceType": "com.gyee.frame.common.cache.RedisConfig",
+      "sourceMethod": "jedisPoolConfig()"
+    },
+    {
+      "name": "spring.servlet.multipart",
+      "type": "com.gyee.frame.common.conf.FileConfig",
+      "sourceType": "com.gyee.frame.common.conf.FileConfig"
+    },
+    {
+      "name": "temperature",
+      "type": "com.gyee.frame.common.conf.TemperatureConfig",
+      "sourceType": "com.gyee.frame.common.conf.TemperatureConfig"
+    },
+    {
+      "name": "zmconfig",
+      "type": "com.gyee.frame.common.conf.ZmConfig",
+      "sourceType": "com.gyee.frame.common.conf.ZmConfig"
+    }
+  ],
+  "properties": [
+    {
+      "name": "exportcode.template1",
+      "type": "java.util.List<java.lang.String>",
+      "sourceType": "com.gyee.frame.common.conf.ExportConfig"
+    },
+    {
+      "name": "exportcode.template2cft",
+      "type": "java.util.Map<java.lang.String,java.lang.String>",
+      "sourceType": "com.gyee.frame.common.conf.ExportConfig"
+    },
+    {
+      "name": "exportcode.template2swdl",
+      "type": "java.util.Map<java.lang.String,java.lang.String>",
+      "sourceType": "com.gyee.frame.common.conf.ExportConfig"
+    },
+    {
+      "name": "exportcode.template2swgl",
+      "type": "java.util.Map<java.lang.String,java.lang.String>",
+      "sourceType": "com.gyee.frame.common.conf.ExportConfig"
+    },
+    {
+      "name": "gyee.copyright-year",
+      "type": "java.lang.String",
+      "description": "版权年份",
+      "sourceType": "com.gyee.frame.common.conf.V2Config"
+    },
+    {
+      "name": "gyee.name",
+      "type": "java.lang.String",
+      "description": "项目名称",
+      "sourceType": "com.gyee.frame.common.conf.V2Config"
+    },
+    {
+      "name": "gyee.version",
+      "type": "java.lang.String",
+      "description": "版本",
+      "sourceType": "com.gyee.frame.common.conf.V2Config"
+    },
+    {
+      "name": "spring.redis.pool.block-when-exhausted",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.eviction-policy",
+      "type": "org.apache.commons.pool2.impl.EvictionPolicy<java.lang.Object>",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.eviction-policy-class-name",
+      "type": "java.lang.String",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.evictor-shutdown-timeout-millis",
+      "type": "java.lang.Long",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.fairness",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.jmx-enabled",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.jmx-name-base",
+      "type": "java.lang.String",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.jmx-name-prefix",
+      "type": "java.lang.String",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.lifo",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.max-idle",
+      "type": "java.lang.Integer",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.max-total",
+      "type": "java.lang.Integer",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.max-wait-millis",
+      "type": "java.lang.Long",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.min-evictable-idle-time-millis",
+      "type": "java.lang.Long",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.min-idle",
+      "type": "java.lang.Integer",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.num-tests-per-eviction-run",
+      "type": "java.lang.Integer",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.soft-min-evictable-idle-time-millis",
+      "type": "java.lang.Long",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.test-on-borrow",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.test-on-create",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.test-on-return",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.test-while-idle",
+      "type": "java.lang.Boolean",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    },
+    {
+      "name": "spring.redis.pool.time-between-eviction-runs-millis",
+      "type": "java.lang.Long",
+      "sourceType": "redis.clients.jedis.JedisPoolConfig"
+    }
+  ],
+  "hints": []
+}

web/monitor-web-hbnew/target/classes/auto_code/model/Entity.java.vm

@@ -0,0 +1,76 @@
+package ${globalConfig.parentPack}.model.auto;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+${JavaClassPackages}
+/**
+ * ${TsysTables.tableComment} ${TsysTables.tableModel} 
+ * @author ${globalConfig.author}_自动生成
+ * @email ${globalConfig.email}
+ * @date ${datetime}
+ */
+ @ApiModel(value="${TsysTables.tableModel}", description="${TsysTables.tableComment}")
+public class ${TsysTables.tableModel} implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	#foreach ($column in $beanColumns)
+	
+	/** $column.column_comment **/
+	#if(${column.beanType} == "java.util.Date")
+@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	#end
+@ApiModelProperty(value = "$column.column_comment")
+	private ${column.attrType} ${column.beanName};
+	#end
+	
+	#foreach ($column in $beanColumns)
+	#if($column.beanType == "java.util.String")
+	
+	public $column.attrType get${column.funName}() {
+        return $column.beanName;
+    }
+
+    public void set${column.funName}(${column.attrType} ${column.beanName}){
+        this.${column.beanName} = ${column.beanName} == null ? null : ${column.beanName}.trim();
+    }
+			
+	#else
+
+	public ${column.attrType} get${column.funName}() {
+        return ${column.beanName};
+    }
+
+    public void set${column.funName}(${column.attrType} ${column.beanName}) {
+        this.${column.beanName} = ${column.beanName};
+    }
+	 
+	#end  
+	#end
+	
+	public ${TsysTables.tableModel}() {
+        super();
+    }
+    
+	#set( $lag = 0)
+	#set( $lagstr="")
+	#foreach ($column in $beanColumns)
+		#if(($lag+1)>=(${beanColumns.size()}))
+		 #set($lagstr = $lagstr+"${column.attrType} ${column.beanName}")
+		#else
+		 #set($lagstr = $lagstr+"${column.attrType} ${column.beanName},")
+		#end
+		#set( $lag  = $lag + 1 )
+	#end
+
+	public ${TsysTables.tableModel}($lagstr) {
+	
+	#foreach ($column in $beanColumns)
+	this.${column.beanName} = ${column.beanName};
+	#end
+	
+	}
+	
+}