Browse Source

bug修复

master
luogw 2 months ago
parent
commit
c1e48f0dcb
  1. 4
      src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java
  2. 3
      src/main/resources/application-dev.yml
  3. 113
      src/main/resources/application-live.yml
  4. 1
      src/main/resources/application-prod.yml
  5. 28
      src/main/resources/application-test.yml

4
src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java

@ -48,9 +48,9 @@ public class AdminExportExamRecordDomainServiceImpl implements AdminExportExamRe
ExportExamRecordDTO exportDTO = new ExportExamRecordDTO(); ExportExamRecordDTO exportDTO = new ExportExamRecordDTO();
BeanUtil.copyProperties(dto, exportDTO); BeanUtil.copyProperties(dto, exportDTO);
if (Objects.nonNull(dto.getScore())) { if (Objects.nonNull(dto.getScore())) {
exportDTO.setScore(String.format("%.2f" , dto.getScore())); exportDTO.setScore(dto.getScore() == dto.getScore().longValue() ? String.valueOf(dto.getScore().longValue()) : String.format("%.2f", dto.getScore()));
} else { } else {
exportDTO.setScore(""); exportDTO.setScore("0");
} }
if (dto.getSubmitTime() != null) { if (dto.getSubmitTime() != null) {
exportDTO.setSubmitTime(sdf.format(dto.getSubmitTime())); exportDTO.setSubmitTime(sdf.format(dto.getSubmitTime()));

3
src/main/resources/application-dev.yml

@ -82,8 +82,9 @@ algo:
clusterUrl: /semantic-cluster clusterUrl: /semantic-cluster
baseUrl: http://172.16.204.50:8002 baseUrl: http://172.16.204.50:8002
generateQuestionUrl: /v1/generate/questions_from_cluster generateQuestionUrl: /v1/generate/questions_from_cluster
apiUrl: http://8.129.84.155:8000 apiUrl: http://172.16.204.50:8000
extractUrl: /v1/key_points/extract extractUrl: /v1/key_points/extract
callbackUrl: http://172.16.204.50/evaluator-api
jwt: jwt:
secret: "my-very-fixed-and-secure-secret-key-1234567890" secret: "my-very-fixed-and-secure-secret-key-1234567890"

113
src/main/resources/application-live.yml

@ -1,113 +0,0 @@
server:
port: 7088
spring:
datasource:
dynamic:
primary: master
datasource:
master:
driverClassName: com.mysql.cj.jdbc.Driver
password: Itc@123456
url: jdbc:mysql://8.129.84.155:3306/ai_evaluator_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&rewriteBatchedStatements=true
username: root
# Redis
data:
redis:
host: 8.129.84.155
port: 6379
password: Itc@123456
database: 3
timeout: 5000ms
lettuce:
pool:
max-active: 8
max-idle: 30
max-wait: 10000
min-idle: 10
jpa:
hibernate:
ddl-auto: update
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
properties:
hibernate:
dialect: org.hibernate.dialect.MySQL8Dialect
show-sql: true
# 上传下载限制
servlet:
multipart:
max-file-size: 100MB
max-request-size: 100MB
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
serialization:
write-dates-as-timestamps: false
generator:
write-numbers-as-strings: true
minio:
endpoint: ${MINIO_ENDPOINT:http://127.0.0.1:9000}
accessKey: ${MINIO_ASSESSKEY:admin}
secretKey: ${MINIO_SECRETKEY:Itc@123456}
bucket: ${MINIO_BUCKET:ai-evaluator-test}
tempAccessFileUrl: http://47.119.114.204/minio-api
mybatis-plus:
configuration:
map-underscore-to-camel-case: true
mapper-locations: classpath*:mapper/**/*.xml
type-aliases-package: com.proposal.**.domain.entity
milvus:
host: 127.0.0.1
port: 19530
analysis:
host: http://8.129.84.155
port: 8888
url: /word/parse
dataExtract:
url: http://127.0.0.1:8002/ai-check/api/documents-parse
callback-url: http://127.0.0.1:7088/api/interaction/dataExtractCallback
ding:
appKey: dinggl2ktuhdhoczkg2o
appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK
agentId: 4283077101
corpId: ding13d71da66ad91ff0f5bf40eda33b7ba0
noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator
algo:
clusterUrl: /semantic-cluster
baseUrl: http://127.0.0.1:8003
generateQuestionUrl: /v1/generate/questions_from_cluster
apiUrl: http://127.0.0.1:8000/
extractUrl: /v1/key_points/extract
jwt:
secret: "my-very-fixed-and-secure-secret-key-1234567890"
# 题目生成相关配置
question:
generation:
# 限流速率:每秒允许的API请求数
rate-limit: 4
downgrade: false
# 队列配置
queue:
# 重试间隔(秒)
retry-interval: 60
scheduled-task:
owner: test
# 经典套题 Mock 配置
classicpaper:
mock:
regenerate-delay-ms: 4000
regenerate-delay-max-ms: 5000
# 是否启用真实算法(true=使用算法服务)
algorithm:
enabled: true
# 简答题异步评分
scoring:
# 每批最多处理多少道简答题
batch-size: 5
# 执行间隔(毫秒),每60秒扫描一次
interval-ms: 60000

1
src/main/resources/application-prod.yml

@ -83,6 +83,7 @@ algo:
generateQuestionUrl: /v1/generate/questions_from_cluster generateQuestionUrl: /v1/generate/questions_from_cluster
apiUrl: http://127.0.0.1:8000 apiUrl: http://127.0.0.1:8000
extractUrl: /v1/key_points/extract extractUrl: /v1/key_points/extract
callbackUrl: http://8.129.84.155/evaluator-api
jwt: jwt:
secret: "my-very-fixed-and-secure-secret-key-1234567890" secret: "my-very-fixed-and-secure-secret-key-1234567890"

28
src/main/resources/application-test.yml

@ -47,11 +47,11 @@ spring:
generator: generator:
write-numbers-as-strings: true write-numbers-as-strings: true
minio: minio:
endpoint: ${MINIO_ENDPOINT:http://8.129.84.155:9000} endpoint: ${MINIO_ENDPOINT:http://127.0.0.1:9000}
accessKey: ${MINIO_ASSESSKEY:DTKYZDZM1i31XOvd24SP} accessKey: ${MINIO_ASSESSKEY:admin}
secretKey: ${MINIO_SECRETKEY:PnfLPcJbvaUboZIwYZAADPB0pDtPZgbi0QiLSs3C} secretKey: ${MINIO_SECRETKEY:Itc@123456}
bucket: ${MINIO_BUCKET:ai-evaluator-test} bucket: ${MINIO_BUCKET:ai-evaluator-test}
tempAccessFileUrl: http://8.129.84.155/minio-api tempAccessFileUrl: http://47.119.114.204/minio-api
mybatis-plus: mybatis-plus:
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
@ -62,29 +62,25 @@ milvus:
host: 127.0.0.1 host: 127.0.0.1
port: 19530 port: 19530
analysis: analysis:
host: http://127.0.0.1 host: http://8.129.84.155
port: 8888 port: 8888
url: /word/parse url: /word/parse
dataExtract:
url: http://127.0.0.1:8002/ai-check/api/documents-parse
callback-url: http://127.0.0.1:7088/api/interaction/dataExtractCallback
ding: ding:
# appKey: dinghgexcbos9dorl3kb
# appSecret: bSNX1ZOUTk2A4FGwQ1U6fyHlFssh9IZtFO6FuKx8A97PE1VZL9lBTJapwzDGCS7v
# # appKey: ding4eootvq4jzas96lr #保伦架构
# # appSecret: UI6XcD8GFPE_W_yo2eQkMuoSsTEf1whpZYEXrsDA7CV7bkJp40B3VNcETWS1aGgg
# agentId: 4418045751
# corpId: ding13a2ff8718e6bcdd
# # corpId: 3318151640
# noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator-test
appKey: dinggl2ktuhdhoczkg2o appKey: dinggl2ktuhdhoczkg2o
appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK
agentId: 4283077101 agentId: 4283077101
corpId: ding13d71da66ad91ff0f5bf40eda33b7ba0 corpId: ding13d71da66ad91ff0f5bf40eda33b7ba0
noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator noticeUrlPrefix: https://ai.itc.vip//ai-evaluator
algo: algo:
clusterUrl: /semantic-cluster clusterUrl: /semantic-cluster
baseUrl: http://172.16.204.50/cluster baseUrl: http://127.0.0.1:8003
generateQuestionUrl: /v1/generate/questions_from_cluster generateQuestionUrl: /v1/generate/questions_from_cluster
apiUrl: http://172.16.204.50:8000/ apiUrl: http://127.0.0.1:8000/
extractUrl: /v1/key_points/extract extractUrl: /v1/key_points/extract
callbackUrl: http://47.119.114.204/evaluator-api
jwt: jwt:
secret: "my-very-fixed-and-secure-secret-key-1234567890" secret: "my-very-fixed-and-secure-secret-key-1234567890"

Loading…
Cancel
Save