Browse Source

//TEST

release_toaliyun_real
xhxu 3 years ago
parent
commit
77a03b1aa8
3 changed files with 3 additions and 2 deletions
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql View File

@@ -15,7 +15,7 @@ INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `
INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78905, '789', NULL, '', 5, '{"index": ["thing1", "date3", "thing4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00');
INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78950, '789', NULL, '', 50, '{"index": ["character_string1", "character_string2", "time4", "thing3"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00');
INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78951, '789', NULL, '', 51, '{"index": ["thing1", "time3", "time4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00');
INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78952, '789', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "amount4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00');
INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78952, '789', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00');


--上线后执行


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -72,6 +72,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {

// 查询token信息
BaseCUserEntity cUser = cUserTokenService.getByToken(token);

if(cUser == null || cUser.getExpireTime().getTime() < System.currentTimeMillis()){
throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录");
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -385,7 +385,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
map.put("amount2",cardSpend.getCardRemainAmountStr());
map.put("date4",dateFormat.format(cardSpend.getCreateDate()));
WxMerchant merchant = wxMerchantMapper.selectById(cardSpend.getMerchantId());
map.put("thing6","商户【"+merchant.getName()+"】消费");
map.put("thing6","消费支出");
map.put("goToPage","pages/index/index?type=ca");

msg.setMsg(JSONObject.toJSONString(map));


Loading…
Cancel
Save