Merge branch 'master' into dev_stone

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: client-admin-web

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

@@ -11,7 +11,6 @@ liquidnet:
       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
 
-
 # end-dev-这里是配置信息基本值
 
 spring:

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

@@ -2,5 +2,5 @@ spring:
     application:
         name: liquidnet-client-admin-web
     profiles:
-        active: test
+        active: dev
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -137,7 +137,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         linkedMultiValueMap.add("notifyUrl", notifyUrl);
         linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
         linkedMultiValueMap.add("orderRefundCode", refundNo);
-        linkedMultiValueMap.add("paymentId", null);
+        linkedMultiValueMap.add("paymentId", memberOrder.getPaymentId());
         linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
         linkedMultiValueMap.add("price", String.valueOf(param.getRefundAmt()));
         linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    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
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: client-job

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

@@ -6,7 +6,12 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #host: 172.17.207.177: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
+
+
 # end-dev-这里是配置信息基本值
 
 spring:

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

-config-server-git: test
-#application-test-begin
-#这里后续添加公共参数值
-liquidnet:
-  secret:
-    passwd-salt: NTZiYzg4
-  security:
-    username: user
-    password: user123
-  jwt:
-    secret: qZHglvNP0n0aOOckHiQXq5JMD468J4eG
-    expire-ttl: 43200
-    refresh-ttl: 525600
-    blacklist_grace_period: 5
-  mysql:
-    urlHostAndPort: 172.17.205.50:3308
-    username: root
-    password: Zhengzai@rd2U#
-  rabbitmq:
-    host: 101.201.127.58
-    port: 5672
-    username: admin
-    password: admin
-    virtual-host: liquidnet
-    adam:
-      host: rabbitmq.zhengzai.tv
-      port: 5672
-      username: admin
-      password: admin
-      virtual-host: liquidnet
-  knife4j:
-    disable: false
-  redis:
-    database: 255
-    dbs: 0,256
-    host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
-    port: 6380
-    password: PO@B!Iud32
-    dragon:
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
-      port: 6380
-      password: PO@B!Iud32
-    sweet:
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
-      port: 6380
-      password: PO@B!Iud32
-  mongodb:
-    host: 172.17.205.50:27017
-    port: 27017
-    user: admin
-    pwd: S&y$6d*JwJ
-    chime:
-      host: s-2ze04ffc16a54af4.mongodb.rds.aliyuncs.com:3717
-      port: 3717
-      user: admin
-      pwd: S&y$6d*JwJ
-  service:
-    adam:
-      url-pay:
-        pay: http://k8s-testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://k8s-testdragon.zhengzai.tv/dragon/pay/checkOrder
-        callback: http://k8s-testadam.zhengzai.tv/adam/member/order/callback
-      url: http://k8s-testadam.zhengzai.tv
-    kylin:
-      url-pay:
-        pay: http://k8s-testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://k8s-testdragon.zhengzai.tv/dragon/pay/checkOrder
-        localUrl: http://k8s-testkylin.zhengzai.tv/kylin/order/syncOrder
-      url: http://k8s-testkylin.zhengzai.tv/kylin
-    candy:
-      url: http://k8s-testcandy.zhengzai.tv/candy
-    order:
-      adam:
-        url: http://k8s-testadam.zhengzai.tv/adam
-      url-pay:
-        pay: http://k8s-testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://k8s-testdragon.zhengzai.tv/dragon/pay/checkOrder
-        localUrl: http://k8s-testorder.zhengzai.tv/order/order/syncOrder
-    dragon:
-      notifyUrl: https://k8s-testdragon.zhengzai.tv/dragon
-    platform:
-      url: http://k8s-testplatform.zhengzai.tv
-    sweet:
-      url: http://k8s-testsweet.zhengzai.tv
-    chime:
-      url: http://k8s-testchime.zhengzai.tv
-    executor-main:
-      xxl:
-        admin:
-          addresses: 172.17.121.166:8090
-  client:
-    admin:
-      phpPayUrl: http://k8s-testdragon.zhengzai.tv
-      phpMallUrl: https://k8s-testmall.zhengzai.tv
-      platformUrl: https://k8s-testplatform.zhengzai.tv
-      h5Url: https://k8s-testm.zhengzai.tv
-  aliyun:
-    dypns:
-      accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
-      accessKeySecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
-    dysms:
-      accessKeyId: LTAI5tHt7yvm97G8zxackcMK
-      accessKeySecret: xC3i5qEptJ3JIIRaYLaKvhk4gVASfl
-    oss:
-      imgUrl: "https://img.zhengzai.tv/"
-      appUrl: "https://app.zhengzai.tv/"
-      endpoint: http://oss-cn-hangzhou.aliyuncs.com
-      accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-      accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
-  wechat:
-    service:
-      zhengzai:
-        appid: wx3498304dda39c5a1
-        secret: a1307fab0a5f2380086a7c636f7339ea
-        token: tftipg1427706847
-        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
-      zhengzaiActivity:
-        appid: wx769aa9167bef9ce2
-        secret: bebccc204b9472ba41661372b197eb81
-      modernsky:
-        appid: wx6bf7999941a06d15
-        secret: a12012b31307a539719dbe4d137ca45a
-    applet:
-      zhengzai:
-        appid: wx4732efeaa2b08086
-        secret: 94562c1f92da1b6cb3f1327c8842c6d3
-      strawberry:
-        appid: wx08b852ade69f8019
-        secret: 0aac285fd1fbc6aa4e562b7ad81de392
-      five:
-        appid: wxb5371c8c95226957
-        secret: a6a909ae1ab25a79d4addd154eafbb7e
-      mdsk:
-        appid: wxc278ddf30f515188
-        secret: 21c0daa5d7d323f86c70c29db3c0613b
-  umeng:
-    ios:
-      appkey: 54fe819bfd98c546b50004f0
-      appMasterSecret: fsls9dv1vwyemqdv9lidjfppk37nmssa
-    android:
-      appkey: 5c6cf6cbb465f592e4000bae
-      appMasterSecret: dmsho74wlpd1hp7vrwp9bjehzwo29pza
-  shumei:
-    url:
-  easemob:
-    api-url: https://a1.easemob.com
-    org-name: 1106210901175651
-    app-name: demo
-    client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
-    client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
-  express:
-    shunfeng:
-      url: "https://butler-dev.sit.sf-express.com"
-      sk: 21e9a70f677a2bf29dfa2b3bead4f018
-      appid: 557104628450889728
-      custid: 7551234567
-      jCompany: 北京正在映画互联网有限公司
-      jContact: 摩登天空票务部
-      jTel: 4001680650
-      jProvince: 北京
-      jCity: 北京市
-      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
-      expressType: 2 # 默认顺丰特快
-      depositumInfo: 演出纸质票
-
-
-#application-test-end

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

