update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/AuthServerApplication.java

@@ -16,7 +16,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients("com.ym.mec.im")
+@EnableFeignClients({"com.ym.mec.im"})
 @MapperScan("com.ym.mec.auth.dal.dao")
 @ComponentScan(basePackages="com.ym.mec")
 @Configuration

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -52,4 +52,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
     String getOrganName(Integer organId);
+
+	/**
+	 * 获取随机盐不为null的一条数据
+	 * @param userType
+	 * @return
+	 */
+	SysUser findUserBySalt(String userType);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -2,7 +2,6 @@ package com.ym.mec.auth.service.impl;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.auth.dal.dao.SysUserDao;
 import com.ym.mec.auth.service.SysRoleMenuService;
@@ -14,7 +13,6 @@ import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
-import com.ym.mec.web.TeacherFeignService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,9 +32,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	private SysUserRoleService sysUserRoleService;
 
 	@Autowired
-	private TeacherFeignService teacherFeignService;
-
-	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
 
 	@Autowired
@@ -145,15 +140,25 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Override
 	public SysUserInfo initUser(String phone, String clientId) {
 		if(autoRegister){
-			if(StringUtils.equalsIgnoreCase(clientId,"teacher")){
-				//注册用户
-				SysUser sysUser = registerUser(phone,SysUserType.TEACHER);
-				return queryUserInfoByPhone(phone);
-			}else if(StringUtils.equalsIgnoreCase(clientId,"student")){
-				SysUser sysUser = registerUser(phone,SysUserType.STUDENT);
-				//注册现金账户
-				teacherFeignService.saveUserCashAccount(sysUser.getId());
-				return queryUserInfoByPhone(phone);
+			Date date = new Date();
+			if(StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
+				SysUser sysUser = sysUserDao.findUserBySalt("TEACHER");
+				if(sysUser != null){
+					sysUser.setPhone(phone);
+					sysUser.setPassword(null);
+					sysUser.setUpdateTime(date);
+					sysUserDao.update(sysUser);
+					return queryUserInfoByPhone(phone);
+				}
+			}else if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
+				SysUser sysUser = sysUserDao.findUserBySalt("STUDENT");
+				if(sysUser != null){
+					sysUser.setPhone(phone);
+					sysUser.setPassword(null);
+					sysUser.setUpdateTime(date);
+					sysUserDao.update(sysUser);
+					return queryUserInfoByPhone(phone);
+				}
 			}
 			throw new UsernameNotFoundException("404.9");
 		}else {
@@ -161,20 +166,4 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		}
 	}
 
-	private SysUser registerUser(String phone, SysUserType sysUserType){
-		SysUser sysUser = new SysUser();
-		sysUser.setPhone(phone);
-		sysUser.setUsername(phone);
-		sysUser.setOrganId(1);
-		sysUser.setGender(1);
-		sysUser.setIsSuperAdmin(false);
-		//注册用户
-		sysUser.setUserType(sysUserType);
-		sysUserDao.insert(sysUser);
-		ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), phone, null));
-		sysUser.setImToken(register.getToken());
-		sysUserDao.update(sysUser);
-		return sysUser;
-	}
-
 }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -186,4 +186,7 @@
     <select id="getOrganName" resultType="java.lang.String">
         SELECT name_ FROM organization WHERE id_ = #{organId}
     </select>
+    <select id="findUserBySalt" resultMap="SysUser">
+        SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND user_type_ = #{userType} LIMIT 1
+    </select>
 </mapper>

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

@@ -8,6 +8,9 @@ import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -49,6 +52,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private SysUserCashAccountDao sysUserCashAccountDao;
 	@Autowired
+	private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
+	@Autowired
+	private ClassGroupTeacherSalaryDao classGroupTeacherSalaryDao;
+	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private ImFeignService imFeignService;

mec-client-api/src/main/java/com/ym/mec/web/TeacherFeignService.java

@@ -1,21 +0,0 @@
-package com.ym.mec.web;
-
-import com.ym.mec.common.config.FeignConfiguration;
-import com.ym.mec.common.entity.ImUserModel;
-import com.ym.mec.web.fallback.TeacherFeignServiceFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(name = "teacher-server", configuration = FeignConfiguration.class, fallback = TeacherFeignServiceFallback.class)
-public interface TeacherFeignService {
-
-	/**
-	 * 用户注册
-	 * @param userId
-	 * @return
-	 */
-	@PostMapping(value = "code/saveUserCashAccount")
-	void saveUserCashAccount(Integer userId);
-}

mec-client-api/src/main/java/com/ym/mec/web/fallback/TeacherFeignServiceFallback.java

@@ -1,12 +0,0 @@
-package com.ym.mec.web.fallback;
-
-import com.ym.mec.web.TeacherFeignService;
-import org.springframework.stereotype.Component;
-
-@Component
-public class TeacherFeignServiceFallback implements TeacherFeignService {
-    @Override
-    public void saveUserCashAccount(Integer userId) {
-
-    }
-}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SmsCodeController.java

@@ -3,9 +3,8 @@ package com.ym.mec.teacher.controller;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
 import com.google.code.kaptcha.servlet.KaptchaServlet;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.service.SmsCodeService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
+import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.security.SecurityConstants;
 import io.swagger.annotations.Api;
@@ -34,20 +33,12 @@ public class SmsCodeController extends BaseController {
     @Autowired
     private SmsCodeService smsCodeService;
     @Autowired
-    private SysUserCashAccountService sysUserCashAccountService;
+    private TeacherService teacherService;
     @Autowired
     private Producer captchaProducer;
     @Autowired
     private RedisTemplate<String,String> redisTemplate;
 
-    @PostMapping(value = "/saveUserCashAccount")
-    public Object saveUserCashAccount(Integer userId){
-        SysUserCashAccount account = new SysUserCashAccount();
-        account.setUserId(userId);
-        sysUserCashAccountService.insert(account);
-        return succeed();
-    }
-
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
     @PostMapping(value = "/sendSms")