wangliang hai 1 ano
pai
achega
e9424533e4

+ 12 - 8
themis-admin/src/main/resources/application.properties

@@ -19,18 +19,18 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=themis-admin
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
-db.port=3306
-db.name=themis_release
-db.username=root
-db.password=123456789
+db.host=192.168.10.136
+db.port=3307
+db.name=themis_release_v1.1
+db.username=online
+db.password=online
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 #com.qmth.redis.host=${db.host}
 #com.qmth.redis.port=6379
 #com.qmth.redis.db=13
 #com.qmth.redis.password=
-redis.host=${db.host}
+redis.host=127.0.0.1
 redis.database=13
 redis.port=6379
 redis.password=
@@ -120,8 +120,12 @@ rocketmq.producer.enable-msg-trace=true
 #\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
 #rocketmq.producer.customized-trace-topic=my-trace-topic
 
-com.qmth.solar.access-key=0de21ea8c3f041819af866a160f38b12
-com.qmth.solar.access-secret=Ly3AxTF2Mbek8vcTmZiKa8zDDKUej4n2
+#\u6B63\u5F0F\u73AF\u5883
+#com.qmth.solar.access-key=0de21ea8c3f041819af866a160f38b12
+#com.qmth.solar.access-secret=Ly3AxTF2Mbek8vcTmZiKa8zDDKUej4n2
+#\u6D4B\u8BD5\u73AF\u5883
+com.qmth.solar.access-key=8134f6aae0134770b8618913705d3667
+com.qmth.solar.access-secret=s1NENpvc8Jq5evcE0B7GfLmoQOvwmlCy
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/\u897F\u4EA4\u5927\u6FC0\u6D3B\u6587\u4EF6/tc-xjtu.lic
 
 #\u65E0\u9700\u9274\u6743\u7684url

+ 1 - 1
themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -514,7 +514,7 @@
                 and tees.exam_activity_id = #{examActivityId}
             </if>
             <if test="roomCodeList != null and roomCodeList != '' and roomCodeList.size > 0">
-                and s.room_code in
+                and tees.room_code in
                 <foreach collection="roomCodeList" item="roomCode" index="index" open="(" close=")" separator=",">
                     #{roomCode}
                 </foreach>