@@ -50,7 +50,7 @@ liquidnet:
     user: admin
     pwd: S&y$6d*JwJ
     chime:
-      host: s-2ze04ffc16a54af4-pub.mongodb.rds.aliyuncs.com:3717
+      host: s-2ze04ffc16a54af4.mongodb.rds.aliyuncs.com:3717,s-2zed407acd469104.mongodb.rds.aliyuncs.com
       port: 3717
       user: admin
       pwd: S&y$6d*JwJ
@@ -87,7 +87,8 @@ liquidnet:
     executor-main:
       xxl:
         admin:
-          addresses: 172.17.121.166:8090
+          #addresses: 172.17.121.166:8090
+          addresses: 192.168.96.147:8090
   client:
     admin:
       phpPayUrl: http://testdragon.zhengzai.tv

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-druid-k8s-test.yml

-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://${liquidnet.mysql.master.urlHostAndPort}/${liquidnet.mysql.master.database-name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: ${liquidnet.mysql.master.username}
-                password: ${liquidnet.mysql.master.password}
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: jdbc:mysql://${liquidnet.mysql.slave.urlHostAndPort}/${liquidnet.mysql.slave.database-name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: ${liquidnet.mysql.slave.username}
-                password: ${liquidnet.mysql.slave.password}
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-    info:
-        port: 7099
-        context:
-        name: liquidnet-client-admin-web
-    logfile:
-        path: /data/logs
-        name: client-admin-web
-        config: classpath:logback-spring.xml
-        file-max-size: 200MB
-        level: debug
-    mysql:
-        master:
-            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
-            username: ${liquidnet.mysql.username}
-            password: ${liquidnet.mysql.password}
-            database-name: test_ln_scene
-        slave:
-            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
-            username: ${liquidnet.mysql.username}
-            password: ${liquidnet.mysql.password}
-            database-name: test_ln_scene
-    mongodb:
-        sslEnabled: false
-        database: test_ln_scene
-
-# end-test-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-k8s-test.yml

