feats

.gitignore

@@ -1,5 +1,6 @@
 HELP.md
 target/
+deploy/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>drawlots</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2</version>
 	<name>drawlots</name>
 	<description>红鹤抽奖</description>
 	<properties>
@@ -56,6 +56,25 @@
 			<artifactId>weixin-java-mp</artifactId>
 			<version>3.8.0</version>
 		</dependency>
+		<!--jwt start-->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.11.2</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.11.2</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson if Gson is preferred -->
+			<version>0.11.2</version>
+			<scope>runtime</scope>
+		</dependency>
+		<!--jwt end-->
 		<!--swagger start-->
 		<dependency>
 			<groupId>io.springfox</groupId>
@@ -77,8 +96,35 @@
 							<artifactId>lombok</artifactId>
 						</exclude>
 					</excludes>
+<!--					<mainClass>com.yunzhi.drawlots.DrawlotsApplication</mainClass>-->
+<!--					<layout>ZIP</layout>-->
+<!--					<includes>-->
+<!--						<include>-->
+<!--							<groupId>nothing</groupId>-->
+<!--							<artifactId>nothing</artifactId>-->
+<!--						</include>-->
+<!--					</includes>-->
 				</configuration>
 			</plugin>
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-dependency-plugin</artifactId>-->
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<goals>-->
+<!--							<goal>copy-dependencies</goal>-->
+<!--						</goals>-->
+<!--						<configuration>-->
+<!--							&lt;!&ndash; ${project.build.directory}是maven变量，内置的，表示target目录,如果不写，将在跟目录下创建/lib &ndash;&gt;-->
+<!--							<outputDirectory>${project.build.directory}/lib</outputDirectory>-->
+<!--							&lt;!&ndash; excludeTransitive:是否不包含间接依赖包，比如我们依赖A，但是A又依赖了B，我们是否也要把B打进去 默认不打&ndash;&gt;-->
+<!--							<excludeTransitive>false</excludeTransitive>-->
+<!--							&lt;!&ndash; 复制的jar文件去掉版本信息 true去掉 false 不去&ndash;&gt;-->
+<!--							<stripVersion>false</stripVersion>-->
+<!--						</configuration>-->
+<!--					</execution>-->
+<!--				</executions>-->
+<!--			</plugin>-->
 		</plugins>
 	</build>
 

src/main/java/com/yunzhi/drawlots/common/CurrentContext.java

@@ -0,0 +1,25 @@
+package com.yunzhi.drawlots.common;
+
+import java.util.Map;
+
+public class CurrentContext {
+
+    /**
+     * TokenParam 相关
+     */
+    private static final ThreadLocal<Map<String, Object>> tokenParamHolder = new ThreadLocal<>();
+
+    public static void setTokenParam(Map<String, Object> tokenParam) {
+        tokenParamHolder.remove();
+        tokenParamHolder.set(tokenParam);
+    }
+
+    public static void clear() {
+        tokenParamHolder.remove();
+    }
+
+    public static Map<String, Object> getTokenParam() {
+        Map<String, Object> params = tokenParamHolder.get();
+        return params;
+    }
+}

src/main/java/com/yunzhi/drawlots/common/JWTUtils.java

