Commit 663ab529 663ab529c591353e935939d106ebd3db19d93df1 by xianghan

1.update

1 parent 7cf8df3d
...@@ -51,10 +51,9 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService { ...@@ -51,10 +51,9 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
51 @Transactional(rollbackFor = Exception.class) 51 @Transactional(rollbackFor = Exception.class)
52 public void create(MemberVipHistory resources) { 52 public void create(MemberVipHistory resources) {
53 log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources); 53 log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
54 this.checkMember(resources); 54 MemberDTO memberDTO = this.memberService.findByCode(resources.getMemberCode());
55 55 resources.setMemberId(memberDTO.getId());
56 MemberVipHistory memberVipHistory = MemberVipHistoryBuilder.build(resources); 56 this.memberVipHistoryRepository.save(resources);
57 this.memberVipHistoryRepository.save(memberVipHistory);
58 } 57 }
59 58
60 @Override 59 @Override
......
...@@ -152,6 +152,9 @@ public class RestTemplateClient { ...@@ -152,6 +152,9 @@ public class RestTemplateClient {
152 152
153 public String deleteCollection(String content) { 153 public String deleteCollection(String content) {
154 String url = BASE_URL + "/uce/userOperation/deleteCollection"; 154 String url = BASE_URL + "/uce/userOperation/deleteCollection";
155 //处理接口调用 中文不显示问题
156 content = new String(Base64.getEncoder().encode(content.getBytes(StandardCharsets.UTF_8)));
157
155 restTemplate.postForEntity(url, content, String.class); 158 restTemplate.postForEntity(url, content, String.class);
156 /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class); 159 /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class);
157 String entityBody = ""; 160 String entityBody = "";
......
1 spring:
2 # 数据源
3 datasource:
4 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
5 username: root
6 password: root
7 # 驱动程序
8 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
9 # Druid
10 type: com.alibaba.druid.pool.DruidDataSource
11 druid:
12 # 初始化配置
13 initial-size: 3
14 # 最小连接数
15 min-idle: 3
16 # 最大连接数
17 max-active: 15
18 # 获取连接超时时间
19 max-wait: 5000
20 # 连接有效性检测时间
21 time-between-eviction-runs-millis: 90000
22 # 最大空闲时间
23 min-evictable-idle-time-millis: 1800000
24 test-while-idle: true
25 test-on-borrow: false
26 test-on-return: false
27 validation-query: select 1
28 # 配置监控统计拦截的filters
29 filters: stat
30 stat-view-servlet:
31 url-pattern: /druid/*
32 reset-enable: false
33 # 过滤器
34 web-stat-filter:
35 url-pattern: /*
36 exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
37
38 # jpa
39 jpa:
40 properties:
41 hibernate:
42 # 数据库类型
43 dialect: org.hibernate.dialect.MySQL5InnoDBDialect
44 hibernate:
45 # 生产环境设置成 none,避免程序运行时自动更新数据库结构
46 ddl-auto: none
47 open-in-view: true
48
49 # redis
50 redis:
51 #数据库索引
52 database: 0
53 host: 122.112.214.149
54 port: 6379
55 password: redis123
56 #连接超时时间
57 timeout: 5000
58
59
60 ###########################################自定义属性#################################################################
61 # 多mq配置
62 mutil-mq:
63 # 服务侧
64 service:
65 # ip
66 host: 122.112.214.149
67 # host: 139.196.145.150
68 # 端口
69 port: 5672
70 # 用户名
71 username: guest
72 # username: admin
73 # 密码
74 password: guest
75 # password: Topdraw1qaz
76 # 虚拟空间
77 virtual-host: member_center_chongshu
78 publisher-confirms: true #如果对异步消息需要回调必须设置为true
79
80 # 管理侧
81 management:
82 # host: 122.112.214.149 # rabbitmq的连接地址
83 host: 122.112.214.149 # rabbitmq的连接地址
84 port: 5672 # rabbitmq的连接端口号
85 virtual-host: member_center # rabbitmq的虚拟host
86 username: guest # rabbitmq的用户名
87 password: guest # rabbitmq的密码
88 # username: admin # rabbitmq的用户名
89 # password: Topdraw1qaz # rabbitmq的密码
90 publisher-confirms: true #如果对异步消息需要回调必须设置为true
91
92 # 服务属性
93 service:
94 mq:
95 list:
96 - source: event
97 exchange: event.exchange
98 queue: event.queue
99 exchange-type: direct
100 routing-key:
101 active: service
102 - source: collection
103 exchange: collection.exchange
104 queue: collection.queue
105 exchange-type: direct
106 routing-key:
107 active: service
108 - source: viewRecord
109 exchange: viewRecord.exchange
110 queue: viewRecord.queue
111 exchange-type: direct
112 routing-key:
113 active: service
114 - source: eventBus
115 exchange: uc.eventbus
116 queue: uc.eventbus
117 exchange-type: topic
118 routing-key: uc.eventbus.*.topic
119 active: service
120 - source: uce
121 exchange: uce.exchange
122 queue: uce.queue
123 exchange-type: direct
124 routing-key:
125 active: management
126 - source: wechat
127 exchange: weixin.exchange.direct
128 queue: weixin.subOrUnSub.queue
129 exchange-type: direct
130 routing-key:
131 active:
132 error:
133 logs:
134 list:
135 - type: eventBus
136 filePath: /logs/mq/eventBus/
137 fileName: error
138 start: on
139 - type: ucg
140 filePath: /logs/mq/ucg/
141 fileName: error
142 start: on
143 - type: uce
144 filePath: /logs/mq/uce/
145 fileName: error
146 start: on
147 - type: wechat
148 filePath: /logs/mq/wechat/
149 fileName: error
150 start: on
151
152 api:
153 baseUrl: http://127.0.0.1:8447
...\ No newline at end of file ...\ No newline at end of file
...@@ -74,7 +74,7 @@ mutil-mq: ...@@ -74,7 +74,7 @@ mutil-mq:
74 password: guest 74 password: guest
75 # password: Topdraw1qaz 75 # password: Topdraw1qaz
76 # 虚拟空间 76 # 虚拟空间
77 virtual-host: member_center_chongshu 77 virtual-host: member_center_iptv_sichuan
78 publisher-confirms: true #如果对异步消息需要回调必须设置为true 78 publisher-confirms: true #如果对异步消息需要回调必须设置为true
79 79
80 # 管理侧 80 # 管理侧
...@@ -82,7 +82,7 @@ mutil-mq: ...@@ -82,7 +82,7 @@ mutil-mq:
82 # host: 122.112.214.149 # rabbitmq的连接地址 82 # host: 122.112.214.149 # rabbitmq的连接地址
83 host: 122.112.214.149 # rabbitmq的连接地址 83 host: 122.112.214.149 # rabbitmq的连接地址
84 port: 5672 # rabbitmq的连接端口号 84 port: 5672 # rabbitmq的连接端口号
85 virtual-host: member_center # rabbitmq的虚拟host 85 virtual-host: member_center_small_sichuan # rabbitmq的虚拟host
86 username: guest # rabbitmq的用户名 86 username: guest # rabbitmq的用户名
87 password: guest # rabbitmq的密码 87 password: guest # rabbitmq的密码
88 # username: admin # rabbitmq的用户名 88 # username: admin # rabbitmq的用户名
...@@ -103,7 +103,7 @@ service: ...@@ -103,7 +103,7 @@ service:
103 exchange: collection.exchange 103 exchange: collection.exchange
104 queue: collection.queue 104 queue: collection.queue
105 exchange-type: direct 105 exchange-type: direct
106 routing-key: 106 routing-key: service
107 active: service 107 active: service
108 - source: viewRecord 108 - source: viewRecord
109 exchange: viewRecord.exchange 109 exchange: viewRecord.exchange
...@@ -124,7 +124,7 @@ service: ...@@ -124,7 +124,7 @@ service:
124 routing-key: 124 routing-key:
125 active: management 125 active: management
126 - source: wechat 126 - source: wechat
127 exchange: wechat.exchange 127 exchange: weixin.subOrUnSub.direct
128 queue: weixin.subOrUnSub.queue 128 queue: weixin.subOrUnSub.queue
129 exchange-type: direct 129 exchange-type: direct
130 routing-key: 130 routing-key:
...@@ -149,3 +149,5 @@ service: ...@@ -149,3 +149,5 @@ service:
149 fileName: error 149 fileName: error
150 start: on 150 start: on
151 151
152 api:
153 baseUrl: http://127.0.0.1:8447
...\ No newline at end of file ...\ No newline at end of file
......