移动端应用增加 phoneJson 手机客户端json信息

yt-adage/adage-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-algebraic/algebraic-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-allusion/allusion-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-answer/answer-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-arithmetic/arithmetic-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-calculator/calculator-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-carp/carp-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-common/src/main/java/com/ytpm/app/model/YtDyzUser.java

@@ -123,4 +123,6 @@ public class YtDyzUser extends PageMeta {
     private String phone;
     @ApiModelProperty(value = "设备ID")
     private String deviceId;
+    @ApiModelProperty(value = "手机json收集信息")
+    private String phoneJson;
 }

yt-countstep/countstep-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-diary/diary-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>

yt-dtw/dtw-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>

yt-emoticons/emoticons-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-funarith/funarith-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-gateway/src/main/resources/bootstrap.yml

@@ -1,10 +1,6 @@
 spring:
   profiles:
     active: prod
-logging:
-  level:
-    com.alibaba.nacos: DEBUG
-    org.springframework.cloud: DEBUG
 ---
 spring:
   profiles: local

yt-idiom/idiom-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-irun/irun-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>

yt-lemon/lemon-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-lime/lime-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-mileage/mileage-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-nofeeds/nofeeds-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-picking/picking-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-raisepig/raisepig-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>

yt-risk/risk-feign/src/main/java/com/ytpm/feign/fallback/RiskFeignFallBack.java

@@ -4,19 +4,22 @@ import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.feign.RiskFeign;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
+import com.ytpm.general.StatusCode;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-
+/**
+ * 服务降级配置
+ */
 @Component
 public abstract class RiskFeignFallBack implements RiskFeign {
     @Override
     public Result<?> checkRisk(@RequestBody YtDyzUser ytDyzUser) {
-        return Result.resultErr(RepMessage.SERVICE_UNAVAILABLE);
+        return new Result<>(StatusCode.ACCESS_ERR, RepMessage.TOKEN_EXPIRE);
     }
 
     @Override
     public Result<?> checkAdRisk(@RequestBody YtDyzUser ytDyzUser) {
-        return Result.resultErr(RepMessage.SERVICE_UNAVAILABLE);
+        return new Result<>(StatusCode.ACCESS_ERR, RepMessage.TOKEN_EXPIRE);
     }
 }

yt-summary/summary-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-vitality/vitality-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>

yt-walk/walk-service/src/main/resources/mapper/AppUserMapper.xml

@@ -27,6 +27,7 @@
          app_id,
          power,
          phone,
+         phone_json,
          device_id
         )
         values
@@ -54,6 +55,7 @@
          #{appId},
          #{power},
          #{phone},
+         #{phoneJson},
          #{deviceId}
         )
     </insert>
@@ -153,6 +155,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="phoneJson != null">
+                phone_json = #{phoneJson},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>