Ver Fonte

去掉orgCenter

wangliang há 2 anos atrás
pai
commit
a44507310d

+ 2 - 3
distributed-print/src/main/resources/application-36dev.properties

@@ -70,9 +70,6 @@ sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
@@ -143,6 +140,7 @@ sync.config.groupSaveUrl=/api/exam/mark_group/save
 sync.config.groupCountUrl=/api/exam/mark_group/count
 sync.config.groupDeleteUrl=/api/exam/mark_group/delete
 sync.config.markerSaveUrl=/api/exam/marker/save
+sync.config.markLeaderSaveUrl=/api/exam/subject_header/save
 
 #com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
 #com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
@@ -190,6 +188,7 @@ report.open.examDeleteApi=/api/report/open/exam_delete
 report.open.courseEditApi=/api/report/open/course_edit
 report.open.courseDelApi=/api/report/open/course_del
 report.open.calculateApi=/api/report/open/calculate
+report.open.publishApi=/api/report/open/publish
 report.open.ssoLoginApi=/api/report/sso/login
 
 print.open.callbackPwd=123456

+ 1 - 4
distributed-print/src/main/resources/application-dev.properties

@@ -57,7 +57,7 @@ com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
 com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
@@ -70,9 +70,6 @@ sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

+ 1 - 4
distributed-print/src/main/resources/application-offline.properties

@@ -70,9 +70,6 @@ sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
@@ -194,4 +191,4 @@ report.open.calculateApi=/api/report/open/calculate
 report.open.publishApi=/api/report/open/publish
 report.open.ssoLoginApi=/api/report/sso/login
 
-print.open.callbackPwd=123456
+print.open.callbackPwd=123456

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

@@ -70,9 +70,6 @@ sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

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

@@ -59,18 +59,6 @@ public class DictionaryConfig {
 //        return new AliYunOssDomain();
 //    }
 
-    /**
-     * 机构用户中心配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "org.center", ignoreUnknownFields = false)
-    public OrgCenterDomain orgCenterDomain() {
-        return new OrgCenterDomain();
-    }
-
-
     /**
      * 云阅卷同步推送
      *

+ 0 - 34
teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/OrgCenterDomain.java

@@ -1,34 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-/**
- * @Description: 机构用户中心配置
- * @Author: CaoZixuan
- * @Date: 2021-04-02
- */
-public class OrgCenterDomain {
-    private static final long serialVersionUID = 7510626406622200443L;
-
-    private String url;
-
-    private String orgQueryApi;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getOrgQueryApi() {
-        return orgQueryApi;
-    }
-
-    public void setOrgQueryApi(String orgQueryApi) {
-        this.orgQueryApi = orgQueryApi;
-    }
-}

+ 0 - 3
teachcloud-report/src/main/resources/application-36dev.properties

@@ -47,9 +47,6 @@ sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.86:8057/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

+ 0 - 3
teachcloud-report/src/main/resources/application-dev.properties

@@ -47,9 +47,6 @@ sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://127.0.0.1:8057/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

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

@@ -47,9 +47,6 @@ sys.config.reportUrl=http://192.168.10.136/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.136/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

+ 0 - 3
teachcloud-report/src/main/resources/application-test.properties

@@ -47,9 +47,6 @@ sys.config.reportUrl=https://*.teachcloud-report-test.work/#/student-report/
 sys.config.loginAuthenUrl=https://*.teachcloud-report-test.work/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-org.center.url=https://solar.qmth.com.cn
-org.center.orgQueryApi=/api/open/org/query
-
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count

+ 1 - 1
teachcloud-task/src/main/resources/application-task.properties

@@ -58,7 +58,7 @@ com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
 com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200