From 72532b1a9825f48183b2e8dae3c6d143e1ad3cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=BB=B4=E7=82=B3?= Date: Fri, 18 Apr 2025 13:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=A8=A1?= =?UTF-8?q?=E5=9D=97exam=EF=BC=8Cjudgement=E5=B9=B6=E4=BF=AE=E6=94=B9pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9Erabbitmq=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exam-spring-boot-starter-mq/pom.xml | 2 +- exam-module-exam/exam-module-exam-api/pom.xml | 11 +- exam-module-exam/exam-module-exam-biz/pom.xml | 92 +++++++++++++--- .../exam/controller/admin/ExamController.java | 74 +------------ exam-module-exam/pom.xml | 4 +- .../convert/codegen/CodegenConvertImpl.java | 2 +- .../convert/config/ConfigConvertImpl.java | 2 +- .../convert/file/FileConfigConvertImpl.java | 2 +- .../infra/convert/redis/RedisConvertImpl.java | 2 +- .../exam-module-judgement-api/pom.xml | 11 +- .../exam-module-judgement-biz/pom.xml | 99 ++++++++++++++---- exam-module-judgement/pom.xml | 4 +- .../exam-module-system-biz/pom.xml | 6 ++ .../mq/consumer/sms/SmsSendConsumer.java | 2 + .../system/mq/message/sms/SmsSendMessage.java | 2 + .../system/mq/producer/sms/SmsProducer.java | 21 +++- .../mq/consumer/sms/SmsSendConsumer.class | Bin 1413 -> 1517 bytes .../mq/message/sms/SmsSendMessage.class | Bin 5014 -> 5078 bytes .../system/mq/producer/sms/SmsProducer.class | Bin 2201 -> 2343 bytes .../system/convert/auth/AuthConvertImpl.java | 2 +- .../convert/oauth2/OAuth2OpenConvertImpl.java | 2 +- .../convert/social/SocialUserConvertImpl.java | 2 +- .../convert/tenant/TenantConvertImpl.java | 2 +- .../system/convert/user/UserConvertImpl.java | 2 +- exam-server/pom.xml | 10 ++ .../src/main/resources/application-local.yaml | 6 +- .../target/classes/application-local.yaml | 6 +- 27 files changed, 235 insertions(+), 133 deletions(-) diff --git a/exam-framework/exam-spring-boot-starter-mq/pom.xml b/exam-framework/exam-spring-boot-starter-mq/pom.xml index 577a6c01..f7b69ba3 100644 --- a/exam-framework/exam-spring-boot-starter-mq/pom.xml +++ b/exam-framework/exam-spring-boot-starter-mq/pom.xml @@ -31,7 +31,7 @@ org.springframework.amqp spring-rabbit - true + org.apache.rocketmq diff --git a/exam-module-exam/exam-module-exam-api/pom.xml b/exam-module-exam/exam-module-exam-api/pom.xml index acf6e265..93457a91 100644 --- a/exam-module-exam/exam-module-exam-api/pom.xml +++ b/exam-module-exam/exam-module-exam-api/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + pc.exam.gg exam-module-exam - pc.exam ${revision} 4.0.0 @@ -18,9 +18,16 @@ - pc.exam + pc.exam.gg exam-common + + + + org.springframework.boot + spring-boot-starter-validation + true + diff --git a/exam-module-exam/exam-module-exam-biz/pom.xml b/exam-module-exam/exam-module-exam-biz/pom.xml index 5f06ac36..acd1d07e 100644 --- a/exam-module-exam/exam-module-exam-biz/pom.xml +++ b/exam-module-exam/exam-module-exam-biz/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + pc.exam.gg exam-module-exam - pc.exam ${revision} 4.0.0 @@ -17,48 +17,112 @@ - - org.springframework.boot - spring-boot-starter + pc.exam.gg + exam-module-system-api + ${revision} + + + pc.exam.gg + exam-module-infra-api + ${revision} - pc.exam - exam-module-exam-api - ${revision} + pc.exam.gg + exam-spring-boot-starter-biz-tenant - pc.exam - exam-spring-boot-starter-web + pc.exam.gg + exam-spring-boot-starter-security - pc.exam - exam-spring-boot-starter-security + pc.exam.gg + exam-spring-boot-starter-websocket - pc.exam + pc.exam.gg exam-spring-boot-starter-mybatis + + com.baomidou + mybatis-plus-generator + + + + pc.exam.gg + exam-spring-boot-starter-redis + + + + + + + pc.exam.gg + exam-spring-boot-starter-job + + + + + pc.exam.gg + exam-spring-boot-starter-mq + - pc.exam + pc.exam.gg exam-spring-boot-starter-test test + - pc.exam + pc.exam.gg exam-spring-boot-starter-excel + + + org.apache.velocity + velocity-engine-core + + + + + pc.exam.gg + exam-spring-boot-starter-monitor + + + + de.codecentric + spring-boot-admin-starter-server + + + + + commons-net + commons-net + + + com.jcraft + jsch + + + com.amazonaws + aws-java-sdk-s3 + + + + org.apache.tika + tika-core + + diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/ExamController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/ExamController.java index 88540a6a..04299bae 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/ExamController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/ExamController.java @@ -1,84 +1,14 @@ package pc.exam.pp.module.exam.controller.admin; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.validation.Valid; - -import pc.exam.pp.framework.common.pojo.CommonResult; -import pc.exam.pp.framework.common.pojo.PageResult; -import pc.exam.pp.module.exam.controller.admin.vo.ExamPageReqVO; -import pc.exam.pp.module.exam.dal.dataobject.ExamDO; -import pc.exam.pp.module.exam.service.ExamService; - -import static pc.exam.pp.framework.common.pojo.CommonResult.success; /** - * 管理后台 - 考试信息 + * 管理后台 - 授权信息 * * @author pengchen */ @RestController -@RequestMapping("/exam") +@RequestMapping("/exam/authorize") public class ExamController { - @Resource - private ExamService examService; - - /** - * 创建考试 - * - * @param createReqVO 创建信息 - * @return 考试编号 - */ - @PostMapping("/create") - public CommonResult createExam(@Valid @RequestBody ExamDO createReqVO) { - return success(examService.createExam(createReqVO)); - } - - /** - * 更新考试 - * - * @param updateReqVO 更新信息 - * @return 成功状态 - */ - @PutMapping("/update") - public CommonResult updateExam(@Valid @RequestBody ExamDO updateReqVO) { - examService.updateExam(updateReqVO); - return success(true); - } - - /** - * 删除考试 - * - * @param id 编号 - * @return 成功状态 - */ - @DeleteMapping("/delete") - public CommonResult deleteExam(@RequestParam("id") Long id) { - examService.deleteExam(id); - return success(true); - } - - /** - * 获得考试 - * - * @param id 编号 - * @return 考试 - */ - @GetMapping("/get") - public CommonResult getExam(@RequestParam("id") Long id) { - return success(examService.getExam(id)); - } - - /** - * 获得考试分页 - * - * @param pageVO 分页查询 - * @return 考试分页 - */ - @GetMapping("/page") - public CommonResult> getExamPage(@Valid ExamPageReqVO pageVO) { - return success(examService.getExamPage(pageVO)); - } - } diff --git a/exam-module-exam/pom.xml b/exam-module-exam/pom.xml index 4147d498..bb8eb385 100644 --- a/exam-module-exam/pom.xml +++ b/exam-module-exam/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pengchen-exam-java-new - pc.exam + pc.exam.gg + exam ${revision} 4.0.0 diff --git a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/codegen/CodegenConvertImpl.java b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/codegen/CodegenConvertImpl.java index e2740270..389803b4 100644 --- a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/codegen/CodegenConvertImpl.java +++ b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/codegen/CodegenConvertImpl.java @@ -12,7 +12,7 @@ import pc.exam.pp.module.infra.dal.dataobject.codegen.CodegenTableDO; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class CodegenConvertImpl implements CodegenConvert { diff --git a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/config/ConfigConvertImpl.java b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/config/ConfigConvertImpl.java index 21132bb8..2dbcb66f 100644 --- a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/config/ConfigConvertImpl.java +++ b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/config/ConfigConvertImpl.java @@ -10,7 +10,7 @@ import pc.exam.pp.module.infra.dal.dataobject.config.ConfigDO; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class ConfigConvertImpl implements ConfigConvert { diff --git a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/file/FileConfigConvertImpl.java b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/file/FileConfigConvertImpl.java index 79895aae..a6dd1fd7 100644 --- a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/file/FileConfigConvertImpl.java +++ b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/file/FileConfigConvertImpl.java @@ -6,7 +6,7 @@ import pc.exam.pp.module.infra.dal.dataobject.file.FileConfigDO; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class FileConfigConvertImpl implements FileConfigConvert { diff --git a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/redis/RedisConvertImpl.java b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/redis/RedisConvertImpl.java index 2b54283f..3f123f3f 100644 --- a/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/redis/RedisConvertImpl.java +++ b/exam-module-infra/exam-module-infra-biz/target/generated-sources/annotations/pc/exam/pp/module/infra/convert/redis/RedisConvertImpl.java @@ -4,7 +4,7 @@ import javax.annotation.processing.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class RedisConvertImpl implements RedisConvert { diff --git a/exam-module-judgement/exam-module-judgement-api/pom.xml b/exam-module-judgement/exam-module-judgement-api/pom.xml index d236ba13..f06af9c3 100644 --- a/exam-module-judgement/exam-module-judgement-api/pom.xml +++ b/exam-module-judgement/exam-module-judgement-api/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + pc.exam.gg exam-module-judgement - pc.exam ${revision} 4.0.0 @@ -18,9 +18,16 @@ - pc.exam + pc.exam.gg exam-common + + + + org.springframework.boot + spring-boot-starter-validation + true + diff --git a/exam-module-judgement/exam-module-judgement-biz/pom.xml b/exam-module-judgement/exam-module-judgement-biz/pom.xml index 1809c79f..a4164251 100644 --- a/exam-module-judgement/exam-module-judgement-biz/pom.xml +++ b/exam-module-judgement/exam-module-judgement-biz/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + pc.exam.gg exam-module-judgement - pc.exam ${revision} 4.0.0 @@ -17,55 +17,112 @@ - - org.springframework.boot - spring-boot-starter + pc.exam.gg + exam-module-system-api + ${revision} + + + pc.exam.gg + exam-module-infra-api + ${revision} - pc.exam - exam-module-judgement-api - ${revision} - - - - - pc.exam - exam-module-exam-api - ${revision} + pc.exam.gg + exam-spring-boot-starter-biz-tenant - pc.exam - exam-spring-boot-starter-web + pc.exam.gg + exam-spring-boot-starter-security - pc.exam - exam-spring-boot-starter-security + pc.exam.gg + exam-spring-boot-starter-websocket - pc.exam + pc.exam.gg exam-spring-boot-starter-mybatis + + com.baomidou + mybatis-plus-generator + + + + pc.exam.gg + exam-spring-boot-starter-redis + + + + + + + pc.exam.gg + exam-spring-boot-starter-job + + + + + pc.exam.gg + exam-spring-boot-starter-mq + - pc.exam + pc.exam.gg exam-spring-boot-starter-test test + - pc.exam + pc.exam.gg exam-spring-boot-starter-excel + + + org.apache.velocity + velocity-engine-core + + + + + pc.exam.gg + exam-spring-boot-starter-monitor + + + + de.codecentric + spring-boot-admin-starter-server + + + + + commons-net + commons-net + + + com.jcraft + jsch + + + com.amazonaws + aws-java-sdk-s3 + + + + org.apache.tika + tika-core + + diff --git a/exam-module-judgement/pom.xml b/exam-module-judgement/pom.xml index 77eeb80e..f4e1d551 100644 --- a/exam-module-judgement/pom.xml +++ b/exam-module-judgement/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pengchen-exam-java-new - pc.exam + pc.exam.gg + exam ${revision} 4.0.0 diff --git a/exam-module-system/exam-module-system-biz/pom.xml b/exam-module-system/exam-module-system-biz/pom.xml index 62407038..a0ad7617 100644 --- a/exam-module-system/exam-module-system-biz/pom.xml +++ b/exam-module-system/exam-module-system-biz/pom.xml @@ -29,6 +29,12 @@ ${revision} + + + pc.exam.gg + exam-spring-boot-starter-mq + + pc.exam.gg diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.java index 3c329d96..0be480c8 100644 --- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.java +++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.java @@ -1,5 +1,6 @@ package pc.exam.pp.module.system.mq.consumer.sms; +import org.springframework.amqp.rabbit.annotation.RabbitListener; import pc.exam.pp.module.system.mq.message.sms.SmsSendMessage; import pc.exam.pp.module.system.service.sms.SmsSendService; import lombok.extern.slf4j.Slf4j; @@ -15,6 +16,7 @@ import jakarta.annotation.Resource; * @author zzf */ @Component +@RabbitListener(queues = SmsSendMessage.QUEUE) @Slf4j public class SmsSendConsumer { diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/message/sms/SmsSendMessage.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/message/sms/SmsSendMessage.java index ea0ad85c..1c37fed6 100644 --- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/message/sms/SmsSendMessage.java +++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/message/sms/SmsSendMessage.java @@ -14,6 +14,8 @@ import java.util.List; @Data public class SmsSendMessage { + public static final String QUEUE = "SEND_MESSAGE_QUEUE"; // 重点:需要增加消息对应的 Queue + /** * 短信日志编号 */ diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/producer/sms/SmsProducer.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/producer/sms/SmsProducer.java index 7adbaf44..c3095fc7 100644 --- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/producer/sms/SmsProducer.java +++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/mq/producer/sms/SmsProducer.java @@ -1,5 +1,6 @@ package pc.exam.pp.module.system.mq.producer.sms; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import pc.exam.pp.framework.common.core.KeyValue; import pc.exam.pp.module.system.mq.message.sms.SmsSendMessage; import lombok.extern.slf4j.Slf4j; @@ -21,7 +22,23 @@ public class SmsProducer { @Resource private ApplicationContext applicationContext; - + @Resource + private RabbitTemplate rabbitTemplate; // 重点:注入 RabbitTemplate 对象 + /** + * 发送 {@link SmsSendMessage} 消息 + * + * @param logId 短信日志编号 + * @param mobile 手机号 + * @param channelId 渠道编号 + * @param apiTemplateId 短信模板编号 + * @param templateParams 短信模板参数 + */ +// public void sendSmsSendMessage(Long logId, String mobile, +// Long channelId, String apiTemplateId, List> templateParams) { +// SmsSendMessage message = new SmsSendMessage().setLogId(logId).setMobile(mobile); +// message.setChannelId(channelId).setApiTemplateId(apiTemplateId).setTemplateParams(templateParams); +// applicationContext.publishEvent(message); +// } /** * 发送 {@link SmsSendMessage} 消息 * @@ -35,7 +52,7 @@ public class SmsProducer { Long channelId, String apiTemplateId, List> templateParams) { SmsSendMessage message = new SmsSendMessage().setLogId(logId).setMobile(mobile); message.setChannelId(channelId).setApiTemplateId(apiTemplateId).setTemplateParams(templateParams); - applicationContext.publishEvent(message); + rabbitTemplate.convertAndSend(SmsSendMessage.QUEUE, message); // 重点:使用 RabbitTemplate 发送消息 } } diff --git a/exam-module-system/exam-module-system-biz/target/classes/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.class b/exam-module-system/exam-module-system-biz/target/classes/pc/exam/pp/module/system/mq/consumer/sms/SmsSendConsumer.class index 1291dca23748adf298fe2ce226341074a65de022..9ef3c8483c05ef9b8c816a040fefc0edfce31034 100644 GIT binary patch delta 172 zcmZqWe#^~u>ff$?3=9mm4AvXDyjWrw8LWNsi_-Or3yL!H($k6(b5qOni?a0-a|;Xf zixQKPGE4Lm^YZdb5=%1k^YnwjB0ibLC8>F-Mb?ZAY=xz%rK!b?3_`)KelGF8uED{M z?ym8Hp{}8>lS5eI7)2*ff$?3=9mm3>F)?yjUi0V2NWCp3Kkc%PGyk%^<@d${;&Al{Hmdh=Ga0 V6sV4g!Hhv2NV738GMF%8dpIMRB#gIT=&q@y4i{%=%5u+J4LaTMBOD zjth6a*o}MIclS5xfi_u?a*Ru;)OHkZ$mrojg(h`h;$HQa0QRjs}%y@FP5B8?WSa|@kAOM#(zUo>1m6?M~VNKaTM3&1xAjv~zXT`1cr}5+c|r_EFbzCHBbGpWymHVM88N zvLdJk+YC@91~P%n?6AFehR)54I}nn_!hBjrGKsE3`|ed!JD z$tR_HiG6xaI!syaL_E9ym$$SvzhAFTh-m{{MsFi0s{}V4|UOu%HFjV?_3MRWQ-;Iha^1j;t3a;b6{_{?dV!bEZ$kDdtS? zb{A))EsqZqub1Yu={1#DpUvh^|GZ^zCOH1UT&^^8=tF|gV$2}PVX|Q}rf`NfJF4*> z{ZtM_F^K^xF>udumdc4CT*f&n7p^14UjlBt;+Nn&RRP}c+j9YlQYiS$iM&Xo2Vb!c zm#DlL)OrFf8;pMFGbPG_3gZORfzUF|^?&r)P>frgz<96l64jAAr21kp5yYqsL*lxzg zk)Wep^e3Z-mLw?fQ1|L%zG!wg_dVPLg6QMZZ)gR3u$QZS*01~dEnx#TigVP>T!}ME z;|HkkC}iY7k+PsBY_>qz<)nax^oSNr2L8YJ{PjQmUgGo$aluE@lWH3fmffpRRaVjrfa>`F39fO9CoXFGM z^x-qsFf`5koY7x}de>Y1ka8r-jkVSdmO{}I&Gmou*--Q?ZeYQN954x6uvLt)K3w%W zNGR2~TrQT{%&5Tx4(|C<_lB)5R(Y}VLQ;{~8PJ?|6rQi?D zlV9Mo3L-xE0n(4?mz1tE2}1MK1N-cK*4}He&OVP_7}1A6clQ7muy+}Kp*Fj{^1;DL zW6!PBzmyxUf>fdA9b4b(-bwZNlUJ^|-)r7yt6ce7w_2mtVa;=`;y<*x2!<6Hj=i;7 z+O!=fo3~55`}V#a#VB5B7}F6)Lcw&WcKScW6?7lgs;92k$X1UWw|b;tEbdQ*d;MP_ z{b}N36yuoCkknzq@_(zv@RW`>nD*0R$B(PI>of6FtO@i>5DI4a{V;QiS;bq-vQD?L zcLDYigB_UQI~1@o{-X9gIoF;CdN9vgXCItcz#_APB`iZA!}Y)i>1i_m|xgqKeU=8au zyFs*N%tR%R0-KwJdO}nLwLldh$H+6b7%H|A!A|R=e9JY+(`5|Y;`KEqrF|u^FE@|RHTCQ~MM7V{%})TUsMbRR(rv18cNoJ+T1eR#L0Uk&-%9rg z*f;klm*=-Xr4I_fx(w=sc9_d-=0()Xxp68%Piz!aYe z&`;A#3}T4!Ok10!SIqrh#T>IdGePgqzCzR)NX+vz0H7BOJndEi7O})kU>PffnC2H& zTlD(FjRjM+zQ8*Y5{9BYiUS|xBqB&5!N1HQ?GY=jt~QbV+{>ExipDxNNHy9fHRVMG zYKEjy#1@B-AdV8soN}9LYd(#uA}YMxp%nF#2(my5P@olQyEKVC1hL;)fLV|Ex}5kM XG7V@mzWBEUhb;%xBn~@!JOcgzR-Z63 diff --git a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/auth/AuthConvertImpl.java b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/auth/AuthConvertImpl.java index 8e7a2376..0046b3c6 100644 --- a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/auth/AuthConvertImpl.java +++ b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/auth/AuthConvertImpl.java @@ -14,7 +14,7 @@ import pc.exam.pp.module.system.dal.dataobject.permission.MenuDO; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class AuthConvertImpl implements AuthConvert { diff --git a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/oauth2/OAuth2OpenConvertImpl.java b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/oauth2/OAuth2OpenConvertImpl.java index 86fdc692..2cc4688f 100644 --- a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/oauth2/OAuth2OpenConvertImpl.java +++ b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/oauth2/OAuth2OpenConvertImpl.java @@ -4,7 +4,7 @@ import javax.annotation.processing.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class OAuth2OpenConvertImpl implements OAuth2OpenConvert { diff --git a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/social/SocialUserConvertImpl.java b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/social/SocialUserConvertImpl.java index 59c3f367..b7abe53e 100644 --- a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/social/SocialUserConvertImpl.java +++ b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/social/SocialUserConvertImpl.java @@ -6,7 +6,7 @@ import pc.exam.pp.module.system.controller.admin.socail.vo.user.SocialUserBindRe @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class SocialUserConvertImpl implements SocialUserConvert { diff --git a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/tenant/TenantConvertImpl.java b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/tenant/TenantConvertImpl.java index 3f4e66fb..56b738f7 100644 --- a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/tenant/TenantConvertImpl.java +++ b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/tenant/TenantConvertImpl.java @@ -4,7 +4,7 @@ import javax.annotation.processing.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class TenantConvertImpl implements TenantConvert { diff --git a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/user/UserConvertImpl.java b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/user/UserConvertImpl.java index 4d1858a1..e24009cd 100644 --- a/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/user/UserConvertImpl.java +++ b/exam-module-system/exam-module-system-biz/target/generated-sources/annotations/pc/exam/pp/module/system/convert/user/UserConvertImpl.java @@ -4,7 +4,7 @@ import javax.annotation.processing.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-04-17T13:07:54+0800", + date = "2025-04-18T13:31:34+0800", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.13 (Oracle Corporation)" ) public class UserConvertImpl implements UserConvert { diff --git a/exam-server/pom.xml b/exam-server/pom.xml index e82ef306..df3d3343 100644 --- a/exam-server/pom.xml +++ b/exam-server/pom.xml @@ -31,6 +31,16 @@ exam-module-infra-biz ${revision} + + pc.exam.gg + exam-module-exam-biz + ${revision} + + + pc.exam.gg + exam-module-judgement-biz + ${revision} + diff --git a/exam-server/src/main/resources/application-local.yaml b/exam-server/src/main/resources/application-local.yaml index 660924f1..6d5ba78d 100644 --- a/exam-server/src/main/resources/application-local.yaml +++ b/exam-server/src/main/resources/application-local.yaml @@ -13,7 +13,7 @@ spring: - org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusVectorStoreAutoConfiguration # 禁用 AI 模块的 Milvus,手动创建 # 数据源配置项 datasource: - druid: # Druid 【监控】相关的全局配置 + druid: # Druid 【监控】相关的全局配置f web-stat-filter: enabled: true stat-view-servlet: @@ -126,8 +126,8 @@ spring: rabbitmq: host: 127.0.0.1 # RabbitMQ 服务的地址 port: 5672 # RabbitMQ 服务的端口 - username: rabbit # RabbitMQ 服务的账号 - password: rabbit # RabbitMQ 服务的密码 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 # Kafka 配置项,对应 KafkaProperties 配置类 kafka: bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔 diff --git a/exam-server/target/classes/application-local.yaml b/exam-server/target/classes/application-local.yaml index 660924f1..6d5ba78d 100644 --- a/exam-server/target/classes/application-local.yaml +++ b/exam-server/target/classes/application-local.yaml @@ -13,7 +13,7 @@ spring: - org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusVectorStoreAutoConfiguration # 禁用 AI 模块的 Milvus,手动创建 # 数据源配置项 datasource: - druid: # Druid 【监控】相关的全局配置 + druid: # Druid 【监控】相关的全局配置f web-stat-filter: enabled: true stat-view-servlet: @@ -126,8 +126,8 @@ spring: rabbitmq: host: 127.0.0.1 # RabbitMQ 服务的地址 port: 5672 # RabbitMQ 服务的端口 - username: rabbit # RabbitMQ 服务的账号 - password: rabbit # RabbitMQ 服务的密码 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 # Kafka 配置项,对应 KafkaProperties 配置类 kafka: bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