Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/SysMessageFeignService.java

@@ -0,0 +1,10 @@
+package com.keao.edu.auth.api.client;
+
+import com.keao.edu.auth.api.client.fallback.SysMessageFeignServiceFallback;
+import com.keao.edu.common.config.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(contextId = "SysMessageFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysMessageFeignServiceFallback.class)
+public interface SysMessageFeignService {
+
+}

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/fallback/SysMessageFeignServiceFallback.java

@@ -0,0 +1,9 @@
+package com.keao.edu.auth.api.client.fallback;
+
+import com.keao.edu.auth.api.client.SysMessageFeignService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SysMessageFeignServiceFallback implements SysMessageFeignService {
+
+}

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

@@ -26,7 +26,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("/task/**","/v2/api-docs","/code/*").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
+				.authorizeRequests().antMatchers("/task/**","/v2/api-docs","/code/*","/user/updatePassword","/user/noAuth/queryUserByPhone").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -26,7 +26,7 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.114.176.40:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: edu_saas
     password: dayaDataOnline@2019
     # 使用druid数据源
@@ -47,7 +47,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 47.99.212.176
+    host: 47.114.176.40
     port: 6379
     password: dyym
     database: 1

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

@@ -30,7 +30,7 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.114.176.40:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: edu_saas
     password: dayaDataOnline@2019
     # 使用druid数据源
@@ -51,7 +51,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 47.99.212.176
+    host: 47.114.176.40
     port: 6379
     password: dyym
     database: 1

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

@@ -0,0 +1,42 @@
+package com.keao.edu.user.controller;
+
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.entity.Student;
+import com.keao.edu.user.service.StudentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统配置控制层
+ */
+@RestController
+@Api(tags = "学员服务")
+@RequestMapping(value = "student")
+public class StudentController extends BaseController {
+
+	@Autowired
+	private StudentService studentService;
+
+	@ApiOperation(value = "学员列表")
+	@GetMapping(value = "list")
+    @PreAuthorize("@pcs.hasPermissions('teacher/list')")
+	public HttpResponseResult<PageInfo<Student>> list(QueryInfo queryInfo) {
+		return succeed(studentService.queryPage(queryInfo));
+	}
+
+	@ApiOperation(value = "查询学员")
+	@GetMapping(value = "get")
+    @PreAuthorize("@pcs.hasPermissions('teacher/get')")
+	public HttpResponseResult<Student> get(Integer id) {
+		return succeed(studentService.get(id));
+	}
+}

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

@@ -55,7 +55,7 @@ public class TeacherController extends BaseController {
 	}
 
 	@ApiOperation(value = "删除教师")
-	@GetMapping(value = "del")
+	@PostMapping(value = "del")
     @PreAuthorize("@pcs.hasPermissions('teacher/del')")
 	public HttpResponseResult<Teacher> del(Integer id) {
 		teacherService.delete(id);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/OrganizationQueryInfo.java

@@ -8,6 +8,16 @@ public class OrganizationQueryInfo extends QueryInfo {
 
     private Integer parentId;
 
+    private Integer isAllowArrangeExam;
+
+    public Integer getIsAllowArrangeExam() {
+        return isAllowArrangeExam;
+    }
+
+    public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+        this.isAllowArrangeExam = isAllowArrangeExam;
+    }
+
     public Integer getParentId() {
         return parentId;
     }

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @Author Joburgess
  * @Date 2020.06.18
  */
+@Service
 public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implements StudentService {
 
     @Autowired

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

@@ -49,9 +49,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 		teacher.setTenantId(tenantId);
 		sysUser.setTenantId(tenantId);
 		if(user != null && user.getId() != null){
-			if(user.getUserType().contains("TEACHER")){
-				throw new BizException("此手机号已被占用");
-			}
 			Integer id = user.getId();
 			sysUser.setId(id);
 			Teacher teacher1 = teacherDao.get(id);

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

@@ -29,7 +29,7 @@ spring:
 #    url: jdbc:mysql://47.99.212.176:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
 #    username: edu_saas
 #    password: edu_saas
-    url: jdbc:mysql://47.99.212.176:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.114.176.40:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: edu_saas
     password: dayaDataOnline@2019
     # 使用druid数据源
@@ -50,7 +50,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 47.99.212.176
+    host: 47.114.176.40
     port: 6379
     password: dyym
     database: 1

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

@@ -93,6 +93,9 @@
 			<if test="settlementType != null and settlementType != ''">
 				AND settlement_type_ = #{settlementType}
 			</if>
+			<if test="isAllowArrangeExam != null">
+				AND is_allow_arrange_exam_ = #{isAllowArrangeExam}
+			</if>
 			<if test="search != null and search != ''">
 				AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%')
 				OR contact_name_ LIKE CONCAT('%',#{search},'%')

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

@@ -64,7 +64,7 @@
 	</insert>
 
 	<update id="delete">
-		UPDATE teacher SET del_flag_ = 1,update_time_ = NOW() WHERE id_ = #{id}
+		UPDATE teacher SET del_flag_ = 1,update_time_ = NOW() WHERE user_id_ = #{id}
 	</update>
 	<sql id="teacherQueryPage">
 		<where>
@@ -74,6 +74,9 @@
 				OR su.real_name_ LIKE CONCAT('%',#{search},'%')
 				OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="settlementType != null and settlementType != ''">
+				AND t.salary_settlement_type_ = #{settlementType}
+			</if>
 		</where>
 	</sql>
 	<!-- 分页查询 -->