Commit 463c7342 463c7342537839a83c9304ef5ef106454de94cac by xianghan

1.同步future

2.删除@Log注解
1 parent 10594020
1 package com.topdraw.business.module.user.app.rest; 1 package com.topdraw.business.module.user.app.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.user.app.domain.UserApp; 4 import com.topdraw.business.module.user.app.domain.UserApp;
6 import com.topdraw.business.module.user.app.domain.UserAppBind; 5 import com.topdraw.business.module.user.app.domain.UserAppBind;
7 import com.topdraw.business.module.user.app.service.UserAppBindService; 6 import com.topdraw.business.module.user.app.service.UserAppBindService;
...@@ -37,7 +36,6 @@ public class UserAppController { ...@@ -37,7 +36,6 @@ public class UserAppController {
37 @Autowired 36 @Autowired
38 private UserAppBindService userAppBindService; 37 private UserAppBindService userAppBindService;
39 38
40 @Log
41 @PostMapping(value = "/saveAppAndBindApple4Vis") 39 @PostMapping(value = "/saveAppAndBindApple4Vis")
42 @ApiOperation("兼容海南app苹果数据") 40 @ApiOperation("兼容海南app苹果数据")
43 @AnonymousAccess 41 @AnonymousAccess
...@@ -53,7 +51,6 @@ public class UserAppController { ...@@ -53,7 +51,6 @@ public class UserAppController {
53 return this.userAppService.saveAppAndBindApple4Vis(resources); 51 return this.userAppService.saveAppAndBindApple4Vis(resources);
54 } 52 }
55 53
56 @Log
57 @PostMapping(value = "/saveAppAndBindWeibo4Vis") 54 @PostMapping(value = "/saveAppAndBindWeibo4Vis")
58 @ApiOperation("兼容海南app原微博数据") 55 @ApiOperation("兼容海南app原微博数据")
59 @AnonymousAccess 56 @AnonymousAccess
...@@ -69,7 +66,6 @@ public class UserAppController { ...@@ -69,7 +66,6 @@ public class UserAppController {
69 return this.userAppService.saveAppAndBindWeibo4Vis(resources); 66 return this.userAppService.saveAppAndBindWeibo4Vis(resources);
70 } 67 }
71 68
72 @Log
73 @PostMapping(value = "/saveAppAndBindQq4Vis") 69 @PostMapping(value = "/saveAppAndBindQq4Vis")
74 @ApiOperation("兼容海南app原QQ数据") 70 @ApiOperation("兼容海南app原QQ数据")
75 @AnonymousAccess 71 @AnonymousAccess
...@@ -85,7 +81,6 @@ public class UserAppController { ...@@ -85,7 +81,6 @@ public class UserAppController {
85 81
86 } 82 }
87 83
88 @Log
89 @PostMapping(value = "/saveAppAndBindWeixin4Vis") 84 @PostMapping(value = "/saveAppAndBindWeixin4Vis")
90 @ApiOperation("兼容海南app原微信数据") 85 @ApiOperation("兼容海南app原微信数据")
91 @AnonymousAccess 86 @AnonymousAccess
...@@ -108,7 +103,6 @@ public class UserAppController { ...@@ -108,7 +103,6 @@ public class UserAppController {
108 } 103 }
109 104
110 105
111 @Log
112 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImgById") 106 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImgById")
113 @ApiOperation("修改app账号最后登录时间、昵称和头像和用户名") 107 @ApiOperation("修改app账号最后登录时间、昵称和头像和用户名")
114 @AnonymousAccess 108 @AnonymousAccess
...@@ -131,7 +125,6 @@ public class UserAppController { ...@@ -131,7 +125,6 @@ public class UserAppController {
131 return ResultInfo.success(result); 125 return ResultInfo.success(result);
132 } 126 }
133 127
134 @Log
135 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImg") 128 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImg")
136 @ApiOperation("修改app账号最后登录时间、昵称和头像") 129 @ApiOperation("修改app账号最后登录时间、昵称和头像")
137 @AnonymousAccess 130 @AnonymousAccess
...@@ -147,7 +140,6 @@ public class UserAppController { ...@@ -147,7 +140,6 @@ public class UserAppController {
147 return ResultInfo.success(result); 140 return ResultInfo.success(result);
148 } 141 }
149 142
150 @Log
151 @PostMapping(value = "/updateAppPasswordByUsername") 143 @PostMapping(value = "/updateAppPasswordByUsername")
152 @ApiOperation("修改app账号密码") 144 @ApiOperation("修改app账号密码")
153 @AnonymousAccess 145 @AnonymousAccess
...@@ -175,7 +167,6 @@ public class UserAppController { ...@@ -175,7 +167,6 @@ public class UserAppController {
175 return ResultInfo.success(result); 167 return ResultInfo.success(result);
176 } 168 }
177 169
178 @Log
179 @PostMapping(value = "/updateLastActiveTime") 170 @PostMapping(value = "/updateLastActiveTime")
180 @ApiOperation("修改app账号最新登录时间") 171 @ApiOperation("修改app账号最新登录时间")
181 @AnonymousAccess 172 @AnonymousAccess
...@@ -190,7 +181,6 @@ public class UserAppController { ...@@ -190,7 +181,6 @@ public class UserAppController {
190 return ResultInfo.success(result); 181 return ResultInfo.success(result);
191 } 182 }
192 183
193 @Log
194 @PostMapping(value = "/saveThirdAccount") 184 @PostMapping(value = "/saveThirdAccount")
195 @ApiOperation("保存第三方账号") 185 @ApiOperation("保存第三方账号")
196 @AnonymousAccess 186 @AnonymousAccess
...@@ -212,7 +202,6 @@ public class UserAppController { ...@@ -212,7 +202,6 @@ public class UserAppController {
212 return ResultInfo.success(userAppBindDTO); 202 return ResultInfo.success(userAppBindDTO);
213 } 203 }
214 204
215 @Log
216 @PostMapping(value = "/updateValidStatusAndUserAppIdAndNickname") 205 @PostMapping(value = "/updateValidStatusAndUserAppIdAndNickname")
217 @ApiOperation("修改第三方账号绑定状态、绑定的app账号以及第三方账号昵称") 206 @ApiOperation("修改第三方账号绑定状态、绑定的app账号以及第三方账号昵称")
218 @AnonymousAccess 207 @AnonymousAccess
...@@ -244,7 +233,6 @@ public class UserAppController { ...@@ -244,7 +233,6 @@ public class UserAppController {
244 return ResultInfo.success(result); 233 return ResultInfo.success(result);
245 } 234 }
246 235
247 @Log
248 @PostMapping(value = "/updateThirdAccountNickname") 236 @PostMapping(value = "/updateThirdAccountNickname")
249 @ApiOperation("修改第三方账号昵称") 237 @ApiOperation("修改第三方账号昵称")
250 @AnonymousAccess 238 @AnonymousAccess
......
...@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
5 import com.alibaba.fastjson.JSON; 5 import com.alibaba.fastjson.JSON;
6 import com.alibaba.fastjson.JSONObject; 6 import com.alibaba.fastjson.JSONObject;
7 import com.topdraw.annotation.AnonymousAccess; 7 import com.topdraw.annotation.AnonymousAccess;
8 import com.topdraw.aop.log.Log;
9 import com.topdraw.business.module.common.validated.CreateGroup; 8 import com.topdraw.business.module.common.validated.CreateGroup;
10 import com.topdraw.business.module.common.validated.UpdateGroup; 9 import com.topdraw.business.module.common.validated.UpdateGroup;
11 import com.topdraw.business.module.member.service.MemberService; 10 import com.topdraw.business.module.member.service.MemberService;
...@@ -87,7 +86,6 @@ public class UserOperationController { ...@@ -87,7 +86,6 @@ public class UserOperationController {
87 * @param userApp app账号 86 * @param userApp app账号
88 * @return ResultInfo 87 * @return ResultInfo
89 */ 88 */
90 @Log
91 @PostMapping(value = "/appSignOut") 89 @PostMapping(value = "/appSignOut")
92 @ApiOperation("app账号退出登录") 90 @ApiOperation("app账号退出登录")
93 @AnonymousAccess 91 @AnonymousAccess
...@@ -106,7 +104,6 @@ public class UserOperationController { ...@@ -106,7 +104,6 @@ public class UserOperationController {
106 * @param userApp app账号 104 * @param userApp app账号
107 * @return ResultInfo 105 * @return ResultInfo
108 */ 106 */
109 @Log
110 @PostMapping(value = "/appCancellation") 107 @PostMapping(value = "/appCancellation")
111 @ApiOperation("注销app账号") 108 @ApiOperation("注销app账号")
112 @AnonymousAccess 109 @AnonymousAccess
...@@ -123,7 +120,6 @@ public class UserOperationController { ...@@ -123,7 +120,6 @@ public class UserOperationController {
123 return ResultInfo.success(result); 120 return ResultInfo.success(result);
124 } 121 }
125 122
126 @Log
127 @PostMapping(value = "/updateAppInfo") 123 @PostMapping(value = "/updateAppInfo")
128 @ApiOperation("修改app账号信息") 124 @ApiOperation("修改app账号信息")
129 @AnonymousAccess 125 @AnonymousAccess
...@@ -147,8 +143,6 @@ public class UserOperationController { ...@@ -147,8 +143,6 @@ public class UserOperationController {
147 return ResultInfo.success(result); 143 return ResultInfo.success(result);
148 } 144 }
149 145
150
151 @Log
152 @PostMapping(value = "/appRegister") 146 @PostMapping(value = "/appRegister")
153 @ApiOperation("app注册") 147 @ApiOperation("app注册")
154 @AnonymousAccess 148 @AnonymousAccess
...@@ -183,7 +177,6 @@ public class UserOperationController { ...@@ -183,7 +177,6 @@ public class UserOperationController {
183 return ResultInfo.success(userAppDTO); 177 return ResultInfo.success(userAppDTO);
184 } 178 }
185 179
186 @Log
187 @PostMapping(value = "/appBindThirdAccount") 180 @PostMapping(value = "/appBindThirdAccount")
188 @ApiOperation("app账号绑定第三方账号") 181 @ApiOperation("app账号绑定第三方账号")
189 @AnonymousAccess 182 @AnonymousAccess
...@@ -214,7 +207,6 @@ public class UserOperationController { ...@@ -214,7 +207,6 @@ public class UserOperationController {
214 return this.userOperationService.appBindThirdAccount(resources); 207 return this.userOperationService.appBindThirdAccount(resources);
215 } 208 }
216 209
217 @Log
218 @PostMapping(value = "/cancelUserAppBind") 210 @PostMapping(value = "/cancelUserAppBind")
219 @ApiOperation("取消关联第三方账号") 211 @ApiOperation("取消关联第三方账号")
220 @AnonymousAccess 212 @AnonymousAccess
...@@ -270,7 +262,6 @@ public class UserOperationController { ...@@ -270,7 +262,6 @@ public class UserOperationController {
270 262
271 /******************************************************* weixin ************************************/ 263 /******************************************************* weixin ************************************/
272 264
273 @Log
274 @PostMapping(value = "/saveGrowthReport") 265 @PostMapping(value = "/saveGrowthReport")
275 @ApiOperation("同步大屏成长报告") 266 @ApiOperation("同步大屏成长报告")
276 @AnonymousAccess 267 @AnonymousAccess
......
1 package com.topdraw.business.process.service.impl; 1 package com.topdraw.business.process.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray;
5 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
6 import com.topdraw.aspect.AsyncMqSend; 5 import com.topdraw.aspect.AsyncMqSend;
7 import com.topdraw.business.module.coupon.service.CouponService; 6 import com.topdraw.business.module.coupon.service.CouponService;
...@@ -9,7 +8,6 @@ import com.topdraw.business.module.coupon.service.dto.CouponDTO; ...@@ -9,7 +8,6 @@ import com.topdraw.business.module.coupon.service.dto.CouponDTO;
9 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO; 8 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
10 import com.topdraw.business.module.rights.service.RightsService; 9 import com.topdraw.business.module.rights.service.RightsService;
11 import com.topdraw.business.module.rights.service.dto.RightsDTO; 10 import com.topdraw.business.module.rights.service.dto.RightsDTO;
12 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
13 import com.topdraw.business.module.task.attribute.service.TaskAttrService; 11 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
14 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; 12 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
15 import com.topdraw.business.module.task.domain.TaskBuilder; 13 import com.topdraw.business.module.task.domain.TaskBuilder;
...@@ -46,8 +44,6 @@ import org.springframework.aop.framework.AopContext; ...@@ -46,8 +44,6 @@ import org.springframework.aop.framework.AopContext;
46 import org.springframework.beans.BeanUtils; 44 import org.springframework.beans.BeanUtils;
47 import org.springframework.beans.factory.annotation.Autowired; 45 import org.springframework.beans.factory.annotation.Autowired;
48 import org.springframework.beans.factory.annotation.Value; 46 import org.springframework.beans.factory.annotation.Value;
49 import org.springframework.cache.annotation.CacheEvict;
50 import org.springframework.data.redis.core.RedisTemplate;
51 import org.springframework.data.redis.core.StringRedisTemplate; 47 import org.springframework.data.redis.core.StringRedisTemplate;
52 import org.springframework.data.redis.core.ValueOperations; 48 import org.springframework.data.redis.core.ValueOperations;
53 import org.springframework.stereotype.Service; 49 import org.springframework.stereotype.Service;
......