From df7554c138d0366514968eba9a32670876510df7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 二月 2020 14:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
index 46ae816..75e6abe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
@@ -239,11 +239,11 @@
* @param out
*/
@UserActive(uid = "#uid")
- @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
- public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
+ @RequestMapping(value = "getUserInfo")
+ public void getuserinfoNew(WXMPAcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getAppId());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -258,12 +258,12 @@
// 娣诲姞鐢ㄦ埛娲昏穬璁板綍
UserActiveLog userActiveLog = new UserActiveLog();
- userActiveLog.setChannel(acceptData.getChannel());
+ userActiveLog.setChannel("wxmp");
userActiveLog.setIp(requst.getRemoteHost());
userActiveLog.setUid(userInfo.getId());
userActiveLog.setVersionCode(acceptData.getVersion());
- userActiveLog.setOsVersion(acceptData.getOsVersion());
- userActiveLog.setDeviceType(acceptData.getDeviceType());
+ userActiveLog.setOsVersion(acceptData.getWxVersion());
+ userActiveLog.setDeviceType("wxmp");
userActiveLog.setDevice(acceptData.getDevice());
userActiveLogService.addUserActiveLog(userActiveLog);
--
Gitblit v1.8.0