Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: auth
         file-extension: yaml

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: bbs
         file-extension: yaml

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: teacher
         file-extension: yaml

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: admin
         file-extension: yaml

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

@@ -875,6 +875,7 @@
             <![CDATA[ AND s.class_date_ >= #{param.startDate} ]]>
             <![CDATA[ AND s.class_date_ <= #{param.endDate} ]]>
         </if>
+        ORDER BY s.start_time_
     </select>
     <select id="selectWaitCourse" resultType="com.yonge.cooleshow.biz.dal.dto.UserAccountRecordDto">
         SELECT DISTINCT

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

@@ -65,7 +65,7 @@
     <select id="selectCourseList" resultType="com.yonge.cooleshow.biz.dal.vo.CourseScheduleRecordVo">
         SELECT
         s.id_ AS courseId,
-        g.name_ AS groupName,
+        CONCAT(g.name_,'-第',s.class_num_,'课') AS groupName,
         g.subject_id_ AS subjectId,
         sb.name_ AS subjectName,
         s.status_ AS `status`,

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
 
         group: DEFAULT_GROUP
         prefix: classroom

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: student
         file-extension: yaml

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: teacher
         file-extension: yaml

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

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: website
         file-extension: yaml

cooleshow-websocket/src/main/resources/bootstrap-prod.yml

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 47.96.80.97:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: websocket
         file-extension: yaml