新增开放接口properties配置

distributed-print/src/main/java/com/qmth/distributed/print/api/NotifyApiController.java

@@ -1,20 +1,23 @@
 package com.qmth.distributed.print.api;
 
-import com.alibaba.fastjson.JSONObject;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 /**
  * <p>
  * 回调接口前端控制器
@@ -27,13 +30,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.notify}")
 @Validated
+@Aac(auth = BOOL.FALSE)
 public class NotifyApiController {
     private final static Logger log = LoggerFactory.getLogger(NotifyApiController.class);
 
     @ApiOperation(value = "教研分析进度回调")
     @ApiResponses({@ApiResponse(code = 200, message = "教研分析进度回调", response = Object.class)})
     @RequestMapping(value = "/analysis/progress", method = RequestMethod.POST)
-    public Result analysisProgress(JSONObject jsonObject) {
-        return ResultUtil.ok(true);
+    public Result analysisProgress(@ApiParam(value = "接收教研分析回调数据", required = true) @RequestBody String result) throws UnsupportedEncodingException {
+        log.info("analysis_progress,result:{}", result);
+        String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
+        log.info("analysis_progress decodeJson:{}", decodeJson);
+        return ResultUtil.ok(System.currentTimeMillis());
     }
 }

distributed-print/src/main/resources/application-dev.properties

@@ -159,7 +159,7 @@ sync.config.markerSaveUrl=/api/exam/marker/save
 
 #com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
 #com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-com.qmth.solar.license=/Users/king/Downloads/tc-dev-wl.lic
+com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237v3.0.2/tc-dev-wl.lic
 
 sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
@@ -194,4 +194,6 @@ sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 sms.config.aliyunSMSAuditRejectCode=SMS_237206063
 # \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
 sms.config.aliyunSMSUploadStructureCode=SMS_237201068
-sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
+sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
+
+report.open.semesterApi=/api/report/open/semester_edit

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

@@ -104,4 +104,26 @@ public class DictionaryConfig {
     public FssPrivateDomain fssPrivateDomain() {
         return new FssPrivateDomain();
     }
+
+    /**
+     * 分布式印刷开放接口
+     *
+     * @return
+     */
+    @Bean
+    @ConfigurationProperties(prefix = "print.open", ignoreUnknownFields = false)
+    public PrintOpenDomain printOpenDomain() {
+        return new PrintOpenDomain();
+    }
+
+    /**
+     * 教研分析开放接口
+     *
+     * @return
+     */
+    @Bean
+    @ConfigurationProperties(prefix = "report.open", ignoreUnknownFields = false)
+    public ReportOpenDomain reportOpenDomain() {
+        return new ReportOpenDomain();
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/PrintOpenDomain.java

@@ -0,0 +1,23 @@
+package com.qmth.teachcloud.common.domain;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 分布式印刷开放接口
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/4/10
+ */
+public class PrintOpenDomain implements Serializable {
+
+    String callbackUrlApi;
+
+    public String getCallbackUrlApi() {
+        return callbackUrlApi;
+    }
+
+    public void setCallbackUrlApi(String callbackUrlApi) {
+        this.callbackUrlApi = callbackUrlApi;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/ReportOpenDomain.java

@@ -0,0 +1,23 @@
+package com.qmth.teachcloud.common.domain;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 分布式印刷开放接口
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/4/10
+ */
+public class ReportOpenDomain implements Serializable {
+
+    String semesterApi;
+
+    public String getSemesterApi() {
+        return semesterApi;
+    }
+
+    public void setSemesterApi(String semesterApi) {
+        this.semesterApi = semesterApi;
+    }
+}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/TeachcloudReportApplication.java

@@ -1,6 +1,8 @@
 package com.qmth.teachcloud.report;
 
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
+import com.qmth.teachcloud.common.base.CustomizedSqlInjector;
+import com.qmth.teachcloud.common.threadPool.MyThreadPool;
 import com.qmth.teachcloud.report.auth.TeachcloudReportAuthenticationService;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -8,6 +10,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -36,5 +40,17 @@ public class TeachcloudReportApplication {
             registration.setDefault(teachcloudReportAuthenticationService);
         };
     }
+
+    @Primary
+    @Bean
+    public TaskExecutor primaryTaskExecutor() {
+        return new MyThreadPool();
+    }
+
+    @Bean
+    public CustomizedSqlInjector customizedSqlInjector() {
+        return new CustomizedSqlInjector();
+    }
+
 }
 

teachcloud-report/src/main/resources/application-dev.properties

@@ -13,11 +13,10 @@ spring.application.name=teachcloud-report
 #db.host=192.168.10.136
 db.host=localhost
 db.port=3306
-db.name=teachcloud_report_test
+db.name=teachcloud-report-v3.0.2
 #db.name=teachcloud-report
 db.username=root
-db.password=88888888
-#db.password=123456789
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
@@ -140,6 +139,8 @@ sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 yun.mark.url=https://www.markingcloud.com
 yun.mark.studentScoreApi=/api/exam/student/score
 
-com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+print.open.callbackUrlApi=/admin/print/notify/analysis/progress
+
+#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 #com.qmth.solar.license=/Users/king/Downloads/tc-dev-wl.lic