Merge branch 'dev-zenas-20241018' of wangfan/adweb3-server into master

jeecg-boot-base-core/src/main/java/org/jeecg/config/security/SecurityConfig.java

@@ -6,8 +6,10 @@ import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.jwk.source.ImmutableJWKSet;
 import com.nimbusds.jose.jwk.source.JWKSource;
 import com.nimbusds.jose.proc.SecurityContext;
+
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
+
 import org.jeecg.config.security.app.AppGrantAuthenticationConvert;
 import org.jeecg.config.security.app.AppGrantAuthenticationProvider;
 import org.jeecg.config.security.password.PasswordGrantAuthenticationConvert;
@@ -36,7 +38,6 @@ import org.springframework.security.oauth2.server.authorization.client.JdbcRegis
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer;
-import org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings;
 import org.springframework.security.oauth2.server.authorization.token.*;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
@@ -114,6 +115,7 @@ public class SecurityConfig {
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/phoneLogin")).permitAll()
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/user/checkOnlyUser")).permitAll()
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/user/register")).permitAll()
+                        .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/user/registerNew")).permitAll()
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/user/phoneVerification")).permitAll()
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/sys/user/passwordChange")).permitAll()
                         .requestMatchers(AntPathRequestMatcher.antMatcher("/auth/2step-code")).permitAll()

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -24,6 +24,14 @@
             <artifactId>hibernate-re</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.restfb/restfb -->
+        <dependency>
+            <groupId>com.restfb</groupId>
+            <artifactId>restfb</artifactId>
+            <version>2025.4.1</version>
+        </dependency>
+
+
         <!-- 企业微信/钉钉 api -->
         <dependency>
             <groupId>org.jeecgframework</groupId>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/controller/FaceBookController.java

@@ -1,17 +1,26 @@
 package org.jeecg.modules.adweb.marketing.facebook.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.restfb.*;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.adweb.marketing.facebook.entity.AdwebImFacebook;
+import org.jeecg.modules.adweb.marketing.facebook.mapper.AdwebImFacebookMapper;
 import org.jeecg.modules.adweb.marketing.facebook.service.IFacebookService;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookChatVO;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookMessageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Optional;
 
 @Tag(name = "Facebook - 帐号，广告，报表数据等")
@@ -22,6 +31,8 @@ public class FaceBookController {
     
     @Autowired private IFacebookService facebookService;
 
+    @Resource private AdwebImFacebookMapper facebookMapper;
+
     /** 获取站点绑定的Facebook account */
     @GetMapping("/account/get")
     public Result<AdwebImFacebook> getFacebookAccount(@RequestParam String siteCode) {
@@ -49,9 +60,79 @@ public class FaceBookController {
 
         facebook.setSiteCode(siteCode);
         facebook.setCustomerId(customerId);
-        facebook.setRefreshToken(refreshToken);
+        facebook.setAccessToken(refreshToken);
         facebookService.saveOrUpdate(facebook);
 
         return Result.ok("添加成功");
     }
+
+    /** 获取Facebook聊天列表 */
+    @GetMapping("/chat/list")
+    public Result<List<FacebookChatVO>> getFacebookChatList(@RequestParam String siteCode) {
+        log.info("getFacebookChatList: siteCode={}", siteCode);
+        List<FacebookChatVO> chatList = facebookService.getChatList(siteCode);
+        log.info("getFacebookChatList: chatList={}", chatList);
+        return Result.ok(chatList);
+    }
+
+    @GetMapping("/chat/detail")
+    public Result<List<FacebookMessageVO>> getFacebookChatDetail(@RequestParam String siteCode, @RequestParam String conversationId) {
+        log.info("getFacebookChatDetail: siteCode={}, conversationId={}", siteCode, conversationId);
+        List<FacebookMessageVO> chatDetailList = facebookService.getChatDetail(siteCode, conversationId);
+        log.info("getFacebookChatDetail: chatDetailList={}", chatDetailList);
+        return Result.ok(chatDetailList);
+    }
+
+    
+
+    public static void main(String[] args) {
+        // 替换为你的App ID和App Secret
+        String appId = "961285249321302";
+        String appSecret = "57b38cafc19b10f23eda72ecfc465810";
+        String userAccessToken = "EAANqSKnQSVYBOzxamdbMucs9YIo6M8TXPWq4wZCZCTCaZApswM4dUiHBrZBQZCrZArhXiiVb3Pv5WamLra8QAPHGOJabIZCuVZCYWdS1Q4yzxWC8ZCtZBZBozwOz4zZAWHZC2QWXDUukCIYS2oegw1C3mDG50XXdRLLnhypOLGkoVMn1t024UnZCxGmzp7K8nOsXeCi3E65vYjK5a2VHgWuH4IyAZDZD";
+
+        try {
+            // 1.获取Page ID
+            // 创建一个Facebook客户端实例
+            DefaultFacebookClient client = new DefaultFacebookClient(Version.LATEST);
+            FacebookEndpoints endpoints =
+                    new FacebookEndpoints() {
+                        @Override
+                        public String getGraphEndpoint() {
+                            return "http://facebook-proxy.adwebcloud.com";
+                        }
+                    };
+
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(userAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+
+            String response = client.fetchObject("me/accounts", String.class);
+            log.info("me/accounts: response={}", response);
+            Gson gson = new Gson();
+            // String转json对象
+            JsonObject jsonObject = gson.fromJson(response, JsonObject.class);
+            String pageId = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("id").getAsString();
+            String pageAccessToken = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("access_token")
+                    .getAsString();
+
+            // 2.获取CONVERSATION-ID
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(pageAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+            response = client.fetchObject(pageId + "/conversations", String.class);
+            log.info("pageId/conversations: response={}", response);
+            jsonObject = gson.fromJson(response, JsonObject.class);
+            String conversationId = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("id").getAsString();
+            // 3.获取MESSAGES-ID
+            response = client.fetchObject(conversationId + "?fields=messages", String.class);
+            log.info("conversationId/messages: response={}", response);
+            // 4.获取MESSAGE详情
+            jsonObject = gson.fromJson(response, JsonObject.class);
+            String messageId = jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().get(0).getAsJsonObject().get("id").getAsString();
+            response = client.fetchObject(messageId + "?fields=id,created_time,from,to,message", String.class);
+            log.info("messageId: response={}", response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/entity/AdwebImFacebook.java

@@ -37,7 +37,7 @@ public class AdwebImFacebook implements Serializable {
 
     private String customerId;
 
-    private String refreshToken;
+    private String accessToken;
     /** ctime */
     @Excel(name = "ctime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/service/IFacebookService.java

@@ -1,6 +1,16 @@
 package org.jeecg.modules.adweb.marketing.facebook.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import org.jeecg.modules.adweb.marketing.facebook.entity.AdwebImFacebook;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookChatVO;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookMessageVO;
+
+import java.util.List;
+
+public interface IFacebookService extends IService<AdwebImFacebook> {
+
+    List<FacebookChatVO> getChatList(String siteCode);
 
-public interface IFacebookService extends IService<AdwebImFacebook> {}
+    List<FacebookMessageVO> getChatDetail(String siteCode, String conversationId);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/service/impl/FacebookServiceImpl.java

@@ -1,15 +1,191 @@
 package org.jeecg.modules.adweb.marketing.facebook.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.restfb.DefaultFacebookClient;
+import com.restfb.FacebookEndpoints;
+import com.restfb.Version;
+
+import jakarta.annotation.Resource;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.jeecg.modules.adweb.marketing.facebook.entity.AdwebImFacebook;
 import org.jeecg.modules.adweb.marketing.facebook.mapper.AdwebImFacebookMapper;
 import org.jeecg.modules.adweb.marketing.facebook.service.IFacebookService;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookChatVO;
+import org.jeecg.modules.adweb.marketing.facebook.vo.FacebookMessageVO;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Zenas
  */
 @Service
+@Slf4j
 public class FacebookServiceImpl extends ServiceImpl<AdwebImFacebookMapper, AdwebImFacebook> implements IFacebookService {
 
-}
+    @Resource
+    private AdwebImFacebookMapper facebookMapper;
+    @Override
+    public List<FacebookChatVO> getChatList(String siteCode) {
+        // 根据siteCode从Facebook API获取聊天列表
+        // 根据站点code获取用户的access token
+        String userAccessToken = getUserAccessTokenBySiteCode(siteCode);
+        try {
+            // 1.获取Page ID
+            // 创建一个Facebook客户端实例
+            DefaultFacebookClient client = new DefaultFacebookClient(Version.LATEST);
+            FacebookEndpoints endpoints =
+                    new FacebookEndpoints() {
+                        @Override
+                        public String getGraphEndpoint() {
+                            return "http://facebook-proxy.adwebcloud.com";
+                        }
+                    };
+
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(userAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+
+            String response = client.fetchObject("me/accounts", String.class);
+            log.info("me/accounts: response={}", response);
+            Gson gson = new Gson();
+            // String转json对象
+            JsonObject jsonObject = gson.fromJson(response, JsonObject.class);
+            String pageId = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("id").getAsString();
+            String pageAccessToken = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("access_token")
+                    .getAsString();
+
+            // 2.获取CONVERSATION-ID
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(pageAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+            response = client.fetchObject(pageId + "/conversations", String.class);
+            log.info("pageId/conversations: response={}", response);
+            jsonObject = gson.fromJson(response, JsonObject.class);
+            List<String> conversationIdList = new ArrayList<>();
+            for (int i = 0; i < jsonObject.get("data").getAsJsonArray().size(); i++) {
+                conversationIdList.add(jsonObject.get("data").getAsJsonArray().get(i).getAsJsonObject().get("id").getAsString());
+            }
+            if (conversationIdList.isEmpty()) {
+                return null;
+            }
+            // 获取每个conversationId下最新的消息
+            List<FacebookChatVO> facebookChatVOS = new ArrayList<FacebookChatVO>();
+            for (int i = 0; i < conversationIdList.size(); i++) {
+                FacebookChatVO facebookChatVO = new FacebookChatVO();
+                response = client.fetchObject(conversationIdList.get(i) + "?fields=messages", String.class);
+                log.info("conversationId/messages: response={}", response);
+                jsonObject = gson.fromJson(response, JsonObject.class);
+                String messageId = jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().get(0).getAsJsonObject().get("id").getAsString();
+                // 获取messageId下的消息 获取每个conversationId下最新的消息
+                response = client.fetchObject(messageId + "?fields=id,created_time,from,to,message", String.class);
+                log.info("messageId: response={}", response);
+                jsonObject = gson.fromJson(response, JsonObject.class);
+                facebookChatVO.setId(jsonObject.get("id").getAsString());
+                facebookChatVO.setName(jsonObject.get("from").getAsJsonObject().get("name").getAsString());
+                facebookChatVO.setLastMessage(jsonObject.get("message").getAsString());
+                facebookChatVO.setLastMessageTime(jsonObject.get("created_time").getAsString());
+                ArrayList<String> messageIdList = new ArrayList<>();
+                for (int j = 0; j < jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().size(); j++) {
+                    messageIdList.add(jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().get(j).getAsJsonObject().get("id").getAsString());
+                }
+                if (messageIdList.isEmpty()) {
+                    return null;
+                }
+                List<FacebookMessageVO> facebookMessageVOS = new ArrayList<>();
+                for (int k = 0; k < messageIdList.size(); k++) {
+                    response = client.fetchObject(messageIdList.get(k) + "?fields=id,created_time,from,to,message", String.class);
+                    log.info("messageId: response={}", response);
+                    jsonObject = gson.fromJson(response, JsonObject.class);FacebookMessageVO facebookMessageVO = new FacebookMessageVO();
+                    facebookMessageVO.setId(jsonObject.get("id").getAsString());
+                    facebookMessageVO.setSender(jsonObject.get("from").getAsJsonObject().get("name").getAsString());
+                    facebookMessageVO.setAvatar(jsonObject.get("to").getAsJsonObject().get("name").getAsString());
+                    facebookMessageVO.setContent(jsonObject.get("message").getAsString());
+                    facebookMessageVO.setTime(jsonObject.get("created_time").getAsString());
+                    facebookMessageVOS.add(facebookMessageVO);
+                }
+                log.info("facebookMessageVOS: {}", facebookMessageVOS);
+                facebookChatVO.setMessageVOList(facebookMessageVOS);
+                facebookChatVOS.add(facebookChatVO);
+            }
+            return facebookChatVOS;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public List<FacebookMessageVO> getChatDetail(String siteCode, String conversationId) {
+        // 根据站点code获取用户的access token
+        String userAccessToken = getUserAccessTokenBySiteCode(siteCode);
+        try {
+            // 1.获取Page ID
+            // 创建一个Facebook客户端实例
+            DefaultFacebookClient client = new DefaultFacebookClient(Version.LATEST);
+            FacebookEndpoints endpoints =
+                    new FacebookEndpoints() {
+                        @Override
+                        public String getGraphEndpoint() {
+                            return "http://facebook-proxy.adwebcloud.com";
+                        }
+                    };
+
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(userAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+
+            String response = client.fetchObject("me/accounts", String.class);
+            log.info("me/accounts: response={}", response);
+            Gson gson = new Gson();
+            // String转json对象
+            JsonObject jsonObject = gson.fromJson(response, JsonObject.class);
+            String pageAccessToken = jsonObject.get("data").getAsJsonArray().get(0).getAsJsonObject().get("access_token")
+                    .getAsString();
+
+            // 2.获取CONVERSATION-ID
+            client = (DefaultFacebookClient) client.createClientWithAccessToken(pageAccessToken);
+            client.setFacebookEndpointUrls(endpoints);
+            response = client.fetchObject(conversationId + "?fields=messages", String.class);
+            log.info("conversationId/messages: response={}", response);
+            // 获取每个conversationId下所有消息
+            ArrayList<String> messageIdList = new ArrayList<>();
+            jsonObject = gson.fromJson(response, JsonObject.class);
+            for (int i = 0; i < jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().size(); i++) {
+                messageIdList.add(jsonObject.get("messages").getAsJsonObject().get("data").getAsJsonArray().get(i).getAsJsonObject().get("id").getAsString());
+            }
+            if (messageIdList.isEmpty()) {
+                return null;
+            }
+            List<FacebookMessageVO> facebookMessageVOS = new ArrayList<>();
+            for (int i = 0; i < messageIdList.size(); i++) {
+                response = client.fetchObject(messageIdList.get(i) + "?fields=id,created_time,from,to,message", String.class);
+                log.info("messageId: response={}", response);
+                jsonObject = gson.fromJson(response, JsonObject.class);FacebookMessageVO facebookMessageVO = new FacebookMessageVO();
+                facebookMessageVO.setId(jsonObject.get("id").getAsString());
+                facebookMessageVO.setSender(jsonObject.get("from").getAsJsonObject().get("name").getAsString());
+                facebookMessageVO.setAvatar(jsonObject.get("to").getAsJsonObject().get("name").getAsString());
+                facebookMessageVO.setContent(jsonObject.get("message").getAsString());
+                facebookMessageVO.setTime(jsonObject.get("created_time").getAsString());
+                facebookMessageVOS.add(facebookMessageVO);
+            }
+            log.info("facebookMessageVOS: {}", facebookMessageVOS);
+            return facebookMessageVOS;
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    private String getUserAccessTokenBySiteCode(String siteCode) {
+        // 根据siteCode从数据库获取用户的access token
+        QueryWrapper<AdwebImFacebook> adwebImFacebookQueryWrapper = new QueryWrapper<>();
+        adwebImFacebookQueryWrapper.eq("site_code", siteCode);
+        AdwebImFacebook adwebImFacebook = facebookMapper.selectOne(adwebImFacebookQueryWrapper);
+        return adwebImFacebook.getAccessToken();
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/vo/FacebookChatVO.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.adweb.marketing.facebook.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Zenas
+ */
+@Data
+public class FacebookChatVO {
+
+    private String id;
+
+    private String name;
+
+    private String profilePictureUrl;
+
+    private String lastMessage;
+
+    private String lastMessageTime;
+
+    private List<FacebookMessageVO> messageVOList;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/facebook/vo/FacebookMessageVO.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.adweb.marketing.facebook.vo;
+
+import lombok.Data;
+
+/**
+ * @author Zenas
+ */
+@Data
+public class FacebookMessageVO {
+
+    private String id;
+    private String type;
+    private String content;
+    private String sender;
+    private String avatar;
+    private String time;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -74,6 +74,9 @@ public class SysUserController {
     private ISysUserRoleService sysUserRoleService;
 
     @Autowired
+    private ISysRoleService sysRoleService;
+
+    @Autowired
     private ISysUserDepartService sysUserDepartService;
 
     @Autowired
@@ -1028,6 +1031,104 @@ public class SysUserController {
         }
         return result;
     }
+    /**
+     * 用户注册接口
+     *
+     * @param jsonObject 包含用户名、企业全称、邮箱、手机号（选填）和密码的 JSON 对象
+     * @return 注册结果
+     */
+    @PostMapping("/registerNew")
+    public Result<JSONObject> registerNew(@RequestBody JSONObject jsonObject) {
+        Result<JSONObject> result = new Result<>();
+        String username = jsonObject.getString("username");
+        String companyName = jsonObject.getString("companyName");
+        String email = jsonObject.getString("email");
+        String phone = jsonObject.getString("phone"); // 可选
+        String password = jsonObject.getString("password");
+
+        // 验证输入参数
+        if (oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(companyName) || oConvertUtils.isEmpty(email) || oConvertUtils.isEmpty(password)) {
+            result.setMessage("用户名、企业全称、邮箱和密码不能为空");
+            result.setSuccess(false);
+            return result;
+        }
+
+        // 检查用户是否存在
+        SysUser sysUser1 = sysUserService.getUserByName(username);
+        if (sysUser1 != null) {
+            result.setMessage("用户名已注册");
+            result.setSuccess(false);
+            return result;
+        }
+
+        SysUser sysUser2 = sysUserService.getUserByEmail(email);
+        if (sysUser2 != null) {
+            result.setMessage("该邮箱已注册");
+            result.setSuccess(false);
+            return result;
+        }
+
+        if (oConvertUtils.isNotEmpty(phone)) {
+            SysUser sysUser3 = sysUserService.getUserByPhone(phone);
+            if (sysUser3 != null) {
+                result.setMessage("该手机号已注册");
+                result.setSuccess(false);
+                return result;
+            }
+        }
+
+        try {
+            // 设置默认租户为“苏豪” (tenant_id 为 1003)
+            Integer tenantId = 1003; // “苏豪”的租户ID是 1003
+
+            SysUser user = new SysUser();
+            user.setCreateTime(new Date()); // 设置创建时间
+            String salt = oConvertUtils.randomGen(8);
+            String passwordEncode = PasswordUtil.encrypt(username, password, salt);
+            user.setSalt(salt);
+            user.setUsername(username);
+            user.setRealname(companyName);
+            user.setCompanyName(companyName);
+            user.setPassword(passwordEncode);
+            user.setEmail(email);
+            user.setPhone(phone);
+            user.setLoginTenantId(tenantId);
+            user.setStatus(CommonConstant.USER_UNFREEZE);
+            user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            user.setActivitiSync(CommonConstant.ACT_SYNC_1);
+
+            // 保存用户
+            sysUserService.save(user);
+
+            // 查询 "third_role" 角色的 ID
+            LambdaQueryWrapper<SysRole> roleQuery = new LambdaQueryWrapper<>();
+            roleQuery.eq(SysRole::getRoleCode, "third_role");
+            SysRole thirdRole = sysRoleService.getOne(roleQuery);
+            if (thirdRole == null) {
+                log.error("third_role not found in database");
+                result.error500("注册失败: third_role 未找到");
+                return result;
+            }
+
+            // 设置用户角色为 “第三方登陆角色”
+            SysUserRole sysUserRole = new SysUserRole(user.getId(), thirdRole.getId());
+            sysUserRoleService.save(sysUserRole);
+
+
+            SysUserTenant sysUserTenant = new SysUserTenant();
+            sysUserTenant.setUserId(user.getId());
+            sysUserTenant.setTenantId(tenantId);
+            sysUserTenant.setStatus(CommonConstant.USER_TENANT_NORMAL);
+            userTenantService.save(sysUserTenant);
+
+            result.success("注册成功");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("注册失败");
+        }
+        return result;
+    }
+
 
 //	/**
 //	 * 根据用户名或手机号查询用户信息

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -16,9 +13,16 @@ import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
- * 用户表 @Author scott
+ * <p>
+ * 用户表
+ * </p>
  *
+ * @Author scott
  * @since 2018-12-20
  */
 @Data
@@ -26,162 +30,222 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Accessors(chain = true)
 public class SysUser implements Serializable {
 
-  private static final long serialVersionUID = 1L;
-
-  /** id */
-  @TableId(type = IdType.ASSIGN_ID)
-  private String id;
-
-  /** 登录账号 */
-  @Excel(name = "登录账号", width = 15)
-  private String username;
-
-  /** 真实姓名 */
-  @Excel(name = "真实姓名", width = 15)
-  private String realname;
-
-  /** 企业全称 */
-  @Excel(name = "企业全称", width = 15)
-  private String companyName;
-
-  /** 社会信用代码 */
-  @Excel(name = "社会信用代码", width = 15)
-  private String socialCreditCode;
-
-  /** 头像 */
-  @Excel(name = "营业执照", width = 15, type = 2)
-  private String businessLicense;
-
-  /** 密码 */
-  @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-  private String password;
-
-  /** md5密码盐 */
-  @JsonProperty(access = JsonProperty.Access.READ_WRITE)
-  private String salt;
-
-  /** 头像 */
-  @Excel(name = "头像", width = 15, type = 2)
-  private String avatar;
-
-  /** 生日 */
-  @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date birthday;
-
-  /** 性别（1：男 2：女） */
-  @Excel(name = "性别", width = 15, dicCode = "sex")
-  @Dict(dicCode = "sex")
-  private Integer sex;
-
-  /** 电子邮件 */
-  @Excel(name = "电子邮件", width = 15)
-  private String email;
-
-  /** 电话 */
-  @Excel(name = "电话", width = 15)
-  private String phone;
-
-  /** 登录选择部门编码 */
-  private String orgCode;
-
-  /** 登录选择租户ID */
-  private Integer loginTenantId;
-
-  /** 部门名称 */
-  private transient String orgCodeTxt;
-
-  /** 状态(1：正常 2：冻结 ） */
-  @Excel(name = "状态", width = 15, dicCode = "user_status")
-  @Dict(dicCode = "user_status")
-  private Integer status;
-
-  /** 删除状态（0，正常，1已删除） */
-  @Excel(name = "删除状态", width = 15, dicCode = "del_flag")
-  @TableLogic
-  private Integer delFlag;
-
-  /** 工号，唯一键 */
-  @Excel(name = "工号", width = 15)
-  private String workNo;
-
-  /** 职务，关联职务表 */
-  @Excel(name = "职务", width = 15)
-  @Dict(dictTable = "sys_position", dicText = "name", dicCode = "id")
-  @TableField(exist = false)
-  private String post;
-
-  /** 座机号 */
-  @Excel(name = "座机号", width = 15)
-  private String telephone;
-
-  /** 创建人 */
-  private String createBy;
-
-  /** 创建时间 */
-  private Date createTime;
-
-  /** 更新人 */
-  private String updateBy;
-
-  /** 更新时间 */
-  private Date updateTime;
-
-  /** 同步工作流引擎1同步0不同步 */
-  private Integer activitiSync;
-
-  /** 身份（0 普通成员 1 上级） */
-  @Excel(name = "（1普通成员 2上级）", width = 15)
-  private Integer userIdentity;
-
-  /** 负责部门 */
-  @Excel(
-      name = "负责部门",
-      width = 15,
-      dictTable = "sys_depart",
-      dicText = "depart_name",
-      dicCode = "id")
-  @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
-  private String departIds;
-
-  /** 多租户ids临时用，不持久化数据库(数据库字段不存在) */
-  @TableField(exist = false)
-  private String relTenantIds;
-
-  /** 多租户ids临时用，不持久化数据库(数据库字段不存在) */
-  @TableField(exist = false)
-  private transient String relTenantNames;
-
-  /** 设备id uniapp推送用 */
-  private String clientId;
-
-  /** 用户渠道来源code */
-  private String oemCode;
-
-  /** 是否有主账户 */
-  private Integer hasMasterAccount;
-
-  /** 登录首页地址 */
-  @TableField(exist = false)
-  private String homePath;
-
-  /** 职位名称 */
-  @TableField(exist = false)
-  private String postText;
-
-  /** 流程状态 */
-  private String bpmStatus;
-
-  /** 是否已经绑定第三方 */
-  @TableField(exist = false)
-  private boolean izBindThird;
-
-  /** 用户角色 */
-  @TableField(exist = false)
-  private List<String> roles;
-
-  /** 用户角色 */
-  @TableField(exist = false)
-  private transient String roleNames;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名", width = 15)
+    private String realname;
+
+    /**
+     * 密码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String password;
+
+    /**
+     * md5密码盐
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_WRITE)
+    private String salt;
+
+    /**
+     * 头像
+     */
+    @Excel(name = "头像", width = 15, type = 2)
+    private String avatar;
+
+    /**
+     * 生日
+     */
+    @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 性别（1：男 2：女）
+     */
+    @Excel(name = "性别", width = 15, dicCode = "sex")
+    @Dict(dicCode = "sex")
+    private Integer sex;
+
+    /**
+     * 电子邮件
+     */
+    @Excel(name = "电子邮件", width = 15)
+    private String email;
+
+    /**
+     * 电话
+     */
+    @Excel(name = "电话", width = 15)
+    private String phone;
+
+    /**
+     * 登录选择部门编码
+     */
+    private String orgCode;
+    /**
+     * 登录选择租户ID
+     */
+    private Integer loginTenantId;
+
+    /**
+     * 部门名称
+     */
+    private transient String orgCodeTxt;
+
+    /**
+     * 状态(1：正常  2：冻结 ）
+     */
+    @Excel(name = "状态", width = 15, dicCode = "user_status")
+    @Dict(dicCode = "user_status")
+    private Integer status;
+
+    /**
+     * 删除状态（0，正常，1已删除）
+     */
+    @Excel(name = "删除状态", width = 15, dicCode = "del_flag")
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 工号，唯一键
+     */
+    @Excel(name = "工号", width = 15)
+    private String workNo;
+
+    /**
+     * 职务，关联职务表
+     */
+    @Excel(name = "职务", width = 15)
+    @Dict(dictTable = "sys_position", dicText = "name", dicCode = "id")
+    @TableField(exist = false)
+    private String post;
+
+    /**
+     * 座机号
+     */
+    @Excel(name = "座机号", width = 15)
+    private String telephone;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 同步工作流引擎1同步0不同步
+     */
+    private Integer activitiSync;
+
+    /**
+     * 身份（0 普通成员 1 上级）
+     */
+    @Excel(name = "（1普通成员 2上级）", width = 15)
+    private Integer userIdentity;
+
+    /**
+     * 负责部门
+     */
+    @Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    private String departIds;
+
+    /**
+     * 多租户ids临时用，不持久化数据库(数据库字段不存在)
+     */
+    @TableField(exist = false)
+    private String relTenantIds;
+
+    /**
+     * 多租户ids临时用，不持久化数据库(数据库字段不存在)
+     */
+    @TableField(exist = false)
+    private transient String relTenantNames;
+
+    /**
+     * 设备id uniapp推送用
+     */
+    private String clientId;
+
+    /**
+     * 用户渠道来源code
+     */
+    private String oemCode;
+
+    /**
+     * 是否有主账户
+     */
+    private Integer hasMasterAccount;
+
+    /**
+     * 登录首页地址
+     */
+    @TableField(exist = false)
+    private String homePath;
+
+    /**
+     * 职位名称
+     */
+    @TableField(exist = false)
+    private String postText;
+
+    /**
+     * 流程状态
+     */
+    private String bpmStatus;
+
+    /**
+     * 是否已经绑定第三方
+     */
+    @TableField(exist = false)
+    private boolean izBindThird;
+
+    /**
+     * 用户角色
+     */
+    @TableField(exist = false)
+    private List<String> roles;
+
+
+    /**
+     * 用户角色
+     */
+    @TableField(exist = false)
+    private transient String roleNames;
+
+    /**
+     * 企业全称
+     */
+    @TableField("company_name")
+    private String companyName;
 }