Merge branch 'zx_1115_courseware' of http://git.dayaedu.com/yonge/mec into test

audio-analysis/pom.xml

@@ -57,10 +57,6 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-auth-api</artifactId>
 			<exclusions>
-				<!-- <exclusion>
-            		<groupId>org.redisson</groupId>
-            		<artifactId>redisson-spring-boot-starter</artifactId>
-				</exclusion> -->
 				<exclusion>
 					<artifactId>netty-common</artifactId>
 					<groupId>io.netty</groupId>
@@ -96,10 +92,6 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-biz</artifactId>
 			<exclusions>
-				<!-- <exclusion>
-            		<groupId>org.redisson</groupId>
-            		<artifactId>redisson-spring-boot-starter</artifactId>
-				</exclusion> -->
 				<exclusion>
 					<artifactId>netty-common</artifactId>
 					<groupId>io.netty</groupId>

audio-analysis/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=audio-analysis
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

audio-analysis/src/main/resources/logback-spring.xml

@@ -27,6 +27,17 @@
 		</encoder>
 	</appender>
 
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-audio</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
 	<logger name="com.yonge" level="info" />
 
 	<!--开发环境:打印控制台 -->
@@ -47,7 +58,14 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+			<appender-ref ref="plumelog" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>

cms/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=cms
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

cms/src/main/resources/logback-spring.xml

@@ -27,6 +27,17 @@
 		</encoder>
 	</appender>
 
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-audio</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
 	<logger name="com.ym.mec" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -55,7 +66,14 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+			<appender-ref ref="plumelog" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>

mec-application/src/main/java/com/ym/mec/AppServerApplication.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@ComponentScan(basePackages = {"com.ym.mec", "org.snaker.engine", "com.yonge.log", "com.mec.redisson"})
+@ComponentScan(basePackages = {"com.ym.mec", "org.snaker.engine", "com.yonge.log", "com.mec.redisson", "com.dayaedu.cbs.openfeign"})
 @MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao", "com.ym.mec.biz.dal.mapper"})
 @Configuration
 @EnableSwagger2Doc

mec-application/src/main/java/com/ym/mec/student/controller/LessonCoursewareController.java

@@ -0,0 +1,78 @@
+package com.ym.mec.student.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
+import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareDetailWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
+import com.ym.mec.biz.service.LessonCoursewareService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@RequestMapping("${app-config.url.student:}/lessonCourseware")
+@Api(tags = "课件教材")
+@RestController
+public class LessonCoursewareController extends BaseController {
+
+	@Autowired
+	private CoursewareFeignService coursewareFeignService;
+	@Resource
+	private LessonCoursewareService lessonCoursewareService;
+
+	@ApiOperation(value = "分页查询已添加的课件")
+	@PostMapping("/queryLessonCourseware")
+	public HttpResponseResult<PageInfo<LessonCoursewareWrapper.LessonCoursewareDto>> queryLessonCourseware(@RequestBody LessonCoursewareWrapper.LessonCoursewareQuery query){
+		query.setEnable(true);
+		IPage<LessonCoursewareWrapper.LessonCoursewareDto> pages = lessonCoursewareService.selectPage(QueryInfo.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
+	}
+
+	@ApiOperation(value = "获取课件详情")
+	@GetMapping("/getLessonCoursewareDetail/{id}")
+	public HttpResponseResult<CbsLessonCoursewareWrapper.LessonCourseware> getLessonCoursewareDetail(@PathVariable("id") Long id){
+		return succeed(coursewareFeignService.lessonCoursewareDetail(id).feignData());
+	}
+
+	@ApiOperation(value = "获取课件关联的课程列表")
+	@GetMapping("/getLessonCoursewareCourseList/{id}")
+	public HttpResponseResult<List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail>> getLessonCoursewareCourseList(@PathVariable("id") Long id){
+		List<CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetails = coursewareFeignService.coursewareDetail(id).feignData();
+		if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
+			String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
+			List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
+			return succeed(courseScheduleCoursewareDetailList);
+		}
+		return succeed(new ArrayList<>());
+	}
+
+	@ApiOperation(value = "获取课程详情")
+	@GetMapping("/getLessonCourseDetail/{id}")
+	public HttpResponseResult<CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail> getLessonCourseDetail(@PathVariable("id") String id){
+		return succeed(coursewareFeignService.lessonCoursewareDetailDetail(Long.parseLong(id)).feignData());
+	}
+
+	@ApiOperation(value = "获取课件关联的声部列表")
+	@GetMapping("/getLessonCoursewareSubjectList")
+	public HttpResponseResult<List<Subject>> getLessonCoursewareSubjectList(){
+		return succeed(lessonCoursewareService.getDao().getLessonCoursewareSubjectList());
+	}
+}

