diff --git a/ff-bean/ff-util/pom.xml b/ff-bean/ff-util/pom.xml
new file mode 100644
index 0000000..f192c62
--- /dev/null
+++ b/ff-bean/ff-util/pom.xml
@@ -0,0 +1,65 @@
+
+
+ 4.0.0
+
+ ff
+ com.ff
+ 0.0.1
+
+
+ ff-util
+ 0.0.1
+ ff-util
+ jar
+
+
+
+
+
+ org.projectlombok
+ lombok
+ provided
+
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+ com.alibaba.fastjson2
+ fastjson2
+
+
+
+ commons-io
+ commons-io
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.5.15
+
+ true
+
+
+
+
+ repackage
+
+
+
+
+
+ ff-util
+
+
+
diff --git a/ff-fetcher/src/main/java/com/ff/utils/AdjustTimestampByMinuteOffset.java b/ff-bean/ff-util/src/main/java/com/ff/utils/AdjustTimestampByMinuteOffset.java
similarity index 100%
rename from ff-fetcher/src/main/java/com/ff/utils/AdjustTimestampByMinuteOffset.java
rename to ff-bean/ff-util/src/main/java/com/ff/utils/AdjustTimestampByMinuteOffset.java
diff --git a/ff-fetcher/src/main/java/com/ff/utils/CalculateDateDaysAgo.java b/ff-bean/ff-util/src/main/java/com/ff/utils/CalculateDateDaysAgo.java
similarity index 100%
rename from ff-fetcher/src/main/java/com/ff/utils/CalculateDateDaysAgo.java
rename to ff-bean/ff-util/src/main/java/com/ff/utils/CalculateDateDaysAgo.java
diff --git a/ff-fetcher/src/main/java/com/ff/utils/CurrentMillis.java b/ff-bean/ff-util/src/main/java/com/ff/utils/CurrentMillis.java
similarity index 100%
rename from ff-fetcher/src/main/java/com/ff/utils/CurrentMillis.java
rename to ff-bean/ff-util/src/main/java/com/ff/utils/CurrentMillis.java
diff --git a/ff-bean/ff-util/src/main/java/com/ff/utils/Md5Utils.java b/ff-bean/ff-util/src/main/java/com/ff/utils/Md5Utils.java
new file mode 100644
index 0000000..d05552f
--- /dev/null
+++ b/ff-bean/ff-util/src/main/java/com/ff/utils/Md5Utils.java
@@ -0,0 +1,36 @@
+package com.ff.utils;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * @author cengy
+ */
+public class Md5Utils {
+
+ public static String md5New(String input) {
+ try {
+ // 创建 MD5 消息摘要对象
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ // 更新输入数据
+ md.update(input.getBytes());
+ // 获取 MD5 哈希值
+ byte[] hashBytes = md.digest();
+
+ // 将字节数组转为十六进制字符串
+ StringBuilder hexString = new StringBuilder();
+ for (byte b : hashBytes) {
+ // 将每个字节转换为两位十六进制数字
+ String hex = Integer.toHexString(0xFF & b);
+ if (hex.length() == 1) {
+ hexString.append('0'); // 保证是两位
+ }
+ hexString.append(hex);
+ }
+
+ return hexString.toString();
+ } catch (NoSuchAlgorithmException e) {
+ return null; // 或者抛出异常
+ }
+ }
+}
diff --git a/ff-fetcher/src/main/java/com/ff/utils/SortByAttributeNameASC.java b/ff-bean/ff-util/src/main/java/com/ff/utils/SortByAttributeNameASC.java
similarity index 100%
rename from ff-fetcher/src/main/java/com/ff/utils/SortByAttributeNameASC.java
rename to ff-bean/ff-util/src/main/java/com/ff/utils/SortByAttributeNameASC.java
diff --git a/ff-fetcher/src/main/java/com/ff/utils/TimestampFromString.java b/ff-bean/ff-util/src/main/java/com/ff/utils/TimestampFromString.java
similarity index 100%
rename from ff-fetcher/src/main/java/com/ff/utils/TimestampFromString.java
rename to ff-bean/ff-util/src/main/java/com/ff/utils/TimestampFromString.java
diff --git a/ff-bean/xk-client/pom.xml b/ff-bean/xk-client/pom.xml
index 321a568..3123e48 100644
--- a/ff-bean/xk-client/pom.xml
+++ b/ff-bean/xk-client/pom.xml
@@ -20,6 +20,11 @@
com.ff
ff-domain
+
+ com.ff
+ comp-redis
+
+
org.projectlombok
lombok
@@ -54,10 +59,6 @@
commons-io
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
diff --git a/ff-bean/xk-client/src/main/java/com/ff/enums/GamePlatforms.java b/ff-bean/xk-client/src/main/java/com/ff/enums/GamePlatforms.java
new file mode 100644
index 0000000..642bc65
--- /dev/null
+++ b/ff-bean/xk-client/src/main/java/com/ff/enums/GamePlatforms.java
@@ -0,0 +1,49 @@
+package com.ff.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum GamePlatforms {
+ JILI("JILI", "JILI"),
+ XK("XK", "XK"),
+ PG("PG", "PG"),
+ PGX("PGX", "PGX"),
+ FC("FC", "FC"),
+ SA("SA", "SA"),
+ DG("DG", "DG"),
+ MT("MT", "美天棋牌"),
+ AE("AE", "AE"),
+ KM("KM", "KM"),
+ PGT("PGT", "PGT"),
+ FBSports("FBSports", "FB体育"),
+ SV388("SV388", "SV388真人"),
+ DBSports("DBSports", "DB体育");
+
+ private final String code;
+ private final String info;
+
+ GamePlatforms(String code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+
+ public static List getCodes() {
+ List result = new ArrayList<>();
+ GamePlatforms[] values = GamePlatforms.values();
+ for (GamePlatforms value : values) {
+ result.add(value.getCode());
+ }
+ return result;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+
+}
diff --git a/ff-bean/xk-client/src/main/java/com/ff/service/PlatformManager.java b/ff-bean/xk-client/src/main/java/com/ff/service/PlatformManager.java
new file mode 100644
index 0000000..693d26d
--- /dev/null
+++ b/ff-bean/xk-client/src/main/java/com/ff/service/PlatformManager.java
@@ -0,0 +1,24 @@
+package com.ff.service;
+
+import com.ff.game.domain.Platform;
+import com.ff.redis.GRedisCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author cengy
+ */
+@Service
+public class PlatformManager {
+
+ @Autowired
+ GRedisCache gRedisCache;
+
+ public Platform get(String platformCode) {
+ return gRedisCache.getCacheObject(getCacheKey(platformCode));
+ }
+
+ private String getCacheKey(String configKey) {
+ return "platform:" + configKey;
+ }
+}
diff --git a/ff-fetcher/pom.xml b/ff-fetcher/pom.xml
index 33b34fd..0cb60e4 100644
--- a/ff-fetcher/pom.xml
+++ b/ff-fetcher/pom.xml
@@ -19,10 +19,6 @@
com.ff
xk-client
-
- com.ff
- comp-redis
-
com.xuxueli
xxl-job-core
diff --git a/ff-platform/xk-dbsports/pom.xml b/ff-platform/xk-dbsports/pom.xml
index a4f5e83..b10ea4b 100644
--- a/ff-platform/xk-dbsports/pom.xml
+++ b/ff-platform/xk-dbsports/pom.xml
@@ -16,7 +16,15 @@
+
+ com.ff
+ ff-util
+
+
+ com.ff
+ xk-client
+
org.projectlombok
lombok
@@ -50,7 +58,10 @@
commons-io
commons-io
-
+
+ com.dtflys.forest
+ forest-spring-boot-starter
+
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/address/DBSportsAddress.java b/ff-platform/xk-dbsports/src/main/java/com/ff/address/DBSportsAddress.java
index 70a2e09..01acd0b 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/address/DBSportsAddress.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/address/DBSportsAddress.java
@@ -3,8 +3,8 @@ package com.ff.address;
import com.dtflys.forest.callback.AddressSource;
import com.dtflys.forest.http.ForestAddress;
import com.dtflys.forest.http.ForestRequest;
-import com.ff.base.enums.GamePlatforms;
-import com.sun.media.jfxmediaimpl.platform.PlatformManager;
+import com.ff.enums.GamePlatforms;
+import com.ff.service.PlatformManager;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/client/DBSportsClient.java b/ff-platform/xk-dbsports/src/main/java/com/ff/client/DBSportsClient.java
index df3020a..86174f3 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/client/DBSportsClient.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/client/DBSportsClient.java
@@ -1,8 +1,11 @@
package com.ff.client;
-import com.ff.dto.CreateUserResponse;
-import com.ff.dto.TransferResponse;
-import com.ff.sports.db.address.DBSportsAddress;
+import com.dtflys.forest.annotation.Address;
+import com.dtflys.forest.annotation.Body;
+import com.dtflys.forest.annotation.Header;
+import com.dtflys.forest.annotation.Post;
+import com.ff.address.DBSportsAddress;
+import com.ff.dto.*;
/**
* @author cengy
@@ -20,7 +23,7 @@ public interface DBSportsClient {
}
)
CreateUserResponse createMember(@Body CreateUserRequest request,
- @Header("requestId") @Var("requestId") String requestId);
+ @Header("requestId") String requestId);
/**
* 用户登录接口(注册和登录合并为一个接口)
@@ -49,7 +52,7 @@ public interface DBSportsClient {
}
)
TransferResponse transferIn(@Body TransferRequest request,
- @Header("requestId") @Var("requestId") String requestId
+ @Header("requestId") String requestId
);
@Post(url = "/api/fund/transfer",
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/CreateUserRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/CreateUserRequest.java
index 418b522..2718ea9 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/CreateUserRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/CreateUserRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/Enums.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/Enums.java
deleted file mode 100644
index 9042222..0000000
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/Enums.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ff.dto;
-
-/**
- * @author cengy
- */
-public class Enums {
-
-
-}
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetBetListRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetBetListRequest.java
index a9e568f..de5bb81 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetBetListRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetBetListRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetMemberInfoRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetMemberInfoRequest.java
index 69009ab..de894bc 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetMemberInfoRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/GetMemberInfoRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/KickUserRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/KickUserRequest.java
index 07c707a..c300a38 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/KickUserRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/KickUserRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/LoginRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/LoginRequest.java
index 207eca9..83f6177 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/LoginRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/LoginRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferDetailRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferDetailRequest.java
index d6e8ae8..5ad6de2 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferDetailRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferDetailRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferRequest.java b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferRequest.java
index 556a408..3df56ff 100644
--- a/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferRequest.java
+++ b/ff-platform/xk-dbsports/src/main/java/com/ff/dto/TransferRequest.java
@@ -1,6 +1,6 @@
package com.ff.dto;
-import com.ff.base.utils.sign.Md5Utils;
+import com.ff.utils.Md5Utils;
import lombok.Data;
import java.io.Serializable;
diff --git a/pom.xml b/pom.xml
index 579bfa9..2ffef31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,11 @@
xk-client
${ff.version}
+
+ com.ff
+ ff-util
+ ${ff.version}
+
@@ -231,6 +236,7 @@
ff-bean/ff-domain
ff-bean/comp-redis
ff-bean/xk-client
+ ff-bean/ff-util
ff-platform/xk-dbsports