@@ -0,0 +1,107 @@
+package com.yunzhi.drawlots.common;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.SecretKey;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * JWTUtils
+ * jwt 辅助类
+ * https://github.com/jwtk/jjwt
+ */
+public class JWTUtils {
+    private static final Logger log = LoggerFactory.getLogger(JWTUtils.class);
+
+    // 过期时间 30 分钟
+    public static final long EXPIRE_TIME = 30 * 60 * 24;
+
+    // 私钥
+    static final SecretKey SECRET_KEY = Keys.hmacShaKeyFor(Base64.getEncoder().encode("Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes()));
+
+    // 请求头
+    public static final String AUTH_HEADER = "X-Authorization-JWT";
+
+    /**
+     * 生成 token, claims 里必须要有 userId
+     * @param claims
+     * @return
+     */
+    public static String encode(Map<String, Object> claims) {
+        Date[] datePair = getDatePair();
+        Date iat = datePair[0];
+        Date exp = datePair[1];
+
+        return Jwts.builder().setIssuer(claims.get("userId").toString()).setIssuedAt(iat).setExpiration(exp).addClaims(claims).signWith(SECRET_KEY).compact();
+    }
+
+    public static Map<String, Object> decode(String token) throws Exception {
+        return parse(token);
+    }
+
+    public static String refresh(String token) {
+        try {
+            Claims claims = parse(token);
+
+            Integer iat = (Integer) claims.get("iat");
+            if (null != iat) {
+                long currentTime = System.currentTimeMillis() / 1000;
+                int oneMinute = 60;
+                if (currentTime - iat < oneMinute) {
+                    return token;
+                }
+            }
+
+            claims.remove("iat");
+            claims.remove("exp");
+
+            return encode(claims);
+        } catch (Exception e) {
+            log.error("解析 JWT Token 失败: {}", e.getMessage());
+        }
+        return null;
+    }
+
+    public static void refresh(String jws, HttpServletResponse response) {
+        if (!StringUtils.isEmpty(jws)) {
+            String token =  refresh(jws);
+            response.addHeader(AUTH_HEADER, token);
+        }
+    }
+
+    public static String getToken(HttpServletRequest request) {
+        return request.getHeader(AUTH_HEADER);
+    }
+
+    public static void verify(String token) throws Exception {
+        parse(token);
+    }
+
+    private static Date[] getDatePair() {
+        LocalDateTime now = LocalDateTime.now();
+        Date iat = Date.from(now.atZone(ZoneId.systemDefault()).toInstant());
+        Date exp = Date.from(now.plusSeconds(EXPIRE_TIME).atZone(ZoneId.systemDefault()).toInstant());
+        return new Date[]{iat, exp};
+    }
+
+    private static Claims parse(String token) throws Exception {
+        if (token == null || "".equals(token)) {
+            throw new Exception("Token 不能为空");
+        }
+
+        long skew = 5;
+        Jws<Claims> claimsJws = Jwts.parserBuilder().setAllowedClockSkewSeconds(skew).setSigningKey(SECRET_KEY).build().parseClaimsJws(token);
+        return claimsJws.getBody();
+    }
+}

src/main/java/com/yunzhi/drawlots/common/ResponseBean.java

@@ -73,4 +73,8 @@ public class ResponseBean<T> implements Serializable {
     public String toString() {
         return  "{ code: "+code+", message: "+message+", data: <T> }";
     }
+
+    public String toJSON() {
+        return String.format("{ \"code\": %d, \"message\": %s }", code, message);
+    }
 }

src/main/java/com/yunzhi/drawlots/config/BaseConfig.java

@@ -0,0 +1,35 @@
+package com.yunzhi.drawlots.config;
+
+import com.yunzhi.drawlots.interceptor.PermissionInterceptor;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.PostConstruct;
+
+@Data
+@Configuration
+public class BaseConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private PermissionInterceptor permissionInterceptor;
+
+    @Autowired
+    private InterceptorConfig interceptorConfig;
+
+    @PostConstruct
+    public void init() {
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 自定义拦截器，添加拦截路径和排除拦截路径
+        if (interceptorConfig.getPermission().isEnable()) {
+            registry.addInterceptor(permissionInterceptor)
+                    .addPathPatterns(interceptorConfig.getPermission().getIncludePaths())
+                    .excludePathPatterns(interceptorConfig.getPermission().getExcludePaths());
+        }
+    }
+}

src/main/java/com/yunzhi/drawlots/config/InterceptorConfig.java

@@ -0,0 +1,32 @@
+package com.yunzhi.drawlots.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "interceptor")
+public class InterceptorConfig {
+
+    private Config permission;
+
+    @Data
+    public static class Config {
+
+        /**
+         * 是否启用
+         */
+        private boolean enable;
+
+        /**
+         * 包含的路径
+         */
+        private String[] includePaths = new String[]{};
+
+        /**
+         * 排除路径
+         */
+        private String[] excludePaths = new String[]{};
+    }
+}

src/main/java/com/yunzhi/drawlots/config/LoggingFilterConfig.java

@@ -0,0 +1,21 @@
+package com.yunzhi.drawlots.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+@Slf4j
+@Configuration
+public class LoggingFilterConfig implements Filter {
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        log.info("Request URI: [{}] {}", req.getMethod() , req.getRequestURI());
+
+        // 继续执行
+        chain.doFilter(request, response);
+    }
+}

