Merge branch 'release/v1.2.0' into 'master'

Release/v1.2.0

See merge request dcuc-tjdsj/coder-service!11

dcuc-coder-service/src/main/resources/application-base.yml

@@ -18,16 +18,6 @@ spring:
       # 设置文件上传大小，springboot默认的最大上传大小是1MB
       max-file-size: 150MB
       max-request-size: 150MB
-  cache:
-    type: redis
-    # 如果底层缓存管理器支持缓存名的话，可以在这里指定要创建的缓存名列表，用逗号分 隔。通常这会禁用运行时创建其他额外缓存的能力。
-    cache-names: defaultCache
-    redis:
-      time-to-live:
-        # spring.cache.redis.time-to-live[defaultCache1]=100000
-        defaultCache: 5000
-    # 多cacheManager支持 CacheManager(ex:ehCacheCacheManager,simpleCacheManager,redisCacheManager,caffeineCacheManager)
-    init-cache-managers: ehCacheCacheManager,simpleCacheManager
   redis:
     host: 127.0.0.1
     port: 6379
@@ -43,18 +33,6 @@ management:
       exposure:
         include: '*'
 duceap:
-  #通过配置duceap.datasource.dynamic.{dataSourceName}.{dataSourceProp}，将自动启用多数据源
-  #用apollo配置数据源方式
-  #  datasource:
-  #    dynamic:
-  #      dcuc:
-  #        url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-  #        username: dcuc
-  #        password: 123
-  #        driver-class-name: com.mysql.jdbc.driver-class-name
-  datasource:
-    dynamic:
-      enabled: false
   uploader:
     store:
       # 上传附件，支持如下存储策略：database、fileSystem、fastDfs ,默认datasource