feats

pom.xml

@@ -9,7 +9,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.shigongli</groupId>
-	<artifactId>serivce</artifactId>
+	<artifactId>shigongli</artifactId>
 	<version>0.0.1</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
@@ -109,6 +109,11 @@
 			<version>3.8.0</version>
 		</dependency>
 		<!--weixin-miniapp start-->
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-mp</artifactId>
+			<version>3.8.0</version>
+		</dependency>
 
 		<!--lombok start-->
 		<dependency>

src/main/java/com/shigongli/common/WxUtils.java

@@ -4,31 +4,46 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.shigongli.config.WeixinConfig;
+import lombok.Data;
+import lombok.Getter;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+@Getter
 @Component
 public class WxUtils {
-    private static WxMaService service;
+    private WxMaService maService;
+    private WxMpService mpService;
 
     @Autowired
     public WxUtils(WeixinConfig config) {
-        setService(config);
+        initMaService(config);
+        initMpService(config);
     }
 
-    private void setService(WeixinConfig config) {
+    private void initMaService(WeixinConfig config) {
         WxMaDefaultConfigImpl conf = new WxMaDefaultConfigImpl();
-        conf.setAppid(config.getMiniapp().getAppid());
-        conf.setSecret(config.getMiniapp().getSecret());
-        conf.setToken(config.getMiniapp().getToken());
-        conf.setAesKey(config.getMiniapp().getAesKey());
-        conf.setMsgDataFormat(config.getMiniapp().getMsgDataFormat());
+        conf.setAppid(config.getMa().getAppid());
+        conf.setSecret(config.getMa().getSecret());
+        conf.setToken(config.getMa().getToken());
+        conf.setAesKey(config.getMa().getAesKey());
+        conf.setMsgDataFormat(config.getMa().getMsgDataFormat());
 
-        WxMaService service = new WxMaServiceImpl();
-        service.setWxMaConfig(conf);
+        maService = new WxMaServiceImpl();
+        maService.setWxMaConfig(conf);
     }
 
-    public WxMaService getService() {
-        return service;
+    private void initMpService(WeixinConfig config) {
+        WxMpDefaultConfigImpl conf = new WxMpDefaultConfigImpl();
+        conf.setAppId(config.getMp().getAppid());
+        conf.setSecret(config.getMp().getSecret());
+        conf.setToken(config.getMp().getToken());
+        conf.setAesKey(config.getMp().getAesKey());
+
+        mpService = new WxMpServiceImpl();
+        mpService.setWxMpConfigStorage(conf);
     }
 }

src/main/java/com/shigongli/config/WeixinConfig.java

@@ -11,14 +11,25 @@ import org.springframework.stereotype.Component;
 public class WeixinConfig {
 
     @NestedConfigurationProperty
-    private Miniapp miniapp = new Miniapp();
+    private Ma ma = new Ma();
+
+    @NestedConfigurationProperty
+    private Mp mp = new Mp();
 
     @Data
-    public static class Miniapp {
+    public static class Ma {
         private String appid;
         private String secret;
         private String token;
         private String aesKey;
         private String msgDataFormat;
     }
+
+    @Data
+    public static class Mp {
+        private String appid;
+        private String secret;
+        private String token;
+        private String aesKey;
+    }
 }

src/main/java/com/shigongli/constants/StatusConstant.java

@@ -0,0 +1,7 @@
+package com.shigongli.constants;
+
+public class StatusConstant {
+    public final static Integer DELETE = -1;
+    public final static Integer READY = 0;
+    public final static Integer NORMAL = 1;
+}

src/main/java/com/shigongli/controller/LoginController.java

@@ -1,69 +1,66 @@
 package com.shigongli.controller;
 
-import com.shigongli.common.BaseController;
-import com.shigongli.common.EncryptUtils;
-import com.shigongli.common.ResponseBean;
-//import com.yunzhi.niucai.entity.SysUser;
-//import com.yunzhi.niucai.service.ISysUserService;
-//import org.springframework.beans.factory.annotation.Autowired;
+import com.shigongli.common.*;
+import com.shigongli.entity.SysUser;
+import com.shigongli.service.ISysUserService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.shigongli.vo.LoginParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-//import java.util.HashMap;
+import java.util.HashMap;
+import java.util.Map;
 
 
 @Api(tags = "登入/登出")
 @RestController
 public class LoginController extends BaseController {
 
-//    @Autowired
-//    ISysUserService iSysUserService;
+    @Autowired
+    ISysUserService iSysUserService;
 
+    @Autowired
+    WxUtils wxUtils;
+
+    /**
+     * 公众号登录
+     * @param code
+     * @return
+     * @throws Exception
+     */
     @PostMapping("/mp/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.get("userName");
-//        String password = loginParam.get("password");
-//
-//        if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(password)) {
-//            return ResponseBean.error("账户或密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        SysUser sysUser = iSysUserService.getLoginUser(userName);
-//        if (null == sysUser) {
-//            return ResponseBean.error("账户或密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        if (!checkPassword(password, sysUser.getPassword(), sysUser.getUserId().toString())) {
-//            return ResponseBean.error("账户或密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        if (!iSysUserService.checkStatus(sysUser)) {
-//            return ResponseBean.error("用户状态不正确, 请联系管理人员", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//
-//        // 生成 token
-//        Map<String, Object> claims = new HashMap<String, Object>(){{
-//            put("userId", sysUser.getUserId());
-//        }};
-//        String jws = JWTUtils.encode(claims);
-//        sysUser.setPassword(null);
-//        sysUser.setToken(jws);
-//
-//        return ResponseBean.success(sysUser);
-        return ResponseBean.success("");
-    }
+    public ResponseBean login(@ApiParam("登录参数") @RequestParam("code") String code) throws Exception {
+        WxMpService mpService = wxUtils.getMpService();
+        WxMpOAuth2AccessToken wxMpOAuth2AccessToken = mpService.oauth2getAccessToken(code);
+        WxMpUser wxMpUser = mpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
+
+        SysUser sysUser = iSysUserService.getByOpenId(wxMpOAuth2AccessToken.getOpenId());
+        if (null == sysUser) {
+            sysUser = new SysUser();
+            sysUser.setName(wxMpUser.getNickname());
+            sysUser.setOpenid(wxMpUser.getOpenId());
+            iSysUserService.save(sysUser);
+        }
+
+        if (StringUtils.isEmpty(sysUser.getPhone())) {
+            return ResponseBean.error("请先联系管理员进行授权操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 生成 token
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("userId", sysUser.getUserId());
+        String jws = JWTUtils.encode(claims);
+        sysUser.setToken(jws);
 
-    private boolean checkPassword(String src, String targ, String salt) {
-        return EncryptUtils.md5(src, salt).equals(targ);
+        return ResponseBean.success(sysUser);
     }
 }

src/main/java/com/shigongli/controller/WxPortalController.java

@@ -0,0 +1,81 @@
+package com.shigongli.controller;
+
+import com.shigongli.common.BaseController;
+import com.shigongli.common.WxUtils;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/mp/portal/{appid}")
+public class WxPortalController extends BaseController {
+
+    @Autowired
+    WxUtils wxUtils;
+
+    /**
+     * 微信公众号接入
+     * @param appid
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @param echostr
+     * @return
+     */
+    @GetMapping(produces = "text/plain;charset=utf-8")
+    public String authGet(@PathVariable String appid,
+                          @RequestParam(name = "signature", required = false) String signature,
+                          @RequestParam(name = "timestamp", required = false) String timestamp,
+                          @RequestParam(name = "nonce", required = false) String nonce,
+                          @RequestParam(name = "echostr", required = false) String echostr) {
+        return echostr;
+    }
+
+    @PostMapping(produces = "application/xml; charset=UTF-8")
+    public String post(@PathVariable String appid,
+                       @RequestBody String requestBody,
+                       @RequestParam("signature") String signature,
+                       @RequestParam("timestamp") String timestamp,
+                       @RequestParam("nonce") String nonce,
+                       @RequestParam("openid") String openid,
+                       @RequestParam(name = "encrypt_type", required = false) String encType,
+                       @RequestParam(name = "msg_signature", required = false) String msgSignature) {
+
+        log.info("\n接收微信请求：[openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}],"
+                        + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
+                openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
+
+        WxMpService mpService = wxUtils.getMpService().switchoverTo(appid);
+        if (null == mpService) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
+
+        if (!mpService.checkSignature(timestamp, nonce, signature)) {
+            throw new IllegalArgumentException("非法请求，可能属于伪造的请求！");
+        }
+
+        WxMpXmlMessage inMessage = null;
+        WxMpXmlOutMessage outMessage = null;
+        if (encType == null) {
+            // 明文传输的消息
+            inMessage = WxMpXmlMessage.fromXml(requestBody);
+        } else if ("aes".equalsIgnoreCase(encType)) {
+            // aes加密的消息
+            inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, mpService.getWxMpConfigStorage(),
+                    timestamp, nonce, msgSignature);
+            log.debug("\n消息解密后内容为：\n{} ", inMessage.toString());
+        }
+
+        // 关注公众号
+        if (inMessage.getMsgType().equals(WxConsts.XmlMsgType.EVENT) && inMessage.getEvent().equals(WxConsts.EventType.SUBSCRIBE)) {
+            // todo
+        }
+
+        return "";
+    }
+}

src/main/java/com/shigongli/entity/SysUser.java

@@ -2,6 +2,8 @@ package com.shigongli.entity;
 
 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 io.swagger.annotations.ApiModel;
@@ -27,7 +29,7 @@ public class SysUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "系统ID")
-    @TableId(value = "user_id", type = IdType.INPUT)
+    @TableId(value = "user_id", type = IdType.UUID)
     private String userId;
 
     @ApiModelProperty(value = "用户名")
@@ -45,5 +47,6 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private String token;
 }

src/main/java/com/shigongli/service/ISysUserService.java

@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysUserService extends IService<SysUser> {
 
+    SysUser getByOpenId(String openId);
+
+    SysUser getByPhone(String phone);
 }

src/main/java/com/shigongli/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,7 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.SysUser;
 import com.shigongli.mapper.SysUserMapper;
 import com.shigongli.service.ISysUserService;
@@ -17,4 +19,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
+    @Override
+    public SysUser getByOpenId(String openId) {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>()
+                .eq("openid", openId)
+                .eq("status", StatusConstant.NORMAL)
+                .last("limit 1");
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public SysUser getByPhone(String phone) {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>()
+                .eq("phone", phone)
+                .eq("status", StatusConstant.NORMAL)
+                .last("limit 1");
+        return getOne(queryWrapper);
+    }
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 ###
 server:
-  port: 8080
+  port: 8091
   servlet:
     context-path: /api
 
@@ -10,8 +10,8 @@ interceptor:
     enable: true
     include-paths: /**
     exclude-paths:
-      - /login
-      - /logout
+      - /mp/login
+      - /ma/login
       - /swagger-ui/**
       - /swagger-resources/**
       - /v2/**
@@ -25,12 +25,12 @@ mybatis-plus:
 
 ###
 aliyun:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  accessKeyId: LTAIGQtIi28MfXms
+  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+    bucketName: zhiyun-image
+    bucketURL: https://zhiyun-image.oss-accelerate.aliyuncs.com
   sms:
     captcha:
       code: SMS_195585471
@@ -38,12 +38,20 @@ aliyun:
 
 ###
 weixin:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+  # 小程序
+  ma:
+    appid: wx06a7372d48d56843
+    secret: ead0c7b1dd40ce828b1fd9bf18183584
     token:
     aesKey:
     msgDataFormat: JSON
+  # 公众号
+  mp:
+    appid: wx74db171e5f6524ad
+    secret: 01257197628a0b8553d7ef54f1252a06
+    token: yansenisahero
+    aesKey: oz3KPVpLL1yWPWUKEv1JLIE23yB8wIPA9OkdhKKK0UB
+
 
 ###
 spring: