update

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

@@ -883,7 +883,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.get(id);
         List<StudentPaymentOrder> orderList = new ArrayList<>();
         orderList.add(studentPaymentOrder);
-        if (studentPaymentOrder.getPaymentChannel().equals("ADAPAY")) {
+        if (studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.ADAPAY.getCode()) || studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.YEEPAY.getCode())) {
             adaPayQuery(orderList);
         } else if (studentPaymentOrder.getPaymentChannel().equals("YQPAY")) {
             yqPayQuery(orderList);

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

@@ -24,7 +24,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("/wechat/*","/v2/api-docs", "/code/*", "/student/registering", "/register/*", "/studentOrder/*", "/musicGroup/getSubjectGoodsAndInfo",
+                .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*", "/student/registering", "/register/*", "/studentOrder/**", "/musicGroup/getSubjectGoodsAndInfo",
                 "/musicGroup/getMusicGroupStatus", "/musicGroup/getOrderStatus","/sysCouponCode/queryPage",
                 "/musicGroup/pay",
                 "/musicGroup/rePay",

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayUploadService.java

@@ -22,10 +22,9 @@ public class YeepayUploadService {
 		
 		YopRequest request = new YopRequest(hfMerchantConfig.getAppId(), hfMerchantConfig.getRsaPrivateKey());
 		
-		request.addParam("merQual", file);
-		//request.addFile("merQual", file);
+		request.addFile("merQual", file);
 		try {
-			YopResponse response = YopRsaClient.post("/yos/v1.0/sys/merchant/qual/upload", request);
+			YopResponse response = YopRsaClient.upload("/yos/v1.0/sys/merchant/qual/upload", request);
 			
 			LOGGER.info("易宝上传接口 resp:{}", response.getStringResult());
 			

mec-web/src/main/java/com/ym/mec/web/controller/payment/YeepayController.java

@@ -148,24 +148,27 @@ public class YeepayController extends BaseController {
     	
 
         File file = new File("/var/tmp/" + multipartFile.getOriginalFilename());
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        FileOutputStream fos = new FileOutputStream(file);
         InputStream inputStream = multipartFile.getInputStream();
 
         try {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
-            }
-            FileOutputStream fos = new FileOutputStream(file);
             IOUtils.copy(inputStream, fos);
+            inputStream.close();
+            fos.close();
             
             HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
             if(hfMerchantConfig == null){
-            	throw new BizException("请配置机构的汇付商户信息");
+            	throw new BizException("请配置机构的易宝商户信息");
             }
         	
             return succeed(yeepayUploadService.upload(hfMerchantConfig, file));
         } catch (Exception e) {
             return failed(e.getMessage());
         } finally {
+        	IOUtils.closeQuietly(fos);
             IOUtils.closeQuietly(inputStream);
             FileUtils.deleteQuietly(file);
         }