报错修改

ssj-common-service/src/main/resources/application-common-dev.properties

@@ -1,18 +1,14 @@
-#\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
-logging.config=classpath:logback.xml
-
-spring.datasource.url=jdbc:mysql://47.112.200.206:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=ssj1QAZxsw2!@
-#spring.datasource.url=jdbc:mysql://120.79.215.176:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#spring.datasource.username=ssj_user
-#spring.datasource.password=ssjUser!@123
+logging.config=classpath:logback-test.xml
+spring.datasource.url=jdbc:mysql://47.112.200.206:3306/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+#characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+spring.datasource.username=aijia
+spring.datasource.password=SSJ1QAZxsw2!@
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=10
 spring.datasource.minIdle=10
-spring.datasource.maxActive=30
+spring.datasource.maxActive=100
 spring.datasource.maxWait=60000
 spring.datasource.timeBetweenEvictionRunsMillis=60000
 spring.datasource.minEvictableIdleTimeMillis=30000
@@ -25,7 +21,7 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 spring.datasource.filters=stat,wall,slf4j
 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
-
+spring.data.solr.host=http://172.18.121.4:8080/solr
 spring.data.mongodb.uri=mongodb://root:aijia#123@47.106.111.166:27017/aijia
 spring.data.mongodb.option.min-connection-per-host=0 
 spring.data.mongodb.option.max-connection-per-host=100 
@@ -48,17 +44,8 @@ spring.data.mongodb.option.min-heartbeat-frequency=500
 spring.data.mongodb.option.heartbeat-frequency=10000 
 spring.data.mongodb.option.local-threshold=15
 
-
-config-redis.database=4
 spring.redis.database=0
-
-#spring.redis.host=120.79.157.115
-#spring.redis.port=6379
 spring.redis.password=dc1qazxsw2!@
-#spring.redis.pool.max-active=8
-#spring.redis.pool.max-wait=-1
-#spring.redis.pool.max-idle=8
-#spring.redis.pool.min-idle=0
 spring.redis.timeout=3000
 spring.redis.block-when-exhausted=true
 
@@ -76,7 +63,7 @@ spring.redis.cluster.pool.min-idle=0
 
 spring.jmx.enabled=false
 
-spring.rabbitmq.host=120.79.142.254
+spring.rabbitmq.host=47.106.111.166
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
@@ -85,11 +72,10 @@ spring.rabbitmq.publisher-returns=true
 
 
 dubbo.registry.id=ssj-dubbo-registry
-dubbo.registry.address=zookeeper://120.79.142.152:2181
+dubbo.registry.address=zookeeper://47.112.200.206:2181
 dubbo.protocol.serialization=java
 dubbo.consumer.timeout=50000
-#/**\u6CE8\u610F\u8FD9\u91CC\u7684\u6CE8\u89E3\u662Fdubbo\u7684\u6CE8\u89E3\uFF0C\u8FD9\u91CC\u6CA1\u6709\u4F7F\u7528\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u4E3A\u76F4\u8FDE\u65B9\u5F0F\uFF0C\u5404\u81EA\u672C\u5730\u5F00\u53D1\u53EF\u4EE5\u653E\u5F00 \uFF08dubbo://ip:\u670D\u52A1\u7AEF\u53E3\uFF09
-#dubbo.reference.url = dubbo://127.0.0.1:9394
+
 spring.thymeleaf.cache=false
 
 
@@ -101,12 +87,4 @@ spring.elasticsearch.cluster.host=47.112.200.206
 spring.elasticsearch.cluster.port=9200
 spring.elasticsearch.cluster.scheme=http
 spring.elasticsearch.cluster.username=elastic
-spring.elasticsearch.cluster.password=zhidian@123
-
-
-#spring.elasticsearch.cluster.host=47.112.253.242,47.112.250.240,47.112.232.110
-#spring.elasticsearch.cluster.host=119.23.8.52,120.79.157.115,120.79.229.124
-#mybatis热加载
-mybatis-plus.refresh-mapper=true
-
-
+spring.elasticsearch.cluster.password=zhidian@123

ssj-kmt-exercise-service-impl/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #\u670D\u52A1\u542F\u52A8\u7AEF\u53E3
 server.port=9090
 spring.application.name=ssj-kmt-exercise-service-provider
-logger.level=info
+logger.level=trace
 dubbo.scan.base-packages=com.ssj
 dubbo.application.id=ssj-kmt-exercise-service-provider
 dubbo.application.name=ssj-kmt-exercise-service-provider

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/request/rollbackai/ExerciseBooksEditRequest.java

@@ -17,7 +17,7 @@ public class ExerciseBooksEditRequest implements Serializable {
     private String  grade;
 
     @ApiModelProperty(name = "semester", value = "上下册，1上2下", required = true)
-    private String  semester;
+    private int  semester;
 
     @ApiModelProperty(name = "bookName", value = "练习册名称", required = false)
     private String  bookName;
@@ -47,11 +47,11 @@ public class ExerciseBooksEditRequest implements Serializable {
         this.grade = grade;
     }
 
-    public String getSemester() {
+    public int getSemester() {
         return semester;
     }
 
-    public void setSemester(String semester) {
+    public void setSemester(int semester) {
         this.semester = semester;
     }
 

ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -2036,7 +2036,7 @@
     </update>
 
     <select id="findEditExerciseBooks" resultType="com.ssj.service.kmt.dto.exercise.ExerciseBookEditDto">
-        select distinct eb.id, eb.book_name from kmt_exercise_question_rollback rb, kmt_exercise_questions eq, kmt_exercise_book eb
+        select distinct eb.id exercise_book_id, eb.book_name exercise_book_name from kmt_exercise_question_rollback rb, kmt_exercise_questions eq, kmt_exercise_book eb
         where rb.question_id=eq.id and eq.exercise_book_id=eb.id and  rb.type=2 and eb.grade=#{request.grade}
         and eb.course_name=#{request.subject}
         and eb.version=#{request.versionType} and eb.semester=#{request.semester}