Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontBannerServiceImpl.java

@@ -106,7 +106,9 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
     public boolean delte(Long id){
         GoblinFrontBanner goblinFrontBanner=goblinFrontBannerMapper.selectById(id);
         goblinFrontBanner.setDelTag(1);
-       // this.update(goblinFrontBanner);
+        goblinFrontBanner.setUpdateTime(LocalDateTime.now());
+        //数据库修改
+        goblinFrontBannerMapper.updateById(goblinFrontBanner);
         return true;
     }
     /**
@@ -132,6 +134,7 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
         //  PageHelper.startPage(pageNumber, pageSize);
         LambdaQueryWrapper<GoblinFrontBanner> queryWrapper = Wrappers.lambdaQuery(GoblinFrontBanner.class);
         queryWrapper.eq(GoblinFrontBanner::getBannerType,type);
+        queryWrapper.ne(GoblinFrontBanner::getDelTag,1);
         queryWrapper.orderByAsc(GoblinFrontBanner::getIndexs);
         List<GoblinFrontBanner> list=goblinFrontBannerMapper.selectList(queryWrapper);
         List<GoblinFrontBannerBuildParam> list1=new ArrayList();

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -75,45 +75,45 @@ liquidnet:
   service:
     adam:
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
-        callback: http://testadam.zhengzai.tv/adam/member/order/callback
-      url: http://testadam.zhengzai.tv
+        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        callback: http://ttestadam.zhengzai.tv/adam/member/order/callback
+      url: http://ttestadam.zhengzai.tv
     kylin:
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
-        localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
-      url: http://testkylin.zhengzai.tv/kylin
+        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        localUrl: http://ttestkylin.zhengzai.tv/kylin/order/syncOrder
+      url: http://ttestkylin.zhengzai.tv/kylin
     candy:
-      url: http://testcandy.zhengzai.tv/candy
+      url: http://ttestcandy.zhengzai.tv/candy
     goblin:
-      url: http://testgoblin.zhengzai.tv
+      url: http://ttestgoblin.zhengzai.tv
     stone:
-      url: http://teststone.zhengzai.tv/stone
+      url: http://tteststone.zhengzai.tv/stone
     order:
       adam:
-        url: http://testadam.zhengzai.tv/adam
+        url: http://ttestadam.zhengzai.tv/adam
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
-        localUrl: http://testorder.zhengzai.tv/order/order/syncOrder
+        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        localUrl: http://ttestorder.zhengzai.tv/order/order/syncOrder
     dragon:
       notifyUrl: https://testdragon.zhengzai.tv/dragon
     platform:
-      url: http://testplatform.zhengzai.tv
+      url: http://ttestplatform.zhengzai.tv
     sweet:
-      url: http://testsweet.zhengzai.tv
+      url: http://ttestsweet.zhengzai.tv
     chime:
-      url: http://testchime.zhengzai.tv
+      url: http://ttestchime.zhengzai.tv
     executor-main:
       xxl:
         admin:
           #addresses: 172.17.121.166:8090
-          addresses: 192.168.96.147:8090
+          addresses: 172.17.192.6:8090
   client:
     admin:
-      phpPayUrl: http://testdragon.zhengzai.tv
+      phpPayUrl: http://ttestdragon.zhengzai.tv
       phpMallUrl: https://testmall.zhengzai.tv
       platformUrl: https://testplatform.zhengzai.tv
       h5Url: https://testm.zhengzai.tv

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
 #    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-example/liquidnet-service-example-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
+    #host: 172.17.192.6:7001,172.17.121.158:7001,172.17.121.157:7001
     instance:
       prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-test.yml

@@ -11,7 +11,7 @@ liquidnet:
     path: /data/logs
     name: support-config
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
     #instance:
     #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
+server:
+  port: 7001
+  servlet:
+    context-path: /eureka-server
+
+spring:
+  application:
+    name: liquidnet-support-eureka
+  security:
+    user:
+      name: user
+      password: user123
+
+eureka:
+  instance:
+    hostname: 172.17.192.6
+    preferIpAddress: true
+    health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+    status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+    home-page-url: http://localhost:${server.port}${server.servlet.context-path}
+    metadata-map:
+      configPath: ${server.servlet.context-path}
+      management.context-path: ${server.servlet.context-path}
+  server:
+    enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
+    eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
+  client:
+    register-with-eureka: false #禁止自己当做服务注册
+    fetch-registry: false       #屏蔽注册信息
+    serviceUrl:
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:${server.port}${server.servlet.context-path}/eureka
+#  instance:
+#    prefer-ip-address: true
+#    instance-id: ${spring.application.name}:${server.port}
+#     hostname: localhost
+
+logging:
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/bootstrap.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: liquidnet-support-eureka
   profiles:
-    active: dev-server1
\ No newline at end of file
+    active: test
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 172.17.192.6:7001
 # end-test-这里是配置信息基本值
 
 spring: