Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 2 years ago
parent
commit
f749636a1d

+ 1 - 1
ruixuan-admin/src/main/resources/application-prod.yml

@@ -185,6 +185,6 @@ telephoneRobot:
 
 
 promoter:
 promoter:
   #启动宇鹏清洗数据的服务IP
   #启动宇鹏清洗数据的服务IP
-  start_ip_path: http://192.168.0.202:9999/
+  start_ip_path: http://111.206.86.186:9999/
   #内网数据库服务IP
   #内网数据库服务IP
   internal_ip_path: http://api.tjyourong.com.cn/material/
   internal_ip_path: http://api.tjyourong.com.cn/material/

+ 1 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml

@@ -75,6 +75,7 @@
         <if test="userId != null ">
         <if test="userId != null ">
             AND user_id = #{userId}
             AND user_id = #{userId}
         </if>
         </if>
+        limit 1
     </select>
     </select>
 
 
     <insert id="insertKuaishouPromoter" parameterType="com.ruixuan.isc.entity.KuaishouPromoter" useGeneratedKeys="true"
     <insert id="insertKuaishouPromoter" parameterType="com.ruixuan.isc.entity.KuaishouPromoter" useGeneratedKeys="true"