From c03a65f653cb372613b0ae528dfad7f245ad3ae2 Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Tue, 4 Apr 2023 11:09:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/PushController.java | 136 +++++++++++- .../pluss/platform/entitiy/PushBindAlias.java | 9 + .../pluss/platform/entitiy/PushCidAlias.java | 23 +++ .../cn/pluss/platform/util/MobV2PushUtil.java | 194 ++++++++++++++++++ .../platform/user/impl/GeneralPushUtil.java | 13 +- 5 files changed, 367 insertions(+), 8 deletions(-) create mode 100644 pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushBindAlias.java create mode 100644 pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushCidAlias.java create mode 100644 pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java index 1182c72..b03819d 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java @@ -3,15 +3,28 @@ package cn.pluss.platform.controller; import cn.pluss.platform.PushService; import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; +import cn.pluss.platform.entitiy.PushCidAlias; +import cn.pluss.platform.entity.UserApp; +import cn.pluss.platform.userApp.UserAppService; +import cn.pluss.platform.util.MobV2PushUtil; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.*; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; -import java.util.Map; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; /** * 发送下单，催单通知等接口 @@ -25,6 +38,10 @@ public class PushController { @Setter(onMethod_ = {@Autowired}) private PushService pushService; + @Autowired + private UserAppService userAppService; + + @PostMapping("/pushMsg") public Result pushMsg(@RequestBody Map param) { String userId = (String) param.get("userId"); @@ -41,4 +58,119 @@ public class PushController { return ResultGenerator.genSuccessResult(); } - } + + /** + * 绑定cid + * + * @param param + * @return + * @throws IOException + * @throws NoSuchAlgorithmException + */ + @PostMapping("/bindalias") + public Result bindAlias(@RequestBody Map param) throws IOException, NoSuchAlgorithmException { + + UserApp userApp = userAppService.queryUserAppByToken(); + + String uid = userApp.getUserId().toString(); + String cid = param.get("cid").toString(); + + MobV2PushUtil mobV2PushUtil = new MobV2PushUtil(); + String token = mobV2PushUtil.getToken(); + + Map map = new HashMap<>(); + + List pushCidAliases = new ArrayList<>(); + PushCidAlias pushCidAlias = new PushCidAlias(); + pushCidAlias.setCid(cid); + pushCidAlias.setAlias(uid); + pushCidAliases.add(pushCidAlias); + + map.put("data_list", pushCidAliases); + String json = new ObjectMapper().writeValueAsString(map); + + HttpHeaders header = new HttpHeaders(); + header.setContentType(MediaType.APPLICATION_JSON); + header.add("token", token); + + HttpEntity httpEntity = new HttpEntity<>(json, header); + + RestTemplate restTemplate = new RestTemplate(); + // 设置为UTF8编码 + restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); + + String tokenInfo = restTemplate.postForObject( + "https://restapi.getui.com/v2/" + MobV2PushUtil.appId + "/user/alias", httpEntity, + String.class); + + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = mapper.readTree(tokenInfo); + JsonNode code = jsonNode.get("code"); + if (code.asText().equals("0")) { + return ResultGenerator.genSuccessResult(); + } else { + return ResultGenerator.genFailResult(jsonNode.get("msg").asText()); + } + } + + /** + * 解绑别名 + * + * @param param + * @return + * @throws IOException + * @throws NoSuchAlgorithmException + */ + @PostMapping("/unbindingAlias") + public Result unbindingAlias(@RequestBody Map param) throws IOException, NoSuchAlgorithmException { + + UserApp userApp = userAppService.queryUserAppByToken(); + + String uid = userApp.getUserId().toString(); + String cid = param.get("cid").toString(); + + MobV2PushUtil mobV2PushUtil = new MobV2PushUtil(); + String token = mobV2PushUtil.getToken(); + + Map map = new HashMap<>(); + + List pushCidAliases = new ArrayList<>(); + PushCidAlias pushCidAlias = new PushCidAlias(); + pushCidAlias.setCid(cid); + pushCidAlias.setAlias(uid); + pushCidAliases.add(pushCidAlias); + + map.put("data_list", pushCidAliases); + + String json = new ObjectMapper().writeValueAsString(map); + + HttpHeaders header = new HttpHeaders(); + header.setContentType(MediaType.APPLICATION_JSON); + header.add("token", token); + + HttpEntity httpEntity = new HttpEntity<>(json, header); + + RestTemplate restTemplate = new RestTemplate(); + // 设置为UTF8编码 + restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); + + // delete, entity直接设为null即可 + ResponseEntity resultEntity = restTemplate.exchange("https://restapi.getui.com/v2/" + MobV2PushUtil.appId + "/user/alias", + HttpMethod.DELETE, + httpEntity, + Map.class); + if (resultEntity != null) { + System.out.println("result:" + resultEntity); + } + + Map res = resultEntity.getBody(); + + + String code = res.get("code").toString(); + if (code.equals("0")) { + return ResultGenerator.genSuccessResult(); + } else { + return ResultGenerator.genFailResult(res.get("msg").toString()); + } + } +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushBindAlias.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushBindAlias.java new file mode 100644 index 0000000..7ce3dba --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushBindAlias.java @@ -0,0 +1,9 @@ +package cn.pluss.platform.entitiy; + +import java.util.List; + +public class PushBindAlias { + + private List data_list; + +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushCidAlias.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushCidAlias.java new file mode 100644 index 0000000..7a2cf9d --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/PushCidAlias.java @@ -0,0 +1,23 @@ +package cn.pluss.platform.entitiy; + +public class PushCidAlias { + + private String cid; + private String alias; + + public String getCid() { + return cid; + } + + public void setCid(String cid) { + this.cid = cid; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } +} diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java new file mode 100644 index 0000000..6ccb6cc --- /dev/null +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java @@ -0,0 +1,194 @@ +package cn.pluss.platform.util; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.getui.push.v2.sdk.ApiHelper; +import com.getui.push.v2.sdk.GtApiConfiguration; +import com.getui.push.v2.sdk.api.PushApi; +import com.getui.push.v2.sdk.common.ApiResult; +import com.getui.push.v2.sdk.dto.req.Audience; +import com.getui.push.v2.sdk.dto.req.AudienceDTO; +import com.getui.push.v2.sdk.dto.req.Settings; +import com.getui.push.v2.sdk.dto.req.message.PushBatchDTO; +import com.getui.push.v2.sdk.dto.req.message.PushChannel; +import com.getui.push.v2.sdk.dto.req.message.PushDTO; +import com.getui.push.v2.sdk.dto.req.message.PushMessage; +import com.getui.push.v2.sdk.dto.req.message.android.AndroidDTO; +import com.getui.push.v2.sdk.dto.req.message.android.ThirdNotification; +import com.getui.push.v2.sdk.dto.req.message.android.Ups; +import com.getui.push.v2.sdk.dto.req.message.ios.Alert; +import com.getui.push.v2.sdk.dto.req.message.ios.Aps; +import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.converter.StringHttpMessageConverter; +import org.springframework.web.client.RestTemplate; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Slf4j +public class MobV2PushUtil { + + public static final String appKey = "9f5Nw6Bvb982HvsN3sG1y5"; + public static final String appId = "jzSkfM0Wsk8uSDL2zwGu07"; + public static final String masterSecret = "rKk62FdLE486boNJHWBPb1"; + + public String getToken() throws IOException, NoSuchAlgorithmException { + + Map map = new HashMap<>(); + Long timestamp = new Date().getTime(); + + String content = appKey + timestamp + masterSecret; + + MessageDigest messageDigest = MessageDigest.getInstance("SHA-256"); + messageDigest.update(content.getBytes("UTF-8")); + String sign = byte2Hex(messageDigest.digest()); + + map.put("sign", sign); + map.put("timestamp", timestamp); + map.put("appkey", appKey); + + String json = new ObjectMapper().writeValueAsString(map); + + HttpHeaders header = new HttpHeaders(); + header.setContentType(MediaType.APPLICATION_JSON); + + HttpEntity httpEntity = new HttpEntity<>(json, header); + + RestTemplate restTemplate = new RestTemplate(); + // 设置为UTF8编码 + restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); + + String tokenInfo = restTemplate.postForObject( + "https://restapi.getui.com/v2/" + appId + "/auth", httpEntity, + String.class); + + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = mapper.readTree(tokenInfo); + JsonNode code = jsonNode.get("code"); + if (code.asText().equals("0")) { + return jsonNode.get("data").get("token").asText(); + } + return null; + } + + public static void sendSingleByAlias(List alias, String title, String content, String ext) { + + GtApiConfiguration apiConfiguration = new GtApiConfiguration(); + //填写应用配置，参数在“Uni Push”下的“应用配置”页面中获取 + apiConfiguration.setAppId(appId); + apiConfiguration.setAppKey(appKey); + apiConfiguration.setMasterSecret(masterSecret); + apiConfiguration.setDomain("https://restapi.getui.com/v2/"); + // 实例化ApiHelper对象，用于创建接口对象 + ApiHelper apiHelper = ApiHelper.build(apiConfiguration); + + // 创建对象，建议复用。目前有PushApi、StatisticApi、UserApi + PushApi pushApi = apiHelper.creatApi(PushApi.class); + + + PushBatchDTO pushBatchDTO = new PushBatchDTO(); + + for (String value : alias) { + //根据cid进行单推 + PushDTO pushDTO = new PushDTO(); + // 设置推送参数，requestid需要每次变化唯一 + pushDTO.setRequestId(System.currentTimeMillis() + ""); + Settings settings = new Settings(); + pushDTO.setSettings(settings); + //消息有效期，走厂商消息必须设置该值 + settings.setTtl(3600000); + + //在线走个推通道时推送的消息体 + PushMessage pushMessage = new PushMessage(); + pushDTO.setPushMessage(pushMessage); + //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。 + //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}"); + pushMessage.setTransmission(" {title:\"" + title + "\",content:\"" + content + "\"," + ext); + + // 设置接收人信息 + Audience audience = new Audience(); + //audience.addAlias("244"); + audience.addAlias(value); + //audience.addCid("6a757df41e3861b613daeb93091f4eee"); + pushDTO.setAudience(audience); + + + //设置离线推送时的消息体 + PushChannel pushChannel = new PushChannel(); + //安卓离线厂商通道推送的消息体 + AndroidDTO androidDTO = new AndroidDTO(); + Ups ups = new Ups(); + ThirdNotification thirdNotification = new ThirdNotification(); + ups.setNotification(thirdNotification); + thirdNotification.setTitle("安卓离线展示的标题"); + thirdNotification.setBody("安卓离线展示的内容"); + thirdNotification.setClickType("intent"); + //注意：intent参数必须按下方文档（特殊参数说明）要求的固定格式传值，intent错误会导致客户端无法收到消息 + thirdNotification.setIntent("intent://io.dcloud.unipush/?#Intent;scheme=unipush;launchFlags=0x4000000;component=io.dcloud.HBuilder/io.dcloud.PandoraEntry;S.UP-OL-SU=true;S.title=测试标题;S.content=测试内容;S.payload=test;end"); + androidDTO.setUps(ups); + pushChannel.setAndroid(androidDTO); + + //ios离线apn通道推送的消息体 + Alert alert = new Alert(); + alert.setTitle("苹果离线通知栏标题"); + alert.setBody("苹果离线通知栏内容"); + Aps aps = new Aps(); + aps.setContentAvailable(0); + aps.setSound("default"); + aps.setAlert(alert); + IosDTO iosDTO = new IosDTO(); + iosDTO.setAps(aps); + iosDTO.setType("notify"); + pushChannel.setIos(iosDTO); + pushDTO.setPushChannel(pushChannel); + + pushBatchDTO.addPushDTO(pushDTO); + } + + + ApiResult>> apiResult = pushApi.pushBatchByAlias(pushBatchDTO); + + if (apiResult.isSuccess()) { + // success + System.out.println(apiResult.getData()); + } else { + // failed + System.out.println("code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg()); + } + + } + + /** + * 将byte转为16进制 + * + * @param bytes + * @return + */ + private static String byte2Hex(byte[] bytes) { + StringBuffer stringBuffer = new StringBuffer(); + String temp = null; + for (int i = 0; i < bytes.length; i++) { + temp = Integer.toHexString(bytes[i] & 0xFF); + if (temp.length() == 1) { + // 1得到一位的进行补0操作 + stringBuffer.append("0"); + } + stringBuffer.append(temp); + } + return stringBuffer.toString(); + } + + +} diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java index 9ec8863..f77bc0b 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java @@ -2,10 +2,7 @@ package cn.pluss.platform.user.impl; import cn.pluss.platform.user.UserPushService; -import cn.pluss.platform.util.GetuiPushUtil; -import cn.pluss.platform.util.IPush; -import cn.pluss.platform.util.JGPushUtil; -import cn.pluss.platform.util.MobPushUtil; +import cn.pluss.platform.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,9 +63,13 @@ public class GeneralPushUtil implements IPush { @Override public void sendAllPlatByAlias(List alias, String notificationTitle, String msgContent, String extrasParam) { try { - jgPushUtil.sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam); + + /* jgPushUtil.sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam); mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam); - userPushService.push(alias, notificationTitle, msgContent, extrasParam); + userPushService.push(alias, notificationTitle, msgContent, extrasParam);*/ + + MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}\""); + } catch (Exception e) { e.printStackTrace(); } From cd8d91d0671e6f1cd2d406e3222bd4b7b3c7be1a Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Tue, 4 Apr 2023 11:10:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pluss-common-bundle/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pluss-common-bundle/pom.xml b/pluss-common-bundle/pom.xml index eb27402..29c71bc 100644 --- a/pluss-common-bundle/pom.xml +++ b/pluss-common-bundle/pom.xml @@ -319,6 +319,19 @@ bcprov-jdk15to18 1.69 + + + com.getui.push + restful-sdk + 1.0.0.11 + + + org.junit.jupiter + junit-jupiter + RELEASE + compile + + From dedd4e60e288ff24ec5bc70e94948fc252733b5a Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Tue, 4 Apr 2023 13:28:29 +0800 Subject: [PATCH 3/5] update --- .../src/main/java/cn/pluss/platform/util/MobV2PushUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java index 6ccb6cc..a820c41 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java @@ -121,7 +121,6 @@ public class MobV2PushUtil { Audience audience = new Audience(); //audience.addAlias("244"); audience.addAlias(value); - //audience.addCid("6a757df41e3861b613daeb93091f4eee"); pushDTO.setAudience(audience); From a0a3da7a425f2d96096797db45c4b9121d59c900 Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Tue, 4 Apr 2023 18:21:04 +0800 Subject: [PATCH 4/5] update --- .../java/cn/pluss/platform/util/MobV2PushUtil.java | 13 ++++++++----- .../pluss/platform/user/impl/GeneralPushUtil.java | 2 +- .../platform/userApp/impl/UserAppServiceImpl.java | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java index a820c41..48e576f 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java @@ -115,7 +115,10 @@ public class MobV2PushUtil { pushDTO.setPushMessage(pushMessage); //此格式的透传消息由 unipush 做了特殊处理，会自动展示通知栏。开发者也可自定义其它格式，在客户端自己处理。 //pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"快银到账1万元\"}"); - pushMessage.setTransmission(" {title:\"" + title + "\",content:\"" + content + "\"," + ext); + + //pushMessage.setTransmission("{title:" + title + ", content:" + content + ext); + + pushMessage.setTransmission("{title:\"" + title + "\",content:\"" + content + "\"," + ext); // 设置接收人信息 Audience audience = new Audience(); @@ -131,8 +134,8 @@ public class MobV2PushUtil { Ups ups = new Ups(); ThirdNotification thirdNotification = new ThirdNotification(); ups.setNotification(thirdNotification); - thirdNotification.setTitle("安卓离线展示的标题"); - thirdNotification.setBody("安卓离线展示的内容"); + thirdNotification.setTitle(title); + thirdNotification.setBody(content); thirdNotification.setClickType("intent"); //注意：intent参数必须按下方文档（特殊参数说明）要求的固定格式传值，intent错误会导致客户端无法收到消息 thirdNotification.setIntent("intent://io.dcloud.unipush/?#Intent;scheme=unipush;launchFlags=0x4000000;component=io.dcloud.HBuilder/io.dcloud.PandoraEntry;S.UP-OL-SU=true;S.title=测试标题;S.content=测试内容;S.payload=test;end"); @@ -141,8 +144,8 @@ public class MobV2PushUtil { //ios离线apn通道推送的消息体 Alert alert = new Alert(); - alert.setTitle("苹果离线通知栏标题"); - alert.setBody("苹果离线通知栏内容"); + alert.setTitle(title); + alert.setBody(content); Aps aps = new Aps(); aps.setContentAvailable(0); aps.setSound("default"); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java index f77bc0b..464b2cf 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java @@ -68,7 +68,7 @@ public class GeneralPushUtil implements IPush { mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam); userPushService.push(alias, notificationTitle, msgContent, extrasParam);*/ - MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}\""); + MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}"); } catch (Exception e) { e.printStackTrace(); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index 0ce167a..38fc005 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -7,7 +7,7 @@ import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; import cn.pluss.platform.channel.BaseMerchantAuditService; import cn.pluss.platform.channel.MerchantAuditService; -import cn.pluss.platform.channel.ys.YSAuditServiceV3; +//import cn.pluss.platform.channel.ys.YSAuditServiceV3; import cn.pluss.platform.common.CommonRemarkService; import cn.pluss.platform.common.RiskBlacklistService; import cn.pluss.platform.converter.Converter; @@ -174,7 +174,7 @@ public class UserAppServiceImpl extends ServiceImpl impl @Autowired private UserRoleMapper userRoleMapper; @Autowired - private YSAuditServiceV3 ysAuditServiceV3; + //private YSAuditServiceV3 ysAuditServiceV3; @Override @@ -798,7 +798,7 @@ public class UserAppServiceImpl extends ServiceImpl impl case "4": // 银盛 //ysAuditServiceV2.merchantAudit(userId, false); - ysAuditServiceV3.merchantAuditV3(userId, false); + //ysAuditServiceV3.merchantAuditV3(userId, false); break; default: MsgException.throwException("未知的进件通道"); From d7e41884f52206dce4551d798ad72bd04450b35d Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Tue, 4 Apr 2023 18:21:51 +0800 Subject: [PATCH 5/5] update --- .../cn/pluss/platform/controller/home/MerchantController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java index 3040a27..90fad62 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java @@ -202,10 +202,10 @@ public class MerchantController { return "3cdbacb2d4ceefa36ef1c43d0c562fb9"; }*/ - @GetMapping("/auth/ODzUwrTrcr.txt") + @GetMapping("/auth/Hhk6kRGkb7.txt") @ResponseBody public String aKfAirN1hO() { - return "68eb6c8f59bf143e3165aa5198c6905f"; + return "c9b7ead4b4b0efd96c335aad9d445f04"; } @GetMapping("/account/auth")