配置项调整

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis</groupId>
     <artifactId>themis-service</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>pom</packaging>
 
     <modules>

themis-admin/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.admin</groupId>
     <artifactId>themis-admin</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

themis-admin/src/main/resources/application-dev.properties

@@ -151,10 +151,6 @@ sys.config.datacenterId=1
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe
 sys.config.serverUpload=/Users/king/git/themis-files/
-#\u7F51\u5173accessKey\u548Csecret,\u6D4B\u8BD5\u7528
-#sys.config.gatewayAccessKey=LTAI4FhEmrrhh27vzPGh25xe
-#sys.config.gatewayAccessSecret=lgnWDUMRAhWBIn4bvAEg2ZC9ECB0Of
-#sys.config.deviceId=1
 sys.config.fileHost=localhost:6001
 sys.config.serverHost=localhost:6001
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png

themis-admin/src/main/resources/application-test.properties

@@ -153,10 +153,6 @@ sys.config.datacenterId=1
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe
 sys.config.serverUpload=/project/project/themis/tomcat/themis-files/
-#\u7F51\u5173accessKey\u548Csecret,\u6D4B\u8BD5\u7528
-#sys.config.gatewayAccessKey=LTAI4FhEmrrhh27vzPGh25xe
-#sys.config.gatewayAccessSecret=lgnWDUMRAhWBIn4bvAEg2ZC9ECB0Of
-#sys.config.deviceId=1
 sys.config.fileHost=192.168.10.136:8001
 sys.config.serverHost=192.168.10.136:8001
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png

themis-business/pom.xml

@@ -5,13 +5,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.qmth.themis.business</groupId>
 	<artifactId>themis-business</artifactId>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.qmth.themis</groupId>
 		<artifactId>themis-service</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<dependencies>

themis-business/src/main/java/com/qmth/themis/business/domain/SysDomain.java

@@ -28,11 +28,6 @@ public class SysDomain implements Serializable {
 
     private String adminLogoUrl;
 
-    /**
-     * 本地临时文件目录
-     */
-    private String tempDataDir;
-
     private Integer qrExpireTime;
 
     public SysDomain(){
@@ -46,7 +41,6 @@ public class SysDomain implements Serializable {
                      String fileHost,
                      String serverHost,
                      String adminLogoUrl,
-                     String tempDataDir,
                      Integer qrExpireTime){
         this.datacenterId = datacenterId;
         this.oss = oss;
@@ -55,7 +49,6 @@ public class SysDomain implements Serializable {
         this.fileHost = fileHost;
         this.serverHost = serverHost;
         this.adminLogoUrl = adminLogoUrl;
-        this.tempDataDir = tempDataDir;
         this.qrExpireTime = qrExpireTime;
     }
 
@@ -122,13 +115,4 @@ public class SysDomain implements Serializable {
     public void setServerUpload(String serverUpload) {
         this.serverUpload = serverUpload;
     }
-
-    public String getTempDataDir() {
-        return tempDataDir;
-    }
-
-    public void setTempDataDir(String tempDataDir) {
-        this.tempDataDir = tempDataDir;
-    }
-
 }

themis-business/src/main/java/com/qmth/themis/business/util/QrCodeUtil.java

@@ -28,7 +28,6 @@ public class QrCodeUtil {
                 sysDomain.getFileHost(),
                 sysDomain.getServerHost(),
                 sysDomain.getAdminLogoUrl(),
-                sysDomain.getTempDataDir(),
                 sysDomain.getQrExpireTime());
         return this.sysDomain;
     }

themis-common/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.common</groupId>
     <artifactId>themis-common</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

themis-exam/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.exam</groupId>
     <artifactId>themis-exam</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

themis-exam/src/main/resources/application-dev.properties

@@ -178,19 +178,11 @@ sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe
 sys.config.serverUpload=/Users/king/git/themis-files/
 #\u7F51\u5173accessKey\u548Csecret,\u6D4B\u8BD5\u7528
-#sys.config.gatewayAccessKey=LTAI4FhEmrrhh27vzPGh25xe
-#sys.config.gatewayAccessSecret=lgnWDUMRAhWBIn4bvAEg2ZC9ECB0Of
-#sys.config.deviceId=1
 sys.config.fileHost=localhost:6002
 sys.config.serverHost=localhost:6002
-sys.config.tempDataDir=/home/project/themis/exam/files/
 sys.config.qrExpireTime=30
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-#\u4E91\u9605\u5377\u540C\u6B65\u914D\u7F6E
-yun.mark.url=http://localhost:8081
-yun.mark.studentScoreApi=/api/exam/student/score
-
 #api\u524D\u7F00
 prefix.url.exam=api/oe
 prefix.url.mobile=api/mobile

themis-exam/src/main/resources/application-test.properties

@@ -197,10 +197,6 @@ sys.config.fileHost=192.168.10.136:8002
 sys.config.serverHost=192.168.10.136:8002
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-#\u4E91\u9605\u5377\u540C\u6B65\u914D\u7F6E
-yun.mark.url=http://localhost:8081
-yun.mark.studentScoreApi=/api/exam/student/score
-
 #api\u524D\u7F00
 prefix.url.exam=api/oe
 prefix.url.mobile=api/mobile

themis-mq/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.mq</groupId>
     <artifactId>themis-mq</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

themis-task/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.themis.task</groupId>
     <artifactId>themis-task</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.themis</groupId>
         <artifactId>themis-service</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

themis-task/src/main/resources/application-dev.properties

@@ -215,8 +215,4 @@ tencentyun.sdk.callbackTime=10m
 tencentyun.sdk.trtcQueryUrl=trtc.tencentcloudapi.com
 tencentyun.sdk.trtcRegion=ap-guangzhou
 
-monitor.config.prefix=oe_test
-
-#\u4E91\u9605\u5377\u540C\u6B65\u914D\u7F6E
-yun.mark.url=http://localhost:8081
-yun.mark.studentScoreApi=/api/exam/student/score
+monitor.config.prefix=oe_test

themis-task/src/main/resources/application-test.properties

@@ -230,8 +230,4 @@ tencentyun.sdk.callbackTime=1h
 tencentyun.sdk.trtcQueryUrl=trtc.tencentcloudapi.com
 tencentyun.sdk.trtcRegion=ap-guangzhou
 
-monitor.config.prefix=oe_test
-
-#\u4E91\u9605\u5377\u540C\u6B65\u914D\u7F6E
-yun.mark.url=http://localhost:8081
-yun.mark.studentScoreApi=/api/exam/student/score
+monitor.config.prefix=oe_test