1.修复app账号兼容海南历史数据
2.优化配置文件
Showing
3 changed files
with
2 additions
and
33 deletions
| ... | @@ -90,7 +90,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { | ... | @@ -90,7 +90,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { |
| 90 | @Autowired | 90 | @Autowired |
| 91 | private RedisUtils redisUtils; | 91 | private RedisUtils redisUtils; |
| 92 | 92 | ||
| 93 | @Value("${uc.validPriorityMember}") | 93 | @Value("${uc.validPriorityMember:1}") |
| 94 | private int validPriorityMember; | 94 | private int validPriorityMember; |
| 95 | 95 | ||
| 96 | private static final Integer TASK_FINISH_STATUS = 1; | 96 | private static final Integer TASK_FINISH_STATUS = 1; |
| ... | @@ -236,7 +236,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { | ... | @@ -236,7 +236,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { |
| 236 | if (Objects.nonNull(userTvDTO)) { | 236 | if (Objects.nonNull(userTvDTO)) { |
| 237 | 237 | ||
| 238 | // 开启积分自动同步至小屏主会员 | 238 | // 开启积分自动同步至小屏主会员 |
| 239 | if (validPriorityMember == 0) { | 239 | if (validPriorityMember == 1) { |
| 240 | 240 | ||
| 241 | String priorityMemberCode = userTvDTO.getPriorityMemberCode(); | 241 | String priorityMemberCode = userTvDTO.getPriorityMemberCode(); |
| 242 | if (StringUtils.isNotBlank(priorityMemberCode)) { | 242 | if (StringUtils.isNotBlank(priorityMemberCode)) { | ... | ... |
| ... | @@ -84,14 +84,3 @@ spring: | ... | @@ -84,14 +84,3 @@ spring: |
| 84 | username: guest # rabbitmq的用户名 | 84 | username: guest # rabbitmq的用户名 |
| 85 | password: guest # rabbitmq的密码 | 85 | password: guest # rabbitmq的密码 |
| 86 | publisher-confirms: true #如果对异步消息需要回调必须设置为true | 86 | publisher-confirms: true #如果对异步消息需要回调必须设置为true |
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 87 | template: | ||
| 88 | exchange: uce.exchange | ||
| 89 | routing-key: uce.queue | ||
| 90 | |||
| 91 | #是否允许生成代码,生产环境设置为false | ||
| 92 | generator: | ||
| 93 | enabled: false | ||
| 94 | |||
| 95 | #是否开启 swagger-ui | ||
| 96 | swagger: | ||
| 97 | enabled: false | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -6,21 +6,6 @@ spring: | ... | @@ -6,21 +6,6 @@ spring: |
| 6 | profiles: | 6 | profiles: |
| 7 | active: dev | 7 | active: dev |
| 8 | 8 | ||
| 9 | #jwt。依赖的common中有需要jwt的部分属性。 | ||
| 10 | jwt: | ||
| 11 | header: Authorization | ||
| 12 | secret: mySecret | ||
| 13 | # token 过期时间/毫秒,6小时 1小时 = 3600000 毫秒 | ||
| 14 | expiration: 7200000 | ||
| 15 | # 在线用户key | ||
| 16 | online: online-token | ||
| 17 | # 验证码 | ||
| 18 | codeKey: code-key | ||
| 19 | # token 续期检查时间范围(60分钟,单位毫秒),在token即将过期的一段时间内用户操作了,则给用户的token续期 | ||
| 20 | detect: 3600000 | ||
| 21 | # 续期时间,2小时,单位毫秒 | ||
| 22 | renew: 7200000 | ||
| 23 | |||
| 24 | # 微信 | 9 | # 微信 |
| 25 | wechat: | 10 | wechat: |
| 26 | # 小程序 | 11 | # 小程序 |
| ... | @@ -55,12 +40,7 @@ wechat: | ... | @@ -55,12 +40,7 @@ wechat: |
| 55 | qrCodeExpireSeconds: 300 | 40 | qrCodeExpireSeconds: 300 |
| 56 | env: dev | 41 | env: dev |
| 57 | 42 | ||
| 58 | |||
| 59 | #第三方接口 | 43 | #第三方接口 |
| 60 | api: | 44 | api: |
| 61 | # ucs | 45 | # ucs |
| 62 | uc-service: http://127.0.0.1:8446 | 46 | uc-service: http://127.0.0.1:8446 |
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 63 | |||
| 64 | uc: | ||
| 65 | # 主会员是否启用,如果启用任务获得的积分将添加至小屏会员上 | ||
| 66 | validPriorityMember: 0 | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or sign in to post a comment