src/main/java/com/yunzhi/drawlots/config/MybatisPlusConfig.java

@@ -0,0 +1,14 @@
+package com.yunzhi.drawlots.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}

src/main/java/com/yunzhi/drawlots/config/SMSConfig.java

@@ -0,0 +1,20 @@
+package com.yunzhi.drawlots.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "sms")
+public class SMSConfig {
+    private String server;
+    private Captcha captcha;
+
+    @Data
+    public static class Captcha {
+        private String plat;
+        private String template;
+        private String sign;
+    }
+}

src/main/java/com/yunzhi/drawlots/config/SwagggerConfig.java

@@ -0,0 +1,24 @@
+package com.yunzhi.drawlots.config;
+
+import io.swagger.annotations.Api;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwagggerConfig {
+    @Bean
+    public Docket docket() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+                .paths(PathSelectors.any())
+                .build();
+
+    }
+}

src/main/java/com/yunzhi/drawlots/controller/CommController.java

@@ -0,0 +1,13 @@
+package com.yunzhi.drawlots.controller;
+
+import com.yunzhi.drawlots.common.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "通用")
+@RestController
+@RequestMapping("/")
+public class CommController  extends BaseController {
+
+}

src/main/java/com/yunzhi/drawlots/controller/LoginController.java

@@ -0,0 +1,115 @@
+package com.yunzhi.drawlots.controller;
+
+import com.yunzhi.drawlots.common.BaseController;
+import com.yunzhi.drawlots.common.JWTUtils;
+import com.yunzhi.drawlots.common.ResponseBean;
+import com.yunzhi.drawlots.common.StringUtils;
+import com.yunzhi.drawlots.entity.TaPerson;
+import com.yunzhi.drawlots.service.ITaPersonService;
+import com.yunzhi.drawlots.vo.LoginParam;
+import com.yunzhi.drawlots.vo.MPLogin;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "登入/登出")
+@RestController
+public class LoginController extends BaseController {
+
+    @Value("${biz.admin.account}")
+    String adminAccount;
+
+    @Value("${biz.admin.password}")
+    String adminPassword;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @PostMapping("/admin/login")
+    @ApiOperation(value="后端登录", notes = "后端登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean login(@ApiParam("登录参数") @RequestBody LoginParam loginParam) throws Exception {
+        if (null == loginParam) {
+            return ResponseBean.error("账户或密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String userName = loginParam.getUserName();
+        String password = loginParam.getPassword();
+
+        if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(password)) {
+            return ResponseBean.error("账户或密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!adminAccount.equals(userName)) {
+            return ResponseBean.error("账户或密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String targetPassword = md5(md5(adminPassword) + adminAccount);
+
+        if (!checkPassword(password, targetPassword, adminAccount)) {
+            return ResponseBean.error("账户或密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 生成 token
+        Map<String, Object> tokenMap = new HashMap<String, Object>() {{
+           put("userId", adminAccount);
+        }};
+        String token = JWTUtils.encode(tokenMap);
+
+        Map<String, Object> res = new HashMap<String, Object>() {{
+//            put("user", sysUser);
+            put("token", token);
+        }};
+        return ResponseBean.success(res);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param params  登录参数
+     */
+    @RequestMapping(value="/wx/login",method= RequestMethod.POST)
+    @ApiOperation(value="微信登录", notes = "微信登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taPersonGet(@ApiParam("对象ID") @RequestBody MPLogin params) throws Exception{
+        String openid = params.getOpenid();
+        if (StringUtils.isEmpty(openid)) {
+            return ResponseBean.error("登录参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson taPerson = iTaPersonService.getByOpenId(openid);
+
+        // 更新人员信息
+        if (!StringUtils.isEmpty(params.getNickname())) {
+            taPerson.setName(params.getNickname());
+            taPerson.setAvatar(params.getHeadImgUrl());
+            iTaPersonService.updateById(taPerson);
+        }
+
+        // 生成 token
+        Map<String, Object> tokenMap = new HashMap<String, Object>() {{
+            put("userId", taPerson.getPersonId());
+        }};
+        String token = JWTUtils.encode(tokenMap);
+
+        Map<String, Object> res = new HashMap<String, Object>() {{
+            put("user", taPerson);
+            put("token", token);
+        }};
+
+        return ResponseBean.success(res);
+    }
+
+    private boolean checkPassword(String src, String targ, String salt) {
+        return md5((src+salt)).equals(targ);
+    }
+
+    private String md5(String src) {
+        return DigestUtils.md5DigestAsHex(src.getBytes(StandardCharsets.UTF_8));
+    }
+}

src/main/java/com/yunzhi/drawlots/controller/TaLunarController.java

@@ -33,87 +33,87 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/")
 public class TaLunarController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaLunarController.class);
-
-    @Autowired
-    public ITaLunarService iTaLunarService;
-
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taLunar",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taLunarList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaLunar> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaLunar> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaLunar> result = iTaLunarService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param taLunar 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taLunar",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taLunarAdd(@ApiParam("保存内容") @RequestBody TaLunar taLunar) throws Exception{
-
-        if (iTaLunarService.save(taLunar)){
-            return ResponseBean.success(taLunar);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taLunar/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taLunarDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaLunarService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taLunar 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taLunar/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taLunarUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaLunar taLunar) throws Exception{
-
-        if (iTaLunarService.updateById(taLunar)){
-            return ResponseBean.success(iTaLunarService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taLunar/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taLunarGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaLunarService.getById(id));
-    }
+//
+//    private final Logger logger = LoggerFactory.getLogger(TaLunarController.class);
+//
+//    @Autowired
+//    public ITaLunarService iTaLunarService;
+//
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taLunar",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taLunarList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaLunar> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaLunar> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaLunar> result = iTaLunarService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taLunar 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taLunar",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taLunarAdd(@ApiParam("保存内容") @RequestBody TaLunar taLunar) throws Exception{
+//
+//        if (iTaLunarService.save(taLunar)){
+//            return ResponseBean.success(taLunar);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taLunar/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taLunarDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaLunarService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taLunar 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taLunar/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taLunarUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaLunar taLunar) throws Exception{
+//
+//        if (iTaLunarService.updateById(taLunar)){
+//            return ResponseBean.success(iTaLunarService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taLunar/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taLunarGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaLunarService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/drawlots/controller/TaPersonController.java

@@ -1,10 +1,9 @@
 package com.yunzhi.drawlots.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.drawlots.common.BaseController;
-import com.yunzhi.drawlots.common.ResponseBean;
+import com.yunzhi.drawlots.common.*;
+import com.yunzhi.drawlots.service.ITaPrizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -12,7 +11,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,6 +18,10 @@ import com.yunzhi.drawlots.service.ITaPersonService;
 import com.yunzhi.drawlots.entity.TaPerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 用户表 前端控制器
@@ -39,6 +41,9 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    @Autowired
+    public ITaPrizeService iTaPrizeService;
+
 
     /**
      * 分页查询列表
@@ -49,71 +54,126 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/taPerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam(value = "开始时间", example = "2021-01-01") @RequestParam(value ="startDate", required = false) String startDate,
+                                     @ApiParam(value = "结束时间", example = "2021-10-31") @RequestParam(value ="endDate", required = false) String endDate) throws Exception{
 
-        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        LocalDateTime start = null, end = null;
+
+        if (!StringUtils.isEmpty(startDate)) {
+            start = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+        if (!StringUtils.isEmpty(endDate)) {
+            end = DateUtils.from(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
 
-        IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
+        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTaPersonService.getPageBy(pg, start, end);
         return ResponseBean.success(result);
     }
 
-    /**
-     * 保存对象
-     * @param taPerson 实体对象
-     * @return
-     */
     @RequestMapping(value="/taPerson",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
+    @ApiOperation(value="导出Excel", notes = "导出Excel", httpMethod = "POST", response = ResponseBean.class)
+    public void exportXls(@ApiParam(value = "开始时间", example = "2021-01-01") @RequestParam(value ="startDate", required = false) String startDate,
+                          @ApiParam(value = "结束时间", example = "2021-10-31") @RequestParam(value ="endDate", required = false) String endDate,
+                          HttpServletResponse response) throws Exception {
+        LocalDateTime start = null, end = null;
 
-        if (iTaPersonService.save(taPerson)){
-            return ResponseBean.success(taPerson);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (!StringUtils.isEmpty(startDate)) {
+            start = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
         }
+        if (!StringUtils.isEmpty(endDate)) {
+            end = DateUtils.from(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        List<TaPerson> result = iTaPersonService.getListBy(start, end);
+        ExcelUtils.flush(response, TaPerson.class, result, "参与人员名单");
     }
 
+//    /**
+//     * 保存对象
+//     * @param taPerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
+//
+//        if (iTaPersonService.save(taPerson)){
+//            return ResponseBean.success(taPerson);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+//        if(iTaPersonService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taPerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taPerson/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable String id,
+//                                        @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+//
+//        TaPerson origin = iTaPersonService.getByPhone(taPerson.getPhone());
+//        if (null != origin && !id.equals(origin.getPersonId())) {
+//            return ResponseBean.error("手机号已存在, 请重新填写", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        origin = iTaPersonService.getById(id);
+//        if (null == origin) {
+//            return ResponseBean.error("人员信息校验失败, 请刷新重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        taPerson.setPersonId(id);
+//
+//        if (iTaPersonService.updateName(taPerson)){
+//            return ResponseBean.success(iTaPersonService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+
     /**
-     * 根据id删除对象
+     * 抽奖
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPersonService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/wx/taPerson/{id}/prize",method= RequestMethod.GET)
+    @ApiOperation(value="抽奖", notes = "抽奖", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getPrize(@ApiParam("人员ID") @PathVariable String id) throws Exception{
+        TaPerson taPerson = iTaPersonService.getById(id);
+
+        if (taPerson.getIsJoined() || taPerson.getIsWinning()) {
+            return ResponseBean.error("您已参与抽奖!", ResponseBean.ERROR_UNAVAILABLE);
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taPerson 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
-
-        if (iTaPersonService.updateById(taPerson)){
-            return ResponseBean.success(iTaPersonService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        try {
+            iTaPrizeService.drawLottery(taPerson);
+        } catch (Exception e) {
+            if (e.getMessage().equals("no-prize")) {
+                return ResponseBean.error("奖品已抽完", 9999);
+            }
+
+            throw e;
         }
-    }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaPersonService.getById(id));
+        return ResponseBean.success(taPerson);
     }
 }

src/main/java/com/yunzhi/drawlots/controller/TaPrizeController.java

@@ -11,14 +11,11 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.drawlots.service.ITaPrizeService;
 import com.yunzhi.drawlots.entity.TaPrize;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -53,67 +50,83 @@ public class TaPrizeController extends BaseController {
 
         IPage<TaPrize> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPrize> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("sort_no");
+        queryWrapper.orderByAsc("sort_no");
 
         IPage<TaPrize> result = iTaPrizeService.page(pg, queryWrapper);
         return ResponseBean.success(result);
     }
 
+
     /**
-     * 保存对象
-     * @param taPrize 实体对象
+     * 获取奖品列表
      * @return
      */
-    @RequestMapping(value="/taPrize",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taPrizeAdd(@ApiParam("保存内容") @RequestBody TaPrize taPrize) throws Exception{
-
-        if (iTaPrizeService.save(taPrize)){
-            return ResponseBean.success(taPrize);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+    @RequestMapping(value="/wx/taPrize",method= RequestMethod.GET)
+    @ApiOperation(value="获取奖品列表", notes = "获取奖品列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getPrizeList() throws Exception{
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPrize/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPrizeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPrizeService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+        QueryWrapper<TaPrize> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc("sort_no");
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taPrize 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPrize/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPrizeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPrize taPrize) throws Exception{
-
-        if (iTaPrizeService.updateById(taPrize)){
-            return ResponseBean.success(iTaPrizeService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        List<TaPrize> result = iTaPrizeService.list(queryWrapper);
+        return ResponseBean.success(result);
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPrize/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPrizeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaPrizeService.getById(id));
-    }
+//    /**
+//     * 保存对象
+//     * @param taPrize 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPrize",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taPrizeAdd(@ApiParam("保存内容") @RequestBody TaPrize taPrize) throws Exception{
+//
+//        if (iTaPrizeService.save(taPrize)){
+//            return ResponseBean.success(taPrize);
+//        } else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPrize/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taPrizeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaPrizeService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taPrize 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPrize/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taPrizeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaPrize taPrize) throws Exception{
+//
+//        if (iTaPrizeService.updateById(taPrize)){
+//            return ResponseBean.success(iTaPrizeService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPrize/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taPrizeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaPrizeService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/drawlots/entity/TaPerson.java

@@ -1,9 +1,16 @@
 package com.yunzhi.drawlots.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.yunzhi.drawlots.common.excelConverter.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,31 +33,55 @@ public class TaPerson implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "用户ID")
     @TableId(value = "person_id", type = IdType.UUID)
     private String personId;
 
+    @ExcelProperty(value = "姓名", index = 0)
+    @ColumnWidth(80)
     @ApiModelProperty(value = "用户名")
     private String name;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "openid")
+    private String openid;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否参与")
     private Boolean isJoined;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "参与时间")
     private LocalDateTime joinedDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否中奖")
     private Boolean isWinning;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "中奖ID")
     private String prizeId;
 
+    @ExcelProperty(value = "中奖时间", converter = LocalDateTimeConverter.class, index = 2)
+    @ColumnWidth(160)
     @ApiModelProperty(value = "中奖时间")
     private LocalDateTime prizeDate;
+
+    @ExcelProperty(value = "奖品", index = 1)
+    @ApiModelProperty("中奖名称")
+    @TableField(exist = false)
+    private String prizeName;
 }

src/main/java/com/yunzhi/drawlots/entity/TaPrize.java

@@ -35,6 +35,9 @@ public class TaPrize implements Serializable {
     @ApiModelProperty(value = "图片")
     private String thumb;
 
+    @ApiModelProperty(value = "图片2")
+    private String thumb2;
+
     @ApiModelProperty(value = "库存")
     private Integer totalNum;
 

src/main/java/com/yunzhi/drawlots/exception/GlobalExceptionHandler.java

@@ -0,0 +1,19 @@
+package com.yunzhi.drawlots.exception;
+
+import com.yunzhi.drawlots.common.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ResponseBody
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+    }
+}

src/main/java/com/yunzhi/drawlots/interceptor/PermissionInterceptor.java

@@ -0,0 +1,48 @@
+package com.yunzhi.drawlots.interceptor;
+
+import com.yunzhi.drawlots.common.JWTUtils;
+import com.yunzhi.drawlots.common.ResponseBean;
+import com.yunzhi.drawlots.common.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+
+@Slf4j
+@Component
+public class PermissionInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+//        log.info("Request URI: {}", request.getRequestURI());
+
+        // JWT
+        String jws = JWTUtils.getToken(request);
+        if (StringUtils.isEmpty(jws)) {
+            responseTokenError(response, "鉴权失败, 请先进行登录操作");
+            return false;
+        }
+
+        try {
+            Map<String, Object> tokenMap = JWTUtils.decode(jws);
+        } catch (Exception e) {
+            log.error("鉴权失败: {}", e.getMessage());
+            responseTokenError(response, "鉴权失败, 请重新登录");
+            return false;
+        }
+
+        return true;
+    }
+
+    private void responseTokenError(HttpServletResponse response, String error) throws IOException {
+        response.addHeader("Content-type", "application/json");
+        response.getOutputStream().write(
+                ResponseBean.error(error, ResponseBean.ERROR_AUTH_FAIL).toJSON().getBytes(StandardCharsets.UTF_8));
+    }
+}

src/main/java/com/yunzhi/drawlots/mapper/TaPersonMapper.java

@@ -1,8 +1,13 @@
 package com.yunzhi.drawlots.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.drawlots.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
+    IPage<TaPerson> getPageBy(IPage<TaPerson> pg, @Param("start") LocalDateTime start, @Param("end")  LocalDateTime end);
+
+    List<TaPerson> getListBy(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end);
 }

src/main/java/com/yunzhi/drawlots/service/ITaPersonService.java

@@ -1,8 +1,12 @@
 package com.yunzhi.drawlots.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.drawlots.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPersonService extends IService<TaPerson> {
 
+    TaPerson getByOpenId(String openid);
+
+    boolean updateName(TaPerson taPerson);
+
+    TaPerson getByPhone(String phone);
+
+    IPage<TaPerson> getPageBy(IPage<TaPerson> pg, LocalDateTime start, LocalDateTime end);
+
+    List<TaPerson> getListBy(LocalDateTime start, LocalDateTime end);
 }

src/main/java/com/yunzhi/drawlots/service/impl/TaPersonServiceImpl.java

@@ -1,11 +1,17 @@
 package com.yunzhi.drawlots.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.drawlots.entity.TaPerson;
 import com.yunzhi.drawlots.mapper.TaPersonMapper;
 import com.yunzhi.drawlots.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +23,51 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Override
+    public TaPerson getByOpenId(String openid) {
+
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("openid", openid);
+        queryWrapper.last("limit 1");
+
+        TaPerson taPerson = getOne(queryWrapper);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setOpenid(openid);
+            taPerson.setCreateDate(LocalDateTime.now());
+            save(taPerson);
+        }
+
+        return taPerson;
+    }
+
+    @Override
+    public boolean updateName(TaPerson taPerson) {
+        UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("name", taPerson.getName());
+        updateWrapper.set("phone", taPerson.getPhone());
+        updateWrapper.eq("person_id", taPerson.getPersonId());
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public TaPerson getByPhone(String phone) {
+
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", phone);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public IPage<TaPerson> getPageBy(IPage<TaPerson> pg, LocalDateTime start, LocalDateTime end) {
+        return baseMapper.getPageBy(pg, start, end);
+    }
+
+    @Override
+    public List<TaPerson> getListBy(LocalDateTime start, LocalDateTime end) {
+        return baseMapper.getListBy(start, end);
+    }
 }

src/main/java/com/yunzhi/drawlots/service/impl/TaPrizeServiceImpl.java

@@ -43,7 +43,7 @@ public class TaPrizeServiceImpl extends ServiceImpl<TaPrizeMapper, TaPrize> impl
             try {
                 List<TaPrize> taPrizeList = baseMapper.getStock();
                 if (null == taPrizeList || taPrizeList.size() < 1) {
-                    return;
+                    throw new Exception("no-prize");
                 }
 
                 LocalDateTime now = LocalDateTime.now();

src/main/java/com/yunzhi/drawlots/vo/LoginParam.java

@@ -0,0 +1,16 @@
+package com.yunzhi.drawlots.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "登录参数")
+@Data
+public class LoginParam {
+
+    @ApiModelProperty("用户名")
+    String userName;
+
+    @ApiModelProperty("密码, MD5 加密后数据")
+    String password;
+}

src/main/java/com/yunzhi/drawlots/vo/MPLogin.java

@@ -0,0 +1,20 @@
+package com.yunzhi.drawlots.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "公众号登录")
+@Data
+public class MPLogin {
+
+    @ApiModelProperty("OpenID")
+    String openid;
+
+    @ApiModelProperty("昵称")
+    String nickname;
+
+    @ApiModelProperty("头像")
+    String headImgUrl;
+}

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 ###
 server:
-  port: 8080
+  port: 9000
   servlet:
     context-path: /api
 
@@ -11,7 +11,8 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/hh_draw_lots?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://110.40.183.156:3306/hh_draw_lots?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/hh_draw_lots?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: hh_draw_lots
     password: hh_draw_lots@ABC123
 
@@ -21,3 +22,25 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
   mapper-locations: classpath:mapper/**/*.xml
+
+
+###
+interceptor:
+  permission:
+    enable: true
+    include-paths: /**
+    exclude-paths:
+      - /admin/login
+      - /wx/login
+      - /wx/taPrize
+      - /swagger-ui/**
+      - /swagger-resources/**
+      - /v2/**
+
+# 业务
+biz:
+  admin:
+    # 账户名
+    account: admin
+    # 密码
+    password: 888888

src/main/resources/mapper/TaPersonMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.drawlots.mapper.TaPersonMapper">
 
+    <sql id="listSQL">
+        SELECT
+            t.*,
+            s.`name` AS prize_name
+        FROM
+            ta_person t
+            LEFT JOIN ta_prize s ON t.prize_id = s.prize_id
+        WHERE
+            1 = 1
+            <if test="start != null">AND t.create_date &gt;= #{start}</if>
+            <if test="end != null">AND t.create_date &lt;= #{end}</if>
+        ORDER BY
+            IFNULL(t.joined_date, t.create_date) DESC
+    </sql>
+
+    <select id="getPageBy" resultType="com.yunzhi.drawlots.entity.TaPerson">
+        <include refid="listSQL"></include>
+    </select>
+    <select id="getListBy" resultType="com.yunzhi.drawlots.entity.TaPerson">
+        <include refid="listSQL"></include>
+    </select>
 </mapper>