mec-application/src/main/java/com/ym/mec/web/controller/LessonCoursewareController.java

@@ -0,0 +1,113 @@
+package com.ym.mec.web.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
+import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
+import com.google.common.collect.Lists;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.webportal.exception.BizException;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
+import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
+import com.ym.mec.biz.service.LessonCoursewareService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@RequestMapping("${app-config.url.web:}/lessonCourseware")
+@Api(tags = "课件教材")
+@RestController
+public class LessonCoursewareController extends BaseController {
+
+	@Autowired
+	private CoursewareFeignService coursewareFeignService;
+	@Resource
+	private LessonCoursewareService lessonCoursewareService;
+
+	@ApiOperation(value = "获取内容平台课件教材")
+	@PostMapping("/queryPage")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryPage')")
+	public HttpResponseResult<PageInfo<CbsLessonCoursewareWrapper.LessonCourseware>> queryPage(@RequestBody CbsLessonCoursewareWrapper.LessonCoursewareQuery query) throws Exception {
+		return succeed(PageUtil.pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
+	}
+
+	@ApiOperation(value = "获取已添加的课件id列表")
+	@PostMapping("/queryLessonCoursewareId")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryLessonCoursewareId')")
+	public HttpResponseResult<List<Long>> queryLessonCoursewareId(){
+		List<LessonCourseware> list = lessonCoursewareService.lambdaQuery().list();
+		if (list == null || list.isEmpty()) {
+			return succeed(Lists.newArrayList());
+		}
+		List<Long> ids = list.stream().map(LessonCourseware::getLessonCourseId).collect(java.util.stream.Collectors.toList());
+		return succeed(ids);
+	}
+
+	@ApiOperation(value = "批量删除已添加的课件")
+	@PostMapping("/deleteLessonCourseware")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/deleteLessonCourseware')")
+	public HttpResponseResult<Boolean> deleteLessonCourseware(@RequestBody List<Long> ids){
+		if (CollectionUtils.isEmpty(ids)) {
+			return succeed(false);
+		}
+		return succeed(lessonCoursewareService.removeByIds(ids));
+	}
+
+	@ApiOperation(value = "分页查询已添加的课件")
+	@PostMapping("/queryLessonCourseware")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryLessonCourseware')")
+	public HttpResponseResult<PageInfo<LessonCoursewareWrapper.LessonCoursewareDto>> queryLessonCourseware(@RequestBody LessonCoursewareWrapper.LessonCoursewareQuery query){
+		IPage<LessonCoursewareWrapper.LessonCoursewareDto> pages = lessonCoursewareService.selectPage(QueryInfo.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
+	}
+
+	@ApiOperation(value = "添加课件")
+	@PostMapping("/addLessonCourseware")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/addLessonCourseware')")
+	public HttpResponseResult<Boolean> addLessonCourseware(@RequestBody List<Long> lessonCoursewareIds){
+		if (CollectionUtils.isEmpty(lessonCoursewareIds)) {
+			throw new BizException("课件id不能为空");
+		}
+		List<LessonCourseware> list = new ArrayList<>();
+		lessonCoursewareIds.forEach(id -> {
+			LessonCourseware lessonCourseware = new LessonCourseware();
+			lessonCourseware.setLessonCourseId(id);
+			list.add(lessonCourseware);
+		});
+		Integer count = lessonCoursewareService.lambdaQuery().in(LessonCourseware::getLessonCourseId, lessonCoursewareIds).count();
+		if (count > 0) {
+			throw new BizException("请勿重复添加课件");
+		}
+		return succeed(lessonCoursewareService.saveBatch(list));
+	}
+
+	@ApiOperation(value = "启用、停用课件")
+	@GetMapping("/updateEnableFlag")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/updateEnableFlag')")
+	public HttpResponseResult updateEnableFlag(Integer id,Boolean enableFlag){
+		lessonCoursewareService.lambdaUpdate().set(LessonCourseware::getEnable, enableFlag)
+				.eq(LessonCourseware::getId, id)
+				.update();
+		return succeed();
+	}
+
+	@ApiOperation(value = "修改课件声部")
+	@GetMapping("/updateSubject")
+	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/updateSubject')")
+	public HttpResponseResult updateSubject(Integer id,Integer subjectId){
+		lessonCoursewareService.lambdaUpdate().set(LessonCourseware::getSubjectId, subjectId)
+				.eq(LessonCourseware::getId, id)
+				.update();
+		return succeed();
+	}
+}

mec-application/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,14 @@
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=app
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true
+#Enables autoconfiguration for the refresh scope and associated features
+spring.cloud.refresh.enabled=true
+logging.config=classpath:logback-spring.xml

mec-application/src/main/resources/bootstrap-test.properties

@@ -9,4 +9,4 @@ spring.cloud.nacos.config.prefix=app
 spring.cloud.nacos.config.file-extension=yaml
 #\u662F\u5426\u52A8\u6001\u5237\u65B0
 spring.cloud.nacos.config.enabled=true
-logging.config=classpath:logback-test.xml
+logging.config=classpath:logback-test-env.xml

mec-application/src/main/resources/logback-spring.xml

@@ -114,7 +114,13 @@
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
         <root level="WARN">
-<!--            <appender-ref ref="stdout"/>-->
+            <appender-ref ref="file"/>
+            <appender-ref ref="plumelog" />
+        </root>
+    </springProfile>
+    <!--生产环境:输出到文件 -->
+    <springProfile name="pre">
+        <root level="WARN">
             <appender-ref ref="file"/>
             <appender-ref ref="plumelog" />
         </root>

mec-application/src/main/resources/logback-test.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="10 seconds">
-
-    <property name="LOG_HOME" value="/mdata/mec-test/logs/app-%d{yyyy-MM-dd_HH}-%i.log" />
-    <property name="CONSOLE_LOG_PATTERN"
-              value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
-
-    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder charset="UTF-8">
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="file"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_HOME}</FileNamePattern>
-            <MaxHistory>90</MaxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>20MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="com.ym.app" level="INFO" />
-<!--    <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="trace" />-->
-
-    <!--本地环境:打印控制台 -->
-    <root level="INFO">
-        <appender-ref ref="stdout" />
-        <appender-ref ref="file" />
-    </root>
-</configuration>

mec-auth/mec-auth-server/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=auth
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -39,10 +39,18 @@
 	</appender>
 
 	<logger name="com.ym.mec" level="WARN" />
-	<root level="WARN">
-<!--		<appender-ref ref="stdout" />-->
-		<appender-ref ref="file" />
-		<appender-ref ref="plumelog" />
-	</root>
+	<springProfile name="prod">
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 </configuration>

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LessonCourseware.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ym.mec.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class LessonCourseware{
+	@ApiModelProperty(value = "主键")
+	@TableId(value = "id_", type = IdType.AUTO)
+	private Integer id;
+
+	@ApiModelProperty(value = "关联声部")
+	@TableField(value = "subject_id_")
+	private Integer subjectId;
+
+	@ApiModelProperty(value = "课件编号")
+	@TableField(value = "lesson_course_id_")
+	private Long lessonCourseId;
+
+	@ApiModelProperty(value = "是否启用")
+	@TableField(value = "enable_")
+	private Boolean enable = false;
+
+	@ApiModelProperty(value = "更新时间")
+	@TableField(value = "update_time_")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time_")
+	private Date createTime;
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/LessonCoursewareMapper.java

@@ -0,0 +1,21 @@
+package com.ym.mec.biz.dal.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
+import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface LessonCoursewareMapper extends BaseMapper<LessonCourseware> {
+
+    List<LessonCoursewareWrapper.LessonCoursewareDto> selectPage(@Param("page") IPage<LessonCoursewareWrapper.LessonCoursewareDto> page,
+                                                                 @Param("param") LessonCoursewareWrapper.LessonCoursewareQuery param);
+
+
+    //获取课件关联的声部列表
+    List<Subject> getLessonCoursewareSubjectList();
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/LessonCoursewareWrapper.java

@@ -0,0 +1,96 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareDetailWrapper;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 课件教材
+ */
+@ApiModel(value = "LessonCoursewareWrapper对象", description = "课件教材")
+public class LessonCoursewareWrapper {
+
+    @Data
+	@Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @ApiModel("课件教材分页查询")
+    public static class LessonCoursewareQuery implements QueryInfo {
+
+        @ApiModelProperty("声部")
+        private Integer subjectId;
+
+        @ApiModelProperty("启用状态")
+        private Boolean enable;
+    }
+
+    @Data
+	@Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @ApiModel("课件教材dto")
+    public static class LessonCoursewareDto{
+        private Integer id;
+
+        @ApiModelProperty("课件编号")
+		private Long lessonCoursewareId;
+
+        @ApiModelProperty("课件名称")
+		private String name;
+
+        @ApiModelProperty("封面")
+        private String cover;
+
+        @ApiModelProperty("启用状态")
+        private Boolean enable;
+
+        @ApiModelProperty("课时数")
+        private Integer courseNum;
+
+        @ApiModelProperty("声部")
+        private String subjectName;
+
+        @ApiModelProperty("声部id")
+        private Integer subjectId;
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel("CourseScheduleCoursewareDetail-课程计划课件详情")
+    public static class CourseScheduleCoursewareDetail {
+
+        // 课程计划编号
+        @ApiModelProperty("课程计划编号")
+        private Long lessonCoursewareId;
+
+        // 课程计划编号
+        @ApiModelProperty("课程计划详情编号")
+        private Long lessonCoursewareDetailId;
+
+        @ApiModelProperty("课程计划详情编号")
+        private String coursewareDetailId;
+
+        // 课件名称
+        @ApiModelProperty("课件详情名称")
+        private String coursewareDetailName;
+
+        @ApiModelProperty("知识点")
+        private List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList;
+
+        public void setLessonCoursewareDetailId(Long lessonCoursewareDetailId) {
+        	this.lessonCoursewareDetailId = lessonCoursewareDetailId;
+            this.coursewareDetailId = String.valueOf(lessonCoursewareDetailId);
+        }
+
+    }
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/LessonCoursewareService.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.mapper.LessonCoursewareMapper;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
+import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
+
+public interface LessonCoursewareService extends IService<LessonCourseware> {
+
+    LessonCoursewareMapper getDao();
+
+    //分页查询已添加的课件
+    IPage<LessonCoursewareWrapper.LessonCoursewareDto> selectPage(IPage<LessonCoursewareWrapper.LessonCoursewareDto> page, LessonCoursewareWrapper.LessonCoursewareQuery query);
+}
+

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonCoursewareServiceImpl.java

@@ -0,0 +1,78 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
+import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
+import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.mapper.LessonCoursewareMapper;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
+import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
+import com.ym.mec.biz.service.LessonCoursewareService;
+import com.ym.mec.biz.service.SubjectService;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMapper, LessonCourseware> implements LessonCoursewareService {
+
+    private final static Logger log = LoggerFactory.getLogger(LessonCoursewareServiceImpl.class);
+
+
+    @Override
+    public LessonCoursewareMapper getDao() {
+        return this.baseMapper;
+    }
+
+    @Autowired
+    private CoursewareFeignService coursewareFeignService;
+    @Resource
+    private SubjectDao subjectDao;
+
+    @Override
+    public IPage<LessonCoursewareWrapper.LessonCoursewareDto> selectPage(IPage<LessonCoursewareWrapper.LessonCoursewareDto> page, LessonCoursewareWrapper.LessonCoursewareQuery query) {
+        List<LessonCoursewareWrapper.LessonCoursewareDto> dtos = baseMapper.selectPage(page, query);
+        if(CollectionUtils.isNotEmpty(dtos)){
+            List<Long> lessonCoursewareIds = dtos.stream().map(LessonCoursewareWrapper.LessonCoursewareDto::getLessonCoursewareId).collect(Collectors.toList());
+            CbsLessonCoursewareWrapper.LambdaQuery lambdaQuery = new CbsLessonCoursewareWrapper.LambdaQuery();
+            lambdaQuery.setIds(lessonCoursewareIds);
+            List<CbsLessonCoursewareWrapper.Entity> entityList = coursewareFeignService.lessonCoursewareLambdaQuery(lambdaQuery).feignData();
+            if(CollectionUtils.isNotEmpty(entityList)){
+                Map<Long, CbsLessonCoursewareWrapper.Entity> entityMap = entityList.stream().collect(Collectors.groupingBy(CbsLessonCoursewareWrapper.Entity::getId,
+                        Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
+                for (LessonCoursewareWrapper.LessonCoursewareDto e : dtos) {
+                    CbsLessonCoursewareWrapper.Entity entity = entityMap.get(e.getLessonCoursewareId());
+                    if (Objects.isNull(entity)) {
+                        continue;
+                    }
+                    e.setName(entity.getName());
+                    e.setCover(entity.getCoverImg());
+                    e.setCourseNum(entity.getCourseNum());
+                }
+            }
+            List<Integer> collect = dtos.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(collect)){
+                String subjectIds = collect.stream().map(e -> String.valueOf(e)).collect(Collectors.joining(","));
+                List<Map<Integer, String>> subjectNames = subjectDao.queryNameByIds(subjectIds);
+                Map<Integer, String> subjectNameMap = MapUtil.convertMybatisMap(subjectNames);
+                for (LessonCoursewareWrapper.LessonCoursewareDto e : dtos) {
+                    e.setSubjectName(subjectNameMap.get(e.getSubjectId()));
+                }
+            }
+        }
+        return page.setRecords(dtos);
+    }
+
+}
+

mec-biz/src/main/resources/config/mybatis/LessonCoursewareMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ym.mec.biz.dal.mapper.LessonCoursewareMapper">
+    
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper$LessonCoursewareDto">
+        select id_ id, subject_id_ subjectId, lesson_course_id_ lessonCoursewareId, enable_ enable from lesson_courseware
+        <where>
+            <if test="param.subjectId != null">
+                and subject_id_ = #{param.subjectId}
+            </if>
+            <if test="param.enable != null">
+                and enable_ = #{param.enable}
+            </if>
+        </where>
+        order by create_time_ desc
+	</select>
+    <select id="getLessonCoursewareSubjectList" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
+        select s.* from lesson_courseware lc
+        left join subject s on s.id_ = lc.subject_id_
+        where lc.subject_id_ IS NOT NULL
+        group by lc.subject_id_
+    </select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/StudentExtracurricularExercisesSituationMapper.xml

@@ -860,7 +860,7 @@
         LEFT JOIN (
         SELECT DISTINCT cs.id_
         FROM course_schedule cs
-        WHERE cs.group_type_ = 'MUSIC' AND cs.class_date_ = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        WHERE cs.group_type_ = 'MUSIC' AND cs.class_date_ = DATE_FORMAT(NOW(), '%Y-%m-%d') and cs.actual_teacher_id_ = #{teacherId}
         ) music_cs ON FIND_IN_SET(music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_
@@ -873,7 +873,7 @@
         LEFT JOIN (
         SELECT DISTINCT cs.id_
         FROM course_schedule cs
-        WHERE cs.group_type_ != 'MUSIC' AND cs.class_date_ <= DATE_FORMAT(NOW(), '%Y-%m-%d')
+        WHERE cs.group_type_ != 'MUSIC'  AND cs.class_date_ >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) and cs.actual_teacher_id_ = #{teacherId}
         ) non_music_cs ON FIND_IN_SET(non_music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_

mec-common/common-core/pom.xml

@@ -18,6 +18,25 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>com.dayaedu.cbs.openfeign</groupId>
+			<artifactId>dayaedu-openfeign-client</artifactId>
+			<version>1.0.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>spring-cloud-loadbalancer</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>spring-cloud-starter-openfeign</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
 			<groupId>com.plumelog</groupId>
 			<artifactId>plumelog-logback</artifactId>
 			<version>3.5.3</version>

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java

@@ -9,6 +9,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 
+import java.util.Collection;
+import java.util.Map;
+
 public class RequestHeaderConfiguration implements RequestInterceptor {
 
 	@Override
@@ -21,7 +24,9 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 		
 		String authorization = request.getHeader("Authorization");
 
-		if (StringUtils.isNotBlank(authorization)) {
+		// open-feign请求头已包含Authorization，不再添加
+		Map<String, Collection<String>> headers = template.headers();
+		if (StringUtils.isNotBlank(authorization) && !headers.containsKey("Authorization")) {
 			template.header("Authorization", authorization);
 		}
 		

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -47,6 +47,20 @@ public class PageUtil {
         return resultPage;
     }
 
+    public static <T> PageInfo<T> pageInfo(com.microsvc.toolkit.common.response.paging.PageInfo<T> source) {
+        if (Objects.isNull(source)) {
+            return new PageInfo<>(1, 20);
+        }
+        int total = Integer.parseInt(String.valueOf(source.getTotal()));
+        int limit = Integer.parseInt(String.valueOf(source.getLimit()));
+        PageInfo<T> resultPage = new PageInfo<>();
+        resultPage.setRows(source.getRows());
+        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
+        resultPage.setLimit(limit);
+        resultPage.setTotal(total);
+        return resultPage;
+    }
+
     /**
      * 分页有需要拼接时分秒要求的可以使用这个方法
      */

mec-common/common-core/src/main/java/com/ym/mec/common/redis/config/RedisConfig.java

@@ -20,13 +20,13 @@ public class RedisConfig {
 
 	/*@Value("${spring.redis.host}")
 	private String host;
-	
+
 	@Value("${spring.redis.port}")
 	private int port;
-	
+
 	@Value("${spring.redis.password}")
 	private String password;
-	
+
 	@Value("${spring.redis.database}")
 	private int database;
 

mec-eureka/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=eureka
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

mec-gateway/mec-gateway-web/src/main/java/com/ym/mec/gateway/web/controller/ErrorHandlerController.java

@@ -1,6 +1,6 @@
 package com.ym.mec.gateway.web.controller;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

mec-gateway/mec-gateway-web/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=gateway-web
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -66,7 +66,13 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
+			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-im/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,17 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=im
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true
+logging.config=classpath:logback-spring.xml

mec-im/src/main/resources/logback-spring.xml

@@ -72,7 +72,13 @@
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
         <root level="WARN">
-<!--            <appender-ref ref="stdout" />-->
+            <appender-ref ref="file" />
+            <appender-ref ref="plumelog" />
+        </root>
+    </springProfile>
+    <!--生产环境:输出到文件 -->
+    <springProfile name="prd">
+        <root level="WARN">
             <appender-ref ref="file" />
             <appender-ref ref="plumelog" />
         </root>

mec-mall/mall-admin/src/main/resources/bootstrap-pre.yml

@@ -2,11 +2,13 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 121.41.82.151:8848
-        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        server-addr: 10.206.0.12:8848
+        namespace: 59e3c24c-a617-4632-a8d0-2766b3cf6d44
         group: DEFAULT_GROUP
         prefix: mall-admin
         file-extension: yaml
-        refresh:
-          enabled: true
-        enabled: true
+        enabled: true
+    refresh:
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml

@@ -9,4 +9,6 @@ spring:
         file-extension: yaml
         enabled: true
     refresh:
-      enabled: true
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-admin/src/main/resources/logback-spring.xml

@@ -63,8 +63,8 @@
 	</springProfile>
 
 	<springProfile name="pre">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -72,7 +72,6 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-mall/mall-portal/src/main/resources/bootstrap-pre.yml

@@ -2,14 +2,16 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 121.41.82.151:8848
-        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        server-addr: 10.206.0.12:8848
+        namespace: 59e3c24c-a617-4632-a8d0-2766b3cf6d44
         group: DEFAULT_GROUP
         prefix: mall-portal
         file-extension: yaml
-        refresh:
-          enabled: true
         enabled: true
+    refresh:
+      enabled: true
     alibaba:
       seata:
-        tx-service-group: default_tx_group
+        tx-service-group: default_tx_group
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml

@@ -12,4 +12,6 @@ spring:
       seata:
         tx-service-group: default_tx_group
     refresh:
-      enabled: true
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-portal/src/main/resources/logback-spring.xml

@@ -63,8 +63,8 @@
 	</springProfile>
 
 	<springProfile name="pre">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -72,7 +72,6 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-task/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=task
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

mec-task/src/main/resources/logback-spring.xml

@@ -64,9 +64,15 @@
 	</springProfile>
 
 	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
+			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-websocket/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\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}
+spring.cloud.nacos.config.prefix=websocket
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

mec-websocket/src/main/resources/logback-spring.xml

@@ -83,9 +83,15 @@
 	</springProfile>
 
 	<!--生产环境:输出到文件 -->
+	<springProfile name="pre">
+		<root level="WARN">
+			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
+		</root>
+	</springProfile>
+	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>