From d552378a0fbc97a530e8d7601ca874551ced5d6c Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 30 三月 2023 11:10:00 +0800
Subject: [PATCH] 登录
---
src/main/resources/application.properties | 6 +++---
src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java | 2 +-
src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java | 7 +++++++
src/main/resources/log4j2.xml | 12 ++++++------
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java | 2 +-
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
index 0e8fa69..3303d50 100644
--- a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
+++ b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
@@ -528,9 +528,14 @@
subjectUtils.setStudyTime(new BigDecimal(progressValue));
}
mySubjectV.setSubjectName(openSubjectV.getSubjectName());
+ mySubjectV.setCoverPageUrl(openSubjectV.getCoverPageUrl());
mySubjectV.getId().setSubjectId(openSubjectV.getSubjectId());
result.add(mySubjectV);
lecurelist.add(subjectUtils);
+ }
+ for (MySubjectV mySubjectV:
+ result) {
+ System.out.println(mySubjectV);
}
return new Result(true, "success",
CollectionUtils.newObjectMap("subjectList",
@@ -571,6 +576,7 @@
if (percentAvg.isNaN()) {
percentAvg = 0.0;
}
+ subject.setCoverPageUrl(subject1.getCoverPageUrl());
subject.setPercent(percentAvg);
subject.setProgressValue(new BigDecimal(progressValue));
progressLst.get(0).put("percent", subject.getPercent());
@@ -593,6 +599,7 @@
if (percentAvg.isNaN()) {
percentAvg = 0.0;
}
+ subject.setCoverPageUrl(subject1.getCoverPageUrl());
subject.setPercent(percentAvg);
subject.setProgressValue(new BigDecimal(progressValue));
subject.setSubjectName(subject1.getName());
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
index 90d6499..c6d79e1 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
@@ -129,7 +129,7 @@
Res res = read(Res.class, resId);
- resItemServiceMap.get(res.getType()).update(res.getItemDestId(), name);
+// resItemServiceMap.get(res.getType()).update(res.getItemDestId(), name);
TraceUtils.setUpdateTrace(res);
res.setName(name);
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
index e4128fe..b24c4f6 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
@@ -95,7 +95,7 @@
ResItemDoc doc = read(ResItemDoc.class, id);
- TraceUtils.setUpdateTrace(doc);
+// TraceUtils.setUpdateTrace(doc);
doc.setName(name);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4da5ba6..2718c45 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -19,7 +19,7 @@
spring.http.multipart.maxRequestSize=3000Mb
#mysqldb.datasource.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds.aliyuncs.com:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
#mysqldb.datasource.url=jdbc:mysql://10.1.80.52:3306/rsdb?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
-mysqldb.datasource.url=jdbc:mysql://localhost:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
+mysqldb.datasource.url=jdbc:mysql://110.41.147.200:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
mysqldb.datasource.username=root
#mysqldb.datasource.username=rs
#######\uFFFD\uFFFD\uFFFD\uFFFD\u03AA\uFFFD\uFFFD\u05F0\uFFFD\uFFFD\u03F5\u0373\uFFFD\uFFFD\u012C\uFFFD\uFFFD\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02FF\uFFFD#############
@@ -27,9 +27,9 @@
#mysqldb.datasource.password=fwefwefWEFefewf$ #
# port:3370 #
#################################################
-mysqldb.datasource.password=12345678
+mysqldb.datasource.password=123456
#mysqldb.datasource.password=QQTec@2019
-#mysqldb.datasource.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds.aliyuncs.com:3306/scc_sr?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
+#mysqldb.datasource.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds .aliyuncs.com:3306/scc_sr?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
#mysqldb.datasource.username=ssc_sr
#mysqldb.datasource.password=fsefWEF23@#!
mysqldb.datasource.driverClassName= com.mysql.jdbc.Driver
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 0d43191..77076d8 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -6,8 +6,8 @@
</Console>
<RollingRandomAccessFile name="File"
- fileName="D:/log/qxueyou.log" append="true"
- filePattern="D:/log/qxueyou-%d{yyyyMMdd}-%i.log">
+ fileName="C:/log/qxueyou.log" append="true"
+ filePattern="C:/log/qxueyou-%d{yyyyMMdd}-%i.log">
<PatternLayout>
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</Pattern>
</PatternLayout>
@@ -19,8 +19,8 @@
</RollingRandomAccessFile>
<RollingRandomAccessFile name="error_file"
- fileName="D:/log/qxueyou_err.log" append="true"
- filePattern="D:/log/qxueyou_err-%d{yyyyMMdd}-%i.log">
+ fileName="C:/log/qxueyou_err.log" append="true"
+ filePattern="C:/log/qxueyou_err-%d{yyyyMMdd}-%i.log">
<PatternLayout>
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</Pattern>
</PatternLayout>
@@ -32,8 +32,8 @@
</RollingRandomAccessFile>
<RollingRandomAccessFile name="OnsFile"
- fileName="D:/logOns/qxueyouOns.log" append="true"
- filePattern="D:/logOns/qxueyouOns-%d{yyyyMMdd}-%i.log">
+ fileName="C:/logOns/qxueyouOns.log" append="true"
+ filePattern="C:/logOns/qxueyouOns-%d{yyyyMMdd}-%i.log">
<PatternLayout>
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</Pattern>
</PatternLayout>
--
Gitblit v1.8.0