Эх сурвалжийг харах

配置文件修改和去掉阿里云oss

wangliang 3 жил өмнө
parent
commit
2b286ef7e7

+ 0 - 8
distributed-print/src/main/resources/application-36dev.properties

@@ -47,14 +47,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn

+ 0 - 8
distributed-print/src/main/resources/application-dev.properties

@@ -47,14 +47,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn

+ 0 - 8
distributed-print/src/main/resources/application-offline.properties

@@ -47,14 +47,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn

+ 0 - 8
distributed-print/src/main/resources/application-test.properties

@@ -47,14 +47,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn

+ 10 - 10
teachcloud-common/src/main/java/com/qmth/teachcloud/common/config/DictionaryConfig.java

@@ -48,16 +48,16 @@ public class DictionaryConfig {
         return new SmsDomain();
     }
 
-    /**
-     * 阿里云oss配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "aliyun.oss")
-    public AliYunOssDomain aliYunOssDomain() {
-        return new AliYunOssDomain();
-    }
+//    /**
+//     * 阿里云oss配置
+//     *
+//     * @return
+//     */
+//    @Bean
+//    @ConfigurationProperties(prefix = "aliyun.oss")
+//    public AliYunOssDomain aliYunOssDomain() {
+//        return new AliYunOssDomain();
+//    }
 
     /**
      * 机构用户中心配置

+ 74 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/AliYunOssDomain.java

@@ -0,0 +1,74 @@
+package com.qmth.teachcloud.common.domain;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 阿里云oss config
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/3/30
+ */
+public class AliYunOssDomain implements Serializable {
+
+    private String endpoint;
+
+    private String name;
+
+    private String accessKeyId;
+
+    private String accessKeySecret;
+
+    private String bucket;
+
+    private String url;
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getBucket() {
+        return bucket;
+    }
+
+    public void setBucket(String bucket) {
+        this.bucket = bucket;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}
+

+ 175 - 175
teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/OssUtil.java

@@ -1,175 +1,175 @@
-package com.qmth.teachcloud.common.util;
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.*;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.domain.AliYunOssDomain;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Description: oss工具
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/4
- */
-@Component
-public class OssUtil {
-    private final static Logger log = LoggerFactory.getLogger(OssUtil.class);
-
-    AliYunOssDomain aliYunOssDomain;
-
-    OSS ossClient;
-
-    @Bean
-    public AliYunOssDomain ossDomain(AliYunOssDomain aliYunOssDomain) {
-        this.aliYunOssDomain = aliYunOssDomain;
-        this.ossClient = new OSSClientBuilder().build(this.aliYunOssDomain.getEndpoint(), this.aliYunOssDomain.getAccessKeyId(), this.aliYunOssDomain.getAccessKeySecret());
-        return this.aliYunOssDomain;
-    }
-
-    /**
-     * oss上传文件
-     *
-     * @param dirName
-     * @param inputStream
-     * @param md5
-     */
-    public void ossUpload(String dirName, InputStream inputStream, String md5) throws IOException {
-        log.info("ossUpload is come in");
-        ObjectMetadata meta = new ObjectMetadata();
-        if (Objects.nonNull(md5)) {
-            // 设置MD5校验。
-            meta.setContentMD5(md5);
-        }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream, meta);
-        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
-        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-    }
-
-    /**
-     * oss上传文件
-     *
-     * @param dirName
-     * @param file
-     * @param md5
-     */
-    public void ossUpload(String dirName, File file, String md5) {
-        log.info("ossUpload is come in");
-        ObjectMetadata meta = new ObjectMetadata();
-        if (Objects.nonNull(md5)) {
-            // 设置MD5校验。
-            meta.setContentMD5(md5);
-        }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, file);
-        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
-        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-    }
-
-    /**
-     * oss上传文件
-     *
-     * @param dirName
-     * @param content
-     */
-    public void ossUpload(String dirName, String content) {
-        log.info("ossUpload is come in");
-        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, new ByteArrayInputStream(content.getBytes()));
-        PutObjectResult por = ossClient.putObject(putObjectRequest);
-        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-    }
-
-    /**
-     * oss copy
-     *
-     * @param dirName
-     * @param dirNewName
-     */
-    public void ossCopy(String dirName, String dirNewName) {
-        log.info("ossCopy is come in");
-        CopyObjectResult result = ossClient.copyObject(this.aliYunOssDomain.getBucket(), dirName, this.aliYunOssDomain.getBucket(), dirNewName);
-        log.info("ETag:{},LastModified:{}", result.getETag(), result.getLastModified());
-    }
-
-    /**
-     * 从oss上下载文件到本地
-     *
-     * @param dirName
-     * @param localPath
-     * @throws IOException
-     */
-    public File ossDownload(String dirName, String localPath) throws IOException {
-        log.info("ossDownload is come in");
-        // 下载OSS文件到本地文件。如果指定的本地文件存在会覆盖,不存在则新建。
-        File localFile = new File(localPath);
-        if (!localFile.getParentFile().exists()) {
-            localFile.getParentFile().mkdirs();
-        }
-        ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), dirName), localFile);
-        return localFile;
-    }
-
-    /**
-     * 从oss上下载文件到byte[]
-     *
-     * @param objectName
-     * @throws IOException
-     */
-    public byte[] ossDownload(String objectName) throws IOException {
-        log.info("oss Download is come in");
-        OSSObject obj = ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), objectName));
-        byte[] data = IOUtils.toByteArray(obj.getObjectContent());
-        obj.close();
-        return data;
-    }
-
-    /**
-     * oss删除文件
-     *
-     * @param dirName
-     */
-    public void ossDelete(String dirName) {
-        ossClient.deleteObject(this.aliYunOssDomain.getBucket(), dirName);
-    }
-
-    /**
-     * oss批量删除文件
-     *
-     * @param paths
-     */
-    public void ossBatchDelete(List<String> paths) {
-        // 删除文件。key等同于ObjectName,表示删除OSS文件时需要指定包含文件后缀在内的完整路径,例如abc/efg/123.jpg。
-        DeleteObjectsResult deleteObjectsResult = ossClient.deleteObjects(new DeleteObjectsRequest(this.aliYunOssDomain.getBucket()).withKeys(paths));
-        deleteObjectsResult.getDeletedObjects();
-    }
-
-    /**
-     * 获取私有bucket文件访问url
-     *
-     * @param objectPath
-     * @return
-     */
-    public String getPrivateUrl(String objectPath) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        calendar.add(Calendar.MILLISECOND, SystemConstant.OSS_URL_EXPIRE);
-        GeneratePresignedUrlRequest generatePresignedUrlRequest;
-        generatePresignedUrlRequest = new GeneratePresignedUrlRequest(this.aliYunOssDomain.getBucket(), objectPath);
-        generatePresignedUrlRequest.setExpiration(calendar.getTime());
-        return ossClient.generatePresignedUrl(generatePresignedUrlRequest).toString();
-    }
-}
+//package com.qmth.teachcloud.common.util;
+//
+//import com.aliyun.oss.OSS;
+//import com.aliyun.oss.OSSClientBuilder;
+//import com.aliyun.oss.model.*;
+//import com.qmth.teachcloud.common.contant.SystemConstant;
+//import com.qmth.teachcloud.common.domain.AliYunOssDomain;
+//import org.apache.commons.io.IOUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.ByteArrayInputStream;
+//import java.io.File;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Objects;
+//
+///**
+// * @Description: oss工具
+// * @Param:
+// * @return:
+// * @Author: wangliang
+// * @Date: 2020/4/4
+// */
+//@Component
+//public class OssUtil {
+//    private final static Logger log = LoggerFactory.getLogger(OssUtil.class);
+//
+//    AliYunOssDomain aliYunOssDomain;
+//
+//    OSS ossClient;
+//
+//    @Bean
+//    public AliYunOssDomain ossDomain(AliYunOssDomain aliYunOssDomain) {
+//        this.aliYunOssDomain = aliYunOssDomain;
+//        this.ossClient = new OSSClientBuilder().build(this.aliYunOssDomain.getEndpoint(), this.aliYunOssDomain.getAccessKeyId(), this.aliYunOssDomain.getAccessKeySecret());
+//        return this.aliYunOssDomain;
+//    }
+//
+//    /**
+//     * oss上传文件
+//     *
+//     * @param dirName
+//     * @param inputStream
+//     * @param md5
+//     */
+//    public void ossUpload(String dirName, InputStream inputStream, String md5) throws IOException {
+//        log.info("ossUpload is come in");
+//        ObjectMetadata meta = new ObjectMetadata();
+//        if (Objects.nonNull(md5)) {
+//            // 设置MD5校验。
+//            meta.setContentMD5(md5);
+//        }
+//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream, meta);
+//        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
+//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
+//    }
+//
+//    /**
+//     * oss上传文件
+//     *
+//     * @param dirName
+//     * @param file
+//     * @param md5
+//     */
+//    public void ossUpload(String dirName, File file, String md5) {
+//        log.info("ossUpload is come in");
+//        ObjectMetadata meta = new ObjectMetadata();
+//        if (Objects.nonNull(md5)) {
+//            // 设置MD5校验。
+//            meta.setContentMD5(md5);
+//        }
+//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, file);
+//        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
+//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
+//    }
+//
+//    /**
+//     * oss上传文件
+//     *
+//     * @param dirName
+//     * @param content
+//     */
+//    public void ossUpload(String dirName, String content) {
+//        log.info("ossUpload is come in");
+//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, new ByteArrayInputStream(content.getBytes()));
+//        PutObjectResult por = ossClient.putObject(putObjectRequest);
+//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
+//    }
+//
+//    /**
+//     * oss copy
+//     *
+//     * @param dirName
+//     * @param dirNewName
+//     */
+//    public void ossCopy(String dirName, String dirNewName) {
+//        log.info("ossCopy is come in");
+//        CopyObjectResult result = ossClient.copyObject(this.aliYunOssDomain.getBucket(), dirName, this.aliYunOssDomain.getBucket(), dirNewName);
+//        log.info("ETag:{},LastModified:{}", result.getETag(), result.getLastModified());
+//    }
+//
+//    /**
+//     * 从oss上下载文件到本地
+//     *
+//     * @param dirName
+//     * @param localPath
+//     * @throws IOException
+//     */
+//    public File ossDownload(String dirName, String localPath) throws IOException {
+//        log.info("ossDownload is come in");
+//        // 下载OSS文件到本地文件。如果指定的本地文件存在会覆盖,不存在则新建。
+//        File localFile = new File(localPath);
+//        if (!localFile.getParentFile().exists()) {
+//            localFile.getParentFile().mkdirs();
+//        }
+//        ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), dirName), localFile);
+//        return localFile;
+//    }
+//
+//    /**
+//     * 从oss上下载文件到byte[]
+//     *
+//     * @param objectName
+//     * @throws IOException
+//     */
+//    public byte[] ossDownload(String objectName) throws IOException {
+//        log.info("oss Download is come in");
+//        OSSObject obj = ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), objectName));
+//        byte[] data = IOUtils.toByteArray(obj.getObjectContent());
+//        obj.close();
+//        return data;
+//    }
+//
+//    /**
+//     * oss删除文件
+//     *
+//     * @param dirName
+//     */
+//    public void ossDelete(String dirName) {
+//        ossClient.deleteObject(this.aliYunOssDomain.getBucket(), dirName);
+//    }
+//
+//    /**
+//     * oss批量删除文件
+//     *
+//     * @param paths
+//     */
+//    public void ossBatchDelete(List<String> paths) {
+//        // 删除文件。key等同于ObjectName,表示删除OSS文件时需要指定包含文件后缀在内的完整路径,例如abc/efg/123.jpg。
+//        DeleteObjectsResult deleteObjectsResult = ossClient.deleteObjects(new DeleteObjectsRequest(this.aliYunOssDomain.getBucket()).withKeys(paths));
+//        deleteObjectsResult.getDeletedObjects();
+//    }
+//
+//    /**
+//     * 获取私有bucket文件访问url
+//     *
+//     * @param objectPath
+//     * @return
+//     */
+//    public String getPrivateUrl(String objectPath) {
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTime(new Date());
+//        calendar.add(Calendar.MILLISECOND, SystemConstant.OSS_URL_EXPIRE);
+//        GeneratePresignedUrlRequest generatePresignedUrlRequest;
+//        generatePresignedUrlRequest = new GeneratePresignedUrlRequest(this.aliYunOssDomain.getBucket(), objectPath);
+//        generatePresignedUrlRequest.setExpiration(calendar.getTime());
+//        return ossClient.generatePresignedUrl(generatePresignedUrlRequest).toString();
+//    }
+//}

+ 1 - 46
teachcloud-report/src/main/resources/application-36dev.properties

@@ -28,14 +28,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
@@ -146,41 +138,4 @@ print.open.examStudentScore=/api/admin/print/open/exam_student_score
 
 com.qmth.solar.access-key=0bf05ef4857b4fb58b6cd480b7f0dcd0
 com.qmth.solar.access-secret=28yvjWPtLqIQPgxS2UWZPAF8McwMteaZ
-#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
-
-#============================================================================
-# \u914D\u7F6EJobStore
-#============================================================================
-spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=never
-# JobDataMaps\u662F\u5426\u90FD\u4E3AString\u7C7B\u578B\uFF0C\u9ED8\u8BA4false
-spring.quartz.properties.org.quartz.jobStore.useProperties=false
-# \u8868\u7684\u524D\u7F00\uFF0C\u9ED8\u8BA4QRTZ_
-spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_
-# \u662F\u5426\u52A0\u5165\u96C6\u7FA4
-spring.quartz.properties.org.quartz.jobStore.isClustered=true
-# \u8C03\u5EA6\u5B9E\u4F8B\u5931\u6548\u7684\u68C0\u67E5\u65F6\u95F4\u95F4\u9694 ms
-spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=5000
-# \u5F53\u8BBE\u7F6E\u4E3A\u201Ctrue\u201D\u65F6\uFF0C\u6B64\u5C5E\u6027\u544A\u8BC9Quartz \u5728\u975E\u6258\u7BA1JDBC\u8FDE\u63A5\u4E0A\u8C03\u7528setTransactionIsolation\uFF08Connection.TRANSACTION_READ_COMMITTED\uFF09\u3002
-spring.quartz.properties.org.quartz.jobStore.txIsolationLevelReadCommitted=true
-# \u6570\u636E\u4FDD\u5B58\u65B9\u5F0F\u4E3A\u6570\u636E\u5E93\u6301\u4E45\u5316
-spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
-# \u6570\u636E\u5E93\u4EE3\u7406\u7C7B\uFF0C\u4E00\u822Corg.quartz.impl.jdbcjobstore.StdJDBCDelegate\u53EF\u4EE5\u6EE1\u8DB3\u5927\u90E8\u5206\u6570\u636E\u5E93
-spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#============================================================================
-# Scheduler \u8C03\u5EA6\u5668\u5C5E\u6027\u914D\u7F6E
-#============================================================================
-# \u8C03\u5EA6\u6807\u8BC6\u540D \u96C6\u7FA4\u4E2D\u6BCF\u4E00\u4E2A\u5B9E\u4F8B\u90FD\u5FC5\u987B\u4F7F\u7528\u76F8\u540C\u7684\u540D\u79F0
-spring.quartz.properties.org.quartz.scheduler.instanceName=ClusterQuartz
-# ID\u8BBE\u7F6E\u4E3A\u81EA\u52A8\u83B7\u53D6 \u6BCF\u4E00\u4E2A\u5FC5\u987B\u4E0D\u540C
-spring.quartz.properties.org.quartz.scheduler.instanceId=AUTO
-
-#============================================================================
-# \u914D\u7F6EThreadPool
-#============================================================================
-# \u7EBF\u7A0B\u6C60\u7684\u5B9E\u73B0\u7C7B\uFF08\u4E00\u822C\u4F7F\u7528SimpleThreadPool\u5373\u53EF\u6EE1\u8DB3\u51E0\u4E4E\u6240\u6709\u7528\u6237\u7684\u9700\u6C42\uFF09
-spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-# \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
-spring.quartz.properties.org.quartz.threadPool.threadCount=10
-# \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic

+ 1 - 46
teachcloud-report/src/main/resources/application-dev.properties

@@ -28,14 +28,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
@@ -147,41 +139,4 @@ print.open.examStudentScore=/api/admin/print/open/exam_student_score
 
 com.qmth.solar.access-key=0bf05ef4857b4fb58b6cd480b7f0dcd0
 com.qmth.solar.access-secret=28yvjWPtLqIQPgxS2UWZPAF8McwMteaZ
-#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
-
-#============================================================================
-# \u914D\u7F6EJobStore
-#============================================================================
-spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=never
-# JobDataMaps\u662F\u5426\u90FD\u4E3AString\u7C7B\u578B\uFF0C\u9ED8\u8BA4false
-spring.quartz.properties.org.quartz.jobStore.useProperties=false
-# \u8868\u7684\u524D\u7F00\uFF0C\u9ED8\u8BA4QRTZ_
-spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_
-# \u662F\u5426\u52A0\u5165\u96C6\u7FA4
-spring.quartz.properties.org.quartz.jobStore.isClustered=true
-# \u8C03\u5EA6\u5B9E\u4F8B\u5931\u6548\u7684\u68C0\u67E5\u65F6\u95F4\u95F4\u9694 ms
-spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=5000
-# \u5F53\u8BBE\u7F6E\u4E3A\u201Ctrue\u201D\u65F6\uFF0C\u6B64\u5C5E\u6027\u544A\u8BC9Quartz \u5728\u975E\u6258\u7BA1JDBC\u8FDE\u63A5\u4E0A\u8C03\u7528setTransactionIsolation\uFF08Connection.TRANSACTION_READ_COMMITTED\uFF09\u3002
-spring.quartz.properties.org.quartz.jobStore.txIsolationLevelReadCommitted=true
-# \u6570\u636E\u4FDD\u5B58\u65B9\u5F0F\u4E3A\u6570\u636E\u5E93\u6301\u4E45\u5316
-spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
-# \u6570\u636E\u5E93\u4EE3\u7406\u7C7B\uFF0C\u4E00\u822Corg.quartz.impl.jdbcjobstore.StdJDBCDelegate\u53EF\u4EE5\u6EE1\u8DB3\u5927\u90E8\u5206\u6570\u636E\u5E93
-spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#============================================================================
-# Scheduler \u8C03\u5EA6\u5668\u5C5E\u6027\u914D\u7F6E
-#============================================================================
-# \u8C03\u5EA6\u6807\u8BC6\u540D \u96C6\u7FA4\u4E2D\u6BCF\u4E00\u4E2A\u5B9E\u4F8B\u90FD\u5FC5\u987B\u4F7F\u7528\u76F8\u540C\u7684\u540D\u79F0
-spring.quartz.properties.org.quartz.scheduler.instanceName=ClusterQuartz
-# ID\u8BBE\u7F6E\u4E3A\u81EA\u52A8\u83B7\u53D6 \u6BCF\u4E00\u4E2A\u5FC5\u987B\u4E0D\u540C
-spring.quartz.properties.org.quartz.scheduler.instanceId=AUTO
-
-#============================================================================
-# \u914D\u7F6EThreadPool
-#============================================================================
-# \u7EBF\u7A0B\u6C60\u7684\u5B9E\u73B0\u7C7B\uFF08\u4E00\u822C\u4F7F\u7528SimpleThreadPool\u5373\u53EF\u6EE1\u8DB3\u51E0\u4E4E\u6240\u6709\u7528\u6237\u7684\u9700\u6C42\uFF09
-spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-# \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
-spring.quartz.properties.org.quartz.threadPool.threadCount=10
-# \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic

+ 0 - 45
teachcloud-report/src/main/resources/application-offline.properties

@@ -28,14 +28,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
@@ -147,40 +139,3 @@ print.open.examStudentScore=/api/admin/print/open/exam_student_score
 #com.qmth.solar.access-key=0bf05ef4857b4fb58b6cd480b7f0dcd0
 #com.qmth.solar.access-secret=28yvjWPtLqIQPgxS2UWZPAF8McwMteaZ
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
-
-#============================================================================
-# \u914D\u7F6EJobStore
-#============================================================================
-spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=never
-# JobDataMaps\u662F\u5426\u90FD\u4E3AString\u7C7B\u578B\uFF0C\u9ED8\u8BA4false
-spring.quartz.properties.org.quartz.jobStore.useProperties=false
-# \u8868\u7684\u524D\u7F00\uFF0C\u9ED8\u8BA4QRTZ_
-spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_
-# \u662F\u5426\u52A0\u5165\u96C6\u7FA4
-spring.quartz.properties.org.quartz.jobStore.isClustered=true
-# \u8C03\u5EA6\u5B9E\u4F8B\u5931\u6548\u7684\u68C0\u67E5\u65F6\u95F4\u95F4\u9694 ms
-spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=5000
-# \u5F53\u8BBE\u7F6E\u4E3A\u201Ctrue\u201D\u65F6\uFF0C\u6B64\u5C5E\u6027\u544A\u8BC9Quartz \u5728\u975E\u6258\u7BA1JDBC\u8FDE\u63A5\u4E0A\u8C03\u7528setTransactionIsolation\uFF08Connection.TRANSACTION_READ_COMMITTED\uFF09\u3002
-spring.quartz.properties.org.quartz.jobStore.txIsolationLevelReadCommitted=true
-# \u6570\u636E\u4FDD\u5B58\u65B9\u5F0F\u4E3A\u6570\u636E\u5E93\u6301\u4E45\u5316
-spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
-# \u6570\u636E\u5E93\u4EE3\u7406\u7C7B\uFF0C\u4E00\u822Corg.quartz.impl.jdbcjobstore.StdJDBCDelegate\u53EF\u4EE5\u6EE1\u8DB3\u5927\u90E8\u5206\u6570\u636E\u5E93
-spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#============================================================================
-# Scheduler \u8C03\u5EA6\u5668\u5C5E\u6027\u914D\u7F6E
-#============================================================================
-# \u8C03\u5EA6\u6807\u8BC6\u540D \u96C6\u7FA4\u4E2D\u6BCF\u4E00\u4E2A\u5B9E\u4F8B\u90FD\u5FC5\u987B\u4F7F\u7528\u76F8\u540C\u7684\u540D\u79F0
-spring.quartz.properties.org.quartz.scheduler.instanceName=ClusterQuartz
-# ID\u8BBE\u7F6E\u4E3A\u81EA\u52A8\u83B7\u53D6 \u6BCF\u4E00\u4E2A\u5FC5\u987B\u4E0D\u540C
-spring.quartz.properties.org.quartz.scheduler.instanceId=AUTO
-
-#============================================================================
-# \u914D\u7F6EThreadPool
-#============================================================================
-# \u7EBF\u7A0B\u6C60\u7684\u5B9E\u73B0\u7C7B\uFF08\u4E00\u822C\u4F7F\u7528SimpleThreadPool\u5373\u53EF\u6EE1\u8DB3\u51E0\u4E4E\u6240\u6709\u7528\u6237\u7684\u9700\u6C42\uFF09
-spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-# \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
-spring.quartz.properties.org.quartz.threadPool.threadCount=10
-# \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5

