Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-common/tuoheng-common-core/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=tuoheng-common-core
-groupId=com.tuoheng
-version=1.0.0

tuoheng-common/tuoheng-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,53 +0,0 @@
-com/tuoheng/common/core/utils/ExceptionUtil.class
-com/tuoheng/common/core/config/http/RestTemplateConfig$1.class
-com/tuoheng/common/core/enums/SysExceptionEnum.class
-com/tuoheng/common/core/exception/ServiceException.class
-com/tuoheng/common/core/model/dto/LoginUser.class
-com/tuoheng/common/core/utils/DateUtils.class
-com/tuoheng/common/core/config/xxl/XxlJobConfig.class
-com/tuoheng/common/core/common/BaseQuery.class
-com/tuoheng/common/core/config/common/CommonConfig.class
-com/tuoheng/common/core/common/ExceptionInterface.class
-com/tuoheng/common/core/common/OperationEnum.class
-com/tuoheng/common/core/config/http/DefaultClientHttpRequestInterceptor.class
-com/tuoheng/common/core/enums/LockType.class
-com/tuoheng/common/core/utils/HttpUtils$TrustAnyTrustManager.class
-com/tuoheng/common/core/utils/CommonNumberTypeUtils.class
-com/tuoheng/common/core/config/UploadFileConfig.class
-com/tuoheng/common/core/common/BaseEntity.class
-com/tuoheng/common/core/utils/ThreadLocalUtil.class
-com/tuoheng/common/core/common/BaseServiceImpl.class
-com/tuoheng/common/core/config/http/RestTemplateConfig.class
-com/tuoheng/common/core/utils/StringUtils.class
-com/tuoheng/common/core/enums/HttpStatusEnum.class
-com/tuoheng/common/core/utils/IpUtils.class
-com/tuoheng/common/core/config/http/HeadClientHttpRequestInterceptor.class
-com/tuoheng/common/core/utils/ValidatorUtils.class
-com/tuoheng/common/core/utils/ServletUtils.class
-com/tuoheng/common/core/utils/EncryptUtil.class
-com/tuoheng/common/core/enums/PhotographyEnum.class
-com/tuoheng/common/core/enums/OperType.class
-com/tuoheng/common/core/utils/LogUtil.class
-com/tuoheng/common/core/entity/UserEntity.class
-com/tuoheng/common/core/constant/CommonConstants.class
-com/tuoheng/common/core/utils/HttpUtils$TrustAnyHostnameVerifier.class
-com/tuoheng/common/core/config/http/RestProperties.class
-com/tuoheng/common/core/enums/LogType.class
-com/tuoheng/common/core/utils/ThumbnailUtil.class
-com/tuoheng/common/core/constant/SecurityHeadConstant.class
-com/tuoheng/common/core/utils/RedisUtils.class
-com/tuoheng/common/core/common/IBaseService.class
-com/tuoheng/common/core/utils/CommonUtils.class
-com/tuoheng/common/core/utils/JacksonUtil.class
-com/tuoheng/common/core/config/ValidatorConfig.class
-com/tuoheng/common/core/utils/JsonResult.class
-com/tuoheng/common/core/common/BaseController.class
-com/tuoheng/common/core/utils/SpringUtils.class
-com/tuoheng/common/core/utils/FileUtils.class
-com/tuoheng/common/core/advice/CustomExceptionHandler.class
-com/tuoheng/common/core/utils/SecurityUserUtils.class
-com/tuoheng/common/core/annotation/Log.class
-com/tuoheng/common/core/config/RedisConfig.class
-com/tuoheng/common/core/utils/HttpUtils.class
-com/tuoheng/common/core/exception/ExceptionInterface.class
-com/tuoheng/common/core/enums/ServiceExceptionEnum.class

tuoheng-common/tuoheng-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,53 +0,0 @@
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/FileUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/RedisConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/LockType.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/UploadFileConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/xxl/XxlJobConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/entity/UserEntity.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/IBaseService.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/LogType.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/http/DefaultClientHttpRequestInterceptor.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/annotation/LockAction.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/ServletUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/SpringUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/advice/CustomExceptionHandler.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/StringUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/JsonResult.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/LogUtil.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/redisson/RedissonDistributedLockAspectConfiguration.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/model/dto/LoginUser.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/ValidatorConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/IpUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/BaseEntity.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/ExceptionInterface.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/http/RestTemplateConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/DateUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/CommonNumberTypeUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/BaseQuery.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/http/RestProperties.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/JacksonUtil.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/ServiceExceptionEnum.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/http/HeadClientHttpRequestInterceptor.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/constant/CommonConstants.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/interceptor/FeignRequestInterceptor.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/HttpUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/SecurityUserUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/ValidatorUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/CommonUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/SysExceptionEnum.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/OperType.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/exception/ServiceException.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/EncryptUtil.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/HttpStatusEnum.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/OperationEnum.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/BaseServiceImpl.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/ThumbnailUtil.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/common/BaseController.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/config/common/CommonConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/ThreadLocalUtil.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/enums/PhotographyEnum.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/constant/SecurityHeadConstant.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/exception/ExceptionInterface.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/RedisUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/annotation/Log.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-core/src/main/java/com/tuoheng/common/core/utils/ExceptionUtil.java

