zyp

fs-company/src/main/resources/application.yml

@@ -3,8 +3,8 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+    active: druid-myhk
+    include: common,config-myhk
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
 #    active: druid-hdt

fs-qw-task/src/main/resources/application.yml

@@ -6,7 +6,5 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: dev
-#    include: common,config-dev
-    active: druid-hcl
-    include: common,config-druid-hcl
+    active: druid-myhk
+    include: common,config-myhk

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -199,7 +199,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "            <if test=\"companyUserId != null \"> and qu.company_user_id = #{companyUserId}</if>\n" +
             "            <if test=\"corpId != null \"> and qu.corp_id = #{corpId}</if>\n" +
             "            <if test=\"status != null \"> and qu.status = #{status}</if>\n" +
-            "            <if test=\"type != null and sendType !=null and type==2 and (sendType==2 or sendType==4) \"> and qu.app_key IS NOT NULL  </if>\n" +
+            "            <if test=\"type != null and sendType !=null and type==2 and (sendType==2 or sendType==4 or sendType==11) \"> and qu.app_key IS NOT NULL  </if>\n" +
             "</script>"})
     List<QwUserVO> selectQwUserListVO(QwUserListParam qwUser);
 

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -4756,7 +4756,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         logger.info("开始外部联系人存redis");
         List<QwUser> qwUser = qwUserMapper.getQwUserAllKey();
         for (QwUser user : qwUser) {
-            logger.info("外部联系人存redis："+user.getId());
+//            logger.info("外部联系人存redis："+user.getId());
             QwExternalContactListResult contactListResult = qwApiService.getExternalcontactList(user.getQwUserId(), user.getCorpId());
             if (contactListResult.getErrcode() == 0) {
                 List<String> externalUserid = contactListResult.getExternal_userid();
@@ -4776,7 +4776,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         int i=1;
         for (QwUser user : qwUser) {
             syncAddMyQwExternalContactByRedis(user);
-            logger.info("外部联系人存redis："+user.getId()+":"+i);
+//            logger.info("外部联系人存redis："+user.getId()+":"+i);
             i++;
         }
     }

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -826,11 +826,11 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         CourseConfig config = JSON.parseObject(json, CourseConfig.class);
 
         if (config == null) {
-            return R.error().put("msg","课程默认配置为空，请联系管理员");
+            return R.error("课程默认配置为空，请联系管理员");
         }
 
         if (StringUtil.strIsNullOrEmpty(param.getCorpId())){
-            return R.error().put("msg","企业编号为空，不能创建一键群发");
+            return R.error("企业编号为空，不能创建一键群发");
         }
 
         QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(param.getCorpId());
@@ -1073,21 +1073,21 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
                             String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
 
-                    if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
-
-                        log.error("配置中无小程序id，采用默认的");
-
-                        st.setMiniprogramAppid("wxc84c6f789ba7f176");
-                    }else {
-                        st.setMiniprogramAppid(config.getMiniprogramAppid());
-                    }
-//                    if (StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
-//                        log.error("企业未配置小程序-"+param.getCorpId());
+//                    if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
+//
+//                        log.error("配置中无小程序id，采用默认的");
 //
+//                        st.setMiniprogramAppid("wxc84c6f789ba7f176");
 //                    }else {
-//                        //置换各自的小程序
-//                        st.setMiniprogramAppid(qwCompany.getMiniAppId());
+//                        st.setMiniprogramAppid(config.getMiniprogramAppid());
 //                    }
+                    if (StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                        log.error("企业未配置小程序-"+param.getCorpId());
+
+                    }else {
+                        //置换各自的小程序
+                        st.setMiniprogramAppid(qwCompany.getMiniAppId());
+                    }
                     st.setMiniprogramPage(linkByMiniApp);
                     break;
                 default:

fs-service/src/main/resources/application-druid-myhk.yml

@@ -2,12 +2,14 @@
 spring:
     # redis 配置
     redis:
-        host: 172.27.0.6
+#        host: 172.27.0.6
+        host: 127.0.0.1
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password: myhk888777666.
+#        password: myhk888777666.
+        password:
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -17,7 +19,7 @@ spring:
                 # 连接池中的最大空闲连接
                 max-idle: 8
                 # 连接池的最大数据库连接数
-                max-active: 8
+                max-active: 100
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     datasource:
@@ -37,9 +39,10 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: myhk888777666.
+                  url: jdbc:mysql://cd-cdb-5vtn8yte.sql.tencentcdb.com:22680/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                  url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  username: root
+                  password: myhk888777666.
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -92,7 +95,8 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://cd-cdb-5vtn8yte.sql.tencentcdb.com:22680/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: myhk888777666.
                 # 初始连接数

fs-service/src/main/resources/mapper/sop/SopUserLogsMapper.xml

@@ -192,6 +192,7 @@
         where a.start_time <= Now()
           and a.status = 1
           and b.send_type != 4 and b.status in (2,3)
+        and sop_id = 'b3d86baabe5b58b25977c48853ea0a34'
     </select>
 
     <select id="meetsTheRatingByUserInfo"   resultMap="SopUserLogsResult">