moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台-sa token

Browse Source
This commit is contained in:
khalil
2023-11-02 13:10:20 +08:00
parent a90d7c90a1
commit 61b39b3a61
20 changed files with 153 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accompany-admin/accompany-admin-service/pom.xml
View File

@@ -77,6 +77,13 @@
<artifactId>javase</artifactId>
<version>${zxing.version}</version>
</dependency>
<!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>${sa-token.version}</version>
</dependency>
</dependencies>
</project>

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminUserService.java
View File

@@ -85,6 +85,11 @@ public class AdminUserService extends BaseService {
return null;
}
public String getAdminName(int adminId) {
AdminUser adminUser = getAdminUserById(adminId);
return null != adminUser? adminUser.getUsername(): String.valueOf(adminId);
}
public AdminUser getAdminUserById(int adminId) {
return adminUserMapper.selectByPrimaryKey(adminId);
}

57
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/BaseController.java
View File

@@ -1,6 +1,7 @@
package com.accompany.admin.controller;
import cn.dev33.satoken.stp.StpUtil;
import com.accompany.admin.common.AdminConstants;
import com.accompany.admin.frame.MvcContext;
import com.accompany.admin.frame.Scope;
@@ -42,59 +43,8 @@ public class BaseController {
}
protected int getAdminId() {
Object admin = getAttribute(AdminConstants.ADMIN_ID, Scope.SESSION);
String adminId = admin == null ? "" : admin.toString();
return StringUtils.isBlank(adminId) ? -1 : Integer.parseInt(adminId);
return StpUtil.getLoginIdAsInt();
}
protected String getAdminName() {
return getAttribute(AdminConstants.ADMIN_NAME, Scope.SESSION).toString();
}
/**
* 设置请求的属性
* @param key
* @param obj
*/
public void setAttribute(String key, Object obj){
setAttribute(key, obj, Scope.REQUEST);
}
public void setAttribute(String key, Object obj, Scope scope) {
switch (scope) {
case REQUEST:
getRequest().setAttribute(key, obj);
break;
case SESSION:
getRequest().getSession().setAttribute(key, obj);
break;
case APPLICATION:
getRequest().getSession().getServletContext().setAttribute(key, obj);
break;
default:
getRequest().setAttribute(key, obj);
break;
}
}
public Object getAttribute(String key, Scope scope){
Object attr = null;
switch (scope) {
case REQUEST:
attr = getRequest().getAttribute(key);
break;
case SESSION:
attr = getRequest().getSession().getAttribute(key);
break;
case APPLICATION:
attr = getRequest().getSession().getServletContext().getAttribute(key);
break;
default:
break;
}
return attr;
}
public void writeJson(String json){
try{
@@ -164,8 +114,7 @@ public class BaseController {
* @param binder
*/
@InitBinder
public void initBinder(WebDataBinder binder)
{
public void initBinder(WebDataBinder binder) {
binder.registerCustomEditor(Date.class, new CustomDateEditor("yyyy-MM-dd HH:mm:ss", true));
}

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/audiocard/AudioCardAdminController.java
View File

@@ -2,6 +2,7 @@ package com.accompany.admin.controller.audiocard;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.audiocard.AudioCardAdminService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.vo.audiocard.UserAudioCardAdminVo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.result.PageResult;
@@ -19,6 +20,8 @@ public class AudioCardAdminController extends BaseController {
@Autowired
private AudioCardAdminService audioCardAdminService;
@Autowired
private AdminUserService adminUserService;
@GetMapping("/page")
public PageResult<UserAudioCardAdminVo> page(Page<UserAudioCardAdminVo> page,
@@ -29,7 +32,8 @@ public class AudioCardAdminController extends BaseController {
@PostMapping("/verify")
public BusiResult<Void> verify(Long id, Byte status){
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
audioCardAdminService.operate(id, status, adminName);
return new BusiResult<>(BusiStatus.SUCCESS);
}

19
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java
View File

@@ -2,7 +2,9 @@ package com.accompany.admin.controller.feedback;
import com.accompany.admin.base.Pagination;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.model.AdminUser;
import com.accompany.admin.service.AccountBlockAdminService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.business.service.account.AccountBlockService;
import com.accompany.common.result.BusiResult;
import com.accompany.core.model.AccountBlock;
@@ -34,6 +36,9 @@ public class AccountBlockAdminController extends BaseController {
@Autowired
private AccountBlockService accountBlockService;
@Autowired
private AdminUserService adminUserService;
@ApiOperation("查询封禁列表")
@GetMapping(value = "/list")
public Pagination getAccountBlockList(Integer pageSize, Integer pageNum, Integer type, String blockValue) {
@@ -54,7 +59,9 @@ public class AccountBlockAdminController extends BaseController {
String blockEndTime, String blockDesc,Boolean wallStatus,String remark) throws Exception{
//不用回车或换行符的原因是不同的操作系统不一样
List<String> blockValueList = Arrays.asList(blockValue.split(","));
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
Boolean result = accountBlockAdminService.batchSaveAccountBlock(blockValueList,blockType,blockStartTime,
blockEndTime,blockDesc,wallStatus,adminName,remark);
return new BusiResult(result);
@@ -64,7 +71,8 @@ public class AccountBlockAdminController extends BaseController {
@PostMapping(value = "/update")
public BusiResult updateBlockedAccount(String blockValue,Integer blockStatus,String blockStartTime,
String blockEndTime, String blockDesc,Boolean wallStatus,String remark) throws Exception{
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
Boolean result = accountBlockAdminService.updateBlockedAccount(blockValue,blockStatus,blockStartTime,
blockEndTime,blockDesc,wallStatus,adminName,remark);
return new BusiResult(result);
@@ -72,10 +80,11 @@ public class AccountBlockAdminController extends BaseController {
@ApiOperation("解除封禁记录")
@PostMapping(value = "/delete")
public BusiResult deleteAccountBlock(String blockValue) throws Exception{
String adminName = getAdminName();
public BusiResult<Boolean> deleteAccountBlock(String blockValue) throws Exception{
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
boolean result = accountBlockAdminService.deleteAccountBlock(blockValue,adminName);
return new BusiResult(result);
return new BusiResult<>(result);
}
}

13
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/firstpage/FirstPageBannerAdminController.java
View File

@@ -2,8 +2,10 @@ package com.accompany.admin.controller.firstpage;
import com.accompany.admin.base.Pagination;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.model.AdminUser;
import com.accompany.admin.service.firstpage.FirstPageBannerAdminService;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.business.model.firstpage.FirstPageBanner;
import com.accompany.business.service.api.QinniuService;
import com.accompany.business.service.firstpage.FirstPageBannerService;
@@ -42,17 +44,20 @@ public class FirstPageBannerAdminController extends BaseController {
@Autowired
private AdminLogService adminLogService;
@Autowired
private AdminUserService adminUserService;
@ApiOperation("新增/修改banner")
@PostMapping(value = "/save")
public BusiResult saveOrUpdateFirstPageBanner(FirstPageBanner firstPageBanner, String startTimeString, String endTimeString) {
String adminName = getAdminName();
Integer adminId = getAdminId();
public BusiResult<Void> saveOrUpdateFirstPageBanner(FirstPageBanner firstPageBanner, String startTimeString, String endTimeString) {
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
firstPageBanner.setOperator(adminName);
Boolean result = firstPageBannerAdminService.saveOrUpdateFirstPageBanner(firstPageBanner,startTimeString,endTimeString);
if(result) {
adminLogService.insertLog(adminId, getClass().getCanonicalName(), "saveOrUpdateFirstPageBanner", "params===>>" + firstPageBanner.toString());
}
return new BusiResult(BusiStatus.SUCCESS);
return new BusiResult<>(BusiStatus.SUCCESS);
}

8
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageAdminController.java
View File

@@ -14,6 +14,7 @@ import com.accompany.admin.base.Pagination;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.params.gamemanage.GameResultReqParams;
import com.accompany.admin.service.gamemanage.*;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.vo.gamemanage.GameManageJoinedUser;
import com.accompany.admin.vo.gamemanage.GameManageMoneyStatVO;
import com.accompany.business.service.gamemange.GameManageBizService;
@@ -57,11 +58,11 @@ public class GameManageAdminController extends BaseController {
@Autowired
private GameManageJoinRecordAdminService gameManageJoinRecordAdminService;
@Autowired
private GameManageService gameManageService;
@Autowired
private GameManageBizService gameManageBizService;
@Autowired
private AdminGameManageGiveTicketService adminGameManageGiveTicketService;
@Autowired
private AdminUserService adminUserService;
@GetMapping(value = "/saveOrUpdateGroup")
public BaseResponseVO saveOrUpdateGroup(GameManageGroupInfo info) {
@@ -175,7 +176,8 @@ public class GameManageAdminController extends BaseController {
@GetMapping("/giveTicket")
public BaseResponseVO giveTicket(String erbanNos, Long ticketId, Integer num) {
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
return adminGameManageGiveTicketService.giveTicket(erbanNos, ticketId, num, adminName);
}

8
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamemanage/GameManageBannerAdminController.java
View File

@@ -4,6 +4,7 @@ import com.accompany.admin.base.Pagination;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.gamemanage.GameManageBannerAdminService;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.business.model.firstpage.FirstPageBanner;
import com.accompany.business.service.api.QinniuService;
import com.accompany.business.util.ReplaceDomainUtil;
@@ -43,11 +44,14 @@ public class GameManageBannerAdminController extends BaseController {
@Autowired
private AdminLogService adminLogService;
@Autowired
private AdminUserService adminUserService;
@ApiOperation("新增/修改banner")
@PostMapping(value = "/save")
public BusiResult saveOrUpdateFirstPageBanner(GameManageBanner gameManageBanner, String startTimeString, String endTimeString) {
String adminName = getAdminName();
Integer adminId = getAdminId();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
gameManageBanner.setOperator(adminName);
Boolean result = gameManageBannerAdminService.saveOrUpdateFirstPageBanner(gameManageBanner,startTimeString,endTimeString);
if(result) {

8
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java
View File

@@ -5,6 +5,7 @@ import com.accompany.admin.params.linearlypool.PoolItemDraftSaveReqParams;
import com.accompany.admin.params.linearlypool.PoolItemShowRatioReqParams;
import com.accompany.admin.service.linearly.LinearlyPoolItemAdminService;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.vo.linearlypool.LinearlyPoolDeployResultVO;
import com.accompany.admin.vo.linearlypool.LinearlyPoolItemAdminPageVO;
import com.accompany.admin.vo.linearlypool.PrizeItemVO;
@@ -26,6 +27,8 @@ public class LinearlyPoolAdminController extends BaseController {
private LinearlyPoolItemAdminService linearlyPoolItemAdminService;
@Autowired
private AdminLogService adminLogService;
@Autowired
private AdminUserService adminUserService;
@GetMapping("/getPrizeGroupsInfo")
public BusiResult<LinearlyPoolItemAdminPageVO> getPrizeGroupsInfo() {
@@ -43,8 +46,9 @@ public class LinearlyPoolAdminController extends BaseController {
@PostMapping("/saveDraft")
public BaseResponseVO saveDraft(@RequestBody PoolItemDraftSaveReqParams params) {
String creator = getAdminName();
linearlyPoolItemAdminService.saveDraft(params, creator);
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
linearlyPoolItemAdminService.saveDraft(params, adminName);
adminLogService.insertLog(getAdminId(), getClass().getCanonicalName(), "saveDraft", "params===>>PoolItemDraftSaveReqParams:" + JSONObject.toJSONString(params));
return new BaseResponseVO<>(BusiStatus.SUCCESS);
}

11
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagAdminController.java
View File

@@ -6,6 +6,7 @@ import com.accompany.admin.service.gift.GiftAdminService;
import com.accompany.admin.service.newLuckyBag.NewLuckyBagDeviateAdminService;
import com.accompany.admin.service.newLuckyBag.NewLuckyBagPoolAdminService;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.business.constant.LuckyBagGiftPoolItemTypeEnum;
import com.accompany.business.model.Gift;
import com.accompany.business.model.luckybag.LuckyBagGiftDeviateRange;
@@ -40,6 +41,8 @@ public class NewLuckyBagAdminController extends BaseController {
private GiftService giftService;
@Autowired
private AdminLogService adminLogService;
@Autowired
private AdminUserService adminUserService;
@RequestMapping(value = "/getRefIdList", method = RequestMethod.GET)
public BaseResponseVO getRefIdList() {
@@ -71,7 +74,9 @@ public class NewLuckyBagAdminController extends BaseController {
public BaseResponseVO del(Integer id, Integer luckyBagId, Integer giftId) {
try {
this.newLuckyBagPoolAdminService.del(id, luckyBagId, giftId);
adminLogService.insertLog(getAdminId(), getAdminName(),
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
adminLogService.insertLog(getAdminId(), adminName,
"delLuckyBagPoolItem", "params===>>id:" + id + ", luckyBagId:" + luckyBagId + ", giftId:" + giftId);
return new BaseResponseVO(BusinessStatusCodeEnum.SUCCESS);
} catch (BusinessException e) {
@@ -93,8 +98,10 @@ public class NewLuckyBagAdminController extends BaseController {
@RequestMapping(value = "/pool/save", method = RequestMethod.POST)
public BaseResponseVO savePool(Integer id, Integer luckyBagId, Integer giftId, Integer occupationRatio, Integer prizeLevel, Integer deviateRangeId, Integer giftType, Integer showWingRate) {
try {
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
this.newLuckyBagPoolAdminService.save(id, luckyBagId, giftId, occupationRatio, prizeLevel,
LuckyBagGiftPoolItemTypeEnum.deviate_pool.getValue(), deviateRangeId, getAdminName(), giftType, showWingRate);
LuckyBagGiftPoolItemTypeEnum.deviate_pool.getValue(), deviateRangeId, adminName, giftType, showWingRate);
adminLogService.insertLog(getAdminId(), getClass().getCanonicalName(), "saveLuckyBagDeviatePoolItem",
"params===>>id:" + id + ", luckyBagId:" + luckyBagId + ", giftId:" + giftId +
", occupationRatio:" + occupationRatio + ", prizeLevel:" + prizeLevel);

31
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java
View File

@@ -1,6 +1,8 @@
package com.accompany.admin.controller.system;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import com.accompany.core.util.MD5;
import com.aliyuncs.exceptions.ClientException;
import com.accompany.admin.common.AdminConstants;
@@ -70,7 +72,8 @@ public class LoginController extends BaseController {
if (result.getCode() == 200) { //参数验证成功
AdminUser adminUser = adminUserService.getAdminUser(account, password);
if (adminUser != null) {
setAttribute(AdminConstants.HAS_LOGIN, "true", Scope.SESSION);
StpUtil.login(adminUser.getId());
/*setAttribute(AdminConstants.HAS_LOGIN, "true", Scope.SESSION);
setAttribute(AdminConstants.ADMIN_ID, adminUser.getId(), Scope.SESSION);
setAttribute(AdminConstants.ADMIN_NAME, adminUser.getUsername(), Scope.SESSION);
Cookie cookie1 = new Cookie(AdminConstants.HAS_LOGIN, "true");
@@ -78,7 +81,7 @@ public class LoginController extends BaseController {
Cookie cookie3 = new Cookie(AdminConstants.ADMIN_NAME, URLEncoder.encode(adminUser.getUsername(), "utf-8"));
getResponse().addCookie(cookie1);
getResponse().addCookie(cookie2);
getResponse().addCookie(cookie3);
getResponse().addCookie(cookie3);*/
adminUserService.updateLastLogin(adminUser.getId());
jedisService.hset(RedisKey.httpsession_store.getKey(), adminUser.getId() + "", getRequest().getSession().getId());
String smsCode = adminUserService.updateLoginRecord(adminUser);
@@ -120,24 +123,14 @@ public class LoginController extends BaseController {
Boolean loginSmsCodeSwitch = adminUserService.getLoginSmsCodeSwitch();
logger.info("loginSmsCodeSwitch:{}", loginSmsCodeSwitch);
model.addAttribute("smsSwitch", loginSmsCodeSwitch);
if (getAdminId() > 1) {
logger.info("admin logout, name is:" + getAttribute(AdminConstants.ADMIN_NAME, Scope.SESSION));
getRequest().getSession().removeAttribute(AdminConstants.HAS_LOGIN);
getRequest().getSession().removeAttribute(AdminConstants.ADMIN_ID);
getRequest().getSession().removeAttribute(AdminConstants.ADMIN_NAME);
Cookie[] cookies = getRequest().getCookies();
for (Cookie cookie : cookies) {
if (AdminConstants.HAS_LOGIN.equalsIgnoreCase(cookie.getName())
|| AdminConstants.ADMIN_ID.equalsIgnoreCase(cookie.getName())
|| AdminConstants.ADMIN_NAME.equalsIgnoreCase(cookie.getName())) {
Cookie cookieDel = new Cookie(cookie.getName(), null);
cookieDel.setPath("/");
cookieDel.setMaxAge(0);
getResponse().addCookie(cookieDel);
}
}
try {
int adminId = getAdminId();
logger.info("admin logout, id is:" + adminId);
StpUtil.logout();
} catch (NotLoginException ignore){
}
jedisService.hdel(RedisKey.httpsession_store.getKey(), getAttribute(AdminConstants.ADMIN_ID, Scope.SESSION) + "");
return "login";
}

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolItemAdminController.java
View File

@@ -1,6 +1,7 @@
package com.accompany.admin.controller.treasure;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.treasure.SeizeTreasurePoolItemAdminService;
import com.accompany.admin.vo.treasure.SeizeTreasurePoolItemAdminVo;
import com.accompany.admin.vo.treasure.SeizeTreasurePoolItemCountAdminVo;
@@ -28,6 +29,8 @@ public class SeizeTreasurePoolItemAdminController extends BaseController {
@Autowired
private SeizeTreasurePoolItemAdminService seizeTreasurePoolItemAdminService;
@Autowired
private AdminUserService adminUserService;
/**
* 分页
@@ -50,7 +53,9 @@ public class SeizeTreasurePoolItemAdminController extends BaseController {
@ApiOperation("保存")
@PostMapping("save")
public BusiResult<Void> save(SeizeTreasurePoolItem poolItem) {
poolItem.setCreator(getAdminName());
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
poolItem.setCreator(adminName);
seizeTreasurePoolItemAdminService.save(poolItem);
return BusiResult.success();
}

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/InviteCodeAdminController.java
View File

@@ -3,6 +3,7 @@ package com.accompany.admin.controller.user;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.params.invitecode.AddInviteCodeReqParams;
import com.accompany.admin.params.invitecode.InviteCodeQueryParams;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.user.InviteCodeAdminService;
import com.accompany.admin.vo.InviteCodeAdminVo;
import com.accompany.admin.vo.PageDataVO;
@@ -24,6 +25,8 @@ public class InviteCodeAdminController extends BaseController {
@Autowired
private InviteCodeAdminService inviteCodeAdminService;
@Autowired
private AdminUserService adminUserService;
@RequestMapping("/list")
public BusiResult getList(Integer page, Integer pageSize, String inviteCode, String erbanNo, Date startTime, Date endTime) {
@@ -41,7 +44,8 @@ public class InviteCodeAdminController extends BaseController {
@PostMapping("/addUserSpecialInviteCode")
public BaseResponseVO addUserSpecialInviteCode(@RequestBody AddInviteCodeReqParams params) {
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
params.setCreator(adminName);
inviteCodeAdminService.addUserSpecialInviteCode(params);

30
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java
View File

@@ -1,6 +1,7 @@
package com.accompany.admin.controller.user;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.user.PhoneAuthApplyRecordAdiminService;
import com.accompany.admin.util.StringUtil;
import com.accompany.admin.vo.PhoneAuthApplyRecordExcelVo;
@@ -27,6 +28,8 @@ public class PhoneAuthApplyRecordAdminController extends BaseController {
@Autowired
private PhoneAuthApplyRecordAdiminService phoneAuthApplyRecordAdiminService;
@Autowired
private AdminUserService adminUserService;
@RequestMapping("/list")
public void list(Integer pageNumber, Integer pageSize,String phone, String authCode, Date beginDate, Date endDate, Byte status){
@@ -52,15 +55,12 @@ public class PhoneAuthApplyRecordAdminController extends BaseController {
writeJson(false, "参数有误");
return;
}
try {
int result = phoneAuthApplyRecordAdiminService.changeStatus(id, status, getAdminName());
if(result>0) {
writeJson(true,String.valueOf(result));
return;
}
} catch (Exception e) {
logger.error("Failed to change dynamic status, Cause by:", e);
writeJson(false, e.getMessage());
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
int result = phoneAuthApplyRecordAdiminService.changeStatus(id, status, adminName);
if(result>0) {
writeJson(true,String.valueOf(result));
return;
}
writeJson(false, "操作失败");
}
@@ -71,14 +71,10 @@ public class PhoneAuthApplyRecordAdminController extends BaseController {
writeJson(false, "参数不能为空");
return;
}
try {
phoneAuthApplyRecordAdiminService.remark(id, remark, getAdminName());
writeJson(true,"操作成功");
} catch (Exception e) {
logger.error("Failed to change dynamic status, Cause by:", e);
writeJson(false, e.getMessage());
}
writeJson(false, "操作失败");
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
phoneAuthApplyRecordAdiminService.remark(id, remark, adminName);
writeJson(true,"操作成功");
}
}

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneBlackAdminController.java
View File

@@ -11,6 +11,7 @@
package com.accompany.admin.controller.user;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.user.PhoneBlackAdminService;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
@@ -37,10 +38,13 @@ public class PhoneBlackAdminController extends BaseController {
@Autowired
private PhoneBlackAdminService phoneBlackAdminService;
@Autowired
private AdminUserService adminUserService;
@RequestMapping(value = "/add", method = RequestMethod.GET)
public BaseResponseVO addPhoneBlack(String phonePrefix, Byte status) {
String adminName = getAdminName();
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
phoneBlackAdminService.addPhoneBlack(phonePrefix, status, adminName);
return new BaseResponseVO(BusinessStatusCodeEnum.SUCCESS);
}

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCancelAdminController.java
View File

@@ -1,6 +1,7 @@
package com.accompany.admin.controller.user;
import cn.hutool.core.util.ObjectUtil;
import com.accompany.admin.service.system.AdminUserService;
import com.alibaba.fastjson.JSONObject;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.model.UserCancelRecord;
@@ -25,6 +26,8 @@ public class UserCancelAdminController extends BaseController {
@Autowired
private UserCancelAdminService userCancelAdminService;
@Autowired
private AdminUserService adminUserService;
/**
* @description 获取注销的用户列表
@@ -67,6 +70,8 @@ public class UserCancelAdminController extends BaseController {
if (ObjectUtil.isNull(uid)) {
return new BusiResult(BusiStatus.PARAMERROR);
}
return userCancelAdminService.recoverUser(uid, getAdminName());
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
return userCancelAdminService.recoverUser(uid, adminName);
}
}

46
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserImpeachAdminController.java
View File

@@ -1,7 +1,7 @@
package com.accompany.admin.controller.user;
import com.accompany.admin.common.BusinessException;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.user.UserImpeachAdminService;
import com.accompany.admin.vo.UserImpeachRecordAdminVo;
import com.accompany.business.model.UserImpeachRecord;
@@ -11,6 +11,7 @@ import com.accompany.core.model.Users;
import com.accompany.core.service.user.UsersBaseService;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -31,6 +32,8 @@ public class UserImpeachAdminController extends BaseController {
@Autowired
private UsersBaseService usersBaseService;
@Autowired
private AdminUserService adminUserService;
@RequestMapping("/listLatestTargetUser")
@@ -95,41 +98,28 @@ public class UserImpeachAdminController extends BaseController {
@RequestMapping("/updateHandleResult")
public BusiResult updateHandleResult(int recordId, byte handleResult){
try {
userImpeachAdminService.updateHandleResult(recordId, handleResult, getAdminName());
return new BusiResult(BusiStatus.SUCCESS);
} catch (BusinessException e){
return new BusiResult(500, e.getMessage(),null);
} catch (Exception e){
logger.error(e.getMessage(), e);
return new BusiResult(BusiStatus.SERVER_BUSY);
}
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
userImpeachAdminService.updateHandleResult(recordId, handleResult, adminName);
return new BusiResult(BusiStatus.SUCCESS);
}
@SneakyThrows
@RequestMapping("/block24Hours")
public BusiResult block24Hours(int recordId){
try {
userImpeachAdminService.block24Hours(recordId,getAdminName());
return new BusiResult(BusiStatus.SUCCESS);
} catch (BusinessException e){
return new BusiResult(500, e.getMessage(),null);
} catch (Exception e){
logger.error(e.getMessage(), e);
return new BusiResult(BusiStatus.SERVER_BUSY);
}
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
userImpeachAdminService.block24Hours(recordId, adminName);
return new BusiResult(BusiStatus.SUCCESS);
}
@SneakyThrows
@RequestMapping("/blockPermanent")
public BusiResult blockPermanent(int recordId){
try {
userImpeachAdminService.blockPermanent(recordId,getAdminName());
return new BusiResult(BusiStatus.SUCCESS);
} catch (BusinessException e){
return new BusiResult(500, e.getMessage(),null);
} catch (Exception e){
logger.error(e.getMessage(), e);
return new BusiResult(BusiStatus.SERVER_BUSY);
}
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
userImpeachAdminService.blockPermanent(recordId, adminName);
return new BusiResult(BusiStatus.SUCCESS);
}
/**

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java
View File

@@ -2,6 +2,7 @@ package com.accompany.admin.controller.withdraw;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.system.AdminLogService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.withdraw.WithdrawApplyAdminService;
import com.accompany.admin.vo.withdraw.WithdrawRecordAdminVo;
import com.accompany.common.result.BusiResult;
@@ -32,6 +33,8 @@ public class WithdrawApplyAdminController extends BaseController {
private WithdrawApplyAdminService withdrawApplyAdminService;
@Autowired
private AdminLogService adminLogService;
@Autowired
private AdminUserService adminUserService;
@GetMapping("/list")
public PageResult<WithdrawRecordAdminVo> listWithdrawApply(Long erbanNo, String beginDate, String endDate, Byte status, Integer pageNum, Integer pageSize) {
@@ -44,7 +47,9 @@ public class WithdrawApplyAdminController extends BaseController {
if (null == id || null == status){
throw new ServiceException(BusiStatus.PARAMERROR);
}
withdrawApplyAdminService.updateWithdrawStatus(id, status, getAdminName());
int adminId = getAdminId();
String adminName = adminUserService.getAdminName(adminId);
withdrawApplyAdminService.updateWithdrawStatus(id, status, adminName);
adminLogService.insertLog(getAdminId(),getClass().getCanonicalName(),"updateWithdrawApply",
"params===>>id:" + id + ", status:" + status);
return new BusiResult<>(BusiStatus.SUCCESS);

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java
View File

@@ -1,6 +1,7 @@
package com.accompany.admin.interceptor;
import cn.dev33.satoken.stp.StpUtil;
import com.accompany.admin.common.AdminConstants;
import com.accompany.core.service.common.JedisService;
import com.accompany.common.redis.RedisKey;
@@ -33,7 +34,9 @@ public class LoginInterceptor implements HandlerInterceptor {
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler)
throws Exception {
try {
Object tmp = request.getSession().getAttribute(AdminConstants.HAS_LOGIN);
StpUtil.checkLogin();
return true;
/*Object tmp = request.getSession().getAttribute(AdminConstants.HAS_LOGIN);
log.info("tmp : {}", JSON.toJSONString(tmp));
if (tmp != null) {
String isLogin = tmp.toString();
@@ -46,7 +49,7 @@ public class LoginInterceptor implements HandlerInterceptor {
}
}
}
}
}*/
} catch (Exception e) {
logger.warn("getAdminId fail,admin has not login", e);
}

8
accompany-dependencies/pom.xml
View File

@@ -99,6 +99,7 @@
<bcprov-jdk15on.version>1.64</bcprov-jdk15on.version>
<zxing.version>3.2.0</zxing.version>
<bitwalker.version>1.20</bitwalker.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencyManagement>
@@ -532,6 +533,13 @@
<artifactId>libphonenumber</artifactId>
<version>${googlecode-libphonenumber.version}</version>
</dependency>
<!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>${sa-token.version}</version>
</dependency>
</dependencies>
</dependencyManagement>