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

audio-analysis/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,11 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
+        group: DEFAULT_GROUP
+        prefix: audio-analysis
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -152,4 +152,12 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
     void createUserAccount(@Param("userId") Long id);
 
     List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo);
+
+    void updateImGroupMember(@Param("userId") Long userId,
+                             @Param("username") String username,
+                             @Param("avatar") String avatar);
+
+    void updateImUserFriend(@Param("userId") Long userId,
+                            @Param("username") String username,
+                            @Param("avatar") String avatar);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -233,6 +233,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     @Override
     public void updateRongCloudUserInfo(Long userId) {
         UserSetVo setDetail = this.getSetDetail(userId);
+        //更新imGroupMember表用户头像
+        sysUserDao.updateImGroupMember(userId,setDetail.getUsername(), setDetail.getAvatar());
+        //更新imUserFriend表用户头像
+        sysUserDao.updateImUserFriend(userId,setDetail.getUsername(), setDetail.getAvatar());
         try {
             RongCloudConfig.rongCloud.user.update(new UserModel(userId.toString(), setDetail.getUsername(), setDetail.getAvatar()));
         } catch (Exception e) {

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: auth

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -262,6 +262,12 @@
         update_time_ = now()
         WHERE id_ = #{id}
     </update>
+    <update id="updateImGroupMember">
+        UPDATE im_group_member SET avatar_ = #{avatar},nickname_ = #{username} WHERE user_id_ = #{userId}
+    </update>
+    <update id="updateImUserFriend">
+        UPDATE im_user_friend SET friend_avatar_ = #{avatar},friend_nickname_ = #{username} WHERE friend_id_ = #{userId}
+    </update>
 
     <select id="queryEmployeeList" resultMap="SysUser">
         select  su.*

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: bbs

cooleshow-cms/src/main/resources/bootstrap-prod.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=dba505ee-020c-4c2b-bab2-e91d89cf248e
+#\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-gateway/gateway-web/src/main/resources/bootstrap-prod.yml

@@ -2,10 +2,10 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
-        prefix: teacher
+        prefix: gateway-web
         file-extension: yaml
         refresh:
           enabled: true

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/Users/chenxiaoyu/Documents/logs/gateway-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="/mdata/logs/gateway-%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" />
 
@@ -53,7 +53,7 @@
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
-		<root level="WARN">
+		<root level="INFO">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>

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

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
+        group: DEFAULT_GROUP
+        prefix: mall-admin
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

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

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
+        group: DEFAULT_GROUP
+        prefix: mall-portal
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

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

@@ -0,0 +1,13 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 121.41.82.151:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
+        group: DEFAULT_GROUP
+        prefix: task
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true
+

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: admin

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1051,7 +1051,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
         RLock lock = redissonClient.getLock("teacherId:" + scheduleDto.getTeacherId());
         try {
-            if (lock.tryLock(0, 60, TimeUnit.SECONDS)) {
+            if (lock.tryLock(10, 60, TimeUnit.SECONDS)) {
                 return buyPracticeCourseTran(orderReqInfo);
             }
         } catch (InterruptedException e) {

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

@@ -113,6 +113,12 @@
 			<if	test="param.lessonSubject != null">
 				AND g.lesson_subject_ = #{param.lessonSubject}
 			</if>
+			<if test="null != param.search and '' != param.search">
+				AND (
+				g.lesson_name_ LIKE CONCAT('%', #{param.search}, '%') OR
+				s.username_ LIKE CONCAT('%', #{param.search}, '%')
+				)
+			</if>
 		</where>
 	</select>
 	<select id="selectStudentPage" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentDetailVo">

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

@@ -2,9 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
-
         group: DEFAULT_GROUP
         prefix: classroom
         file-extension: yaml

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

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

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: student

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: teacher

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: website

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

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.96.80.97:8848
+        server-addr: 121.41.82.151:8848
         namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
         group: DEFAULT_GROUP
         prefix: websocket