tuoheng-common/tuoheng-common-security/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=tuoheng-common-security
-groupId=com.tuoheng
-version=1.0.0

tuoheng-common/tuoheng-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,13 +0,0 @@
-com/tuoheng/common/security/config/ResourceServerConfig.class
-com/tuoheng/common/security/security/OAuthAccessDeniedHandler.class
-com/tuoheng/common/security/interceptor/OAuth2FeignRequestInterceptor.class
-com/tuoheng/common/security/utils/JsonResult.class
-com/tuoheng/common/security/constant/SecurityConstant.class
-com/tuoheng/common/security/annotation/EnableTHFeignClients.class
-com/tuoheng/common/security/config/OAuth2FeignConfig.class
-com/tuoheng/common/security/security/OAuthAuthExceptionEntryPoint.class
-com/tuoheng/common/security/security/CustomUserAuthenticationConverter.class
-com/tuoheng/common/security/utils/SecurityUtils.class
-com/tuoheng/common/security/entity/SecurityUser.class
-com/tuoheng/common/security/annotation/EnableCustomConfig.class
-com/tuoheng/common/security/security/SecurityImportBeanDefinitionRegistrar.class

tuoheng-common/tuoheng-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,13 +0,0 @@
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/config/OAuth2FeignConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/utils/SecurityUtils.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/entity/SecurityUser.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/security/OAuthAccessDeniedHandler.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/interceptor/OAuth2FeignRequestInterceptor.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/annotation/EnableCustomConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/security/OAuthAuthExceptionEntryPoint.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/annotation/EnableTHFeignClients.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/config/ResourceServerConfig.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/constant/SecurityConstant.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/utils/JsonResult.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/security/CustomUserAuthenticationConverter.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-common/tuoheng-common-security/src/main/java/com/tuoheng/common/security/security/SecurityImportBeanDefinitionRegistrar.java

tuoheng-feign/tuoheng-api-feign/target/classes/META-INF/spring.factories

@@ -1,3 +0,0 @@
-#org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-#  com.tuoheng.api.feign.feign.fallback.ApiClientFallback
-

tuoheng-feign/tuoheng-api-feign/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=tuoheng-api-feign
-groupId=com.tuoheng
-version=1.0.0

tuoheng-feign/tuoheng-api-feign/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +0,0 @@
-com/tuoheng/api/feign/feign/ApiClient.class
-com/tuoheng/api/feign/feign/fallback/ApiClientFallback.class

tuoheng-feign/tuoheng-api-feign/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,2 +0,0 @@
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-feign/tuoheng-api-feign/src/main/java/com/tuoheng/api/feign/feign/ApiClient.java
-/apps/workspaces-th/tuoheng_telecomumale/tuoheng-feign/tuoheng-api-feign/src/main/java/com/tuoheng/api/feign/feign/fallback/ApiClientFallback.java

tuoheng-service/tuoheng-admin/target/classes/WEB-INF/classes/application-local.yml