-liquidnet:
-  info:
-    context: /
-    name: liquidnet-client-job
-    port: 8090
-  logfile:
-    name: client-job
-    path: /data/logs
-  mysql:
-    database-name: test_ln_clijob

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9001
-    context: /adam
-    name: liquidnet-service-adam
-  logfile:
-    path: /data/logs
-    name: service-adam
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
-    level: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  url-pay:
-    pay: ${liquidnet.service.adam.url-pay.pay}
-    check: ${liquidnet.service.adam.url-pay.check}
-    callback: ${liquidnet.service.adam.url-pay.callback}
-  reviewer:
-    app-login:
-      mobile: 13724286255
-    user-info: false
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9009
-    context: /candy
-    name: liquidnet-service-candy
-  logfile:
-    path: /data/logs
-    name: service-candy
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
-    level: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9011
-    context: /chime
-    name: liquidnet-service-chime
-  logfile:
-    path: /data/logs
-    name: service-chime
-    config: classpath:logback-spring.xml
-    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
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9005
-    context:
-#    context: /service-consumer
-    name: liquidnet-service-consumer-adam
-  logfile:
-    path: /data/logs
-    name: service-consumer-adam
-    config: classpath:logback-spring.xml
-    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-root: debug
-  mysql:
-    database-name: test_ln_scene
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dragon-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9997
-    context:
-#    context: /service-consumer
-    name: liquidnet-service-consumer-dragon
-  logfile:
-    path: /data/logs
-    name: service-consumer-dragon
-    config: classpath:logback-spring.xml
-    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-root: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  dragon:
-    redis:
-      database: 255
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-kylin-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9999
-    context:
-#    context: /service-consumer
-    name: liquidnet-service-consumer-kylin
-  logfile:
-    path: /data/logs
-    name: service-consumer-kylin
-    config: classpath:logback-spring.xml
-    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-root: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-sweet-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9996
-    context:
-#    context: /service-consumer
-    name: liquidnet-service-consumer-sweet
-  logfile:
-    path: /data/logs
-    name: service-consumer-sweet
-    config: classpath:logback-spring.xml
-    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-root: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9006
-    context: /dragon
-    name: liquidnet-service-dragon
-  logfile:
-    path: /data/logs
-    name: service-dragon
-    config: classpath:logback-spring.xml
-    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
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  dragon:
-    url: ${liquidnet.service.dragon.notifyUrl}
-    alipay:
-      gataway-url: https://openapi.alipay.com/gateway.do
-      appId: 2019082866535131
-      merchantPubKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmePaETscydypY3rV4mXa8MtcQIL5zjP1KxdusNkHpePeU61hAZxKn0Z8pDB1wNaTK72wgEWaORXeRp4YTbf4usHlW562Pe5wdiSutb3iT6EMJ5eBD4HLI9wWDgYBtwfHwS5JJFhf0eptP4R1XluLiMhmMynLwJvHepgkVrS3mN+jmoPRmKFhZHGIYDoWypBMbUKiFHWiToHK1n0NYHHIi4WgK2wt4Wj7nexQGD69W7ofRCirYmz35c/cNFUA1lqzOEKu2z7PpjA6jQV2GJolnJ4xXPJ8Dpgp4g/dgsGqRydlmFqZD71i/pDDpF0RfRKHL+WhWVhI1hqe6jLtvJE+zQIDAQAB
-      merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCArhnBTpcAww8wSYBTwGp6oBvenzCCYFrugERgxJDZ7YnBZ3ZdiAaHjJ9PI0WymkpDr27FSg9czVbiH7G91zPq+8s9onrZi/l6cBZ2VjrwQ9BQPN2a8zHy8D6BfoKEV+PIicGz6hNPA7lgf04NgsXeWjeXnYD/IBTLZmnCxB2sPYo/0EN32mlSG9snO63HlPkoqn8ycw71a1cBrlQ+Y22fFnJAk/vrGoou8E0UHfL5zVE/up+ToOYW/eOKMFL/DSceCy32t9Za0RmpV3i2E9s8gBDewzT10Yf4+4mPUiTR6AhcLjqafAy2IaKPK57WZ6cGF9cGs9yq8bSTRpeNC4alAgMBAAECggEAH0Ms+qvPP94j6IVS6gYLWHNhkfp23JXwQZVkB2Z6EpgFKbmrJhoQDAp8Acv9+OBHPp52ePP/O3qfqxwsIIUSFfrKa9T3p7a8C6UDsAhPFWRETdobtLN05SK87NUBfImly2i8aKtruXycIveKzPmCfPzKGMmpN1Jh+vCMrUbcNqX8OUcxmhGvJwnQuBW4QEiepzl89Nl91iSwFmxaZoqLaB9lYUKke/z7FDHTpTWpZvtvxlZ0gvMVNLVp9NBNazolQ8eEjBG2PsQGD2cLUbM33mLTz+/VQjzZR3KXu5kQR9MloURILDsdxE1AyA4AkIXd4eMszEjA4Dv6CQK/jjrsgQKBgQDIiCt1OGmV2sqDBSn4nZNH7BzY3Hdnf+qsYUi+TXKhnQaT8XPKWZpKE/AcqsIKnANmO4sX0NL7ACBe7Rl1RcU9Mq5XuHhnkveFBVRRIHindzUfEN0WgdLy23qmJ2N+1i4FigelY0E5T2lojVb7wycAgAc6vflwE+eYf8W3968q0QKBgQCkRgsVCWWNMSLZeB0V9LV3Om2/UPWY/ovadTxAQtxg0Z75V6Wdu8u0hrYaPSeUK2ryaoE6HKgp7U8NiJGzgm2wpj7D2ysrPmhX5+CjiWkDMCuvWytVT7hLqhhLp7frZT39u8VhyfC8lE0xA67gAPsGSl1sBoZPwvvsmNAQ/h6rlQKBgQCtCtw9be2m88M3JnieYhOax8Po2u5qsLZoBBcKqLhXf7ISbhPWNFXwwJ29jxicoR5J1O3lIj09fVFxuLX0Pb3DXn2VksjLz8Wp0vx8eUHEeRis8xdleaf4C68du/WemOHjw8VvUWQSOVWjc/vwiumYA+K5LQAXWAXM0c1jP+e3UQKBgEWY/1z8TDATn0Yvo3MH6FIJSTIDJOqa/bmibdJ0AVZruUS+o4Y+aEGlyUU4n6og8wCdqv5p4b1Rs2pyb/hzy/FJndHw60s495A2x2/B6eHV6Mw0fhl42wYDnKOA/WUX0bnMcgXKPtpGoqWff9mb0L6LhyUbZpAodf95hr2MTIY5AoGBAIyPtYP6jRyR980h/Ud1MS0fBxymjQrR+kg3GWjnw0ZJJ8yFEXxDqLV8uLyXQKc89HGbI0cClWgZBTjfIPJ5U4Gl19Xlwx1SFrdgg5mGUqnMARTg7w1TG5QLSqNhZo2jgBM5FCJRbDUCO/MzLcFhTeGNva9yP7E7gW5/Dott9D7d
-      signtType: 2019082866535131
-      charset: 2019082866535131
-    wepay:
-      gataway-url: https://openapi.alipay.com/gateway.do
-      merchantId: 1551961491
-      appId: wx3498304dda39c5a1
-      partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-k8s-test.yml

