wangwei 7 سال پیش
والد
کامیت
264824cb5b

+ 12 - 1
examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/Exam.java

@@ -128,6 +128,11 @@ public class Exam implements JsonSerializable {
 	 */
 	@Lob 
 	private String cheatingRemark;
+	
+	/**
+	 * 是否展示作弊
+	 */
+	private Boolean showCheatingRemark;
 
 	/**
 	 * 是否显示成绩
@@ -563,6 +568,12 @@ public class Exam implements JsonSerializable {
 		this.cheatingRemark = cheatingRemark;
 	}
 
-	public Exam() {
+	public Boolean getShowCheatingRemark() {
+		return showCheatingRemark;
 	}
+
+	public void setShowCheatingRemark(Boolean showCheatingRemark) {
+		this.showCheatingRemark = showCheatingRemark;
+	}
+
 }

+ 0 - 16
examcloud-core-examwork-starter/src/main/resources/application-prac.properties

@@ -1,16 +0,0 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
-
-spring.rabbitmq.host=127.0.0.1
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL

+ 18 - 22
examcloud-core-examwork-starter/src/main/resources/application-prod.properties

@@ -1,23 +1,19 @@
-spring.datasource.url=jdbc:mysql://qmthmysql.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=exam_cloud
-spring.datasource.password=examcloud123!@#
-
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://127.0.0.1:1111/eureka/
-hystrix.command.default.execution.timeout.enabled=false
-hystrix.threadpool.default.coreSize = 500
-
-
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud123
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
-
-spring.redis.host=r-wz97e520d2701e54.redis.rds.aliyuncs.com
-spring.redis.port=6379
+spring.datasource.url=jdbc:mysql://rds7b2sll8un5kz99s0i122.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username=exam_cloud
+spring.datasource.password=examcloud123!@#
+
+
+eureka.client.serviceUrl.defaultZone=http://192.168.1.70:1111/eureka/
+hystrix.command.default.execution.timeout.enabled=false
+hystrix.threadpool.default.coreSize = 500
+
+
+spring.rabbitmq.host=192.168.1.70
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=examcloud
+spring.rabbitmq.password=examcloud123
+spring.rabbitmq.listener.acknowledgeMode=MANUAL
+
+spring.redis.host=r-wz97e520d2701e54555.redis.rds.aliyuncs.com
+spring.redis.port=6379
 spring.redis.password=Qmth87863577

+ 0 - 19
examcloud-core-examwork-starter/src/main/resources/application-prodvpc.properties

@@ -1,19 +0,0 @@
-spring.datasource.url=jdbc:mysql://rds7b2sll8un5kz99s0i122.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=exam_cloud
-spring.datasource.password=examcloud123!@#
-
-
-eureka.client.serviceUrl.defaultZone=http://127.0.0.1:1111/eureka/
-hystrix.command.default.execution.timeout.enabled=false
-hystrix.threadpool.default.coreSize = 500
-
-
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud123
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
-
-spring.redis.host=r-wz97e520d2701e54555.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=Qmth87863577