Merge branch 'sharding' into test

# Conflicts:
#	src/main/java/com/sqx/SqxApplication.java
#	src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
#	src/main/resources/mapper/course/CourseDao.xml

src/main/java/com/sqx/modules/app/controller/app/AppController.java

@@ -107,8 +107,8 @@ public class AppController {
         userEntity.setUserId(userId);
         old.setZhiFuBao(userEntity.getZhiFuBao());
         old.setZhiFuBaoName(userEntity.getZhiFuBaoName());
+        boolean bool = userService.updateById(userEntity);
         // 去除首绑支付宝奖励
-//        boolean bool = userService.updateById(userEntity);
 //        if (bool && isFirstBind) {
 //            userService.firstBindAwardsMoney(old);
 //        }

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1498,7 +1498,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             if (ret) {
                 ThreadUtil.execAsync(()->{
                     discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]");
-                },true);
+                });
             }
         } catch (Exception e) {
             log.error("首绑支付宝发放奖励异常，用户信息：{}", JSONUtil.toJsonStr(entity));