-liquidnet:
-  info:
-    port: 8190
-    context: /service-executor-main
-    name: liquidnet-service-executor-main
-  logfile:
-    path: /data/logs
-    name: service-executor-main
-  xxl:
-    accessToken: qk52rqSejRBm9enf6BTTxw==
-    admin:
-      # Job执行器注册地址，多个地址则用逗号分隔
-#      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
-      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
-    executor:
-      # Job执行器IP，默认为空表示自动获取IP，多网卡时手动指定
-      ip:
-      # Job执行器端口，单机多个执行器端口号不能相同
-      port: 8191
-      # Job执行器心跳注册分组依据，按需配置
-      appname: liquidnet-service-executor
-      # Job执行器运行日志，注意目录读写权限
-      logpath: /data/logs/job
-  url:
-    platform: ${liquidnet.service.platform.url}
-    sweet: ${liquidnet.service.sweet.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9002
-    context: /kylin
-    name: liquidnet-service-kylin
-  logfile:
-    path: /data/logs
-    name: service-kylin
-    config: classpath:logback-spring.xml
-    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
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  url-pay:
-    pay: ${liquidnet.service.kylin.url-pay.pay}
-    check: ${liquidnet.service.kylin.url-pay.check}
-    localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
-  adam:
-    url: ${liquidnet.service.adam.url}
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-notify-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9007
-    context: /dragon
-    name: liquidnet-service-notify
-  logfile:
-    path: /data/logs
-    name: service-notify
-    config: classpath:logback-spring.xml
-    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
-  rabbitmq:
-    connection-timeout: 5000
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  dragon:
-    url: ${liquidnet.service.dragon.notifyUrl}
-    alipay:
-      gataway-url: https://openapi.alipay.com/gateway.do
-      appId: 2019082866535131
-      merchantPubKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmePaETscydypY3rV4mXa8MtcQIL5zjP1KxdusNkHpePeU61hAZxKn0Z8pDB1wNaTK72wgEWaORXeRp4YTbf4usHlW562Pe5wdiSutb3iT6EMJ5eBD4HLI9wWDgYBtwfHwS5JJFhf0eptP4R1XluLiMhmMynLwJvHepgkVrS3mN+jmoPRmKFhZHGIYDoWypBMbUKiFHWiToHK1n0NYHHIi4WgK2wt4Wj7nexQGD69W7ofRCirYmz35c/cNFUA1lqzOEKu2z7PpjA6jQV2GJolnJ4xXPJ8Dpgp4g/dgsGqRydlmFqZD71i/pDDpF0RfRKHL+WhWVhI1hqe6jLtvJE+zQIDAQAB
-      merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCArhnBTpcAww8wSYBTwGp6oBvenzCCYFrugERgxJDZ7YnBZ3ZdiAaHjJ9PI0WymkpDr27FSg9czVbiH7G91zPq+8s9onrZi/l6cBZ2VjrwQ9BQPN2a8zHy8D6BfoKEV+PIicGz6hNPA7lgf04NgsXeWjeXnYD/IBTLZmnCxB2sPYo/0EN32mlSG9snO63HlPkoqn8ycw71a1cBrlQ+Y22fFnJAk/vrGoou8E0UHfL5zVE/up+ToOYW/eOKMFL/DSceCy32t9Za0RmpV3i2E9s8gBDewzT10Yf4+4mPUiTR6AhcLjqafAy2IaKPK57WZ6cGF9cGs9yq8bSTRpeNC4alAgMBAAECggEAH0Ms+qvPP94j6IVS6gYLWHNhkfp23JXwQZVkB2Z6EpgFKbmrJhoQDAp8Acv9+OBHPp52ePP/O3qfqxwsIIUSFfrKa9T3p7a8C6UDsAhPFWRETdobtLN05SK87NUBfImly2i8aKtruXycIveKzPmCfPzKGMmpN1Jh+vCMrUbcNqX8OUcxmhGvJwnQuBW4QEiepzl89Nl91iSwFmxaZoqLaB9lYUKke/z7FDHTpTWpZvtvxlZ0gvMVNLVp9NBNazolQ8eEjBG2PsQGD2cLUbM33mLTz+/VQjzZR3KXu5kQR9MloURILDsdxE1AyA4AkIXd4eMszEjA4Dv6CQK/jjrsgQKBgQDIiCt1OGmV2sqDBSn4nZNH7BzY3Hdnf+qsYUi+TXKhnQaT8XPKWZpKE/AcqsIKnANmO4sX0NL7ACBe7Rl1RcU9Mq5XuHhnkveFBVRRIHindzUfEN0WgdLy23qmJ2N+1i4FigelY0E5T2lojVb7wycAgAc6vflwE+eYf8W3968q0QKBgQCkRgsVCWWNMSLZeB0V9LV3Om2/UPWY/ovadTxAQtxg0Z75V6Wdu8u0hrYaPSeUK2ryaoE6HKgp7U8NiJGzgm2wpj7D2ysrPmhX5+CjiWkDMCuvWytVT7hLqhhLp7frZT39u8VhyfC8lE0xA67gAPsGSl1sBoZPwvvsmNAQ/h6rlQKBgQCtCtw9be2m88M3JnieYhOax8Po2u5qsLZoBBcKqLhXf7ISbhPWNFXwwJ29jxicoR5J1O3lIj09fVFxuLX0Pb3DXn2VksjLz8Wp0vx8eUHEeRis8xdleaf4C68du/WemOHjw8VvUWQSOVWjc/vwiumYA+K5LQAXWAXM0c1jP+e3UQKBgEWY/1z8TDATn0Yvo3MH6FIJSTIDJOqa/bmibdJ0AVZruUS+o4Y+aEGlyUU4n6og8wCdqv5p4b1Rs2pyb/hzy/FJndHw60s495A2x2/B6eHV6Mw0fhl42wYDnKOA/WUX0bnMcgXKPtpGoqWff9mb0L6LhyUbZpAodf95hr2MTIY5AoGBAIyPtYP6jRyR980h/Ud1MS0fBxymjQrR+kg3GWjnw0ZJJ8yFEXxDqLV8uLyXQKc89HGbI0cClWgZBTjfIPJ5U4Gl19Xlwx1SFrdgg5mGUqnMARTg7w1TG5QLSqNhZo2jgBM5FCJRbDUCO/MzLcFhTeGNva9yP7E7gW5/Dott9D7d
-      signtType: 2019082866535131
-      charset: 2019082866535131
-    wepay:
-      gataway-url: https://openapi.alipay.com/gateway.do
-      merchantId: 1551961491
-      appId: wx3498304dda39c5a1
-      partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9004
-    context: /order
-    name: liquidnet-service-order
-  logfile:
-    path: /data/logs
-    name: service-order
-    config: classpath:logback-spring.xml
-    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
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  url-pay:
-    pay: ${liquidnet.service.order.url-pay.pay}
-    check: ${liquidnet.service.order.url-pay.check}
-    localUrl: ${liquidnet.service.order.url-pay.localUrl}
-  adam:
-    url: ${liquidnet.service.adam.url}
-  candy:
-    url: ${liquidnet.service.candy.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9003
-    context: /platform
-    name: liquidnet-service-platform
-  logfile:
-    path: /data/logs
-    name: service-platform
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
-    level: debug
-  rabbitmq:
-    connection-timeout: 5000
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-  shunfeng:
-    sk: ${liquidnet.client.admin.shunfeng.sk}
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"
-    appUrl: "https://app.zhengzai.tv/"
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
-    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet-k8s-test.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9008
-    context: /sweet
-    name: liquidnet-service-sweet
-  logfile:
-    path: /data/logs
-    name: service-sweet
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
-    level: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-
-#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet-k8stest.yml

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9008
-    context: /sweet
-    name: liquidnet-service-sweet
-  logfile:
-    path: /data/logs
-    name: service-sweet
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
-    level: debug
-  mysql:
-    database-name: test_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: test_ln_scene
-
-#以下为spring各环境个性配置

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81: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
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-adam

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

@@ -6,11 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177: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
-
+    host: 172.17.207.177:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.service.ICandyCouponService;
+import com.liquidnet.service.candy.util.ObjectUtil;
 import com.liquidnet.service.candy.vo.CandyCouponPreVo;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.candy.vo.CandyMyCouponListVo;
@@ -52,8 +53,24 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "类型 1可用 2过期/已使用 ", required = true),
     })
