wangliang 4 ani în urmă
părinte
comite
210a8538d0

+ 0 - 64
themis-task/src/main/java/com/qmth/themis/task/config/DictionaryConfig.java

@@ -1,64 +0,0 @@
-package com.qmth.themis.task.config;
-
-import com.qmth.themis.business.domain.AliYunOssDomain;
-import com.qmth.themis.business.domain.SysDomain;
-import com.qmth.themis.business.domain.TencentYunDomain;
-import com.qmth.themis.business.domain.WxappDomain;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: 数据字典
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-@Configuration
-public class DictionaryConfig {
-
-    /**
-     * 系统配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "sys.config", ignoreUnknownFields = false)
-    public SysDomain sysDomain() {
-        return new SysDomain();
-    }
-
-    /**
-     * 阿里云oss配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "aliyun.oss", ignoreUnknownFields = false)
-    public AliYunOssDomain aliYunOssDomain() {
-        return new AliYunOssDomain();
-    }
-
-    /**
-     * 腾讯云配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "tencentyun.sdk", ignoreUnknownFields = false)
-    public TencentYunDomain tencentYunDomain() {
-        return new TencentYunDomain();
-    }
-
-    /**
-     * 微信配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "wxapp.upload", ignoreUnknownFields = false)
-    public WxappDomain wxappDomain() {
-        return new WxappDomain();
-    }
-}

+ 0 - 3
themis-task/src/main/java/com/qmth/themis/task/listener/service/impl/MqTaskLogicServiceImpl.java

@@ -49,9 +49,6 @@ public class MqTaskLogicServiceImpl implements MqTaskLogicService {
     @Resource
     QuartzService quartzService;
 
-    @Resource
-    TEExamService teExamService;
-
     /**
      * mq最大重试次数逻辑
      *

+ 1 - 26
themis-task/src/main/resources/application.properties

@@ -93,26 +93,6 @@ spring.redis.jedis.timeout=180000
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
-#\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav
-sys.config.serverUpload=/Users/king/git/themis-files/
-spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.publicName=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.publicEndpoint=http://${aliyun.oss.publicName}
-aliyun.oss.publicAccessKeyId=LTAI4FnJ2pgV6aGceYcCkeEi
-aliyun.oss.publicAccessKeySecret=ktrMEVE7PfoxRPeJUPDFeygOIH4aU7
-aliyun.oss.publicBucket=qmth-test
-aliyun.oss.publicUrl=http://${aliyun.oss.publicBucket}.${aliyun.oss.publicName}
-
-aliyun.oss.privateName=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.privateEndpoint=http://${aliyun.oss.privateName}
-aliyun.oss.privateAccessKeyId=LTAI4FnJ2pgV6aGceYcCkeEi
-aliyun.oss.privateAccessKeySecret=ktrMEVE7PfoxRPeJUPDFeygOIH4aU7
-aliyun.oss.privateBucket=qmth-test
-aliyun.oss.privateUrl=http://${aliyun.oss.privateBucket}.${aliyun.oss.privateName}
 #============================================================================
 # \u914D\u7F6EJobStore
 #============================================================================
@@ -174,9 +154,4 @@ rocketmq.producer.secret-key=SK
 #\u542F\u7528\u6D88\u606F\u8F68\u8FF9\uFF0C\u9ED8\u8BA4\u503Ctrue
 rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
-#rocketmq.producer.customized-trace-topic=my-trace-topic
-
-#\u817E\u8BAF\u4E91\u914D\u7F6E
-tencentyun.sdk.appId=1400411036
-tencentyun.sdk.key=d78004c94473cb1cf78af33d333e18b731132e527e829e44e2ab133945243b11
-tencentyun.sdk.urls=https://live1.qmth.com.cn,https://live2.qmth.com.cn,https://live3.qmth.com.cn,https://live4.qmth.com.cn,https://live5.qmth.com.cn,https://live6.qmth.com.cn
+#rocketmq.producer.customized-trace-topic=my-trace-topic