fix merger

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

@@ -36,7 +36,7 @@ public class PayService {
 //        String orderBody = "大雅乐盟培训课程";//订单内容
 //        String orderSubject = "培训订单";//订单标题
 //        String orderNo = "2019121263844";//订单编号
-//        BigDecimal amount = new BigDecimal("654369"); //订单金额
+//        BigDecimal amount = new BigDecimal("6543"); //订单金额
 
 		String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付提交地址
 		String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置

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

@@ -22,7 +22,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
-		http.csrf().disable().authorizeRequests().antMatchers("/v2/api-docs", "/register/findSubByMusicGroupId","/musicGroup/test").permitAll().anyRequest().authenticated().and().httpBasic();
+		http.csrf().disable().authorizeRequests().antMatchers("/v2/api-docs", "/register/findSubByMusicGroupId", "/register/add","/musicGroup/test","musicGroup/getSubjectGoodsAndInfo").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -153,7 +153,7 @@ public class MusicGroupController extends BaseController {
     public Object test() throws Exception {
 
         BigDecimal amount = new BigDecimal("200");
-        Map map = payService.getPayMap(amount,"201978564578","https://pay.dayaedu.com/notify","","测试订单","测试订单");
+        Map map = payService.getPayMap(amount,"201910113456789386903","https://pay.dayaedu.com/notify","https://baodiu.com","测试订单","测试订单");
         return succeed(map);
     }
 }