-    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.myCoupon(type));
+    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") @NotNull Integer type, @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.myCoupon(type);
+//        List<CandyCouponVo> list = vo.getMyCoupon();
+//        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+//        if (page == null || page == 0) {
+//            page = 1;
+//        }
+//        int size = 40;
+//        int initSize = (page - 1) * size;
+//        int forSize = page * size;
+//        if (forSize >= list.size()) {
+//            forSize = list.size();
+//        }
+//        for (int i = initSize; i < forSize; i++) {
+//            listVo.add(list.get(i));
+//        }
+//        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     //我的会员权益券统计
@@ -87,8 +104,25 @@ public class CandyCouponController {
                                                                     @RequestParam("performanceId") @NotNull @NotBlank String performanceId,
                                                                     @RequestParam("timeId") @NotNull @NotBlank String timeId,
                                                                     @RequestParam("ticketId") @NotNull @NotBlank String ticketId,
-                                                                    @RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.preUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId, type));
+                                                                    @RequestParam("type") @NotNull Integer type,
+                                                                    @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.preUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId, type);
+        List<CandyCouponVo> list = vo.getMyCoupon();
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     // 是否可用券演出
@@ -120,8 +154,25 @@ public class CandyCouponController {
     })
     public ResponseDto<CandyMyCouponListVo> preUseGoodCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
                                                              @RequestParam("goodId") @NotNull @NotBlank String goodId,
