fix
zhanglei
parent
fc44776a06
commit
e5fd58f8ec
46
pom.xml
46
pom.xml
|
|
@ -49,6 +49,9 @@
|
|||
<lombok.version>1.18.30</lombok.version>
|
||||
<jjb-saas-system-client.version>1.7.1.1-SNAPSHOT</jjb-saas-system-client.version>
|
||||
|
||||
<!-- Hutool（需 >=5.8，提供 ObjectUtil.defaultIfNull(Object, Supplier)） -->
|
||||
<hutool.version>5.8.25</hutool.version>
|
||||
|
||||
<!-- X File Storage闂佹寧绋戦悧鍡浰囩缓濂缂傚倷鑳堕崰宥囩博閹绢喖妫橀柛銉檮椤愪粙鎮楀☉娅亪宕戝澶嬫櫖?-->
|
||||
<x-file-storage.version>2.2.0</x-file-storage.version>
|
||||
|
||||
|
|
@ -61,11 +64,37 @@
|
|||
<groupId>com.jjb.saas</groupId>
|
||||
<artifactId>jjb-saas-system-client</artifactId>
|
||||
<version>${jjb-saas-system-client.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zcloud.gbscommon</groupId>
|
||||
<artifactId>zcloud_gbscommon</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- 全模块统一 Hutool 5.8+，避免传递依赖 5.7 导致 NoSuchMethodError -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
@ -111,6 +140,11 @@
|
|||
<artifactId>safety-eval-infrastructure</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.qinan</groupId>
|
||||
<artifactId>safety-cedu-service</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Dubbo -->
|
||||
<dependency>
|
||||
|
|
@ -233,6 +267,18 @@
|
|||
<artifactId>easyexcel</artifactId>
|
||||
<version>${easyexcel.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Hutool -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
|
|
|||
|
|
@ -43,13 +43,6 @@
|
|||
<artifactId>easyexcel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Hutool -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
<version>5.7.19</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JSR-303 校验 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
|
|||
|
|
@ -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<PaperQuestionRelMapper, PaperQuestionRelDO> implements PaperQuestionRelService {
|
||||
|
||||
@Autowired
|
||||
@Lazy
|
||||
private PaperService paperService;
|
||||
|
||||
@Autowired
|
||||
|
|
|
|||
|
|
@ -21,6 +21,11 @@
|
|||
<groupId>org.qinan</groupId>
|
||||
<artifactId>safety-eval-adapter</artifactId>
|
||||
</dependency>
|
||||
<!-- 继续教育 / 课程课件模块 -->
|
||||
<dependency>
|
||||
<groupId>org.qinan</groupId>
|
||||
<artifactId>safety-cedu-service</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-mysql</artifactId>
|
||||
|
|
@ -28,10 +33,30 @@
|
|||
<dependency>
|
||||
<groupId>com.jjb.saas</groupId>
|
||||
<artifactId>jjb-saas-gateway-starter</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.jjb.saas</groupId>
|
||||
<artifactId>jjb-saas-framework-web</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring Boot Starter -->
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue