diff --git a/api/pom.xml b/api/pom.xml
index 2229c00..82ef66a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,6 +32,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-test
+
diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml
index 8022e88..ebab42c 100644
--- a/api/src/main/resources/logback.xml
+++ b/api/src/main/resources/logback.xml
@@ -16,6 +16,7 @@
${LOG_HOME}/common-default-%d{yyyy-MM-dd}.log
+ 30
%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
@@ -31,28 +32,13 @@
${LOG_HOME}/common-error-%d{yyyy-MM-dd}.log
+ 30
%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
-
- ${LOG_HOME}/connection.log
-
- ${LOG_HOME}/connection-%d{yyyy-MM-dd}.log
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
-
-
-
-
-
-
-
diff --git a/netty-pad/src/main/resources/logback.xml b/netty-pad/src/main/resources/logback.xml
index 0fd9d32..b1babd7 100644
--- a/netty-pad/src/main/resources/logback.xml
+++ b/netty-pad/src/main/resources/logback.xml
@@ -16,6 +16,7 @@
${LOG_HOME}/common-default-%d{yyyy-MM-dd}.log
+ 30
%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
@@ -31,6 +32,7 @@
${LOG_HOME}/common-error-%d{yyyy-MM-dd}.log
+ 30
%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
diff --git a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
index a78bda1..d298575 100644
--- a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
+++ b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java
@@ -40,7 +40,7 @@ public class CopyLessonTask {
/**
* 每周一九点
*/
- @Scheduled(cron = "0 */1 * * * ?")
+// @Scheduled(cron = "0 */1 * * * ?")
public void execute(){
logger.info("开始执行拷贝课程批处理");
LocalTime time = LocalTime.parse("09:00");
@@ -70,7 +70,7 @@ public class CopyLessonTask {
for (VenueLesson venueLesson : allForCopy) {
count ++;
Date copyDate = DateUtilCard.addDays(venueLesson.getDate(), 7 * copyTarget + 7);
- venueLessonService.copy(venueLesson.getId(),copyDate,copyDate);
+ venueLessonService.copyOneLesson(venueLesson.getId(),copyDate);
}
logger.info("拷贝的课程数量为：" + count);
}
diff --git a/oms/src/main/resources/config/application-development.yml b/oms/src/main/resources/config/application-development.yml
index 9605ab3..bf9bfa1 100644
--- a/oms/src/main/resources/config/application-development.yml
+++ b/oms/src/main/resources/config/application-development.yml
@@ -3,9 +3,9 @@ spring:
# url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8
# username: yingdd
# password: Yingdd2015
- url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true
+ url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true
username: root
- password: 123456
+ password: hyty1234
redis:
host: 127.0.0.1
password:
diff --git a/oms/src/main/resources/config/application-test.yml b/oms/src/main/resources/config/application-test.yml
index c215019..961633f 100644
--- a/oms/src/main/resources/config/application-test.yml
+++ b/oms/src/main/resources/config/application-test.yml
@@ -1,13 +1,23 @@
spring:
datasource:
- url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8
- username: yingdd
- password: Yingdd2015
+ # url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8
+ # username: yingdd
+ # password: Yingdd2015
+ url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true
+ username: root
+ password: 123456
redis:
- host: 121.41.101.63
- password: yingdiandian2015
+ host: 127.0.0.1
+ password:
timeout: 6000
port: 6379
jpa:
show-sql: true
+
+sv:
+ file:
+ store:
+ image: imagetest/
+ video: videotest/
+ health: health-docstest/
diff --git a/service/src/main/java/com/sv/service/oms/VenueLessonService.java b/service/src/main/java/com/sv/service/oms/VenueLessonService.java
index 50b3006..38090d8 100644
--- a/service/src/main/java/com/sv/service/oms/VenueLessonService.java
+++ b/service/src/main/java/com/sv/service/oms/VenueLessonService.java
@@ -335,5 +335,25 @@ public class VenueLessonService extends BaseServiceImpl {
}
}
}
+
+ /**
+ * copy单个课程
+ * @param lessonId
+ * @param targetDate
+ */
+ @Transactional(readOnly = false)
+ public void copyOneLesson(Integer lessonId, Date targetDate) {
+ VenueLesson x = venueLessonMapper.findById(lessonId);
+ Integer oldId = x.getId();
+ x.setId(null);
+ x.setModifiedId(999);
+ x.setSaleNum(0);
+ x.setModifiedTime(new Date());
+ x.setDate(targetDate);
+ venueLessonMapper.insert(x);
+ insertLessonTicket(x);
+ venueLessonMapper.copyImg(oldId, x.getId());
+ }
+
}