diff --git a/pom.xml b/pom.xml index 9c58c8f3..fc214538 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,9 @@ 1.18.30 1.7.1.1-SNAPSHOT + + 5.8.25 + 2.2.0 @@ -61,11 +64,37 @@ com.jjb.saas jjb-saas-system-client ${jjb-saas-system-client.version} + + + cn.hutool + hutool-all + + + cn.hutool + hutool-core + + com.zcloud.gbscommon zcloud_gbscommon 1.0.0-SNAPSHOT + + + cn.hutool + hutool-all + + + cn.hutool + hutool-core + + + + + + cn.hutool + hutool-all + ${hutool.version} @@ -111,6 +140,11 @@ safety-eval-infrastructure ${project.version} + + org.qinan + safety-cedu-service + ${project.version} + @@ -233,6 +267,18 @@ easyexcel ${easyexcel.version} + + + + cn.hutool + hutool-core + ${hutool.version} + + + cn.hutool + hutool-all + ${hutool.version} + diff --git a/safety-cedu-service/pom.xml b/safety-cedu-service/pom.xml index d4e5e00e..9da2609a 100644 --- a/safety-cedu-service/pom.xml +++ b/safety-cedu-service/pom.xml @@ -43,13 +43,6 @@ easyexcel - - - cn.hutool - hutool-core - 5.7.19 - - org.springframework.boot diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java index 3bea1f9c..a27283c4 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java @@ -15,6 +15,7 @@ import org.qinan.cedu.service.PaperService; import org.qinan.cedu.service.QuestionOptionService; import org.qinan.cedu.service.QuestionService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -33,6 +34,7 @@ import java.util.stream.Collectors; public class PaperQuestionRelServiceImpl extends ServiceImpl implements PaperQuestionRelService { @Autowired + @Lazy private PaperService paperService; @Autowired diff --git a/safety-eval-start/pom.xml b/safety-eval-start/pom.xml index c0a07e53..f7654ab7 100644 --- a/safety-eval-start/pom.xml +++ b/safety-eval-start/pom.xml @@ -21,6 +21,11 @@ org.qinan safety-eval-adapter + + + org.qinan + safety-cedu-service + org.flywaydb flyway-mysql @@ -28,10 +33,30 @@ com.jjb.saas jjb-saas-gateway-starter + + + cn.hutool + hutool-all + + + cn.hutool + hutool-core + + com.jjb.saas jjb-saas-framework-web + + + cn.hutool + hutool-all + + + cn.hutool + hutool-core + + diff --git a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java index fab96bab..5ac5a1e5 100644 --- a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java +++ b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java @@ -8,10 +8,11 @@ import org.springframework.boot.SpringApplication; * Safety eval service bootstrap. */ @JJBSpringbootApplication( - scanBasePackages = {"org.qinan.safetyeval", "com.jjb"}, + scanBasePackages = {"org.qinan.safetyeval", "org.qinan.cedu", "com.jjb"}, mapperPackages = { "org.qinan.safetyeval.infrastructure.mapper", - "org.qinan.safetyeval.infrastructure.persistence.mapper" + "org.qinan.safetyeval.infrastructure.persistence.mapper", + "org.qinan.cedu.mapper" } ) @Slf4j