Merge remote-tracking branch 'origin/master' into lih

ReadMe.md

@@ -137,17 +137,19 @@ question-service.jar > nofeeds.log 2>&1 &
 # 典故问答王 allusion-service
 # 10.206.0.3
 # 10.206.0.13
-nohup java -jar -Xms2048m -Xmx2048m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
--XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
--XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
--XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/allusion.hprof \
-allusion-service.jar > allusion.log 2>&1 &
-
 nohup java -jar -Xms2048m -Xmx2048m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
 -XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
 -XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/ytpm/service-allusion/allusion.hprof \
 question-service.jar > allusion.log 2>&1 &
+
+#nohup java -jar -Xms2048m -Xmx2048m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
+#-XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
+#-XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
+#-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/allusion.hprof \
+#allusion-service.jar > allusion.log 2>&1 &
+
+
 ```
 
 
@@ -759,6 +761,22 @@ nohup java -jar -Xms3072m -Xmx3072m -XX:MaxMetaspaceSize=256M -XX:+UseCompressed
 lemonios-service.jar > lemonios.log 2>&1 &
 ```
 
+
+#### 速算大比拼 quick
+
+```shell
+# 速算大比拼 quick-service
+# 10.206.16.10
+# 10.206.16.15
+nohup java -jar -Xms1024m -Xmx1024m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
+-XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
+-XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
+-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/ytpm/service-quick/quick.hprof \
+question-service.jar > quick.log 2>&1 &
+
+```
+
+
 #### 咕噜日记ios gollumios
 
 ```shell
@@ -794,7 +812,7 @@ nohup java -jar -Xms3072m -Xmx3072m -XX:MaxMetaspaceSize=256M -XX:+UseCompressed
 maintainios-service.jar > maintainios.log 2>&1 &
 ```
 
-#### maintainios maintainios
+#### linefunios linefunios
 
 ```shell
 # linefunios linefunios
@@ -806,21 +824,32 @@ nohup java -jar -Xms3072m -Xmx3072m -XX:MaxMetaspaceSize=256M -XX:+UseCompressed
 lemonios-service.jar > lemonios.log 2>&1 &
 ```
 
+#### sortingios sortingios
 
-#### 速算大比拼 quick
-
-``` shell
-# 速算大比拼 quick-service
+```shell
+# sortingios sortingios
 # 10.206.16.10
-# 10.206.16.15
-nohup java -jar -Xms1024m -Xmx1024m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
+nohup java -jar -Xms3072m -Xmx3072m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
 -XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
 -XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
--XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/ytpm/service-quick/quick.hprof \
-question-service.jar > quick.log 2>&1 &
+-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/ytpm/service-ios-sorting/lemonios.hprof \
+lemonios-service.jar > lemonios.log 2>&1 &
+```
+
+#### guardios guardios
+
+```shell
+# guardios guardios
+# 10.206.0.3
+nohup java -jar -Xms3072m -Xmx3072m -XX:MaxMetaspaceSize=256M -XX:+UseCompressedOops \
+-XX:+UseG1GC -XX:ConcGCThreads=2 -XX:InitiatingHeapOccupancyPercent=35 \
+-XX:G1ReservePercent=10 -XX:MaxGCPauseMillis=300 \
+-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/www/app/ytpm/service-ios-guard/lemonios.hprof \
+lemonios-service.jar > lemonios.log 2>&1 &
 ```
 
 
+
 ## 数据处理
 
 > 删除指定appid风控规则
@@ -839,6 +868,45 @@ where template_id in (SELECT template_id from yt_risk_template where template_co
 delete from yt_risk_template where template_code like '[appid]%';
 ```
 
+> 体力及激励视频核验
+
+```sql
+select GROUP_CONCAT(ta.user_id) from (
+select u.user_id, u.power, t.adCount, t2.subCount, (ifnull(t.adCount, 0) - ifnull(t2.subCount,0)) as real_power
+from yt_dyz_user u
+left join (
+	select user_id, count(record_id) as subCount
+	from yt_dyz_power_record  pr
+	where pr.remark = '减少体力'
+	group by pr.user_id
+	
+) t2 on t2.user_id = u.user_id
+left join (
+	select user_id,ad_source_type, count(record_id) as adCount from yt_dyz_ad_record ydar 
+	group by user_id,ad_source_type
+	having ydar.ad_source_type = 1
+) t on t.user_id = u.user_id
+where u.power > 1 and (ifnull(t.adCount, 0) - ifnull(t2.subCount,0))  = 7
+order by u.power desc
+) ta
+where ta.power != ta.real_power 
+
+
+```
+
+> 主从同步处理
+
+```sql
+# 查询同步状态
+show slave status;
+
+# 跳过当前异常继续同步
+stop slave;
+set global sql_slave_skip_counter = 1;
+start slave;
+
+```
+
 
 ## 更新日志
 
@@ -854,3 +922,16 @@ delete from yt_risk_template where template_code like '[appid]%';
 3. 易推渠道商营销管理中心风控列表修复内外不同步缺陷；
 4. 易推渠道商营销管理中心用户列表查看ECPM支持按登陆状态查看；
 
+
+> 20250922
+
+1. ADS 出包管理新增 原生广告刷新时间间隔、是否允许自动刷新字段控制
+
+
+> 20251009(待合并)
+
+1. 新增子包负责人用户
+    - 仅允许查看用户列、解封日志表、风控日志表
+    - 新增指派关系表，包含：指派应用ID，负责人用户ID， 分账ID， 开始时间，结束时间，是否结束
+2. 新增参数：分层系数
+    - app端增加用户信息增加参数：今日收益，历史收益（真实收益*分层系数） 

yt-common/src/main/java/com/ytpm/advertise/enums/AdPlatformTypeEnum.java

@@ -6,6 +6,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * taku 聚合广告平台枚举
+ */
 @Getter
 public enum AdPlatformTypeEnum {
     TENCENT(8, "腾讯广告"),
@@ -15,7 +18,8 @@ public enum AdPlatformTypeEnum {
     SIGMOB(29, "Sigmob"),
     HUAWEI(39, "华为广告"),
     GROMORE(46, "gromore"),
-    Mi_Uion(49, "米盟"),
+    MI_UION(49, "米盟"),
+    ADX(66, "TakuADX"),
     JAN(72, "京媒平台"),
     QM(74, "趣盟"),
     VIVO(79, "VIVO广告联盟"),

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/feign/guardIosFeign.java

@@ -0,0 +1,9 @@
+package com.ytpm.lemonios.feign.feign;
+
+import com.ytpm.lemonios.feign.base.BaseFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "guardios-service")
+public interface guardIosFeign extends BaseFeign {
+
+}

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/feign/sortingIosFeign.java

@@ -0,0 +1,9 @@
+package com.ytpm.lemonios.feign.feign;
+
+import com.ytpm.lemonios.feign.base.BaseFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "sortingios-service")
+public interface sortingIosFeign extends BaseFeign {
+
+}