-                                                             @RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.preUseGoodCoupon(priceTotal, goodId, type));
+                                                             @RequestParam("type") @NotNull Integer type,
+                                                             @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.preUseGoodCoupon(priceTotal, goodId, type);
+        List<CandyCouponVo> list = vo.getMyCoupon();
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     //是否可用券 - 商品
@@ -145,8 +196,24 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "performanceId", value = "演出id", required = true)
     })
-    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId) {
-        return ResponseDto.success(candyCouponService.myAdvanceCoupon(performanceId));
+    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId,
+                                                            @RequestParam(required = false, name = "page") Integer page) {
+        List<CandyCouponVo> list = candyCouponService.myAdvanceCoupon(performanceId);
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        return ResponseDto.success();
     }
 
 //    //判断券是否可用
@@ -187,11 +254,11 @@ public class CandyCouponController {
                                                    @RequestParam("timeId") @NotNull @NotBlank String timeId,
                                                    @RequestParam("ticketId") @NotNull @NotBlank String ticketId
     ) {
-        CandyUseResultVo result = candyCouponService.useCoupon(uCouponId, content, totalPrice, performanceId, timeId,ticketId, goodId);
+        CandyUseResultVo result = candyCouponService.useCoupon(uCouponId, content, totalPrice, performanceId, timeId, ticketId, goodId);
         if (result == null) {
             return ResponseDto.failure();
         }
-        result.setValue(result.getValue().setScale(2,BigDecimal.ROUND_HALF_UP));
+        result.setValue(result.getValue().setScale(2, BigDecimal.ROUND_HALF_UP));
         return ResponseDto.success(result);
     }
 

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-candy

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-chime

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    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
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-adam

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-    
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-dragon

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    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
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-kylin

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    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
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-sweet

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-dragon

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

