合并

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -197,7 +197,7 @@ public class SysUserController extends BaseController {
         String token = JWTUtils.newToken(sysUser.getUserName());
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
         
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
@@ -214,11 +214,4 @@ public class SysUserController extends BaseController {
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -12,5 +12,6 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
  * @since 2019-09-11
  */
 public interface ISysTokenService extends IService<SysToken> {
-
+	
+	SysToken saveToken(String token);
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 令牌表  服务实现类
@@ -17,5 +20,16 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
-
+	
+	@Autowired
+	private SysTokenMapper sysTokenMapper;
+	
+	@Override
+	public SysToken saveToken(String token) {
+		SysToken sysToken = new SysToken();
+		sysToken.setToken(token);
+		sysToken.setExpDate(LocalDateTime.now().plusDays(7));
+		sysTokenMapper.insert(sysToken);
+		return sysToken;
+	}
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -282,7 +282,7 @@ public class TaUserController extends BaseController {
         String token = JWTUtils.newTokenByMap(map);
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
     
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
@@ -414,11 +414,4 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

src/main/java/com/huiju/estateagents/controller/TaMiniappController.java

@@ -1,10 +1,12 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.ITaMiniappService;
 import org.slf4j.Logger;
@@ -141,4 +143,25 @@ public class TaMiniappController extends BaseController {
         }
         return responseBean;
     }
+
+    @PostMapping(value = "center/check/taMiniapp")
+    public ResponseBean createQRCode(@RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("生成二维码参数为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("非法生成二维码参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String appid = params.getString("appid");
+        String secret = params.getString("secret");
+        String path = params.getString("path");
+
+        if (StringUtils.isEmpty(appid) || StringUtils.isEmpty(secret) || StringUtils.isEmpty(path)) {
+
+        }
+        return null;
+    }
 }

src/main/java/com/huiju/estateagents/service/IMiniAppService.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.service;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
@@ -29,6 +31,8 @@ public interface IMiniAppService {
 
     ResponseBean getQrCode(String paramsStr, String appid);
 
+    String createQrCode(WxMaService service, String path) throws Exception;
+
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -175,6 +175,13 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    @Override
+    public String createQrCode(WxMaService service, String path) throws Exception {
+        File qrFile = service.getQrcodeService().createWxaCode(path);
+        String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+        return qrcode;
+    }
+
     @Override
     public TaMiniappQrcode getQrCodeBySerialNo(Integer id) {
         return taMiniappQrcodeMapper.selectById(id);