小程序后台代码提交，登录, 修改返回参数

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorGraphQLQuery.java

@@ -1,13 +1,37 @@
+/*
 package com.xueyi.system.staff.graphql;
 
+import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo;
+import com.xueyi.system.staff.domain.model.DmVisitorsConverter;
+import com.xueyi.system.staff.mapper.DmVisitorsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+*/
 /**
  * @author yk
  * @description
  * @date 2023-12-25 19:55
- */
+ *//*
+
 @Service
-public class VisitorGraphQLQuery {
+class VisitorGraphQLQueryResolver implements GraphQLQueryResolver {
+    @Autowired
+    private DmVisitorsMapper mapper;
+
+    @Autowired
+    private DmVisitorsConverter converter;
+
+    public DmVisitorsPo findOneVisitor(Long id){
+        return mapper.selectById(id);
+    }
 
+    public List<DmVisitorsPo> getVisitorList(){
+        return mapper.selectList(null).stream().map(t->converter.mapperDto(t)).collect(Collectors.toList());
+    }
 }
+*/

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/wechat/controller/WeChatController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -68,21 +69,15 @@ public class WeChatController {
 
         log.info("微信login返回信息：{}", weChatUserInfo);
         R<SysEnterpriseStaff> staff = tenantService.existStaff(weChatUserInfo.getOpenid(), SecurityConstants.INNER);
+        Map<String, Object> map = new HashMap<>();
         try {
-            if (staff.getData() == null) {
-                return AjaxResult.error("对应用户不存在", CryptoUtils.encrypt(weChatUserInfo.toString()) );
-            } else {
+            map.put("wechat_auth", CryptoUtils.encrypt(weChatUserInfo.toString()));
+            if (staff.getData() != null) {
                 R<LoginUser> loginInfoResult = remoteLoginService.getLoginInfoInnerByPhone(staff.getData().getPhone(), SecurityConstants.INNER);
-
-                log.info("根据openid获取用户信息返回信息：{}", loginInfoResult.getData().getEnterpriseName());
-                if (ObjectUtil.isNull(loginInfoResult.getData())) {
-                    return AjaxResult.error("手机号可能错误，请查证后重试！", CryptoUtils.encrypt(weChatUserInfo.toString()));
-                } else {
-                    Map<String, Object> map = tokenService.createToken(loginInfoResult.getData());
-                    map.put("openid", weChatUserInfo.getOpenid());
-                    return AjaxResult.success(map);
-                }
+                map.putAll(tokenService.createToken(loginInfoResult.getData()));
+                return AjaxResult.success(map);
             }
+            return AjaxResult.success(map);
         } catch (Exception e){
             e.printStackTrace();
             response.setStatus(500);