+ 1 - 46
teachcloud-report/src/main/resources/application-test.properties

@@ -28,14 +28,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
@@ -146,41 +138,4 @@ print.open.examStudentScore=/api/admin/print/open/exam_student_score
 
 com.qmth.solar.access-key=f3f7b13ccbf44035a7410ef997f50379
 com.qmth.solar.access-secret=oCI9O2PbmTy9wo55cgnZjBIOOdom4IZR
-#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
-
-#============================================================================
-# \u914D\u7F6EJobStore
-#============================================================================
-spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=never
-# JobDataMaps\u662F\u5426\u90FD\u4E3AString\u7C7B\u578B\uFF0C\u9ED8\u8BA4false
-spring.quartz.properties.org.quartz.jobStore.useProperties=false
-# \u8868\u7684\u524D\u7F00\uFF0C\u9ED8\u8BA4QRTZ_
-spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_
-# \u662F\u5426\u52A0\u5165\u96C6\u7FA4
-spring.quartz.properties.org.quartz.jobStore.isClustered=true
-# \u8C03\u5EA6\u5B9E\u4F8B\u5931\u6548\u7684\u68C0\u67E5\u65F6\u95F4\u95F4\u9694 ms
-spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=5000
-# \u5F53\u8BBE\u7F6E\u4E3A\u201Ctrue\u201D\u65F6\uFF0C\u6B64\u5C5E\u6027\u544A\u8BC9Quartz \u5728\u975E\u6258\u7BA1JDBC\u8FDE\u63A5\u4E0A\u8C03\u7528setTransactionIsolation\uFF08Connection.TRANSACTION_READ_COMMITTED\uFF09\u3002
-spring.quartz.properties.org.quartz.jobStore.txIsolationLevelReadCommitted=true
-# \u6570\u636E\u4FDD\u5B58\u65B9\u5F0F\u4E3A\u6570\u636E\u5E93\u6301\u4E45\u5316
-spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
-# \u6570\u636E\u5E93\u4EE3\u7406\u7C7B\uFF0C\u4E00\u822Corg.quartz.impl.jdbcjobstore.StdJDBCDelegate\u53EF\u4EE5\u6EE1\u8DB3\u5927\u90E8\u5206\u6570\u636E\u5E93
-spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#============================================================================
-# Scheduler \u8C03\u5EA6\u5668\u5C5E\u6027\u914D\u7F6E
-#============================================================================
-# \u8C03\u5EA6\u6807\u8BC6\u540D \u96C6\u7FA4\u4E2D\u6BCF\u4E00\u4E2A\u5B9E\u4F8B\u90FD\u5FC5\u987B\u4F7F\u7528\u76F8\u540C\u7684\u540D\u79F0
-spring.quartz.properties.org.quartz.scheduler.instanceName=ClusterQuartz
-# ID\u8BBE\u7F6E\u4E3A\u81EA\u52A8\u83B7\u53D6 \u6BCF\u4E00\u4E2A\u5FC5\u987B\u4E0D\u540C
-spring.quartz.properties.org.quartz.scheduler.instanceId=AUTO
-
-#============================================================================
-# \u914D\u7F6EThreadPool
-#============================================================================
-# \u7EBF\u7A0B\u6C60\u7684\u5B9E\u73B0\u7C7B\uFF08\u4E00\u822C\u4F7F\u7528SimpleThreadPool\u5373\u53EF\u6EE1\u8DB3\u51E0\u4E4E\u6240\u6709\u7528\u6237\u7684\u9700\u6C42\uFF09
-spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-# \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
-spring.quartz.properties.org.quartz.threadPool.threadCount=10
-# \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic

+ 0 - 8
teachcloud-task/src/main/resources/application-task.properties

@@ -48,14 +48,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn

+ 0 - 8
teachcloud-task/src/main/resources/application-task_36dev.properties

@@ -48,14 +48,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn

+ 0 - 8
teachcloud-task/src/main/resources/application-task_offline.properties

@@ -48,14 +48,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn

+ 0 - 8
teachcloud-task/src/main/resources/application-task_test.properties

@@ -48,14 +48,6 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#\u963F\u91CC\u4E91OSS\u914D\u7F6E
-aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.endpoint=http://${aliyun.oss.name}
-aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
-aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
-aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn