update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/SealClassApplication.java

@@ -1,6 +1,7 @@
 package com.keao.edu.im;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -18,6 +19,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableFeignClients("com.keao.edu")
 @ComponentScan("com.keao.edu")
+@MapperScan({"com.keao.edu.common.dao"})
 @EnableScheduling
 @EnableDiscoveryClient
 @Configuration

edu-im/edu-im-server/src/main/resources/application.yml

@@ -117,4 +117,17 @@ cn:
       userIMOfflineKickTtl: 300000
 
 message:
-  debugMode: true
+  debugMode: true
+
+push:
+  jiguang:
+    reqURL: https://api.jpush.cn/v3/push
+    appKey:
+      student: 0e7422e1d6e73637e678716a
+      teacher: 7e0282ca92c12c8c45a93bb3
+      system: a003c997b1add94aa8d6caf9
+    masterSecret:
+      student: c2361016604eab56ab2db2ac
+      teacher: d47430e2f4755ef5dc050ac5
+      system: c281fe6a21acf2e8a9f9d628
+    apns_production: false

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamTeacherSalaryMapper.xml

@@ -169,7 +169,7 @@
 	</sql>
 
 	<select id="queryExamTeacherSalary" resultMap="ExamTeacherSalaryDto" parameterType="map">
-		SELECT ets.*,su.real_name_ teacher_real_name_
+		SELECT ets.*,su.real_name_ teacher_real_name_,su.phone_ teacher_phone_
 		FROM exam_teacher_salary ets
 		LEFT JOIN sys_user su ON ets.teacher_id_=su.id_
 		<include refid="queryExamTeacherSalaryCondition"/>