Merge remote-tracking branch 'origin/master'

ReadMe.md

@@ -159,7 +159,15 @@ walkdailyios        25078
 adageios            25079
 quantumios          25080
 irunios             25081
-
+relogicios          25082
+proverbios          25083
+gardenios           25084
+algebraicios        25085
+construedios        25086
+graphicios          25087
+yuanheios           25088
+smartcolorios       25089
+adventureios        25090
 ```
 
 #### 核心服务
@@ -1779,6 +1787,102 @@ nohup java -jar -Xms1024m -Xmx1024m -XX:MaxMetaspaceSize=256M -XX:+UseCompressed
 lemonios-service.jar > irunios.log 2>&1 &
 ```
 
+
+#### IOS: 逆向思维王 relogicios
+
+```shell
+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-ios-relogic/relogicios.hprof \
+lemonios-service.jar > relogicios.log 2>&1 &
+```
+
+
+#### IOS: 谚语知识赛 proverbios
+
+```shell
+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-ios-proverb/proverbios.hprof \
+lemonios-service.jar > proverbios.log 2>&1 &
+```
+
+
+
+#### IOS: 靖节诗苑 gardenios
+
+```shell
+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-ios-garden/gardenios.hprof \
+lemonios-service.jar > gardenios.log 2>&1 &
+```
+
+#### IOS: 代数式能手 algebraicios
+
+```shell
+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-ios-algebraic/algebraicios.hprof \
+lemonios-service.jar > algebraicios.log 2>&1 &
+```
+
+
+#### IOS: 成语趣解释 construedios
+
+```shell
+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-ios-construed/construedios.hprof \
+lemonios-service.jar > construedios.log 2>&1 &
+```
+
+#### IOS: 图形逻辑谜 graphicios
+
+```shell
+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-ios-graphic/graphicios.hprof \
+lemonios-service.jar > graphicios.log 2>&1 &
+```
+
+#### IOS: 元和诗典 yuanheios
+
+```shell
+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-ios-yuanhe/yuanheios.hprof \
+lemonios-service.jar > yuanheios.log 2>&1 &
+```
+
+#### IOS: 灵动色彩搭配助手 smartcolorios
+
+```shell
+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-ios-smartcolor/smartcolorios.hprof \
+lemonios-service.jar > smartcolorios.log 2>&1 &
+```
+
+#### IOS: 色彩大冒险 adventureios
+
+```shell
+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-ios-adventure/adventureios.hprof \
+lemonios-service.jar > adventureios.log 2>&1 &
+```
+
+
 ---
 
 ## 数据处理

yt-agent/agent-service/src/main/resources/mapper/AgentDitchMapper.xml

@@ -42,14 +42,21 @@
 
     <select id="ditchList" resultType="com.ytpm.agent.view.AgentDitchView">
         select
-            ditch_id, ditch_name, app_type, app_id, create_time
-        from yt_ditch
+            yd.ditch_id,
+            yd.ditch_name,
+            yd.app_type,
+            ya.app_id,
+            ypua.service_name,
+            yd.create_time
+        from yt_ditch yd
+        left join yt_app ya on ya.ditch_id = yd.ditch_id
+        left join yt_platform_user_app ypua on ypua.app_id = ya.superior_id
         <where>
-            user_id = #{userId}
+            yd.user_id = #{userId}
             <if test="ditchName != null and ditchName != ''">
-                AND ditch_name LIKE CONCAT('%', #{ditchName}, '%')
+                AND yd.ditch_name LIKE CONCAT('%', #{ditchName}, '%')
             </if>
-            and is_delete=0
+            and yd.is_delete=0
         </where>
     </select>
     <select id="selectById" resultType="com.ytpm.agent.model.YtDitch">

yt-common/src/main/java/com/ytpm/agent/view/AgentDitchView.java

@@ -1,17 +1,26 @@
 package com.ytpm.agent.view;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @ApiModel("渠道列表")
-public class AgentDitchView {
+public class AgentDitchView implements Serializable {
+    @ApiModelProperty("渠道ID")
     private Long ditchId;
+    @ApiModelProperty("渠道名称")
+    private String ditchName;
+    @ApiModelProperty("应用类型")
     private String appType;
+    @ApiModelProperty("应用ID")
     private String appId;
-    private String ditchName;
+    @ApiModelProperty("微服务名")
+    private String serviceName;
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
 }

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -991,7 +991,8 @@ public class RiskServiceImpl implements RiskService {
                 redisService.setTimeOutStr("lock_"+userId,param.getAppId(),1000);
                 redisService.setTimeOutHoursStr("unlock_"+userId,param.getAppId(),24);
                 break;
-            case 3: //增加封禁记录
+            case 3:
+                //增加封禁记录
                 RiskBannedParam bannedParam = new RiskBannedParam();
                 BeanUtil.copyProperties(param, bannedParam);
                 bannedParam.setUserId(param.getUserId());