1.update

@@ -51,10 +51,9 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
     @Transactional(rollbackFor = Exception.class)
     public void create(MemberVipHistory resources) {
         log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
-        this.checkMember(resources);
-
-        MemberVipHistory memberVipHistory = MemberVipHistoryBuilder.build(resources);
-        this.memberVipHistoryRepository.save(memberVipHistory);
+        MemberDTO memberDTO = this.memberService.findByCode(resources.getMemberCode());
+        resources.setMemberId(memberDTO.getId());
+        this.memberVipHistoryRepository.save(resources);
     }
 
     @Override

@@ -152,6 +152,9 @@ public class RestTemplateClient {
 
     public String deleteCollection(String content) {
         String url = BASE_URL + "/uce/userOperation/deleteCollection";
+        //处理接口调用 中文不显示问题
+        content = new String(Base64.getEncoder().encode(content.getBytes(StandardCharsets.UTF_8)));
+
         restTemplate.postForEntity(url, content, String.class);
        /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class);
         String entityBody = "";

+spring:
+  # 数据源
+  datasource:
+    url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+    username: root
+    password: root
+    # 驱动程序
+    driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+    # Druid
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      # 初始化配置
+      initial-size: 3
+      # 最小连接数
+      min-idle: 3
+      # 最大连接数
+      max-active: 15
+      # 获取连接超时时间
+      max-wait: 5000
+      # 连接有效性检测时间
+      time-between-eviction-runs-millis: 90000
+      # 最大空闲时间
+      min-evictable-idle-time-millis: 1800000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      validation-query: select 1
+      # 配置监控统计拦截的filters
+      filters: stat
+      stat-view-servlet:
+        url-pattern: /druid/*
+        reset-enable: false
+      # 过滤器
+      web-stat-filter:
+        url-pattern: /*
+        exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
+
+  # jpa
+  jpa:
+    properties:
+      hibernate:
+        # 数据库类型
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+    hibernate:
+      # 生产环境设置成 none，避免程序运行时自动更新数据库结构
+      ddl-auto: none
+    open-in-view: true
+
+  # redis
+  redis:
+    #数据库索引
+    database: 0
+    host: 122.112.214.149
+    port: 6379
+    password: redis123
+    #连接超时时间
+    timeout: 5000
+
+
+###########################################自定义属性#################################################################
+# 多mq配置
+mutil-mq:
+  # 服务侧
+  service:
+    # ip
+    host: 122.112.214.149
+#    host: 139.196.145.150
+    # 端口
+    port: 5672
+    # 用户名
+    username: guest
+#    username: admin
+    # 密码
+    password: guest
+#    password: Topdraw1qaz
+    # 虚拟空间
+    virtual-host: member_center_chongshu
+    publisher-confirms: true #如果对异步消息需要回调必须设置为true
+
+  # 管理侧
+  management:
+#    host: 122.112.214.149 # rabbitmq的连接地址
+    host: 122.112.214.149 # rabbitmq的连接地址
+    port: 5672 # rabbitmq的连接端口号
+    virtual-host: member_center # rabbitmq的虚拟host
+    username: guest # rabbitmq的用户名
+    password: guest # rabbitmq的密码
+#    username: admin # rabbitmq的用户名
+#    password: Topdraw1qaz # rabbitmq的密码
+    publisher-confirms: true #如果对异步消息需要回调必须设置为true
+
+# 服务属性
+service:
+  mq:
+    list:
+      - source: event
+        exchange: event.exchange
+        queue: event.queue
+        exchange-type: direct
+        routing-key:
+        active: service
+      - source: collection
+        exchange: collection.exchange
+        queue: collection.queue
+        exchange-type: direct
+        routing-key:
+        active: service
+      - source: viewRecord
+        exchange: viewRecord.exchange
+        queue: viewRecord.queue
+        exchange-type: direct
+        routing-key:
+        active: service
+      - source: eventBus
+        exchange: uc.eventbus
+        queue: uc.eventbus
+        exchange-type: topic
+        routing-key: uc.eventbus.*.topic
+        active: service
+      - source: uce
+        exchange: uce.exchange
+        queue: uce.queue
+        exchange-type: direct
+        routing-key:
+        active: management
+      - source: wechat
+        exchange: weixin.exchange.direct
+        queue: weixin.subOrUnSub.queue
+        exchange-type: direct
+        routing-key:
+        active:
+    error:
+      logs:
+        list:
+          - type: eventBus
+            filePath: /logs/mq/eventBus/
+            fileName: error
+            start: on
+          - type: ucg
+            filePath: /logs/mq/ucg/
+            fileName: error
+            start: on
+          - type: uce
+            filePath: /logs/mq/uce/
+            fileName: error
+            start: on
+          - type: wechat
+            filePath: /logs/mq/wechat/
+            fileName: error
+            start: on
+
+api:
+  baseUrl: http://127.0.0.1:8447
\ No newline at end of file

@@ -74,7 +74,7 @@ mutil-mq:
     password: guest
 #    password: Topdraw1qaz
     # 虚拟空间
-    virtual-host: member_center_chongshu
+    virtual-host: member_center_iptv_sichuan
     publisher-confirms: true #如果对异步消息需要回调必须设置为true
 
   # 管理侧
@@ -82,7 +82,7 @@ mutil-mq:
 #    host: 122.112.214.149 # rabbitmq的连接地址
     host: 122.112.214.149 # rabbitmq的连接地址
     port: 5672 # rabbitmq的连接端口号
-    virtual-host: member_center # rabbitmq的虚拟host
+    virtual-host: member_center_small_sichuan # rabbitmq的虚拟host
     username: guest # rabbitmq的用户名
     password: guest # rabbitmq的密码
 #    username: admin # rabbitmq的用户名
@@ -103,7 +103,7 @@ service:
         exchange: collection.exchange
         queue: collection.queue
         exchange-type: direct
-        routing-key:
+        routing-key: service
         active: service
       - source: viewRecord
         exchange: viewRecord.exchange
@@ -124,7 +124,7 @@ service:
         routing-key:
         active: management
       - source: wechat
-        exchange: wechat.exchange
+        exchange: weixin.subOrUnSub.direct
         queue: weixin.subOrUnSub.queue
         exchange-type: direct
         routing-key:
@@ -149,3 +149,5 @@ service:
             fileName: error
             start: on
 
+api:
+  baseUrl: http://127.0.0.1:8447
\ No newline at end of file