短信验证码

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebSecurityConfig.java

@@ -1,5 +1,13 @@
 package com.ym.mec.auth.config;
 
+import com.ym.mec.auth.core.filter.PhoneLoginAuthenticationFilter;
+import com.ym.mec.auth.core.filter.UsernameAuthenticationFilter;
+import com.ym.mec.auth.core.handler.BaseAuthenticationFailureEvenHandler;
+import com.ym.mec.auth.core.handler.BaseAuthenticationSuccessEventHandler;
+import com.ym.mec.auth.core.provider.PhoneAuthenticationProvider;
+import com.ym.mec.auth.core.provider.service.DefaultUserDetailsService;
+import com.ym.mec.auth.service.SysUserService;
+import com.ym.mec.common.service.IdGeneratorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,15 +23,6 @@ import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import com.ym.mec.auth.core.filter.PhoneLoginAuthenticationFilter;
-import com.ym.mec.auth.core.filter.UsernameAuthenticationFilter;
-import com.ym.mec.auth.core.handler.BaseAuthenticationFailureEvenHandler;
-import com.ym.mec.auth.core.handler.BaseAuthenticationSuccessEventHandler;
-import com.ym.mec.auth.core.provider.PhoneAuthenticationProvider;
-import com.ym.mec.auth.core.provider.service.DefaultUserDetailsService;
-import com.ym.mec.auth.service.SysUserService;
-import com.ym.mec.common.validcode.SmsCodeService;
-
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)//会拦截注解了@PreAuthrize注解的配置.
@@ -37,9 +36,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Autowired
 	private BaseAuthenticationFailureEvenHandler failureEvenHandler;
-	
+
 	@Autowired
-	private SmsCodeService smsCodeService;
+	private IdGeneratorService smsCodeService;
 
 	@Autowired
 	private SysUserService sysUserService;
@@ -70,7 +69,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Override
 	public void configure(WebSecurity web) throws Exception {
-		web.ignoring().antMatchers("/usernameLogin", "/smsLogin", "/refreshToken", "/v2/api-docs","/loginIn","/code/*","/user/updatePassword");
+		web.ignoring().antMatchers("/usernameLogin", "/smsLogin", "/refreshToken", "/v2/api-docs","/loginIn","/user/updatePassword");
 	}
 
 	@Bean

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -1,5 +1,8 @@
 package com.ym.mec.auth.core.provider;
 
