Merge remote-tracking branch 'origin/master'

hzgzpt-admin/src/main/java/com/miaxis/app/controller/sms/SmsController.java

@@ -1,50 +0,0 @@
-package com.miaxis.app.controller.sms;
-
-import com.miaxis.app.sms.ISmsService;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.utils.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Author wwl
- * @Date 2020/12/23
- * @Version 1.0
- */
-@RestController
-@RequestMapping(Constants.OPEN_PREFIX+"/sms")
-@Api(tags={"【短信服务】Controller"})
-@AllArgsConstructor
-public class SmsController {
-    private final ISmsService smsService;
-
-
-    /**
-     * 获取短信验证码
-     * @return
-     */
-    @ApiOperation("获取短信验证码")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type",value = "login:用户登录验证码、modify:修改手机验证码" ,dataType = "String",required = true),
-            @ApiImplicitParam(name = "phone", value = "手机号码", required = true, dataType = "String")
-    })
-    @PostMapping(value = "/sendVerificationCode")
-    public Response sendVerificationCode(String type,String phone){
-        //获取当前用户
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-
-        return smsService.sendVerificationCode(user,type,phone);
-    }
-
-
-
-
-}

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -1,7 +1,10 @@
 package com.miaxis.app.controller.user;
 
 import com.miaxis.app.user.domain.UserInfo;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.app.user.service.IUserInfoService;
+import com.miaxis.common.aliyunOSS.AliyunConfig;
+import com.miaxis.common.aliyunOSS.AliyunUpload;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
@@ -14,8 +17,14 @@ import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【用户信息】Controller
@@ -102,6 +111,44 @@ public class UserInfoController extends BaseController{
         return toResponse(userInfoService.deleteUserInfoByIds(ids));
     }
 
+    /**
+     * 上传身份证正反面,及人像图片
+     * uploadIdCardAndHeadPicture
+     */
+    @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/uploadIdCardAndHeadPicture")
+    @ApiOperation("上传身份证正反面,及人像图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type",value = "idCardFront:身份证正面、idCardReverse:身份证反面、faces:人像" ,dataType = "String",required = true),
+            @ApiImplicitParam(name = "multFile", value = "上传文件", required = true, dataType = "String")
+    })
+    public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
+        String savePath = AliyunConfig.gzpt_user + type + "/"
+                + new SimpleDateFormat("yyyyMM").format(new Date()) + "/";
+        String fileName = System.currentTimeMillis() + ".jpg";
+        String fileUrl = AliyunUpload.uploadForStream(multFile.getInputStream(), savePath, fileName);
+        Map<String, Object> map = new HashMap<>();
+        map.put("filePath",savePath+fileName);//文件路径名
+        map.put("fileUrl",fileUrl);//文件访问路径
+        return Response.success(map);
+    }
+
+    /**
+     * 删除文件
+     * uploadIdCardAndHeadPicture
+     */
+    @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/deleteCardAndHeadPicture")
+    @ApiOperation("删除文件")
+    @ApiImplicitParam(name = "filePath",value = "文件路径(filePath)" ,dataType = "String",required = true)
+    public Response deleteCardAndHeadPicture(String filePath) {
+        boolean b = AliyunUpload.deleteObject(filePath);
+        if (!b)return Response.error();
+        return Response.success();
+    }
+
+
+
     /**
      * 修改用户手机号
      */

hzgzpt-common/pom.xml

@@ -173,7 +173,7 @@
             <version>1.9.4</version>
         </dependency>
 
-        <!--aliyun OSS-->
+        <!--aliyunOSS OSS-->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunConfig.java

@@ -1,24 +0,0 @@
-package com.miaxis.common.aliyun;
-
-public class AliyunConfig {
-	public static String endpoint = "oss-cn-shanghai.aliyuncs.com";
-	public static String accessKeyId = "LTAIijc2Vl913Dha";
-	public static String accessKeySecret = "HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
-	public static String bucketName = "xzzfile";
-	public static String visitPath = "http://image.jppt.com.cn";
-
-	public static String gzpt_path = "gzpt/";
-	/** 教练员图片文件*/
-	public static String gzpt_coach_rootpath = gzpt_path + "coach/";
-	/** 学员图片文件 */
-	public static String gzpt_student_rootpath = gzpt_path + "student/";
-	/** 学员图片文件 */
-	public static String gzpt_trainCar_rootpath = gzpt_path + "trainCar/";
-	/** 人脸识别图像文件 */
-	public static String gzpt_faces_rootpath = gzpt_path + "faces/";
-
-	public static String tms_news_rootpath = gzpt_path + "news/";
-
-	
-}
- 

hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunConfig.java

