Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/SysUserService.java

@@ -101,6 +101,6 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * 学员注册
 	 * @return
 	 */
-	SysUserInfo initUser(LoginEntity loginEntity);
+	void initUser(LoginEntity loginEntity);
 
 }

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysUserServiceImpl.java

@@ -143,10 +143,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public SysUserInfo initUser(LoginEntity loginEntity) {
+	public void initUser(LoginEntity loginEntity) {
 		if(StringUtils.equalsIgnoreCase(loginEntity.getClientId(),"STUDENT")){
 			eduUserFeignService.studentApply(loginEntity.getOrganId(),loginEntity.getPhone());
-			return queryUserInfoByPhone(loginEntity.getPhone());
+//			return queryUserInfoByPhone(loginEntity.getPhone());
 		}
 		throw new UsernameNotFoundException("404.9");
 	}

edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -35,6 +35,12 @@ public class RoomController{
         return new BaseResponse<>(roomResult);
     }
 
+    @RequestMapping(value = "/roomQuery", method = RequestMethod.POST)
+    public Object signIn(String roomId) throws Exception {
+        roomService.roomQuery(roomId);
+        return new BaseResponse<>();
+    }
+
     @RequestMapping(value = "/signIn", method = RequestMethod.POST)
     public Object signIn(Long roomId){
         roomService.signIn(roomId);

edu-im/edu-im-server/src/main/java/com/keao/edu/im/http/HttpHelper.java

@@ -3,6 +3,7 @@ package com.keao.edu.im.http;
 import com.keao.edu.im.config.IMProperties;
 import com.keao.edu.im.utils.CodeUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -171,7 +172,9 @@ public class HttpHelper {
         conn.setRequestProperty("Nonce", nonce);
         conn.setRequestProperty("Timestamp", timestamp);
         conn.setRequestProperty("Signature", sign);
-        conn.setRequestProperty("Room-Id", roomId);
+        if(StringUtils.isNotEmpty(roomId)){
+            conn.setRequestProperty("Room-Id", roomId);
+        }
         conn.setRequestProperty("Content-Type", contentType);
         return conn;
     }

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -7,6 +7,7 @@ import com.keao.edu.im.http.HttpHelper;
 import com.keao.edu.im.pojo.IMApiResultInfo;
 import com.keao.edu.im.pojo.IMTokenInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -288,6 +289,27 @@ public class IMHelper {
         return JSON.parseObject(httpHelper.returnResult(conn, body), IMApiResultInfo.class);
     }
 
+    /**
+     * 查询房间状态
+     * @param roomId
+     * @return
+     * @throws Exception
+     */
+    public IMApiResultInfo roomQuery(String roomId) throws Exception {
+        if (StringUtils.isEmpty(roomId)) {
+            throw new IllegalArgumentException("Paramer 'roomId' is required");
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("roomId=").append(URLEncoder.encode(roomId, UTF8));
+        String body = sb.toString();
+
+        HttpURLConnection conn = httpHelper.createIMRtcPostHttpConnection("/rtc/room/query", "application/x-www-form-urlencoded",null);
+        httpHelper.setBodyParameter(body, conn);
+        String returnResult = httpHelper.returnResult(conn, body);
+        return null;
+    }
+
 
     /**
      * 发送群组消息方法（以一个用户身份向群组发送消息，单条消息最大 128k.每秒钟最多发送 20 条消息，每次最多向 3 个群组发送，如：一次向 3 个群组发送消息，示为 3 条消息。）
@@ -360,11 +382,11 @@ public class IMHelper {
         sb.append("&content=").append(URLEncoder.encode(msgStr, UTF8));
 
         if (pushContent != null) {
-            sb.append("&pushContent=").append(URLEncoder.encode(pushContent.toString(), UTF8));
+            sb.append("&pushContent=").append(URLEncoder.encode(pushContent, UTF8));
         }
 
         if (pushData != null) {
-            sb.append("&pushData=").append(URLEncoder.encode(pushData.toString(), UTF8));
+            sb.append("&pushData=").append(URLEncoder.encode(pushData, UTF8));
         }
 
         if (isPersisted != null) {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -76,6 +76,11 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private StudentAttendanceDao studentAttendanceDao;
 
+    @Override
+    public void roomQuery(String roomId) throws Exception {
+        imHelper.roomQuery(roomId);
+    }
+
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
     public RoomResult joinRoom(String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/RoomService.java

@@ -15,6 +15,8 @@ public interface RoomService {
 
     void signIn(Long roomId);
 
+    void roomQuery(String roomId) throws Exception;
+
     void signOut(Long roomId);
 
     public Boolean leaveRoom(String roomId,String userId) throws ApiException, Exception;

edu-task/pom.xml

@@ -57,6 +57,10 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-user-client-api</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

edu-task/src/main/java/com/keao/edu/task/jobs/PayStatusTask.java

@@ -0,0 +1,19 @@
+package com.keao.edu.task.jobs;
+
+import com.keao.edu.task.core.BaseTask;
+import com.keao.edu.task.core.TaskException;
+import com.keao.edu.user.api.client.EduUserFeignService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PayStatusTask extends BaseTask {
+
+	@Autowired
+	private EduUserFeignService eduUserFeignService;
+
+	@Override
+	public void execute() throws TaskException {
+		eduUserFeignService.queryPaymentStatus();
+	}
+}

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/ConfigInit.java

@@ -10,7 +10,7 @@ public class ConfigInit {
     private static ConfigInit instance;
     public final static Integer organId = 46; //商户对应的分部
     public final static String merNo = "B09767221"; //商户对应的分部
-    public final static String appId = "app_f0ebdd29-046f-4b60-bd50-92e2c1285c02";
+    public final static String appId = "app_42a86688-db6f-422c-b5e3-c0883dbadb1d";
 
     public final static String wxAppId = "wx751141096e75a4ee";
     public final static String wxAppSecret = "e882d76c95d1613607a85338b1bed3ff";

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -1,7 +1,6 @@
 package com.keao.edu.user.api.client;
 
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keao.edu.common.config.FeignConfiguration;
 import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
@@ -38,4 +37,8 @@ public interface EduUserFeignService {
 	 */
 	@GetMapping(value = "roomStudentRelation/get")
 	ExamRoomStudentRelation getExamRoomStudentRelation(@RequestParam("basicId") Integer basicId, @RequestParam("roomId") String roomId, @RequestParam("studentId") Integer studentId);
+
+	@GetMapping("task/queryPaymentStatus")
+	// 订单支付状态查询
+	void queryPaymentStatus();
 }

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/fallback/EduUserFeignServiceFallback.java

@@ -3,9 +3,7 @@ package com.keao.edu.user.api.client.fallback;
 import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
-import com.keao.edu.user.api.entity.Student;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
 public class EduUserFeignServiceFallback implements EduUserFeignService {
@@ -25,4 +23,9 @@ public class EduUserFeignServiceFallback implements EduUserFeignService {
 		return null;
 	}
 
+	@Override
+	public void queryPaymentStatus() {
+		return;
+	}
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/UserServerApplication.java

@@ -1,5 +1,9 @@
 package com.keao.edu.user;
 
+import com.huifu.adapay.Adapay;
+import com.huifu.adapay.model.MerConfig;
+import com.keao.edu.thirdparty.adapay.ConfigInit;
+import com.keao.edu.user.service.NotifyCallback;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -32,4 +36,15 @@ public class UserServerApplication {
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}
+
+	@Bean
+	public static void startMqtt() {
+		MerConfig merConfig = ConfigInit.merConfig;
+		NotifyCallback notifyCallback = new NotifyCallback();
+		try {
+			Adapay.startMqttListener(merConfig, notifyCallback);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo")
+                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TaskController.java

@@ -0,0 +1,23 @@
+package com.keao.edu.user.controller;
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.user.service.ExamRegistrationPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TaskController extends BaseController {
+
+@Autowired
+private ExamRegistrationPaymentService examRegistrationPaymentService;
+    // 查询订单状态
+    @GetMapping("/queryOrderStatus")
+    public void queryOrderStatus() throws Exception {
+        try {
+            examRegistrationPaymentService.queryPaymentStatus();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -60,6 +60,6 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      *
      * @throws Exception
      */
-    void queryOrderStatus() throws Exception;
+    void queryPaymentStatus() throws Exception;
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -120,7 +120,7 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public void queryOrderStatus() throws Exception {
+    public void queryPaymentStatus() throws Exception {
         yqPayQuery();
         adaPayQuery();
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -138,7 +138,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
                 examinationBasic.getName(),
                 examinationBasic.getName()
         );
-        examRegistrationPayment.setTransNo((String) payMap.get("routingMerNos"));
+        examRegistrationPayment.setMerNo((String) payMap.get("routingMerNos"));
         examRegistrationPayment.setPayType((String) payMap.get("type"));
         examRegistrationPaymentService.update(examRegistrationPayment);
         rpMap.put("examRegister", examRegistration);
@@ -307,7 +307,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
                 examinationBasic.getName(),
                 examinationBasic.getName()
         );
-        order.setTransNo((String) payMap.get("routingMerNos"));
+        order.setMerNo((String) payMap.get("routingMerNos"));
         order.setPayType((String) payMap.get("type"));
         examRegistrationPaymentService.update(order);
         ExamRegistration examRegistration = examRegistrationDao.get(order.getExamRegistrationId());