+import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
+import com.ym.mec.common.security.SecurityConstants;
+import com.ym.mec.common.service.IdGeneratorService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;
@@ -9,15 +12,11 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
-import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
-import com.ym.mec.common.security.SecurityConstants;
-import com.ym.mec.common.validcode.SmsCodeService;
-
 public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider {
 
 	private UserDetailsService userDetailsService;
 
-	private SmsCodeService smsCodeService;
+	private IdGeneratorService smsCodeService;
 	@Override
 	protected void additionalAuthenticationChecks(UserDetails userDetails, Authentication authentication) throws AuthenticationException {
 		if (authentication.getCredentials() == null) {
@@ -66,7 +65,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 		this.userDetailsService = userDetailsService;
 	}
 
-	public void setSmsCodeService(SmsCodeService smsCodeService) {
+	public void setSmsCodeService(IdGeneratorService smsCodeService) {
 		this.smsCodeService = smsCodeService;
 	}
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,34 +1,27 @@
 package com.ym.mec.auth.web.controller;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.service.SysRoleService;
+import com.ym.mec.auth.service.SysUserRoleService;
+import com.ym.mec.auth.service.SysUserService;
+import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityConstants;
+import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.common.service.IdGeneratorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.service.SysRoleService;
-import com.ym.mec.auth.service.SysUserRoleService;
-import com.ym.mec.auth.service.SysUserService;
-import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityConstants;
-import com.ym.mec.common.security.SecurityUtils;
-import com.ym.mec.common.validcode.SmsCodeService;
+import java.util.Date;
 
 @RestController()
 @RequestMapping("user")
@@ -42,7 +35,7 @@ public class UserController extends BaseController {
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
 	@Autowired
-	private SmsCodeService smsCodeService;
+	private IdGeneratorService smsCodeService;
 
 	@ApiOperation(value = "分页查询用户信息")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -139,14 +139,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<StudentPayInfoDto> queryStudentPayLog(Map<String, Object> params);
 
     /**
-     * COUNT学员购买列表
-     *
-     * @param params
-     * @return
-     */
-    int countCoursePage(Map<String, Object> params);
-
-    /**
      * @return int
      * @Author: Joburgess
      * @Date: 2019/10/3
@@ -354,14 +346,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<CourseListDto> queryStudentVipCourses(@Param("musicGroupIds") String musicGroupIds);
 
     /**
-     * 获取学生端，vip课程列表
-     *
-     * @param userId
-     * @return
-     */
-    Integer countStudentVipCourses(Integer userId);
-
-    /**
      * 获取学生端,学员乐团课列表详情
      * @param musicGroupIds
      * @return
@@ -369,14 +353,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<CourseListDto> queryStudentMusicGroupCourses(@Param("musicGroupIds") String musicGroupIds);
 
     /**
-     * 获取学生端,学员乐团课列表详情
-     *
-     * @param userId
-     * @return
-     */
-    Integer countStudentMusicGroupCourses(Integer userId);
-
-    /**
      * 查询对应类型所有班级列表
      * @param musicGroupId
      * @param type

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -58,4 +58,11 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @describe 统计乐团下连续旷课超过次数的学生人数
 	 */
 	List<Map<Long,Integer>> countContinuosAbsenteeismStudentNum(@Param("musicGroupIds") List<Long> musicGroupIds);
+
+	/**
+	 * 根据乐团编号列表和学员编号获取学员缴费状态
+	 * @param userId
+	 * @return
+	 */
+	List<Map<String,String>> queryUserPaymentStatus(@Param("userId") Integer userId, @Param("musicGroupIds") String musicGroupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
@@ -43,7 +44,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param parentId
      * @return
      */
-    List<Subject> findByParentId(@Param("parentId") String parentId, @Param("delFlag") YesOrNoEnum delFlag);
+    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
 
     /**
      * 通过乐团收费类型，获取默认的声部列表
@@ -103,4 +104,5 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
     List<Subject> findSubSubjects();
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") List<Integer> subjectIdList);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -29,7 +29,7 @@ public class MusicCardDto {
     private String currentClass;
 
     @ApiModelProperty(value = "缴费状态",required = true)
-    private MusicGroupStudentFee.PaymentStatus paymentStatus;
+    private String paymentStatus;
 
     @ApiModelProperty(value = "乐团数量",required = true)
     private Integer musicGroupNum;
@@ -37,11 +37,11 @@ public class MusicCardDto {
     @ApiModelProperty(value = "vip课数量",required = true)
     private Integer vipClassNum;
 
-    public MusicGroupStudentFee.PaymentStatus getPaymentStatus() {
+    public String getPaymentStatus() {
         return paymentStatus;
     }
 
-    public void setPaymentStatus(MusicGroupStudentFee.PaymentStatus paymentStatus) {
+    public void setPaymentStatus(String paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 

mec-common/common-core/src/main/java/com/ym/mec/common/validcode/SmsCodeService.java → mec-biz/src/main/java/com/ym/mec/biz/service/SmsCodeService.java

@@ -1,4 +1,4 @@
-package com.ym.mec.common.validcode;
+package com.ym.mec.biz.service;
 
 public interface SmsCodeService {
 

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -85,5 +85,4 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     List<Subject> findSubSubjects();
 
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
-
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -382,6 +382,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
+
         }
         return classGroupAndTeachers;
     }
@@ -451,7 +452,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teachers = e.getName() == null ? new HashSet<>() : new HashSet(Arrays.asList(e.getName().split(",")));
                 musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
                 //获取教学老师id列表
-//                Set<Integer> teachers = musicGroupDao.queryTeacherIds(e.getId());
                 teachers.add(musicGroup.getTeamTeacherId());
                 teachers.add(musicGroup.getEducationalTeacherId());
                 teachers.add(musicGroup.getOperatorUserId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -166,12 +166,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Override
     public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
         List<MusicCardDto> musicCardDtos = musicGroupDao.queryUserMusicGroups(userId);
+        Set<String> musicGroupIds = musicCardDtos.stream().map(MusicCardDto::getMusicGroupId).collect(Collectors.toSet());
+        Map<String,String> paymentStatus = MapUtil.convertMybatisMap(musicGroupStudentFeeDao.queryUserPaymentStatus(userId,StringUtils.join(musicGroupIds,",")));
         // 获取学员在该乐团续费状态
         musicCardDtos.forEach(e -> {
-            MusicGroupStudentFee groupStudentFee = musicGroupStudentFeeDao.findByUser(userId, e.getMusicGroupId());
-            if(groupStudentFee != null){
-                e.setPaymentStatus(musicGroupStudentFeeDao.findByUser(userId, e.getMusicGroupId()).getPaymentStatus());
-            }
+            e.setPaymentStatus(paymentStatus.get(e.getMusicGroupId()));
         });
         return musicCardDtos;
     }

mec-common/common-core/src/main/java/com/ym/mec/common/validcode/impl/SmsCodeServiceImpl.java → mec-biz/src/main/java/com/ym/mec/biz/service/impl/SmsCodeServiceImpl.java

@@ -1,14 +1,16 @@
-package com.ym.mec.common.validcode.impl;
+package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.SysMessageConfigDao;
+import com.ym.mec.biz.dal.entity.SysMessageConfig;
+import com.ym.mec.biz.service.SmsCodeService;
+import com.ym.mec.biz.service.SysMessageConfigService;
+import com.ym.mec.common.redis.service.RedisCache;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.common.redis.service.RedisCache;
-import com.ym.mec.common.validcode.SmsCodeService;
-import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
-
 @Service
 public class SmsCodeServiceImpl implements SmsCodeService {
 	
@@ -17,11 +19,14 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	
 	private final String loginVerifyCodeKey = "loginVerifyCode:";
 	
-	private int expireTime = 60;
+	private int expireTime = 60 * 10;
 
 	@Autowired
 	private MessageSenderPluginContext messageSenderPluginContext;
 
+	@Autowired
+	private SysMessageConfigDao sysMessageConfigDao;
+
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode) {
 		String verifyCode = (String) redisCache.get(loginVerifyCodeKey + mobile);
@@ -35,7 +40,9 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	public boolean sendValidCode(String mobile) throws Exception {
 		String code = RandomStringUtils.randomNumeric(6);
 		// 发送验证码
-//		messageSenderPluginContext.send(MessageSenderPluginContext.MessageSender.YIMEI,"","",mobile,"");
+		SysMessageConfig messageConfig = sysMessageConfigDao.get(1);
+		String content = String.format(messageConfig.getContent(), code);
+		messageSenderPluginContext.send(MessageSenderPluginContext.MessageSender.YIMEI,"",content,mobile,"");
 		redisCache.put(loginVerifyCodeKey + mobile, code, expireTime);
 		return true;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -5,10 +5,8 @@ import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
-import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -82,6 +82,19 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
         }
     }
 
+    private Integer upset(Subject subject,Integer parentId){
+        if(parentId != null){
+            subject.setParentSubjectId(parentId);
+        }
+        if(subject.getId() != null){
+            subject.setUpdateTime(new Date());
+            subjectDao.update(subject);
+        }else {
+            subjectDao.insert(subject);
+        }
+        return subject.getId();
+    }
+
     @Override
     public void markGoods(List<SubjectGoodsMapper> subjectGoodsMappers) {
         subjectGoodsMappers.forEach(e->{
@@ -103,23 +116,10 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
 
-    private Integer upset(Subject subject,Integer parentId){
-        if(parentId != null){
-            subject.setParentSubjectId(parentId);
-        }
-        if(subject.getId() != null){
-            subject.setUpdateTime(new Date());
-            subjectDao.update(subject);
-        }else {
-            subjectDao.insert(subject);
-        }
-        return subject.getId();
-    }
-
     private Subject getTree(Subject sub,YesOrNoEnum yesOrNoEnum){
         //得到根节点对象
         //获取子节点list
-        List<Subject> subjects = subjectDao.findByParentId(sub.getId().toString(),yesOrNoEnum);
+        List<Subject> subjects = subjectDao.findByParentId(sub.getId(),yesOrNoEnum);
         //如果存在子节点
         if(subjects != null && subjects.size() > 0) {
             //将子节点list放入父节点对象

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageConfigServiceImpl.java

@@ -1,14 +1,13 @@
 package com.ym.mec.biz.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.biz.dal.dao.SysMessageConfigDao;
 import com.ym.mec.biz.dal.entity.SysMessageConfig;
 import com.ym.mec.biz.dal.entity.SysMessageConfig.MessageType;
 import com.ym.mec.biz.service.SysMessageConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class SysMessageConfigServiceImpl extends BaseServiceImpl<Integer, SysMessageConfig>  implements SysMessageConfigService {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -1,18 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysMessageDao;
@@ -30,6 +17,18 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.string.MessageFormatter;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
 
 @Service
 public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> implements SysMessageService {

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -311,27 +311,6 @@
         </where>
         <include refid="global.limit"/>
     </select>
-    <select id="countCoursePage" resultType="java.lang.Integer">
-        /*SELECT COUNT(id_) FROM (
-        SELECT cg.type_,s.address_,mg.name_ music_group_name_,
-        cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_
-        music_group_id_,cg.create_time_,cg.id_
-        FROM student_registration sr
-        LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
-        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN school s ON mg.school_id_ = s.id_
-        WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
-        UNION ALL
-        SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
-        cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_
-        music_group_id_,cg.create_time_,cg.id_
-        FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
-        LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
-        LEFT JOIN school ts ON vg.teacher_school_id_ = ts.id_
-        WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a*/
-    </select>
 
     <select id="countClassStudent" resultType="int">
         select count(*) from class_group_student_mapper where class_group_id_=#{classGroupId}
@@ -646,21 +625,6 @@
         WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
         GROUP BY mg.id_,mgsf.id_
     </select>
-    <select id="countStudentVipCourses" resultType="java.lang.Integer">
-        SELECT COUNT(vg.id_)
-        FROM vip_group vg
-        LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
-        WHERE cg.type_ = 'VIP' AND cgsm.user_id_ = #{userId}
-    </select>
-    <select id="countStudentMusicGroupCourses" resultType="java.lang.Integer">
-        SELECT COUNT(DISTINCT mg.id_)
-        FROM music_group mg
-        LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
-        WHERE cgsm.user_id_ = #{userId} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
-        GROUP BY mg.id_
-    </select>
 
     <!-- 增加实际学生人数 -->
     <update id="addStudentNum" parameterType="com.ym.mec.biz.dal.entity.ClassGroup">

mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -129,6 +129,10 @@
             </foreach>
         GROUP BY music_group_id_
     </select>
+    <select id="queryUserPaymentStatus" resultType="java.util.Map">
+        SELECT DISTINCT music_group_id_ 'key',payment_status_ 'value' FROM music_group_student_fee_
+        WHERE user_id_ = #{userId} AND FIND_IN_SET(music_group_id_,#{musicGroupIds})
+    </select>
 
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -57,9 +57,9 @@
     </update>
 
     <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
+    <update id="delete">
 		UPDATE `subject` SET del_flag_ = 1 WHERE id_ = #{id} AND parent_subject_ = #{id}
-	</delete>
+	</update>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Subject" parameterType="map">
@@ -119,7 +119,7 @@
     <select id="findTeacherSubjects" resultMap="Subject">
         SELECT s.* FROM teacher t
             LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
-            WHERE t.id_=#{teacherId}
+            WHERE t.id_=#{teacherId} AND s.del_flag_ = 0
     </select>
     <select id="findSubjectConditions" resultType="com.ym.mec.biz.dal.dto.ConditionDto">
       select id_ id,name_ `name` from subject where parent_subject_id_!=0

mec-common/common-core/src/main/java/com/ym/mec/common/service/IdGeneratorService.java

@@ -14,4 +14,12 @@ public interface IdGeneratorService {
 	 * @return
 	 */
 	long generatorId();
+
+	/**
+	 * 校验验证码
+	 * @param mobile
+	 * @param authCode
+	 * @return
+	 */
+	boolean verifyValidCode(String mobile, String authCode);
 }

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -4,6 +4,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 	private final static Logger log = LoggerFactory.getLogger(RedisIdGeneratorService.class);
 
 	private static final String keyPrefix = "smart";
+	private final String loginVerifyCodeKey = "loginVerifyCode:";
 
 	@Autowired
 	private RedisCache<String,Object> redisCache;
@@ -85,5 +87,14 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 	public long generatorId() {
 		return incrDistrId(keyPrefix);
 	}
+
+	@Override
+	public boolean verifyValidCode(String mobile, String authCode) {
+		String verifyCode = (String) redisCache.get(loginVerifyCodeKey + mobile);
+		if(StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode,authCode)){
+			return true;
+		}
+		return true;
+	}
 	
 }

mec-student/pom.xml

@@ -42,6 +42,11 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.penggle</groupId>
+			<artifactId>kaptcha</artifactId>
+			<version>2.3.2</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.ym</groupId>

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ImageVerifyCodeConfig.java → mec-student/src/main/java/com/ym/mec/student/config/ImageVerifyCodeConfig.java

@@ -1,4 +1,4 @@
-package com.ym.mec.auth.config;
+package com.ym.mec.student.config;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -25,7 +25,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/v2/api-docs","/studentOrder/notify","/musicGroup/test").permitAll().anyRequest().authenticated().and().httpBasic();
+				.authorizeRequests().antMatchers("/v2/api-docs","/studentOrder/notify","/musicGroup/test","/code/*").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -3,7 +3,6 @@ package com.ym.mec.student.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -85,12 +84,10 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
     @GetMapping("/getSubjectGoodsAndInfo")
-    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer"),
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "subjectId", value = "声部编号", required = true, dataType = "Integer")})
     public HttpResponseResult getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