@@ -0,0 +1,17 @@
+package com.miaxis.common.aliyunOSS;
+
+public class AliyunConfig {
+	public static String endpoint = "oss-cn-shanghai.aliyuncs.com";
+	public static String accessKeyId = "LTAIijc2Vl913Dha";
+	public static String accessKeySecret = "HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
+	public static String bucketName = "xzzfile";
+	public static String visitPath = "http://image.jppt.com.cn";
+
+	public static String gzpt_path = "gzpt/";
+	/** 用户图片文件*/
+	public static String gzpt_user = gzpt_path + "user/";
+
+
+	
+}
+ 

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunDown.java → hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunDown.java

@@ -1,4 +1,4 @@
-package com.miaxis.common.aliyun;
+package com.miaxis.common.aliyunOSS;
 
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.DownloadFileRequest;

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunUpload.java → hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunUpload.java

@@ -1,6 +1,7 @@
-package com.miaxis.common.aliyun;
+package com.miaxis.common.aliyunOSS;
 
 import com.aliyun.oss.OSSClient;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.utils.Base64;
 import sun.misc.BASE64Decoder;
 
@@ -220,4 +221,31 @@ public class AliyunUpload {
 		}
 		return url;
 	}
+
+    /**
+     * 删除文件
+     * @param filePath 文件
+     * @return
+     */
+    public static boolean deleteObject(String filePath) {
+        OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+
+        try {
+            boolean exist = ossClient.doesObjectExist(AliyunConfig.bucketName,filePath);
+            if (!exist) {
+                System.out.println("文件不存在");
+                return false;
+            }
+            ossClient.deleteObject(AliyunConfig.bucketName,filePath);
+
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println("服务异常");
+           return false;
+        }finally {
+            ossClient.shutdown();
+        }
+        return true;
+    }
+
 }

hzgzpt-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java

