From 8cc3c660bdaaaa6a46eecadb78e4e9c17a07c227 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 五月 2022 18:57:06 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ConfigController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ConfigController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ConfigController.java
index d98fcc8..2b3ae26 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ConfigController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ConfigController.java
@@ -1,5 +1,7 @@
package com.yeshi.makemoney.app.controller.client.api;
+import com.google.gson.Gson;
+import com.yeshi.makemoney.app.dto.config.AdSourceConfig;
import com.yeshi.makemoney.app.entity.config.SystemConfigKey;
import com.yeshi.makemoney.app.service.inter.config.SystemConfigService;
import com.yeshi.makemoney.app.vo.AcceptData;
@@ -42,7 +44,8 @@
SystemConfigKey.course,
SystemConfigKey.unRegister,
SystemConfigKey.privacyComplain,
- SystemConfigKey.vipLink
+ SystemConfigKey.helpLink,
+ SystemConfigKey.disclaimerLink
};
for (SystemConfigKey config : configs) {
@@ -50,39 +53,31 @@
data.put(config.name(), value);
}
- //TODO 骞垮憡K鎺ュ彛閰嶇疆
SystemConfigKey[] ads = new SystemConfigKey[]{
-
+ SystemConfigKey.splashAd,
+ SystemConfigKey.rewardAd,
+ SystemConfigKey.exitAppAd
};
+ JSONObject adConfig = new JSONObject();
for (SystemConfigKey ad : ads) {
String value = systemConfigService.getValueCache(acceptData.getSystem(), ad);
JSONObject valueJSON = JSONObject.fromObject(value);
- String channel = acceptData.getChannel();
+ String channel = acceptData.getChannel().toLowerCase();
if (StringUtil.isNullOrEmpty(channel) || valueJSON.optJSONObject(channel) == null) {
channel = "qq";
}
valueJSON = valueJSON.optJSONObject(channel.toLowerCase());
if (valueJSON != null) {
- if (acceptData.getVersion() <= valueJSON.optInt("version")) {
- String pid = valueJSON.optString("pid");
- String type = valueJSON.optString("type");
- valueJSON = new JSONObject();
- valueJSON.put("pid", pid);
- valueJSON.put("type", type);
- } else {
- valueJSON = null;
+ AdSourceConfig adSourceConfig = new Gson().fromJson(valueJSON.toString(), AdSourceConfig.class);
+ if (acceptData.getVersion() <= adSourceConfig.getVersion()) {
+ adConfig.put(ad.name(), new Gson().toJson(adSourceConfig.getTypes()));
}
}
-
- if (valueJSON != null) {
- data.put(ad.name().replace("ad_", ""), valueJSON.toString());
- }
}
-
-
+ data.put("ad", adConfig);
return JsonUtil.loadTrueResult(data);
}
--
Gitblit v1.8.0