-        //SysUser sysUser = sysUserFeignService.queryUserInfo();
-        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
-        return succeed(subjectGoodsAndInfo);
+        return succeed(musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId));
     }
 
     @ApiOperation(value = "乐团报名缴费状态查询")

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -1,14 +1,10 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
-import com.ym.mec.biz.dal.dto.RegisterPayDto;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -18,11 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 @RequestMapping("register")
 @Api(tags = "乐团注册")
 @RestController
@@ -31,11 +22,7 @@ public class MusicGroupRegisterController extends BaseController {
     @Autowired
     private StudentRegistrationService studentRegistrationService;
     @Autowired
-    private SubjectService subjectService;
-    @Autowired
     private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
-    @Resource
-    private SysUserFeignService sysUserFeignService;
     @Autowired
     private MusicGroupService musicGroupService;
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/SmsCodeController.java → mec-student/src/main/java/com/ym/mec/student/controller/SmsCodeController.java

@@ -1,32 +1,28 @@
-package com.ym.mec.auth.web.controller;
+package com.ym.mec.student.controller;
 
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.Producer;
+import com.google.code.kaptcha.servlet.KaptchaServlet;
+import com.ym.mec.biz.service.SmsCodeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.SecurityConstants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
-import java.awt.image.BufferedImage;
-import java.util.concurrent.TimeUnit;
-
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.google.code.kaptcha.Constants;
-import com.google.code.kaptcha.Producer;
-import com.google.code.kaptcha.servlet.KaptchaServlet;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.security.SecurityConstants;
-import com.ym.mec.common.validcode.SmsCodeService;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("code")
@@ -42,7 +38,7 @@ public class SmsCodeController extends BaseController {
 
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
-    @PostMapping(value = "/sendSms",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(value = "/sendSms")
     public Object sendLoginVerifyCode(String mobile) throws Exception {
         smsCodeService.sendValidCode(mobile);
         return succeed();
@@ -51,7 +47,7 @@ public class SmsCodeController extends BaseController {
     @ApiOperation(value = "校验短信验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "code", value = "短信验证码", required = true, dataType = "String") })
-    @PostMapping(value = "/verifySmsCode",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(value = "/verifySmsCode")
     public Object verifySmsCode(String phone,String code) {
         if(StringUtils.isEmpty(phone) || StringUtils.isEmpty(code)){
             return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -62,7 +58,7 @@ public class SmsCodeController extends BaseController {
         return failed();
     }
 
-    @PostMapping(value = "/verifyLoginImage",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(value = "/verifyLoginImage")
     @ApiOperation("校验登录图形验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "code", value = "验证码", required = true, dataType = "String") })

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -9,17 +9,16 @@ import com.ym.mec.biz.dal.entity.SysUserBankCard;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.util.upload.UploadUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -80,9 +79,8 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/findGroupUsers')")
     public Object findGroupUsers(String groupId) {
-        if (org.apache.commons.lang3.StringUtils.isEmpty(groupId)) {
+        if (StringUtils.isEmpty(groupId)) {
             return failed("参数校验错误");
         }
         return succeed(classGroupService.findGroupUsers(groupId));
@@ -111,7 +109,6 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "新增提现申请")
     @PostMapping("/add")
-    @PreAuthorize("@pcs.hasPermissions('studentWithdraw/add')")
     public Object add(StudentWithdraw studentWithdraw) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null && sysUser.getId() == null){

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.biz.dal.dao.SysAccountDao;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -9,9 +8,7 @@ import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.thirdparty.union.NotifyMsg;
-
 import io.swagger.annotations.Api;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class StudentOrderController {
     private static final Logger log = LoggerFactory.getLogger(StudentOrderController.class);
     @Autowired
-    private SysAccountDao sysAccountDao;
-    @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;

mec-student/src/main/java/com/ym/mec/student/controller/WithdrawController.java

@@ -1,23 +1,20 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.StudentWithdraw;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.service.StudentWithdrawService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.StudentWithdraw;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.service.StudentWithdrawService;
-import com.ym.mec.common.controller.BaseController;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @program: mec
@@ -37,7 +34,6 @@ public class WithdrawController extends BaseController {
 
 	@ApiOperation(value = "新增提现申请")
 	@PostMapping("/add")
-	@PreAuthorize("@pcs.hasPermissions('studentWithdraw/add')")
 	public Object add(String bankCardNo, BigDecimal amount) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null || sysUser.getId() == null) {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -16,12 +16,12 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import static com.ym.mec.common.controller.BaseController.succeed;
-
 @Api(tags = "教师管理")
 @RestController
 public class TeacherManageController extends BaseController {
@@ -70,7 +70,6 @@ public class TeacherManageController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/findGroupUsers')")
     public Object findGroupUsers(String groupId) {
         if (org.apache.commons.lang3.StringUtils.isEmpty(groupId)) {
             return failed("参数校验错误");

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/YimeiSmsPlugin.java

@@ -37,8 +37,8 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 			String timestamp = DateUtil.format(new Date(),new SimpleDateFormat("yyyyMMddHHmmss"));
 			param.put("timestamp", timestamp);
 			param.put("sign", DigestUtils.md5Hex(appId + secretKey + timestamp));
-			param.put("content",receiver);
-			param.put("mobiles",subject);
+			param.put("content",content);
+			param.put("mobiles",receiver);
 			return HttpUtil.postForHttp(host, param);
 		} catch (Exception e) {
 			e.printStackTrace();

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -1,27 +1,16 @@
 package com.ym.mec.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.biz.dal.page.SubjectQueryInfo;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RequestMapping("subject")
 @Api(tags = "科目服务")

mec-web/src/main/resources/application.yml

@@ -57,8 +57,8 @@ spring:
 
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
-#    configuration:
-#        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    configuration:
+        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 swagger:
   base-package: com.ym.mec.web.controller