'1'

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

@@ -0,0 +1,79 @@
+package com.miaxis.app.controller.user;
+
+import java.util.List;
+
+import com.miaxis.common.core.domain.entity.UserInfo;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【用户】Controller
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@RestController
+@RequestMapping("/user/info")
+@Api(tags={"【app-用户】"})
+public class UserInfoController extends BaseController{
+    @Autowired
+    private IUserInfoService userInfoService;
+
+    /**
+     * 查询用户列表
+     */
+
+    @GetMapping("/list")
+    @ApiOperation("查询用户列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<UserInfo> list(@ModelAttribute UserInfo userInfo){
+        startPage();
+        List<UserInfo> list = userInfoService.selectUserInfoList(userInfo);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取用户详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取用户详细信息")
+    public Response<UserInfo> getInfo(
+            @ApiParam(name = "id", value = "用户参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(userInfoService.getById(id));
+    }
+
+
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('user:info:edit')")
+    @Log(title = "用户", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改用户")
+    public Response<Integer> edit(@RequestBody UserInfo userInfo){
+        return toResponse(userInfoService.updateById(userInfo) ? 1 : 0);
+    }
+
+
+}

jkt-admin/src/main/java/com/miaxis/app/controller/vip/AppVipCodeController.java

@@ -6,11 +6,11 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.vip.domain.VipCode;
 import com.miaxis.vip.service.IVipCodeService;
 import io.swagger.annotations.*;
@@ -31,19 +31,16 @@ import java.util.Random;
  */
 @RestController
 @RequestMapping(Constants.STUDENT_PREFIX+"/vip/code")
-@Api(tags={"【小程序-激活码】"})
+@Api(tags={"【app-激活码】"})
 public class AppVipCodeController extends BaseController{
     @Autowired
     private IVipCodeService vipCodeService;
 
-//    @Autowired
-//    private IUser vipCodeService;
-
-    @PreAuthorize("@ss.hasPermi('vip:code:edit')")
-    @Log(title = "激活码", businessType = BusinessTypeEnum.UPDATE)
+    @Autowired
+    private IUserInfoService userInfoService;
     @PutMapping
     @ApiOperation("用户激活码激活")
-    public Response<Integer> edit(@ApiParam(name = "id", value = "激活码", required = true)
+    public Response<Integer> edit(
                                   String vipCode){
         QueryWrapper<VipCode> queryWrapper = new QueryWrapper<VipCode>();
         queryWrapper.eq("vip_code", vipCode);
@@ -64,6 +61,11 @@ public class AppVipCodeController extends BaseController{
         vipCodeEntity.setActivationUserId(student.getId());
         vipCodeEntity.setActivationTime(new Date());
         vipCodeService.updateById(vipCodeEntity);
+
+
+        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+        userInfo.setIsVip(1);
+        userInfoService.updateById(userInfo);
         return Response.success();
     }
 

jkt-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java

@@ -35,7 +35,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  */
 @RestController
 @RequestMapping("/vip/code")
-@Api(tags={"【小程序-激活码】"})
+@Api(tags={"【app-激活码】"})
 public class VipCodeController extends BaseController{
     @Autowired
     private IVipCodeService vipCodeService;

jkt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -132,6 +132,17 @@ public class SysLoginController
 
 
 
+    }
+    @PostMapping("/login/code/test")
+    @ApiOperation("用户授权码模式登录--测试")
+    public Response<TokenDTO> testloginByAuthorizationCode(String authorizationCode ){
+        String token = loginService.login("oN0Np5sK6JeTRa06hlE4-OkHDlDY",null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
+        TokenDTO tokenDTO = new TokenDTO();
+        tokenDTO.setToken(token);
+        return Response.success(tokenDTO) ;
+
+
+
     }
 
 //

jkt-common/src/main/java/com/miaxis/common/constant/Constants.java

@@ -68,7 +68,7 @@ public class Constants
 
 
     /**
-     * 小程序消息推送 token
+     * app消息推送 token
      */
     public static final String XCX_MESSAGE_TOKEN = "xcx:message:token:";
 

jkt-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -44,16 +44,16 @@ public class UserInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "微信号码")
     private String wechar;
 
-    /** 小程序头像地址 */
-    @Excel(name = "小程序头像地址")
+    /** app头像地址 */
+    @Excel(name = "app头像地址")
     @TableField("head_image")
-    @ApiModelProperty(value = "小程序头像地址")
+    @ApiModelProperty(value = "app头像地址")
     private String headImage;
 
-    /** 小程序昵称 */
-    @Excel(name = "小程序昵称")
+    /** app昵称 */
+    @Excel(name = "app昵称")
     @TableField("nick_name")
-    @ApiModelProperty(value = "小程序昵称")
+    @ApiModelProperty(value = "app昵称")
     private String nickName;
 
 

jkt-framework/src/main/java/com/miaxis/framework/config/SecurityConfig.java

@@ -102,7 +102,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于app 开放页面，允许任意访问
                 .antMatchers("/**/open-api/**").permitAll()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/login/noCode","/captchaImage","/login/code","/login/jscode-test").anonymous()
+                .antMatchers("/login", "/login/noCode","/captchaImage","/login/code","/login/code/test","/login/jscode-test").anonymous()
                 //.antMatchers("/student/open/**").permitAll()
                 .antMatchers("/student/**").hasRole("STUDENT")
                 .antMatchers(

jkt-generator/src/main/resources/vm/java/controller.java.vm

@@ -35,7 +35,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  */
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-@Api(tags={"【小程序-${functionName}】"})
+@Api(tags={"【app-${functionName}】"})
 public class ${ClassName}Controller extends BaseController{
     @Autowired
     private I${ClassName}Service ${className}Service;

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

@@ -0,0 +1,22 @@
+package com.miaxis.user.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.common.core.domain.entity.UserInfo;
+
+/**
+ * 用户Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface UserInfoMapper extends BaseMapper<UserInfo> {
+    /**
+     * 查询用户列表
+     *
+     * @param userInfo 用户
+     * @return 用户集合
+     */
+    public List<UserInfo> selectUserInfoList(UserInfo userInfo);
+
+}

jkt-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -0,0 +1,22 @@
+package com.miaxis.user.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.common.core.domain.entity.UserInfo;
+
+/**
+ * 用户Service接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface IUserInfoService extends IService<UserInfo>{
+    /**
+     * 查询用户列表
+     *
+     * @param userInfo 用户
+     * @return 用户集合
+     */
+    public List<UserInfo> selectUserInfoList(UserInfo userInfo);
+}

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

@@ -0,0 +1,37 @@
+package com.miaxis.user.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.user.mapper.UserInfoMapper;
+
+import com.miaxis.user.service.IUserInfoService;
+
+/**
+ * 用户Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Service
+public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    /**
+     * 查询用户列表
+     *
+     * @param userInfo 用户
+     * @return 用户
+     */
+    @Override
+    public List<UserInfo> selectUserInfoList(UserInfo userInfo){
+        return userInfoMapper.selectUserInfoList(userInfo);
+    }
+}

jkt-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -0,0 +1,39 @@
+<?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">
+<mapper namespace="com.miaxis.user.mapper.UserInfoMapper">
+
+    <resultMap type="UserInfo" id="UserInfoResult">
+        <result property="id"    column="id"    />
+        <result property="phone"    column="phone"    />
+        <result property="wechar"    column="wechar"    />
+        <result property="headImage"    column="head_image"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="openid"    column="openid"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
+        <result property="isVip"    column="is_vip"    />
+        <result property="unionId"    column="union_id"    />
+    </resultMap>
+
+    <sql id="selectUserInfoVo">
+        select * from user_info
+    </sql>
+
+    <select id="selectUserInfoList" parameterType="UserInfo" resultMap="UserInfoResult">
+        <include refid="selectUserInfoVo"/>
+        <where>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="wechar != null  and wechar != ''"> and wechar = #{wechar}</if>
+            <if test="headImage != null  and headImage != ''"> and head_image = #{headImage}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="isVip != null "> and is_vip = #{isVip}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+        </where>
+    </select>
+
+</mapper>