Merge branch 'website_1_1_20220802'

cooleshow-auth/auth-server/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: auth
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-bbs/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: bbs
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-bbs/src/main/resources/logback-spring.xml

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

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

@@ -0,0 +1,15 @@
+
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=121.41.82.151:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+#\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.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

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

cooleshow-gateway/gateway-web/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: gateway-web
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

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

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

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

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: mall-admin
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

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

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

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

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: mall-portal
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

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

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

cooleshow-task/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,13 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: task
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true
+

cooleshow-user/user-admin/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: admin
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-admin/src/main/resources/logback-spring.xml

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

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -504,15 +504,12 @@
     </select>
 
     <select id="selectMusicNum" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo">
-
         select
             sum(if(ms.source_type_ = 'PLATFORM',1,0)) as musicSheetPlatformCount,
             sum(if(ms.source_type_ = 'TEACHER',1,0)) as musicSheetTeacherCount,
             count(1) as musicSheetCount
         from music_sheet ms
         where ms.state_ = 1 and ms.del_flag_ = 0 and ms.audit_status_ = 'PASS' and ms.charge_type_ = 'CHARGE'
-
-
     </select>
 
     <select id="selectPayMusicSheet" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo$MusicSheetSmall">
@@ -532,7 +529,6 @@
         GROUP BY ms.id_
         ORDER BY count(DISTINCT pr.student_id_)  DESC,ms.id_ desc
         limit 5
-
     </select>
 
     <select id="selectTeacherCount" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo">
@@ -544,7 +540,6 @@
         from
             music_sheet t
         where t.user_id_ = #{userId}
-
     </select>
 
     <select id="queryStudentTotal" resultType="com.yonge.cooleshow.biz.dal.vo.StudentTotalVo">
@@ -575,6 +570,11 @@
             </where>
             group by user_id_
         ) b on t.user_id_ = b.user_id_
+        <where>
+            <if test="null != userId">
+                and t.user_id_ = #{userId}
+            </if>
+        </where>
     </select>
 
     <select id="queryTeacherTotal" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo">
@@ -592,5 +592,10 @@
             </if>
             group by user_id_
         ) a on t.user_id_ = a.user_id_
+        <where>
+            <if test="null != userId">
+                and t.user_id_ = #{userId}
+            </if>
+        </where>
     </select>
 </mapper>

cooleshow-user/user-classroom/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: classroom
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-classroom/src/main/resources/logback-spring.xml

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

cooleshow-user/user-student/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-student/src/main/resources/logback-spring.xml

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

cooleshow-user/user-teacher/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: teacher
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-teacher/src/main/resources/logback-spring.xml

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

cooleshow-user/user-website/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        group: DEFAULT_GROUP
+        prefix: website
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-user/user-website/src/main/resources/logback-spring.xml

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