yonge преди 5 години
родител
ревизия
92f29cc4f2
променени са 22 файла, в които са добавени 69 реда и са изтрити 13 реда
  1. 0 0
      cms/src/main/resources/bootstrap-dev.properties
  2. 8 1
      cms/src/main/resources/logback-spring.xml
  3. 0 0
      mec-auth/mec-auth-server/src/main/resources/bootstrap-dev.properties
  4. 8 1
      mec-auth/mec-auth-server/src/main/resources/logback-spring.xml
  5. 2 2
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
  6. 0 0
      mec-education/src/main/resources/bootstrap-dev.properties
  7. 0 0
      mec-gateway/mec-gateway-web/src/main/resources/bootstrap-dev.properties
  8. 8 1
      mec-gateway/mec-gateway-web/src/main/resources/logback-spring.xml
  9. 0 0
      mec-im/src/main/resources/bootstrap-dev.properties
  10. 8 1
      mec-im/src/main/resources/logback-spring.xml
  11. 0 0
      mec-monitor/src/main/resources/bootstrap-dev.properties
  12. 0 0
      mec-student/src/main/resources/bootstrap-dev.properties
  13. 8 1
      mec-student/src/main/resources/logback-spring.xml
  14. 0 0
      mec-task/src/main/resources/bootstrap-dev.properties
  15. 1 1
      mec-task/src/main/resources/config/mybatis/TaskMapper.xml
  16. 8 1
      mec-task/src/main/resources/logback-spring.xml
  17. 0 0
      mec-teacher/src/main/resources/bootstrap-dev.properties
  18. 8 1
      mec-teacher/src/main/resources/logback-spring.xml
  19. 1 1
      mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java
  20. 0 0
      mec-web/src/main/resources/bootstrap-dev.properties
  21. 8 1
      mec-web/src/main/resources/logback-spring.xml
  22. 1 1
      mec-zipkin/src/main/resources/bootstrap-dev.properties

+ 0 - 0
cms/src/main/resources/bootstrap.properties → cms/src/main/resources/bootstrap-dev.properties


+ 8 - 1
cms/src/main/resources/logback-spring.xml

@@ -36,9 +36,16 @@
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
+	
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 0 - 0
mec-auth/mec-auth-server/src/main/resources/bootstrap.properties → mec-auth/mec-auth-server/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-auth/mec-auth-server/src/main/resources/logback-spring.xml

@@ -36,9 +36,16 @@
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
+	
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1024,8 +1024,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public void studentCoursesScheduleRemind() {
 		List<Mapper> mapperList = courseScheduleDao.queryStudentCoursesTimesOfTomorrow();
 		for (Mapper mapper : mapperList) {
-			Integer userId = (Integer) mapper.getKey();
-			Integer size = (Integer) mapper.getValue();
+			Integer userId = Integer.parseInt(mapper.getKey().toString()) ;
+			Integer size = Integer.parseInt(mapper.getValue().toString());
 
 			Map<Integer, String> receivers = new HashMap<Integer, String>();
 			receivers.put(userId, userId + "");

+ 0 - 0
mec-education/src/main/resources/bootstrap.properties → mec-education/src/main/resources/bootstrap-dev.properties


+ 0 - 0
mec-gateway/mec-gateway-web/src/main/resources/bootstrap.properties → mec-gateway/mec-gateway-web/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-gateway/mec-gateway-web/src/main/resources/logback-spring.xml

@@ -36,9 +36,16 @@
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
+	
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 0 - 0
mec-im/src/main/resources/bootstrap.properties → mec-im/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-im/src/main/resources/logback-spring.xml

@@ -37,8 +37,15 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 0 - 0
mec-monitor/src/main/resources/bootstrap.properties → mec-monitor/src/main/resources/bootstrap-dev.properties


+ 0 - 0
mec-student/src/main/resources/bootstrap.properties → mec-student/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-student/src/main/resources/logback-spring.xml

@@ -37,8 +37,15 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 0 - 0
mec-task/src/main/resources/bootstrap.properties → mec-task/src/main/resources/bootstrap-dev.properties


+ 1 - 1
mec-task/src/main/resources/config/mybatis/TaskMapper.xml

@@ -88,7 +88,7 @@
   <select id="queryPage" parameterType="map" resultMap="TaskResultMap">
  	 select * from sys_task
    <include refid="queryCondition"/>
-   <include refid="global.orderby"/>
+   order by create_on_ desc
    <include refid="global.limit"/>
   </select>
 

+ 8 - 1
mec-task/src/main/resources/logback-spring.xml

@@ -37,8 +37,15 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 0 - 0
mec-teacher/src/main/resources/bootstrap.properties → mec-teacher/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-teacher/src/main/resources/logback-spring.xml

@@ -37,8 +37,15 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java

@@ -70,6 +70,6 @@ public class SchoolController extends BaseController {
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher")
     public Object findVipSchoolByTeacher(@ApiParam(value = "教师编号", required = true) Integer userId){
-        return succeed(schoolService.findVipSchoolByTeacher(userId));
+        return succeed(schoolService.findVipSchoolByTeacher(userId, null));
     }
 }

+ 0 - 0
mec-web/src/main/resources/bootstrap.properties → mec-web/src/main/resources/bootstrap-dev.properties


+ 8 - 1
mec-web/src/main/resources/logback-spring.xml

@@ -37,8 +37,15 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />

+ 1 - 1
mec-zipkin/src/main/resources/bootstrap.properties → mec-zipkin/src/main/resources/bootstrap-dev.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=localhost:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
+spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}