he2802 3 éve
szülő
commit
def16cbde7

+ 1 - 1
zhongzheng-admin/src/main/resources/application-pre.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password:  zhongzheng2021
             # 从库数据源

+ 1 - 1
zhongzheng-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: gdxy2021!@#zzjykj
             # 从库数据源

+ 0 - 2
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -393,8 +393,6 @@ public class WxLoginService implements IWxLoginService
             JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
             if(jsonObject.containsKey("access_token")){
                 accessToken = String.valueOf(jsonObject.get("access_token"));
-                System.out.println("获取");
-                System.out.println(accessToken);
                 if(Validator.isNotEmpty(accessToken)&&!accessToken.equals("null")){
                     redisCache.setCacheObject(key, accessToken,7100, TimeUnit.SECONDS);//7200有效期
                 }

+ 6 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1587,7 +1587,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformRemindVo informRemindVo = informRemindService.queryById(28L);
         for(OrderGoodsVo goodsVo : list2){
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());
                 if (informRemindVo.getWayStatus().equals(1))  {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -1671,7 +1671,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformRemindVo informRemindVo = informRemindService.queryById(29L);
         for(OrderGoodsVo goodsVo : list2){
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());
                 if (informRemindVo.getWayStatus().equals(1))  {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -1758,7 +1758,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 continue;
             }
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());//学生
                 SysUser teacher = iSysUserService.selectUserById(goodsVo.getSysUserId());//教务信息
                 if (informRemindVo.getWayStatus().equals(1))  {
@@ -1823,7 +1823,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformRemindVo informRemindVo = informRemindService.queryById(31L);
         for(OrderGoodsVo goodsVo : list2){
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());
                 if (informRemindVo.getWayStatus().equals(1))  {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -1906,7 +1906,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformRemindVo informRemindVo = informRemindService.queryById(32L);
         for(OrderGoodsVo goodsVo : list2){
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());
                 if (informRemindVo.getWayStatus().equals(1))  {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -1992,7 +1992,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 continue;
             }
             GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
-            if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+            if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
                 UserVo userVo = iUserService.queryById(goodsVo.getUserId());//学生
                 SysUser teacher = iSysUserService.selectUserById(goodsVo.getSysUserId());//教务信息
                 if (informRemindVo.getWayStatus().equals(1))  {

+ 0 - 16
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserWxFollowServiceImpl.java

@@ -110,22 +110,6 @@ public class UserWxFollowServiceImpl extends ServiceImpl<UserWxFollowMapper, Use
     @Override
     public List<UserWxFollow> getBatchList(UserWxFollowQueryBo bo) {
         List<UserWxFollow> list = baseMapper.getBatchList(bo);
-        CountDownLatch countDownLatch = new CountDownLatch(list.size());
-        IUserWxFollowService context = this;
-        for (UserWxFollow userWxFollow:list) {
-           /* RsyncManager.me().execute(new TimerTask() {
-                @Override
-                public void run() {
-                    LambdaUpdateWrapper<UserWxFollow> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                    objectLambdaUpdateWrapper.eq(UserWxFollow::getId, userWxFollow.getId());
-                    objectLambdaUpdateWrapper.set(UserWxFollow::getUnionId, userWxFollow.getUnionId());
-                    objectLambdaUpdateWrapper.set(UserWxFollow::getUpdateTime, DateUtils.getNowTime());
-                    context.update(null,objectLambdaUpdateWrapper);
-                }
-            });*/
-        //    asyncService.executeAsync(userWxFollow, countDownLatch,this);
-        }
-        update();
         return list;
     }