From 3b4ae6e5e888fd19a78f70611b6545e0211c2034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Fri, 16 Aug 2024 20:29:58 +0800 Subject: [PATCH] first commit --- .../{http => }/GlobalCorsConfig.java | 6 +-- .../controller/sys/v1/TenantV1Controller.java | 38 +++++++++++-------- .../entitys/sys/v1/TenantEntity.java | 3 -- .../entitys/sys/v1/TenantUserEntity.java | 18 +++++++++ .../server/appmanager/http/HttpResult.java | 29 +++----------- .../repository/sys/v1/TenantRepository.java | 2 +- .../sys/v1/TenantUserRepository.java | 12 ++++++ 7 files changed, 61 insertions(+), 47 deletions(-) rename src/main/java/com/xuqm/server/appmanager/{http => }/GlobalCorsConfig.java (89%) create mode 100644 src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantUserEntity.java create mode 100644 src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantUserRepository.java diff --git a/src/main/java/com/xuqm/server/appmanager/http/GlobalCorsConfig.java b/src/main/java/com/xuqm/server/appmanager/GlobalCorsConfig.java similarity index 89% rename from src/main/java/com/xuqm/server/appmanager/http/GlobalCorsConfig.java rename to src/main/java/com/xuqm/server/appmanager/GlobalCorsConfig.java index fa9d62a..52bdb38 100644 --- a/src/main/java/com/xuqm/server/appmanager/http/GlobalCorsConfig.java +++ b/src/main/java/com/xuqm/server/appmanager/GlobalCorsConfig.java @@ -1,4 +1,4 @@ -package com.xuqm.server.appmanager.http; +package com.xuqm.server.appmanager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,9 +16,9 @@ public class GlobalCorsConfig { //添加映射路径 registry.addMapping("/**") //放行哪些原始域 - .allowedOrigins("*") + .allowedOriginPatterns("*") //是否发送Cookie信息 - .allowCredentials(false) + .allowCredentials(true) //放行哪些原始域(请求方式) .allowedMethods("GET", "POST", "PUT", "DELETE") //放行哪些原始域(头部信息) diff --git a/src/main/java/com/xuqm/server/appmanager/controller/sys/v1/TenantV1Controller.java b/src/main/java/com/xuqm/server/appmanager/controller/sys/v1/TenantV1Controller.java index f64b589..8073330 100644 --- a/src/main/java/com/xuqm/server/appmanager/controller/sys/v1/TenantV1Controller.java +++ b/src/main/java/com/xuqm/server/appmanager/controller/sys/v1/TenantV1Controller.java @@ -3,9 +3,11 @@ package com.xuqm.server.appmanager.controller.sys.v1; import cn.org.bjca.trust.java.imserver.common.TimeHelper; import com.xuqm.server.appmanager.entitys.sys.v1.ApplicationEntity; import com.xuqm.server.appmanager.entitys.sys.v1.TenantEntity; +import com.xuqm.server.appmanager.entitys.sys.v1.TenantUserEntity; import com.xuqm.server.appmanager.http.HttpResult; import com.xuqm.server.appmanager.repository.sys.v1.ApplicationRepository; import com.xuqm.server.appmanager.repository.sys.v1.TenantRepository; +import com.xuqm.server.appmanager.repository.sys.v1.TenantUserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,27 +23,31 @@ public class TenantV1Controller { @Autowired private TenantRepository tenantRepository; @Autowired + private TenantUserRepository tenantUserRepository; + @Autowired private ApplicationRepository applicationRepository; @PostMapping("/tenant/create") - public HttpResult tenantCreate(@RequestBody TenantEntity tenant) throws Exception { - if (null == tenant.getTenantName() || - null == tenant.getUserPhone() || + public HttpResult tenantCreate(@RequestBody TenantUserEntity tenant) throws Exception { + if (null == tenant.getUserPhone() || null == tenant.getUserEmail() || - null == tenant.getUserName()) { - return new HttpResult<>(201, "参数错误", ""); + null == tenant.getUserPwd()) { + return new HttpResult<>(201, "参数错误", null); } else { - TenantEntity t = tenantRepository.findFirstByUserEmailOrUserPhone(tenant.getUserEmail(), tenant.getUserPhone()); - if (null != t) return new HttpResult<>(201, "当前联系人已注册", ""); - t = new TenantEntity(); - t.setTenantName(tenant.getTenantName()); - t.setUserEmail(tenant.getUserEmail()); - t.setUserName(tenant.getUserName()); - t.setUserPhone(tenant.getUserPhone()); - t.setTenantNo(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000)); + TenantUserEntity u = tenantUserRepository.findFirstByUserEmailOrUserPhone(tenant.getUserEmail(), tenant.getUserPhone()); + if (null != u) return new HttpResult<>(201, "邮箱或手机号重复", null); + u = new TenantUserEntity(); + u.setUserEmail(tenant.getUserEmail()); + u.setUserPhone(tenant.getUserPhone()); + u.setUserPwd(tenant.getUserPwd()); + u.setUserId(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000)); + u.setTenantNo(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000)); + tenantUserRepository.save(u); + TenantEntity t = new TenantEntity(); + t.setUserId(u.getUserId()); + t.setTenantNo(u.getTenantNo()); tenantRepository.save(t); -// RabbitMQHelper.requestByGetAndParams("http://114.115.203.60:15672/api/vhosts/" + appid, ""); return new HttpResult<>(200, "创建成功", "创建成功"); } @@ -51,10 +57,10 @@ public class TenantV1Controller { public HttpResult appCreate(@RequestBody ApplicationEntity application) throws Exception { if (null == application.getAppName() || null == application.getTenantNo()) { - return new HttpResult<>(201, "参数错误", ""); + return new HttpResult<>(201, "参数错误", null); } else { ApplicationEntity app = applicationRepository.findFirstByAppNameAndTenantNo(application.getAppName(), application.getTenantNo()); - if (null != app) return new HttpResult<>(201, "已创建相关类型的同名应用", ""); + if (null != app) return new HttpResult<>(201, "已创建相关类型的同名应用", null); app = new ApplicationEntity(); app.setTenantNo(application.getTenantNo()); app.setAppName(application.getAppName()); diff --git a/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantEntity.java b/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantEntity.java index 9da4e04..67d7cc9 100644 --- a/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantEntity.java +++ b/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantEntity.java @@ -12,7 +12,4 @@ public class TenantEntity extends AbstractBaseTimeEntity { private String tenantNo; private String tenantName; private String userId; - private String userName; - private String userPhone; - private String userEmail; } diff --git a/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantUserEntity.java b/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantUserEntity.java new file mode 100644 index 0000000..51298c7 --- /dev/null +++ b/src/main/java/com/xuqm/server/appmanager/entitys/sys/v1/TenantUserEntity.java @@ -0,0 +1,18 @@ +package com.xuqm.server.appmanager.entitys.sys.v1; + +import com.xuqm.server.appmanager.entitys.converter.AbstractBaseTimeEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.Data; + +@Entity +@Table(name = "user_tenant") +@Data +public class TenantUserEntity extends AbstractBaseTimeEntity { + private String userId; + private String userName; + private String userPhone; + private String userEmail; + private String userPwd; + private String tenantNo; +} diff --git a/src/main/java/com/xuqm/server/appmanager/http/HttpResult.java b/src/main/java/com/xuqm/server/appmanager/http/HttpResult.java index f77f8be..9ff739c 100644 --- a/src/main/java/com/xuqm/server/appmanager/http/HttpResult.java +++ b/src/main/java/com/xuqm/server/appmanager/http/HttpResult.java @@ -1,5 +1,10 @@ package com.xuqm.server.appmanager.http; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public class HttpResult { /** * "code": 200 @@ -16,28 +21,4 @@ public class HttpResult { this.msg = msg; this.data = data; } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } } diff --git a/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantRepository.java b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantRepository.java index db43fa2..4855f3e 100644 --- a/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantRepository.java +++ b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantRepository.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Repository; @Repository public interface TenantRepository extends JpaRepository { - TenantEntity findFirstByUserEmailOrUserPhone(String userEmail, String userPhone); +// TenantEntity findFirstByUserEmailOrUserPhone(String userEmail, String userPhone); } diff --git a/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantUserRepository.java b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantUserRepository.java new file mode 100644 index 0000000..501b62e --- /dev/null +++ b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/TenantUserRepository.java @@ -0,0 +1,12 @@ +package com.xuqm.server.appmanager.repository.sys.v1; + +import com.xuqm.server.appmanager.entitys.sys.v1.TenantEntity; +import com.xuqm.server.appmanager.entitys.sys.v1.TenantUserEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TenantUserRepository extends JpaRepository { + TenantUserEntity findFirstByUserEmailOrUserPhone(String userEmail, String userPhone); + +}