Exam/pengchen-exam-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #45: (hyc -> master)

Browse Source 
Merge Request: 【修改】冲突文件

Created By: @华允传
Accepted By: @华允传
URL: https://g-iswv8783.coding.net/p/education/d/pengchen-exam-java/git/merge/45?initial=true
This commit is contained in:
华允传
2025-04-23 17:52:10 +08:00
committed by Coding
parent e95173f134 60629af34a
commit aabd5baff5
5 changed files with 85 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Annotation profile for exam" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="D:/java/leiku/apache-maven-3.9.6/conf/repository/org/springframework/boot/spring-boot-configuration-processor/3.4.1/spring-boot-configuration-processor-3.4.1.jar" />
<entry name="D:/java/leiku/apache-maven-3.9.6/conf/repository/org/projectlombok/lombok/1.18.36/lombok-1.18.36.jar" />
<entry name="D:/java/leiku/apache-maven-3.9.6/conf/repository/org/mapstruct/mapstruct-processor/1.6.3/mapstruct-processor-1.6.3.jar" />
<entry name="D:/java/leiku/apache-maven-3.9.6/conf/repository/org/mapstruct/mapstruct/1.6.3/mapstruct-1.6.3.jar" />
</processorPath>
<module name="exam-server" />
<module name="exam-module-system-api" />
<module name="exam-spring-boot-starter-redis" />
<module name="exam-spring-boot-starter-security" />
<module name="exam-module-system-biz" />
<module name="exam-spring-boot-starter-job" />
<module name="exam-spring-boot-starter-biz-ip" />
<module name="exam-spring-boot-starter-monitor" />
<module name="exam-spring-boot-starter-mq" />
<module name="exam-spring-boot-starter-biz-tenant" />
<module name="exam-spring-boot-starter-protection" />
<module name="exam-spring-boot-starter-mybatis" />
<module name="exam-module-judgement-api" />
<module name="exam-spring-boot-starter-websocket" />
<module name="exam-module-infra-api" />
<module name="exam-common" />
<module name="exam-spring-boot-starter-test" />
<module name="exam-module-judgement-biz" />
<module name="exam-spring-boot-starter-excel" />
<module name="exam-spring-boot-starter-biz-data-permission" />
<module name="exam-module-exam-api" />
<module name="exam-module-infra-biz" />
<module name="exam-spring-boot-starter-web" />
<module name="exam-module-exam-biz" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="exam-common" options="-parameters" />
<module name="exam-module-exam-api" options="-parameters" />
<module name="exam-module-exam-biz" options="-parameters" />
<module name="exam-module-infra-api" options="-parameters" />
<module name="exam-module-infra-biz" options="-parameters" />
<module name="exam-module-judgement-api" options="-parameters" />
<module name="exam-module-judgement-biz" options="-parameters" />
<module name="exam-module-system-api" options="-parameters" />
<module name="exam-module-system-biz" options="-parameters" />
<module name="exam-server" options="-parameters" />
<module name="exam-spring-boot-starter-biz-data-permission" options="-parameters" />
<module name="exam-spring-boot-starter-biz-ip" options="-parameters" />
<module name="exam-spring-boot-starter-biz-tenant" options="-parameters" />
<module name="exam-spring-boot-starter-excel" options="-parameters" />
<module name="exam-spring-boot-starter-job" options="-parameters" />
<module name="exam-spring-boot-starter-monitor" options="-parameters" />
<module name="exam-spring-boot-starter-mq" options="-parameters" />
<module name="exam-spring-boot-starter-mybatis" options="-parameters" />
<module name="exam-spring-boot-starter-protection" options="-parameters" />
<module name="exam-spring-boot-starter-redis" options="-parameters" />
<module name="exam-spring-boot-starter-security" options="-parameters" />
<module name="exam-spring-boot-starter-test" options="-parameters" />
<module name="exam-spring-boot-starter-web" options="-parameters" />
<module name="exam-spring-boot-starter-websocket" options="-parameters" />
</option>
</component>
</project>

5
.idea/jarRepositories.xml generated
View File

@@ -16,6 +16,11 @@
<option name="name" value="Spring Milestones" />
<option name="url" value="https://repo.spring.io/milestone" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />

2
.idea/misc.xml generated
View File

@@ -8,7 +8,7 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

6
exam-module-judgement/exam-module-judgement-biz/pom.xml
View File

@@ -122,7 +122,11 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10</version>
</dependency>
</dependencies>
</project>

8
exam-server/src/main/resources/application-local.yaml
View File

@@ -56,7 +56,7 @@ spring:
# url: jdbc:kingbase8://127.0.0.1:54321/test # 人大金仓 KingbaseES 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例
username: root
password: Xiaobing0308
password: 123
# username: sa # SQL Server 连接的示例
# password: Exam@2024 # SQL Server 连接的示例
# username: SYSDBA # DM 连接的示例
@@ -67,7 +67,7 @@ spring:
lazy: true # 开启懒加载，保证启动速度
url: jdbc:mysql://127.0.0.1:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
username: root
password: Xiaobing0308
password: 123
# tdengine: # IoT 数据库（需要 IoT 物联网再开启噢！）
# url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro
# driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -81,8 +81,8 @@ spring:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: dev # 密码，建议生产环境开启
database: 15 # 数据库索引
password: 250250 # 密码，建议生产环境开启
--- #################### 定时任务相关配置 ####################