@@ -6,7 +6,12 @@ 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.207.177: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
+
+
 # end-dev-这里是配置信息基本值
 
 spring:

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-executor-main

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

@@ -6,7 +6,12 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #host: 172.17.207.177: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
+
+
 # end-dev-这里是配置信息基本值
 
 spring:

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81: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
-
-# end-dev-这里是配置信息基本值
-spring:
-  profiles:
-    include: service-kylin

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-notify

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-order

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/task/CandyCouponDueTaskController.java

@@ -74,7 +74,7 @@ public class CandyCouponDueTaskController {
 
         // 查取状态可用的到期兑换码
         LambdaQueryWrapper<CandyCouponCode> couponCodeQueryWrapper = Wrappers.lambdaQuery(CandyCouponCode.class);
-        couponCodeQueryWrapper.eq(CandyCouponCode::getState, 1);
+        couponCodeQueryWrapper.eq(CandyCouponCode::getState, 0);
         couponCodeQueryWrapper.le(CandyCouponCode::getRedeemStop, now);
         int totalCount = platformCandyCouponCodeService.count(couponCodeQueryWrapper);
         AtomicInteger pl = new AtomicInteger();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
@@ -133,45 +134,52 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 syncVo = redisUtil.set(umKey, userMemberVo);
                 log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
-                removeUcouponIdList = userCouponBasicDtoList.stream()
-                        .filter(r -> (r.getExclusive() == 1 && r.getDuedAt().compareTo(expiryAt) == 0))
-                        .map(CandyUserCouponBasicDto::getUcouponId)
-                        .collect(Collectors.toList());
+                // 同步更新MYSQL会员信息
+                AdamUserMember updateInfoUserMember = new AdamUserMember();
+                updateInfoUserMember.setExpiryAt(newExpiryAt);
+                updateInfoUserMember.setUpdatedAt(now);
+                updateInfoUserMember.setComment("R");
+                int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
+                log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
+                    removeUcouponIdList = userCouponBasicDtoList.stream()
+                            .filter(r -> (r.getExclusive() == 1 && r.getDuedAt().compareTo(expiryAt) == 0))
+                            .map(CandyUserCouponBasicDto::getUcouponId)
+                            .collect(Collectors.toList());
+                }
             } else if (userMemberVo.getState() == 2) {// 拉黑用户
-                removeUcouponIdList = userCouponBasicDtoList.stream()
-                        .filter(r -> (r.getExclusive() == 1))
-                        .map(CandyUserCouponBasicDto::getUcouponId)
-                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
+                    removeUcouponIdList = userCouponBasicDtoList.stream()
+                            .filter(r -> (r.getExclusive() == 1))
+                            .map(CandyUserCouponBasicDto::getUcouponId)
+                            .collect(Collectors.toList());
+                }
             }
             // 同步删除REDIS用户会员权益券信息