@@ -1,192 +0,0 @@
-spring:
-  # 注册中心consul地址
-  cloud:
-    consul:
-      host: 192.168.11.13 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        # 是否启用服务发现
-        enabled: false
-        # 配置服务注册
-        register: false
-        deregister: false
-        ## consul ip地址
-        hostname: 192.168.11.13
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true
-        health-check-path: /actuator/health                                                      #健康检查
-        health-check-interval: 10s
-  # 配置数据源
-  datasource:
-    druid:
-      name: DataSource-telecomumale-admin-local
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 填写你数据库的url、登录名、密码和数据库名
-#      url: jdbc:mysql://localhost:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-#      username: root
-#      password: 123456
-      url: jdbc:mysql://192.168.11.13:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-      username: root
-      password: idontcare
-      filter:
-        slf4j:
-          enabled: true
-          statement-executable-sql-log-enable: true
-        stat:
-          enabled: true
-          merge-sql: true
-          slow-sql-millis: 3000
-        wall:
-          enabled: true
-      # 初始化时建立物理连接的个数
-      initial-size: 5
-      # 最小连接池数量
-      min-idle: 5
-      # 最大连接池数量 maxIdle已经不再使用
-      max-active: 20
-      # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，
-      # 如果需要可以通过配置useUnfairLock属性为true使用非公平锁。
-      max-wait: 6000
-      use-unfair-lock: true
-      # 申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      # 既作为检测的间隔时间又作为testWhileIdel执行的依据
-      time-between-eviction-runs-millis: 60000
-      # 销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
-      min-evictable-idle-time-millis: 30000
-      #用来检测连接是否有效的sql 必须是一个查询语句
-      #mysql中为 select 'x'
-      #oracle中为 select 1 from dual
-      validation-query: select 1
-      #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-borrow: false
-      #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-return: false
-      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-      pool-prepared-statements: true
-      # 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，
-      # 不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
-      maxOpenPreparedStatements: 100
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      # 配置监拉统计挡成的filters. stat: 监控统计、Log4j:日志记录、waLL: 防御sqL注入
-      # 如果启用日志记录时报错java.lang.ClassNotFoundException: org.apache.log4j.Priority
-      # 则导入Log4j 依赖即时，Maven 地址: https://mvnrepository. com/artifact/log4j/log4
-      max-pool-prepared-statement-per-connection-size: 20
-      stat-view-servlet:
-        url-pattern: /druid/*
-        # IP 白名单，没有配置或者为空，则允许所有访问
-        allow:
-        # IP 黑名单，若白名单也存在，则优先使用
-        deny: 192.168.15.21
-        # 登录用户名/密码
-        login-username: admin
-        login-password: 123456
-        enabled: true # 不配置，则打不开控制台页面
-      web-stat-filter:
-        enabled: true
-        session-stat-enable: false
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
-  # Redis数据源
-  redis:
-    # 缓存库默认索引0
-    database: 0
-    # Redis服务器地址
-    host: 127.0.0.1
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-
-  mqtt:
-    onlineUrl: http://127.0.0.1:18083
-    #MQTT服务地址，端口号默认11883，如果有多个，用逗号隔开
-    url: tcp://127.0.0.1:1883
-    #用户名
-    username:
-    #密码
-    password:
-    #客户端id(不能重复)
-    client:
-      id: th-telecomumale-consumer-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    default:
-      topic: topic
-
-  servlet:
-    multipart:
-      # 过滤springmvc的文件上传
-      enabled: false
-      # 单个文件最大值
-      max-file-size: 50MB
-      # 上传文件总的最大值
-      max-request-size: 100MB
-
-file:
-  #上传的服务器上的映射文件夹
-  accessPath: /uploads/
-  #静态资源对外暴露的访问路径
-  staticAccessPath: /**
-  #静态资源实际存储路径
-  uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-
-# 自定义配置
-tuoheng:
-  oidc-url: http://192.168.11.11:7011
-  # 图片域名
-  image-url: https://image.t-aaron.com/
-  # OSS域名
-  oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
-  # 视频域名
-  video-url: http://vod.play.t-aaron.com/
-  # 高德Key
-  gaodeKey: 5a1f63e7563cba471a9d0773e218144a
-  # 通道地址
-  live-channel-domain-url: https://streaming.t-aaron.com/
-  # DSP服务域名
-  dsp-domain-url: http://192.168.11.241:7011
-  # DSP回调地址
-  dsp-callback-url: https://127.0.0.1:9120/dsp/callback/{requestId}
-  #飞手平台地址
-  pilot-url: http://192.168.11.241:7011/pilot/web/
-  #airport配置地址
-  airport-url: http://192.168.11.22:9060
-  # 文件配置
-  uploads:
-    #上传的服务器上的映射文件夹
-    accessPath: /uploads/
-    #静态资源对外暴露的访问路径
-    staticAccessPath: /**
-    #静态资源实际存储路径
-    uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-#阿里云
-aliyuncsVod:
-  accessKeyId: LTAI5tE7KWN9fsuGU7DyfYF4
-  accessKeySecret: yPPCyfsqWgrTuoz5H4sisY0COclx8E
-  roleArn: acs:ram::1399733914954856:role/ramosstest
-  bucketName: ta-tech-image
-
-aliyun:
-  oss:
-    endpoint: "https://oss-cn-shanghai.aliyuncs.com"
-    accessKeyId: "LTAI5tCMz1nQ3U6jQj8tR8XQ"
-    accessKeySecret: "qH9CwhQwKhNY2g8MyZnHFhhIYqQgTB"
-    bucketName: "th-telecomumale"
-    filedir: "localFile/"

tuoheng-service/tuoheng-admin/target/classes/application-dev.yml

@@ -1,199 +0,0 @@
-spring:
-  # 注册中心consul地址
-  cloud:
-    consul:
-      host: 192.168.11.13 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        ## consul ip地址
-        hostname: 192.168.11.13
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true
-        health-check-path: /actuator/health                                                      #健康检查
-        health-check-interval: 10s
-  # 配置数据源
-  datasource:
-    druid:
-      name: DataSource-telecomumale-admin-dev
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 填写你数据库的url、登录名、密码和数据库名
-      url: jdbc:mysql://192.168.11.13:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-      username: root
-      password: idontcare
-      filter:
-        slf4j:
-          enabled: true
-          statement-executable-sql-log-enable: true
-        stat:
-          enabled: true
-          merge-sql: true
-          slow-sql-millis: 3000
-        wall:
-          enabled: true
-      # 初始化时建立物理连接的个数
-      initial-size: 5
-      # 最小连接池数量
-      min-idle: 5
-      # 最大连接池数量 maxIdle已经不再使用
-      max-active: 20
-      # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，
-      # 如果需要可以通过配置useUnfairLock属性为true使用非公平锁。
-      max-wait: 6000
-      use-unfair-lock: true
-      # 申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      # 既作为检测的间隔时间又作为testWhileIdel执行的依据
-      time-between-eviction-runs-millis: 60000
-      # 销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
-      min-evictable-idle-time-millis: 30000
-      #用来检测连接是否有效的sql 必须是一个查询语句
-      #mysql中为 select 'x'
-      #oracle中为 select 1 from dual
-      validation-query: select 1
-      #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-borrow: false
-      #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-return: false
-      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-      pool-prepared-statements: true
-      # 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，
-      # 不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
-      maxOpenPreparedStatements: 100
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      # 配置监拉统计挡成的filters. stat: 监控统计、Log4j:日志记录、waLL: 防御sqL注入
-      # 如果启用日志记录时报错java.lang.ClassNotFoundException: org.apache.log4j.Priority
-      # 则导入Log4j 依赖即时，Maven 地址: https://mvnrepository. com/artifact/log4j/log4
-      max-pool-prepared-statement-per-connection-size: 20
-      stat-view-servlet:
-        url-pattern: /druid/*
-        # IP 白名单，没有配置或者为空，则允许所有访问
-        allow:
-        # IP 黑名单，若白名单也存在，则优先使用
-        deny: 192.168.15.21
-        # 登录用户名/密码
-        login-username: admin
-        login-password: 123456
-        enabled: true # 不配置，则打不开控制台页面
-      web-stat-filter:
-        enabled: true
-        session-stat-enable: false
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
-  # Redis数据源
-  redis:
-    # 缓存库默认索引0
-    database: 0
-    # Redis服务器地址
-    host: 192.168.11.13
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-
-  mqtt:
-    onlineUrl: http://192.168.11.22:18083
-    #MQTT服务地址，端口号默认11883，如果有多个，用逗号隔开
-    url: tcp://192.168.11.22:1883
-    #用户名
-    username: admin
-    #密码
-    password: public
-    #客户端id(不能重复)
-    client:
-      id: th-telecomumale-consumer-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    default:
-      topic: topic
-
-  servlet:
-    multipart:
-      # 过滤springmvc的文件上传
-      enabled: false
-      # 单个文件最大值
-      max-file-size: 50MB
-      # 上传文件总的最大值
-      max-request-size: 100MB
-
-file:
-  #上传的服务器上的映射文件夹
-  accessPath: /uploads/
-  #静态资源对外暴露的访问路径
-  staticAccessPath: /**
-  #静态资源实际存储路径
-  uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-# 自定义配置
-tuoheng:
-  oidc-url: http://192.168.11.11:7011
-  # 图片域名
-  image-url: https://image.t-aaron.com/
-  # OSS域名
-  oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
-  # 视频域名
-  video-url: https://vod.play.t-aaron.com/
-  # 高德Key
-  gaodeKey: 5a1f63e7563cba471a9d0773e218144a
-  # 通道地址
-  live-channel-domain-url: https://streaming.t-aaron.com/
-  # DSP服务域名
-  dsp-domain-url: https://dsp.t-aaron.com
-  # DSP回调地址
-  dsp-callback-url: https://192.168.11.11:9120/dsp/callback/{requestId}
-  #飞手平台地址
-  pilot-url: http://192.168.11.11:7011/pilot/web/
-  #airport配置地址
-  airport-url: http://192.168.11.22:9060
-  # 文件配置
-  uploads:
-    #上传的服务器上的映射文件夹
-    accessPath: /uploads/
-    #静态资源对外暴露的访问路径
-    staticAccessPath: /**
-    #静态资源实际存储路径
-    uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-#阿里云
-aliyuncsVod:
-  accessKeyId: LTAI5tE7KWN9fsuGU7DyfYF4
-  accessKeySecret: yPPCyfsqWgrTuoz5H4sisY0COclx8E
-  roleArn: acs:ram::1399733914954856:role/ramosstest
-  bucketName: ta-tech-image
-
-xxl:
-  enable: true
-  job:
-    admin:
-      addresses: http://192.168.11.11:8110/xxl-job-admin
-    accessToken: tuoheng
-    executor:
-      appname: xxl-job-executor-telecomumale
-      address:
-      ip:
-      # 多个后台，端口号不能相同
-      port: 9981
-      logpath: /data/java/logs/xxl-job/jobhandler
-      logretentiondays: 15
-
-aliyun:
-  oss:
-    endpoint: "https://oss-cn-shanghai.aliyuncs.com"
-    accessKeyId: "LTAI5tCMz1nQ3U6jQj8tR8XQ"
-    accessKeySecret: "qH9CwhQwKhNY2g8MyZnHFhhIYqQgTB"
-    bucketName: "th-telecomumale"
-    filedir: "devFile/"
-

tuoheng-service/tuoheng-admin/target/classes/application-local.yml

@@ -1,192 +0,0 @@
-spring:
-  # 注册中心consul地址
-  cloud:
-    consul:
-      host: 192.168.11.13 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        # 是否启用服务发现
-        enabled: false
-        # 配置服务注册
-        register: false
-        deregister: false
-        ## consul ip地址
-        hostname: 192.168.11.13
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true
-        health-check-path: /actuator/health                                                      #健康检查
-        health-check-interval: 10s
-  # 配置数据源
-  datasource:
-    druid:
-      name: DataSource-telecomumale-admin-local
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 填写你数据库的url、登录名、密码和数据库名
-#      url: jdbc:mysql://localhost:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-#      username: root
-#      password: 123456
-      url: jdbc:mysql://192.168.11.13:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-      username: root
-      password: idontcare
-      filter:
-        slf4j:
-          enabled: true
-          statement-executable-sql-log-enable: true
-        stat:
-          enabled: true
-          merge-sql: true
-          slow-sql-millis: 3000
-        wall:
-          enabled: true
-      # 初始化时建立物理连接的个数
-      initial-size: 5
-      # 最小连接池数量
-      min-idle: 5
-      # 最大连接池数量 maxIdle已经不再使用
-      max-active: 20
-      # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，
-      # 如果需要可以通过配置useUnfairLock属性为true使用非公平锁。
-      max-wait: 6000
-      use-unfair-lock: true
-      # 申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      # 既作为检测的间隔时间又作为testWhileIdel执行的依据
-      time-between-eviction-runs-millis: 60000
-      # 销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
-      min-evictable-idle-time-millis: 30000
-      #用来检测连接是否有效的sql 必须是一个查询语句
-      #mysql中为 select 'x'
-      #oracle中为 select 1 from dual
-      validation-query: select 1
-      #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-borrow: false
-      #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-return: false
-      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-      pool-prepared-statements: true
-      # 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，
-      # 不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
-      maxOpenPreparedStatements: 100
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      # 配置监拉统计挡成的filters. stat: 监控统计、Log4j:日志记录、waLL: 防御sqL注入
-      # 如果启用日志记录时报错java.lang.ClassNotFoundException: org.apache.log4j.Priority
-      # 则导入Log4j 依赖即时，Maven 地址: https://mvnrepository. com/artifact/log4j/log4
-      max-pool-prepared-statement-per-connection-size: 20
-      stat-view-servlet:
-        url-pattern: /druid/*
-        # IP 白名单，没有配置或者为空，则允许所有访问
-        allow:
-        # IP 黑名单，若白名单也存在，则优先使用
-        deny: 192.168.15.21
-        # 登录用户名/密码
-        login-username: admin
-        login-password: 123456
-        enabled: true # 不配置，则打不开控制台页面
-      web-stat-filter:
-        enabled: true
-        session-stat-enable: false
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
-  # Redis数据源
-  redis:
-    # 缓存库默认索引0
-    database: 0
-    # Redis服务器地址
-    host: 127.0.0.1
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-
-  mqtt:
-    onlineUrl: http://127.0.0.1:18083
-    #MQTT服务地址，端口号默认11883，如果有多个，用逗号隔开
-    url: tcp://127.0.0.1:1883
-    #用户名
-    username:
-    #密码
-    password:
-    #客户端id(不能重复)
-    client:
-      id: th-telecomumale-consumer-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    default:
-      topic: topic
-
-  servlet:
-    multipart:
-      # 过滤springmvc的文件上传
-      enabled: false
-      # 单个文件最大值
-      max-file-size: 50MB
-      # 上传文件总的最大值
-      max-request-size: 100MB
-
-file:
-  #上传的服务器上的映射文件夹
-  accessPath: /uploads/
-  #静态资源对外暴露的访问路径
-  staticAccessPath: /**
-  #静态资源实际存储路径
-  uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-
-# 自定义配置
-tuoheng:
-  oidc-url: http://192.168.11.11:7011
-  # 图片域名
-  image-url: https://image.t-aaron.com/
-  # OSS域名
-  oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
-  # 视频域名
-  video-url: http://vod.play.t-aaron.com/
-  # 高德Key
-  gaodeKey: 5a1f63e7563cba471a9d0773e218144a
-  # 通道地址
-  live-channel-domain-url: https://streaming.t-aaron.com/
-  # DSP服务域名
-  dsp-domain-url: http://192.168.11.241:7011
-  # DSP回调地址
-  dsp-callback-url: https://127.0.0.1:9120/dsp/callback/{requestId}
-  #飞手平台地址
-  pilot-url: http://192.168.11.241:7011/pilot/web/
-  #airport配置地址
-  airport-url: http://192.168.11.22:9060
-  # 文件配置
-  uploads:
-    #上传的服务器上的映射文件夹
-    accessPath: /uploads/
-    #静态资源对外暴露的访问路径
-    staticAccessPath: /**
-    #静态资源实际存储路径
-    uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-#阿里云
-aliyuncsVod:
-  accessKeyId: LTAI5tE7KWN9fsuGU7DyfYF4
-  accessKeySecret: yPPCyfsqWgrTuoz5H4sisY0COclx8E
-  roleArn: acs:ram::1399733914954856:role/ramosstest
-  bucketName: ta-tech-image
-
-aliyun:
-  oss:
-    endpoint: "https://oss-cn-shanghai.aliyuncs.com"
-    accessKeyId: "LTAI5tCMz1nQ3U6jQj8tR8XQ"
-    accessKeySecret: "qH9CwhQwKhNY2g8MyZnHFhhIYqQgTB"
-    bucketName: "th-telecomumale"
-    filedir: "localFile/"

tuoheng-service/tuoheng-admin/target/classes/application-prod.yml

@@ -1,199 +0,0 @@
-spring:
-  # 注册中心consul地址
-  cloud:
-    consul:
-      host: 172.16.5.12 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        ## consul ip地址
-        hostname: 172.16.5.12
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true
-        health-check-path: /actuator/health                                                      #健康检查
-        health-check-interval: 10s
-  # 配置数据源
-  datasource:
-    druid:
-      name: DataSource-telecomumale-admin-prod
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 填写你数据库的url、登录名、密码和数据库名
-      url: jdbc:mysql://rm-uf6x76i111rb1eo48.mysql.rds.aliyuncs.com:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-      username: root
-      password: TH22#2022
-      filter:
-        slf4j:
-          enabled: true
-          statement-executable-sql-log-enable: true
-        stat:
-          enabled: true
-          merge-sql: true
-          slow-sql-millis: 3000
-        wall:
-          enabled: true
-      # 初始化时建立物理连接的个数
-      initial-size: 5
-      # 最小连接池数量
-      min-idle: 5
-      # 最大连接池数量 maxIdle已经不再使用
-      max-active: 20
-      # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，
-      # 如果需要可以通过配置useUnfairLock属性为true使用非公平锁。
-      max-wait: 6000
-      use-unfair-lock: true
-      # 申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      # 既作为检测的间隔时间又作为testWhileIdel执行的依据
-      time-between-eviction-runs-millis: 60000
-      # 销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
-      min-evictable-idle-time-millis: 30000
-      #用来检测连接是否有效的sql 必须是一个查询语句
-      #mysql中为 select 'x'
-      #oracle中为 select 1 from dual
-      validation-query: select 1
-      #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-borrow: false
-      #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-return: false
-      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-      pool-prepared-statements: true
-      # 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，
-      # 不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
-      maxOpenPreparedStatements: 100
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      # 配置监拉统计挡成的filters. stat: 监控统计、Log4j:日志记录、waLL: 防御sqL注入
-      # 如果启用日志记录时报错java.lang.ClassNotFoundException: org.apache.log4j.Priority
-      # 则导入Log4j 依赖即时，Maven 地址: https://mvnrepository. com/artifact/log4j/log4
-      max-pool-prepared-statement-per-connection-size: 20
-      stat-view-servlet:
-        url-pattern: /druid/*
-        # IP 白名单，没有配置或者为空，则允许所有访问
-        allow:
-        # IP 黑名单，若白名单也存在，则优先使用
-        deny: 192.168.15.21
-        # 登录用户名/密码
-        login-username: admin
-        login-password: 123456
-        enabled: true # 不配置，则打不开控制台页面
-      web-stat-filter:
-        enabled: true
-        session-stat-enable: false
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
-  # Redis数据源
-  redis:
-    # 缓存库默认索引0
-    database: 0
-    # Redis服务器地址
-    host: r-uf6r5lm7c7sfdv3ehb.redis.rds.aliyuncs.com
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-
-  mqtt:
-    onlineUrl: https://mqtt.t-aaron.com
-    #MQTT服务地址，端口号默认11883，如果有多个，用逗号隔开
-    url: tcp://mqtt.t-aaron.com:10883
-    #用户名
-    username: admin
-    #密码
-    password: admin##123
-    #客户端id(不能重复)
-    client:
-      id: th-airmonitor-consumer-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    default:
-      topic: topic
-
-  servlet:
-    multipart:
-      # 过滤springmvc的文件上传
-      enabled: false
-      # 单个文件最大值
-      max-file-size: 50MB
-      # 上传文件总的最大值
-      max-request-size: 100MB
-
-file:
-  #上传的服务器上的映射文件夹
-  accessPath: /uploads/
-  #静态资源对外暴露的访问路径
-  staticAccessPath: /**
-  #静态资源实际存储路径
-  uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-
-# 自定义配置
-tuoheng:
-  oidc-url: https://oidc-admin.t-aaron.com
-  # 图片域名
-  image-url: https://image.t-aaron.com/
-  # OSS域名
-  oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
-  # 视频域名
-  video-url: https://vod.play.t-aaron.com/
-  # 高德Key
-  gaodeKey: 5a1f63e7563cba471a9d0773e218144a
-  # 通道地址
-  live-channel-domain-url: https://streaming.t-aaron.com/
-  # DSP服务域名
-  dsp-domain-url: https://dsp-portal.t-aaron.com
-  # DSP回调地址
-  dsp-callback-url: https://telecomumale.t-aaron.com/telecomumale/admin/dsp/callback/{requestId}
-  #飞手平台地址
-  pilot-url: https://pilot.t-aaron.com/pilot/web/
-  #airport配置地址
-  airport-url: https://airport.t-aaron.com
-  # 文件配置
-  uploads:
-    #上传的服务器上的映射文件夹
-    accessPath: /uploads/
-    #静态资源对外暴露的访问路径
-    staticAccessPath: /**
-    #静态资源实际存储路径
-    uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-#阿里云
-aliyuncsVod:
-  accessKeyId: LTAI5tE7KWN9fsuGU7DyfYF4
-  accessKeySecret: yPPCyfsqWgrTuoz5H4sisY0COclx8E
-  roleArn: acs:ram::1399733914954856:role/ramosstest
-  bucketName: ta-tech-image
-
-xxl:
-  enable: true
-  job:
-    admin:
-      addresses: https://xxl-job.t-aaron.com/xxl-job-admin/
-    accessToken: tuoheng
-    executor:
-      appname: xxl-job-executor-telecomumale
-      address:
-      ip:
-      # 多个后台，端口号不能相同
-      port: 9983
-      logpath: /data/java/logs/xxl-job/jobhandler
-      logretentiondays: 15
-
-aliyun:
-  oss:
-    endpoint: "https://oss-cn-shanghai.aliyuncs.com"
-    accessKeyId: "LTAI5tCMz1nQ3U6jQj8tR8XQ"
-    accessKeySecret: "qH9CwhQwKhNY2g8MyZnHFhhIYqQgTB"
-    bucketName: "th-telecomumale"
-    filedir: "prodFile/"

tuoheng-service/tuoheng-admin/target/classes/application-test.yml

@@ -1,199 +0,0 @@
-spring:
-  # 注册中心consul地址
-  cloud:
-    consul:
-      host: 172.15.1.11 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        ## consul ip地址
-        hostname: 172.15.1.11
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true
-        health-check-path: /actuator/health                                                      #健康检查
-        health-check-interval: 10s
-
-  # 配置数据源
-  datasource:
-    druid:
-      name: DataSource-telecomumale-admin-test
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 填写你数据库的url、登录名、密码和数据库名
-      url: jdbc:mysql://rm-uf6z740323e8053pj.mysql.rds.aliyuncs.com:3306/tuoheng_telecomumale?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
-      username: root
-      password: TH22#2022
-      filter:
-        slf4j:
-          enabled: true
-          statement-executable-sql-log-enable: true
-        stat:
-          enabled: true
-          merge-sql: true
-          slow-sql-millis: 3000
-        wall:
-          enabled: true
-      # 初始化时建立物理连接的个数
-      initial-size: 5
-      # 最小连接池数量
-      min-idle: 5
-      # 最大连接池数量 maxIdle已经不再使用
-      max-active: 20
-      # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，
-      # 如果需要可以通过配置useUnfairLock属性为true使用非公平锁。
-      max-wait: 6000
-      use-unfair-lock: true
-      # 申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      # 既作为检测的间隔时间又作为testWhileIdel执行的依据
-      time-between-eviction-runs-millis: 60000
-      # 销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
-      min-evictable-idle-time-millis: 30000
-      #用来检测连接是否有效的sql 必须是一个查询语句
-      #mysql中为 select 'x'
-      #oracle中为 select 1 from dual
-      validation-query: select 1
-      #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-borrow: false
-      #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
-      test-on-return: false
-      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-      pool-prepared-statements: true
-      # 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，
-      # 不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
-      maxOpenPreparedStatements: 100
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      # 配置监拉统计挡成的filters. stat: 监控统计、Log4j:日志记录、waLL: 防御sqL注入
-      # 如果启用日志记录时报错java.lang.ClassNotFoundException: org.apache.log4j.Priority
-      # 则导入Log4j 依赖即时，Maven 地址: https://mvnrepository. com/artifact/log4j/log4
-      max-pool-prepared-statement-per-connection-size: 20
-      stat-view-servlet:
-        url-pattern: /druid/*
-        # IP 白名单，没有配置或者为空，则允许所有访问
-        allow:
-        # IP 黑名单，若白名单也存在，则优先使用
-        deny: 192.168.15.21
-        # 登录用户名/密码
-        login-username: admin
-        login-password: 123456
-        enabled: true # 不配置，则打不开控制台页面
-      web-stat-filter:
-        enabled: true
-        session-stat-enable: false
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
-  # Redis数据源
-  redis:
-    # 缓存库默认索引0
-    database: 0
-    # Redis服务器地址
-    host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-
-  mqtt:
-    onlineUrl: http://106.15.120.154:18083
-    #MQTT服务地址，端口号默认11883，如果有多个，用逗号隔开
-    url: tcp://106.15.120.154:1883
-    #用户名
-    username: admin
-    #密码
-    password: admin##123
-    #客户端id(不能重复)
-    client:
-      id: th-airmonitor-consumer-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    default:
-      topic: topic
-
-  servlet:
-    multipart:
-      # 过滤springmvc的文件上传
-      enabled: false
-      # 单个文件最大值
-      max-file-size: 50MB
-      # 上传文件总的最大值
-      max-request-size: 100MB
-
-file:
-  #上传的服务器上的映射文件夹
-  accessPath: /uploads/
-  #静态资源对外暴露的访问路径
-  staticAccessPath: /**
-  #静态资源实际存储路径
-  uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-# 自定义配置
-tuoheng:
-  oidc-url: http://106.15.64.139:7011
-  # 图片域名
-  image-url: https://image.t-aaron.com/
-  # OSS域名
-  oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
-  # 视频域名
-  video-url: https://vod.play.t-aaron.com/
-  # 高德Key
-  gaodeKey: 5a1f63e7563cba471a9d0773e218144a
-  # 通道地址
-  live-channel-domain-url: https://streaming.t-aaron.com/
-  # DSP服务域名
-  dsp-domain-url: http://172.15.1.11:7011
-  # DSP回调地址
-  dsp-callback-url: https://telecomumale-test.t-aaron.com/telecomumale/admin/dsp/callback/{requestId}
-  #飞手平台地址
-  pilot-url: http://172.15.1.11:7011/pilot/web/
-  #airport配置地址
-  airport-url: https://airport-test.t-aaron.com
-  # 文件配置
-  uploads:
-    #上传的服务器上的映射文件夹
-    accessPath: /uploads/
-    #静态资源对外暴露的访问路径
-    staticAccessPath: /**
-    #静态资源实际存储路径
-    uploadFolder: /data/java/tuoheng_telecomumale/uploads/
-
-#阿里云
-aliyuncsVod:
-  accessKeyId: LTAI5tE7KWN9fsuGU7DyfYF4
-  accessKeySecret: yPPCyfsqWgrTuoz5H4sisY0COclx8E
-  roleArn: acs:ram::1399733914954856:role/ramosstest
-  bucketName: ta-tech-image
-
-xxl:
-  enable: true
-  job:
-    admin:
-      addresses: http://172.15.1.11:8110/xxl-job-admin
-    accessToken: tuoheng
-    executor:
-      appname: xxl-job-executor-telecomumale
-      address:
-      ip:
-      # 多个后台，端口号不能相同
-      port: 9983
-      logpath: /data/java/logs/xxl-job/jobhandler
-      logretentiondays: 15
-
-aliyun:
-  oss:
-    endpoint: "https://oss-cn-shanghai.aliyuncs.com"
-    accessKeyId: "LTAI5tCMz1nQ3U6jQj8tR8XQ"
-    accessKeySecret: "qH9CwhQwKhNY2g8MyZnHFhhIYqQgTB"
-    bucketName: "th-telecomumale"
-    filedir: "testFile/"

tuoheng-service/tuoheng-admin/target/classes/application.yml

@@ -1,44 +0,0 @@
-server:
-  port: 9150
-
-spring:
-  profiles:
-    active: local
-  application:
-    name: tuoheng-telecomumale-admin
-  main:
-    allow-bean-definition-overriding: true
-
-#eureka:
-#  instance:
-#    prefer-ip-address: true #以IP地址注册到服务中心
-#    #instance-id: http://192.168.1.4:8110 #服务中心的信息显示（如果IP地址不显示的话，进行配置）
-#  client:
-#    serviceUrl:
-#      defaultZone: http://localhost:9010/eureka/
-
-# MyBatis
-mybatis-plus:
-  mapper-locations: classpath*:mapper/*Mapper.xml
-  # 实体扫描，多个package用逗号或者分号分隔
-  type-aliases-package: com.tuoheng.**.**.mapper
-  configuration:
-    # 开启驼峰命名法
-    map-underscore-to-camel-case: true
-    use-generated-keys: true
-    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-### 认证配置
-#security:
-#  oauth2:
-#    resource:
-#      loadBalanced: true
-#      user-info-uri: http://tuoheng-auth/oauth/user
-#      token-info-uri: http://tuoheng-auth/oauth/check_token
-#    client:
-#      client-id: tuoheng
-#      client-secret: 123456
-#      access-token-uri: http://tuoheng-auth/oauth/token
-#      grant-type: client_credentials,password
-#      scope: server