@@ -9,6 +9,11 @@ package com.miaxis.common.constant;
  */
 public class SmsTemplateConstants {
 
+    /**
+     * 短信模板类型(可拓展)
+     */
+    public static final String[] smsTemplateType = {"login","modify"};
+
     /**
      * 登录短信模板
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/sms/ISmsService.java

@@ -13,10 +13,9 @@ public interface ISmsService {
 
     /**
      * 发送短信验证码
-     * @param user
      * @param type
      * @param phone
      * @return
      */
-    Response sendVerificationCode(SysUser user, String type, String phone);
+    Response sendVerificationCode(String type, String phone);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/sms/impl/SmsServiceImpl.java

@@ -2,9 +2,9 @@ package com.miaxis.app.sms.impl;
 
 import com.miaxis.app.sms.ISmsService;
 import com.miaxis.common.constant.Constants;
+import com.miaxis.common.constant.SmsTemplateConstants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.ResponseEnum;
-import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.sms.Client;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,12 +12,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 短信服务层接口实现
@@ -45,16 +44,25 @@ public class SmsServiceImpl implements ISmsService {
 
     /**
      * 发送短信验证码
-     * @param user
      * @param type
      * @param phone
      * @return
      */
     @Override
-    public Response sendVerificationCode(SysUser user, String type, String phone) {
+    public Response sendVerificationCode(String type, String phone) {
         //字符编码
         String charset = "UTF-8";
 
+        //type验证
+        List<String> collect = Arrays.stream(SmsTemplateConstants.smsTemplateType)
+                .parallel()
+                .filter(str -> str.equals(type))
+                .collect(Collectors.toList());
+        if (collect.size()==0){
+            return Response.error(500,"参数{type}类型错误");
+        }
+
+
         //手机号格式验证
         if(phone.length() != 11){
             return Response.error(500,"手机格式错误");
@@ -67,6 +75,9 @@ public class SmsServiceImpl implements ISmsService {
         }
         try{
 
+            //短信模板
+            String smsTemplateStr = "";
+
             /**
              * login:登录验证  modify；修改验证
              * keyPrefix : 缓存key前缀
@@ -76,13 +87,12 @@ public class SmsServiceImpl implements ISmsService {
             if (type.equals("login")){
                 map.put("keyPrefix", Constants.SMS_LOGIN_CODE);
                 map.put("verificationCount",Constants.SMS_LOGIN_CODE_COUNT);
+                smsTemplateStr = SmsTemplateConstants.login;
             }
             if (type.equals("modify")){
-                if (user.getPhonenumber().equals(phone)){
-                    return Response.error(500,"该手机号与当前绑定的手机号相同");
-                }
                 map.put("keyPrefix",Constants.SMS_MODIFY_CODE);
                 map.put("verificationCount",Constants.SMS_MODIFY_CODE_COUNT);
+                smsTemplateStr = SmsTemplateConstants.modify;
             }
 
             //验证手机号
@@ -96,7 +106,7 @@ public class SmsServiceImpl implements ISmsService {
             for (int i=0;i<6;i++){
                 code += new Random().nextInt(10);
             }
-            String content = "本次验证码："+code+",验证码两分钟内有效";
+            String content = smsTemplateStr.replace("code",code);
 
             // 调用发送接口
             Client client = new Client(smsUserName, smsPassword);

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserInfo.java

@@ -1,24 +1,22 @@
 package com.miaxis.app.user.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+
+import java.util.Date;
+
 /**
  * 用户信息对象 user_info
  *
  * @author miaxis
- * @date 2020-12-23
+ * @date 2020-12-25
  */
 @Data
 @TableName("user_info")
@@ -51,9 +49,9 @@ public class UserInfo extends BaseBusinessEntity {
 
     /** 身份证明号码 */
     @Excel(name = "身份证明号码")
-    @TableField("sfzmhm")
+    @TableField("id_card")
     @ApiModelProperty(value = "身份证明号码")
-    private String sfzmhm;
+    private String idCard;
 
     /** 注册日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -99,122 +97,29 @@ public class UserInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "驾校全国统一编号")
     private String inscode;
 
+    /** 驾校班型Id */
+    @Excel(name = "驾校班型Id")
+    @TableField("school_class_type_id")
+    @ApiModelProperty(value = "驾校班型Id")
+    private Long schoolClassTypeId;
+
     /** 培训车型 */
     @Excel(name = "培训车型")
     @TableField("pxcx")
     @ApiModelProperty(value = "培训车型")
     private String pxcx;
 
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setSex(Long sex){
-        this.sex = sex;
-    }
-
-    public Long getSex(){
-        return sex;
-    }
-    public void setSfzmlx(Long sfzmlx){
-        this.sfzmlx = sfzmlx;
-    }
-
-    public Long getSfzmlx(){
-        return sfzmlx;
-    }
-    public void setSfzmhm(String sfzmhm){
-        this.sfzmhm = sfzmhm;
-    }
-
-    public String getSfzmhm(){
-        return sfzmhm;
-    }
-    public void setCrdate(Date crdate){
-        this.crdate = crdate;
-    }
-
-    public Date getCrdate(){
-        return crdate;
-    }
-    public void setBirthday(Date birthday){
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday(){
-        return birthday;
-    }
-    public void setMobile(String mobile){
-        this.mobile = mobile;
-    }
-
-    public String getMobile(){
-        return mobile;
-    }
-    public void setPassword(String password){
-        this.password = password;
-    }
-
-    public String getPassword(){
-        return password;
-    }
-    public void setWechar(String wechar){
-        this.wechar = wechar;
-    }
-
-    public String getWechar(){
-        return wechar;
-    }
-    public void setOpenid(String openid){
-        this.openid = openid;
-    }
-
-    public String getOpenid(){
-        return openid;
-    }
-    public void setInscode(String inscode){
-        this.inscode = inscode;
-    }
-
-    public String getInscode(){
-        return inscode;
-    }
-    public void setPxcx(String pxcx){
-        this.pxcx = pxcx;
-    }
-
-    public String getPxcx(){
-        return pxcx;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("sex", getSex())
-            .append("sfzmlx", getSfzmlx())
-            .append("sfzmhm", getSfzmhm())
-            .append("crdate", getCrdate())
-            .append("birthday", getBirthday())
-            .append("mobile", getMobile())
-            .append("password", getPassword())
-            .append("wechar", getWechar())
-            .append("openid", getOpenid())
-            .append("inscode", getInscode())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("pxcx", getPxcx())
-            .toString();
-    }
-}
+    /** 教练全国统一编号 */
+    @Excel(name = "教练全国统一编号")
+    @TableField("coachnum")
+    @ApiModelProperty(value = "教练全国统一编号")
+    private String coachnum;
+
+    /** 0 启用 1禁用 */
+    @Excel(name = "0 启用 1禁用")
+    @TableField("status")
+    @ApiModelProperty(value = "0 启用 1禁用")
+    private Integer status;
+
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/UserInfoMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.app.user.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.user.domain.UserInfo;
+import com.miaxis.app.user.domain.dto.UserDto;
 
 /**
  * 用户信息Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/IUserInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.app.user.service;
 import java.util.List;
 import com.miaxis.app.user.domain.UserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.miaxis.app.user.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;

hzgzpt-service-app/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miaxis.app.user.mapper.UserInfoMapper">
-    
+
     <resultMap type="UserInfo" id="UserInfoResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="sex"    column="sex"    />
         <result property="sfzmlx"    column="sfzmlx"    />
-        <result property="sfzmhm"    column="sfzmhm"    />
+        <result property="idCard"    column="id_card"    />
         <result property="crdate"    column="crdate"    />
         <result property="birthday"    column="birthday"    />
         <result property="mobile"    column="mobile"    />
@@ -18,21 +18,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="openid"    column="openid"    />
         <result property="inscode"    column="inscode"    />
         <result property="createTime"    column="create_time"    />
+        <result property="schoolClassTypeId"    column="school_class_type_id"    />
         <result property="updateTime"    column="update_time"    />
         <result property="pxcx"    column="pxcx"    />
+        <result property="coachnum"    column="coachnum"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectUserInfoVo">
-        select id, name, sex, sfzmlx, sfzmhm, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, update_time, pxcx from user_info
+        select id, name, sex, sfzmlx, id_card, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, school_class_type_id, update_time, pxcx, coachnum, status from user_info
     </sql>
 
     <select id="selectUserInfoList" parameterType="UserInfo" resultMap="UserInfoResult">
         <include refid="selectUserInfoVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="sex != null "> and sex = #{sex}</if>
             <if test="sfzmlx != null "> and sfzmlx = #{sfzmlx}</if>
-            <if test="sfzmhm != null  and sfzmhm != ''"> and sfzmhm = #{sfzmhm}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="crdate != null "> and crdate = #{crdate}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
@@ -40,15 +43,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wechar != null  and wechar != ''"> and wechar = #{wechar}</if>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
             <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
+            <if test="schoolClassTypeId != null "> and school_class_type_id = #{schoolClassTypeId}</if>
             <if test="pxcx != null  and pxcx != ''"> and pxcx = #{pxcx}</if>
+            <if test="coachnum != null  and coachnum != ''"> and coachnum = #{coachnum}</if>
+            <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectUserInfoById" parameterType="Long" resultMap="UserInfoResult">
         <include refid="selectUserInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertUserInfo" parameterType="UserInfo">
         insert into user_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -56,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name,</if>
             <if test="sex != null">sex,</if>
             <if test="sfzmlx != null">sfzmlx,</if>
-            <if test="sfzmhm != null">sfzmhm,</if>
+            <if test="idCard != null">id_card,</if>
             <if test="crdate != null">crdate,</if>
             <if test="birthday != null">birthday,</if>
             <if test="mobile != null">mobile,</if>
@@ -65,15 +71,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">openid,</if>
             <if test="inscode != null">inscode,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="schoolClassTypeId != null">school_class_type_id,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="pxcx != null">pxcx,</if>
-         </trim>
+            <if test="coachnum != null">coachnum,</if>
+            <if test="status != null">status,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="sex != null">#{sex},</if>
             <if test="sfzmlx != null">#{sfzmlx},</if>
-            <if test="sfzmhm != null">#{sfzmhm},</if>
+            <if test="idCard != null">#{idCard},</if>
             <if test="crdate != null">#{crdate},</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="mobile != null">#{mobile},</if>
@@ -82,9 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">#{openid},</if>
             <if test="inscode != null">#{inscode},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="pxcx != null">#{pxcx},</if>
-         </trim>
+            <if test="coachnum != null">#{coachnum},</if>
+            <if test="status != null">#{status},</if>
+        </trim>
     </insert>
 
     <update id="updateUserInfo" parameterType="UserInfo">
@@ -93,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name = #{name},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="sfzmlx != null">sfzmlx = #{sfzmlx},</if>
-            <if test="sfzmhm != null">sfzmhm = #{sfzmhm},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
             <if test="crdate != null">crdate = #{crdate},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="mobile != null">mobile = #{mobile},</if>
@@ -102,8 +114,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">openid = #{openid},</if>
             <if test="inscode != null">inscode = #{inscode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="schoolClassTypeId != null">school_class_type_id = #{schoolClassTypeId},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="pxcx != null">pxcx = #{pxcx},</if>
+            <if test="coachnum != null">coachnum = #{coachnum},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
@@ -113,10 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteUserInfoByIds" parameterType="String">
-        delete from user_info where id in 
+        delete from user_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
 </mapper>

pom.xml

@@ -32,7 +32,7 @@
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <hutool.version>5.4.0</hutool.version>
-        <com.aliyun.oss.version>2.4.0</com.aliyun.oss.version>
+        <com.aliyun.oss.version>2.8.3</com.aliyun.oss.version>
     </properties>
 	
     <!-- 依赖声明 -->
@@ -218,7 +218,7 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!--aliyun OSS-->
+            <!--aliyunOSS OSS-->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>