Przeglądaj źródła

Merge tag 'refs/tags/jenkins-back-end-3317' into SiChuan

release
release_toaliyun_real
Stormeye Wu 6 lat temu
rodzic
commit
774b28c3dd
2 zmienionych plików z 6 dodań i 2 usunięć
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Wyświetl plik

@@ -115,6 +115,9 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/carCallback/**", "anon");
filterChainDefinitionMap.put("/wxMallApply/sendvalidationcode", "anon");

// 补发消息
filterChainDefinitionMap.put("/msgrecord/resendMsg", "anon");

// static files
filterChainDefinitionMap.put("/css/**", "anon");
filterChainDefinitionMap.put("/js/**", "anon");


+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java Wyświetl plik

@@ -62,10 +62,11 @@ public class WxMsgRecordController extends BaseController {
* @return
*/
@GetMapping(value = "/resendMsg")
public ResultData resendMsg(String x, Integer msgType) {
public ResultData resendMsg(String x, String tenantId, Integer msgType) {
logger.debug("[" + getIpAddr() + "] WxMsgRecordController::resendMsg");
if("xll1dxx1314".equals(x)){
TenantEntity tenantEntity = getTenantInfo();
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
WxMsgRecord msgRecord = new WxMsgRecord();
msgRecord.setMsgType(msgType);
msgRecord.updateTenantInfo(tenantEntity);


Ładowanie…
Anuluj
Zapisz