diff --git a/ff-admin/src/main/java/com/ff/api/controller/ApiAgentController.java b/ff-admin/src/main/java/com/ff/api/controller/ApiAgentController.java
index 04d5b7c..6889fb6 100644
--- a/ff-admin/src/main/java/com/ff/api/controller/ApiAgentController.java
+++ b/ff-admin/src/main/java/com/ff/api/controller/ApiAgentController.java
@@ -10,6 +10,7 @@ import com.ff.base.utils.bean.BeanUtils;
import com.ff.common.domain.TenantGameQuota;
import com.ff.common.domain.TenantSecretKey;
import com.ff.common.service.ITenantGameQuotaService;
+import com.ff.common.service.ITenantSecretKeyService;
import com.ff.config.KeyConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
@@ -32,22 +33,20 @@ public class ApiAgentController extends BaseController {
@Resource
- private ITenantGameQuotaService tenantGameQuotaService;
+ private ITenantSecretKeyService tenantSecretKeyService;
@Resource
private KeyConfig keyConfig;
- /**
- * 信息
- *
- * @return {@link AjaxResult }
- */
- @PostMapping("/create/tenant")
- public AjaxResult info() {
- TenantSecretKey tenantSecretKey = keyConfig.get();
- TenantGameQuota tenantGameQuota = tenantGameQuotaService.selectTenantGameQuotaByTenantKey(tenantSecretKey.getTenantKey(), QuotaType.BALANCE.getCode());
- TenantInfoResponse tenantInfoResponse= new TenantInfoResponse();
- BeanUtils.copyProperties(tenantGameQuota,tenantInfoResponse);
- return AjaxResult.success(tenantInfoResponse);
- }
+// /**
+// * 信息
+// *
+// * @return {@link AjaxResult }
+// */
+// @PostMapping("/create/tenant")
+// public AjaxResult info(TenantSecretKey tenantSecretKey) {
+// tenantSecretKey.setAgentId(getUserId());
+// tenantSecretKeyService.insertTenantSecretKey(tenantSecretKey);
+// return AjaxResult.success(tenantInfoResponse);
+// }
}
diff --git a/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java b/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
index ade46d5..4ca4fa1 100644
--- a/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
+++ b/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
@@ -25,13 +25,7 @@ public class TenantSecretKey extends BaseEntity
/** 主键id */
private Long id;
- /** 账号 */
- @Excel(name = "账号")
- private String account;
- /** 密码 */
- @Excel(name = "密码")
- private String password;
/** 租户key */
@Excel(name = "租户key")
diff --git a/ff-admin/src/main/java/com/ff/common/service/ITenantGameQuotaService.java b/ff-admin/src/main/java/com/ff/common/service/ITenantGameQuotaService.java
index de96339..50d124e 100644
--- a/ff-admin/src/main/java/com/ff/common/service/ITenantGameQuotaService.java
+++ b/ff-admin/src/main/java/com/ff/common/service/ITenantGameQuotaService.java
@@ -23,6 +23,8 @@ public interface ITenantGameQuotaService
*/
TenantGameQuota selectTenantGameQuotaById(Long id);
+
+
/**
* 查询租户游戏配额列表
*
diff --git a/ff-admin/src/main/java/com/ff/common/service/ITenantSecretKeyService.java b/ff-admin/src/main/java/com/ff/common/service/ITenantSecretKeyService.java
index b2fefc9..52d932b 100644
--- a/ff-admin/src/main/java/com/ff/common/service/ITenantSecretKeyService.java
+++ b/ff-admin/src/main/java/com/ff/common/service/ITenantSecretKeyService.java
@@ -19,6 +19,13 @@ public interface ITenantSecretKeyService
*/
TenantSecretKey selectTenantSecretKeyById(Long id);
+
+ /**
+ * 生成租户sn
+ *
+ * @return {@link String }
+ */
+ String generateTenantSn();
/**
* 按租户密钥选择租户密钥
*
diff --git a/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java b/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java
index 3fa2e90..4920385 100644
--- a/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java
+++ b/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java
@@ -9,6 +9,7 @@ import com.ff.base.constant.Constants;
import com.ff.base.enums.*;
import com.ff.base.exception.base.ApiException;
import com.ff.base.utils.DateUtils;
+import com.ff.base.utils.NumberUtils;
import com.ff.base.utils.QuotaUtils;
import com.ff.base.utils.StringUtils;
import com.ff.common.domain.TenantGameQuotaFlow;
@@ -29,6 +30,7 @@ import com.ff.common.mapper.TenantGameQuotaMapper;
import com.ff.common.domain.TenantGameQuota;
import com.ff.common.service.ITenantGameQuotaService;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
@@ -74,6 +76,8 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
return tenantGameQuotaMapper.selectTenantGameQuotaById(id);
}
+
+
/**
* 查询租户游戏配额列表
*
diff --git a/ff-admin/src/main/java/com/ff/common/service/impl/TenantSecretKeyServiceImpl.java b/ff-admin/src/main/java/com/ff/common/service/impl/TenantSecretKeyServiceImpl.java
index e3d0fe6..657e581 100644
--- a/ff-admin/src/main/java/com/ff/common/service/impl/TenantSecretKeyServiceImpl.java
+++ b/ff-admin/src/main/java/com/ff/common/service/impl/TenantSecretKeyServiceImpl.java
@@ -2,11 +2,13 @@ package com.ff.common.service.impl;
import java.util.List;
import com.ff.base.utils.DateUtils;
+import com.ff.base.utils.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ff.common.mapper.TenantSecretKeyMapper;
import com.ff.common.domain.TenantSecretKey;
import com.ff.common.service.ITenantSecretKeyService;
+import org.springframework.util.CollectionUtils;
/**
* 用户租户密钥Service业务层处理
@@ -32,6 +34,23 @@ public class TenantSecretKeyServiceImpl implements ITenantSecretKeyService
return tenantSecretKeyMapper.selectTenantSecretKeyById(id);
}
+
+ /**
+ * 生成租户sn
+ *
+ * @return {@link String }
+ */
+ @Override
+ public synchronized String generateTenantSn() {
+ String sn = NumberUtils.generateRandomCode();
+ while (!CollectionUtils.isEmpty(tenantSecretKeyMapper.selectTenantSecretKeyList(TenantSecretKey.builder()
+ .tenantSn(sn)
+ .build()))) {
+ sn = NumberUtils.generateRandomCode();
+ }
+ return sn;
+ }
+
/**
* 按租户密钥选择租户密钥
*
diff --git a/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml b/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
index e1a1c59..7af097c 100644
--- a/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
+++ b/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
@@ -6,8 +6,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
@@ -24,14 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, account, password, tenant_key, agent_id, tenant_sn, tenant_secret, tenant_status, quota_type, score_ratio, tenant_type, deposit_ratio, create_by, create_time, update_by, update_time from ff_tenant_secret_key
+ select id, tenant_key, agent_id, tenant_sn, tenant_secret, tenant_status, quota_type, score_ratio, tenant_type, deposit_ratio, create_by, create_time, update_by, update_time from ff_tenant_secret_key