-            List<String> finalRemoveUcouponIdList = removeUcouponIdList;
-            userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
-            redisUtil.set(uckey, userCouponBasicDtoList);
+            if (!CollectionUtils.isEmpty(removeUcouponIdList)) {
+                List<String> finalRemoveUcouponIdList = removeUcouponIdList;
+                userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
+                redisUtil.set(uckey, userCouponBasicDtoList);
+
+                // 同步更新MYSQL用户会员权益券信息
+                LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);
+                candyUserCouponLambdaUpdateWrapper.in(CandyUserCoupon::getUcouponId, removeUcouponIdList.toArray()).eq(CandyUserCoupon::getState, 1);
+                CandyUserCoupon updateInfoUserCoupon = new CandyUserCoupon();
+                updateInfoUserCoupon.setState(2);
+                updateInfoUserCoupon.setUpdatedAt(now);
+                updateInfoUserCoupon.setOperator("system.vip.refund");
+                int updateRst = candyUserCouponMapper.update(updateInfoUserCoupon, candyUserCouponLambdaUpdateWrapper);
+                log.info("###会员退款回调处理成功:更新DB会员权益券信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+            }
         }
-        // 同步更新MYSQL用户会员权益券信息
-        LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);
-        candyUserCouponLambdaUpdateWrapper.in(CandyUserCoupon::getUcouponId, removeUcouponIdList.toArray()).eq(CandyUserCoupon::getState, 1);
-        CandyUserCoupon updateInfoUserCoupon = new CandyUserCoupon();
-        updateInfoUserCoupon.setState(2);
-        updateInfoUserCoupon.setUpdatedAt(now);
-        updateInfoUserCoupon.setOperator("system.vip.refund");
-        int updateRst = candyUserCouponMapper.update(updateInfoUserCoupon, candyUserCouponLambdaUpdateWrapper);
-        log.info("###会员退款回调处理成功:更新DB会员权益券信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
-
-        // 同步更新MYSQL会员信息
-        AdamUserMember updateInfoUserMember = new AdamUserMember();
-        updateInfoUserMember.setExpiryAt(newExpiryAt);
-        updateInfoUserMember.setUpdatedAt(now);
-        updateInfoUserMember.setComment("R");
-        updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
-        log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
 
         // 同步更新MYSQL会员订单信息
         AdamMemberOrder updateInfoMemberOrder = new AdamMemberOrder();
         updateInfoMemberOrder.setMid(memberOrder.getMid());
         updateInfoMemberOrder.setState(5);
         updateInfoMemberOrder.setUpdatedAt(now);
-        updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
+        int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
         log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
     }
 }

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-platform

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177: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
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-sweet

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  info:
-    port: 7002
-    context: /support-config
-    name: liquidnet-support-config
-  security:
-    username: user
-    password: user123
-  logfile:
-    path: /data/logs
-    name: support-config
-  eureka:
-    #host: 192.168.216.81: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
-    #serviceUrl:
-    #  defaultZone: http://eureka-test-0.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka,eureka-test-1.eureka-test-svc-zhengzai-test:7001${server.servlet.context-path}/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka
-
-#  rabbitmq:
-#    host: 127.0.0.1
-#    port: 5672
-#    username: admin
-#    password: admin
-  config:
-    location: /data/config/support-config
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: support-config

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

@@ -11,7 +11,12 @@ liquidnet:
     path: /data/logs
     name: support-config
   eureka:
-    host: 172.17.207.177:7001
+    #host: 172.17.207.177: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
+
+
   rabbitmq:
     host: 127.0.0.1
     port: 5672