From 0278835db726a8ea5bd0c1fad09f03c87574f91b Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 5 Jun 2025 08:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=89=88=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- admin-pc/src/views/commonCode/CommonCodeList.vue | 44 +++--- .../views/commonCode/modules/CommonCodeForm.vue | 20 +-- .../jeecg/api/controller/AppletFenController.java | 32 +++-- .../org/jeecg/api/service/AppletFenService.java | 13 +- .../api/service/impl/AppletFenServiceImpl.java | 154 +++++++++++++++++++-- .../api/service/impl/AppletInfoServiceImpl.java | 2 + .../api/service/impl/AppletLoginServiceImpl.java | 148 ++++++++++---------- .../src/main/resources/application-dev.yml | 24 ++-- 10 files changed, 295 insertions(+), 146 deletions(-) diff --git a/admin-pc/.env.development b/admin-pc/.env.development index 71e75bb..da1c5e3 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://fission-star-api.hhlm1688.com/fission-star-api/ +VUE_APP_API_BASE_URL=https://www.liebianxing.site/lbx-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 49b756a..31a48f0 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://fission-star-api.hhlm1688.com/fission-star-api/ +VUE_APP_API_BASE_URL=https://www.liebianxing.site/lbx-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-pc/src/views/commonCode/CommonCodeList.vue b/admin-pc/src/views/commonCode/CommonCodeList.vue index eb74010..76a112f 100644 --- a/admin-pc/src/views/commonCode/CommonCodeList.vue +++ b/admin-pc/src/views/commonCode/CommonCodeList.vue @@ -9,18 +9,18 @@ - - - - - - + + + + + + + + + + + + 查询 @@ -161,16 +161,16 @@ dataIndex: 'endTime' }, - { - title:'一级邀请人', - align:"center", - dataIndex: 'pid_dictText' - }, - { - title:'二级邀请人', - align:"center", - dataIndex: 'pidTwo_dictText' - }, + // { + // title:'一级邀请人', + // align:"center", + // dataIndex: 'pid_dictText' + // }, + // { + // title:'二级邀请人', + // align:"center", + // dataIndex: 'pidTwo_dictText' + // }, { title:'激活人', align:"center", diff --git a/admin-pc/src/views/commonCode/modules/CommonCodeForm.vue b/admin-pc/src/views/commonCode/modules/CommonCodeForm.vue index 47615ef..e3563e5 100644 --- a/admin-pc/src/views/commonCode/modules/CommonCodeForm.vue +++ b/admin-pc/src/views/commonCode/modules/CommonCodeForm.vue @@ -23,16 +23,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletFenController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletFenController.java index 9847546..f26aeb2 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletFenController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletFenController.java @@ -31,11 +31,27 @@ public class AppletFenController { return appletFenService.getSharePage(token,state,status,pageBean); } + + //查询当前用户分享审核通过的记录条数 + @ApiOperation(value="查询当前用户分享审核通过的记录条数", notes="查询当前用户分享审核通过的记录条数") + @GetMapping(value = "/queryShareCount") + public Result queryShareCount(@RequestHeader("X-Access-Token") String token) { + return appletFenService.queryShareCount(token); + } + + + + + + + + + //获取个人分享记录详情 @ApiOperation(value="获取个人分享记录详情", notes="获取个人分享记录详情") @GetMapping(value = "/getShareInfo") - public Result getShareInfo(@RequestHeader("X-Access-Token") String token,String id){ - return appletFenService.getShareInfo(token,id); + public Result getShareInfo(String id){ + return appletFenService.getShareInfo(id); } @@ -75,8 +91,8 @@ public class AppletFenController { //获取群分享记录详情 @ApiOperation(value="获取群分享记录详情", notes="获取群分享记录详情") @GetMapping(value = "/getGroupShareInfo") - public Result getGroupShareInfo(@RequestHeader("X-Access-Token") String token,String id){ - return appletFenService.getGroupShareInfo(token,id); + public Result getGroupShareInfo(String id){ + return appletFenService.getGroupShareInfo(id); } //校验群转发是否达标 @@ -89,8 +105,8 @@ public class AppletFenController { //获取文章分享记录详情 @ApiOperation(value="获取文章分享记录详情", notes="获取文章分享记录详情") @GetMapping(value = "/getArticleShareInfo") - public Result getArticleShareInfo(@RequestHeader("X-Access-Token") String token,String id){ - return appletFenService.getArticleShareInfo(token,id); + public Result getArticleShareInfo(String id){ + return appletFenService.getArticleShareInfo(id); } @@ -104,8 +120,8 @@ public class AppletFenController { //获取视频分享记录详情 @ApiOperation(value="获取视频分享记录详情", notes="获取视频分享记录详情") @GetMapping(value = "/getVideoShareInfo") - public Result getVideoShareInfo(@RequestHeader("X-Access-Token") String token,String id){ - return appletFenService.getVideoShareInfo(token,id); + public Result getVideoShareInfo(String id){ + return appletFenService.getVideoShareInfo(id); } //校验视频转发是否达标 diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletFenService.java b/module-common/src/main/java/org/jeecg/api/service/AppletFenService.java index cba17a1..059bfd1 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletFenService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletFenService.java @@ -17,8 +17,13 @@ public interface AppletFenService { //获取分享记录列表带分页 Result getSharePage(String token,Integer state,Integer status,PageBean pageBean); + + //查询当前用户分享审核通过的记录条数 + Result queryShareCount(String token); + + //获取个人分享记录详情 - Result getShareInfo(String token,String id); + Result getShareInfo(String id); //增加分享次数 Result addLog(String token,String state,String id); @@ -33,19 +38,19 @@ public interface AppletFenService { Result checkShare(String token,String id); //获取群分享记录详情 - Result getGroupShareInfo(String token,String id); + Result getGroupShareInfo(String id); //校验群转发是否达标 Result checkGroupShare(String token,String id); //获取文章分享记录详情 - Result getArticleShareInfo(String token,String id); + Result getArticleShareInfo(String id); //校验文章转发是否达标 Result checkArticleShare(String token,String id); //获取视频分享记录详情 - Result getVideoShareInfo(String token,String id); + Result getVideoShareInfo(String id); //校验视频转发是否达标 Result checkVideoShare(String token,String id); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletFenServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletFenServiceImpl.java index 230ed5e..1386ec7 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletFenServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletFenServiceImpl.java @@ -85,6 +85,25 @@ public class AppletFenServiceImpl implements AppletFenService { @Override public Result getSharePage(String token,Integer state,Integer status, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询是否是代理 + if(hanHaiMember.getIsPay() == 0){ + return Result.error("您还不是代理，无法查看分享记录"); + } + // 检查代理是否过期（增加null检查） + Date endTime = hanHaiMember.getEndTime(); + if (endTime == null) { + return Result.error("代理有效期未设置"); + } + + if (endTime.before(new Date())) { + return Result.error("您的代理已过期"); + } + + + + + + if(state == 0){ Page page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -165,11 +184,41 @@ public class AppletFenServiceImpl implements AppletFenService { return Result.error("参数错误"); } - //获取个人分享记录详情 + + //查询当前用户分享审核通过的记录条数 @Override - public Result getShareInfo(String token,String id){ + public Result queryShareCount(String token){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + return Result.OK("个人分享审核通过记录条数",commonMemberService.lambdaQuery() + .eq(CommonMember::getUserId,hanHaiMember.getId()) + .eq(CommonMember::getStatus,1) + .count()); + } + + + //获取个人分享记录详情 + @Override + public Result getShareInfo(String id){ CommonMember commonMember = commonMemberService.getById(id); + //根据当前记录查询当前用户 + HanHaiMember byId = hanHaiMemberService.getById(commonMember.getUserId()); + //分享用户是否存在 + if(null==byId){ + return Result.error("分享用户不存在"); + } + //判断分享用户是否是代理 + if(byId.getIsPay() == 0){ + return Result.error("分享用户不是代理"); + } + //分享权限过期 + if(byId.getEndTime().getTime() < new Date().getTime()){ + return Result.error("分享权限已过期"); + } + + + + + return Result.OK("个人分享详情",commonMember); } @@ -249,7 +298,7 @@ public class AppletFenServiceImpl implements AppletFenService { //根据用户一级邀请人id查询用户信息 HanHaiMember hanHaiMemberOne = hanHaiMemberService.lambdaQuery() - .eq(HanHaiMember::getId,commonCode.getPid()) + .eq(HanHaiMember::getId,hanHaiMember.getShareId()) .one(); if(null!=hanHaiMemberOne){ //根据配置列表查询返佣比例 @@ -274,15 +323,19 @@ public class AppletFenServiceImpl implements AppletFenService { //增加用户佣金 BigDecimal oneMoney1 = hanHaiMemberOne.getPrice().add(oneMoney); hanHaiMemberOne.setPrice(oneMoney1); +// hanHaiMemberOne.setShareId(hanHaiMemberOne.getId()); hanHaiMemberService.updateById(hanHaiMemberOne); + + hanHaiMember.setShareId(hanHaiMemberOne.getId()); + } //根据用户一级邀请人id查询用户信息 HanHaiMember hanHaiMemberTwo = hanHaiMemberService.lambdaQuery() - .eq(HanHaiMember::getId,commonCode.getPidTwo()) + .eq(HanHaiMember::getId,hanHaiMember.getVid()) .one(); if(null!=hanHaiMemberTwo){ //根据配置列表查询返佣比例 @@ -304,8 +357,11 @@ public class AppletFenServiceImpl implements AppletFenService { BigDecimal twoMoney1 = hanHaiMemberTwo.getPrice().add(twoMoney); hanHaiMemberTwo.setPrice(twoMoney1); +// hanHaiMemberTwo.setShareId(hanHaiMemberTwo.getId()); hanHaiMemberService.updateById(hanHaiMemberTwo); + hanHaiMember.setVid(hanHaiMemberTwo.getId()); + } @@ -319,6 +375,8 @@ public class AppletFenServiceImpl implements AppletFenService { //修改个人信息 hanHaiMember.setIsPay(1); hanHaiMember.setEndTime(commonCode.getEndTime()); + + hanHaiMemberService.updateById(hanHaiMember); @@ -356,25 +414,64 @@ public class AppletFenServiceImpl implements AppletFenService { //获取视频分享记录详情 @Override - public Result getVideoShareInfo(String token,String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getVideoShareInfo(String id){ CommonVio commonVio = commonVioService.getById(id); + //根据当前记录查询当前用户 + HanHaiMember byId = hanHaiMemberService.getById(commonVio.getUserId()); + //分享用户是否存在 + if(null==byId){ + return Result.error("分享用户不存在"); + } + //判断分享用户是否是代理 + if(byId.getIsPay() == 0){ + return Result.error("分享用户不是代理"); + } + //分享权限过期 + if(byId.getEndTime().getTime() < new Date().getTime()){ + return Result.error("分享权限已过期"); + } return Result.OK("视频分享详情",commonVio); } //获取群分享记录详情 @Override - public Result getGroupShareInfo(String token,String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getGroupShareInfo(String id){ CommonTeam commonTeam = commonTeamService.getById(id); + //根据当前记录查询当前用户 + HanHaiMember byId = hanHaiMemberService.getById(commonTeam.getUserId()); + //分享用户是否存在 + if(null==byId){ + return Result.error("分享用户不存在"); + } + //判断分享用户是否是代理 + if(byId.getIsPay() == 0){ + return Result.error("分享用户不是代理"); + } + //分享权限过期 + if(byId.getEndTime().getTime() < new Date().getTime()){ + return Result.error("分享权限已过期"); + } return Result.OK("群分享详情",commonTeam); } //获取文章分享记录详情 @Override - public Result getArticleShareInfo(String token,String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getArticleShareInfo(String id){ CommonBook commonBook = commonBookService.getById(id); + //根据当前记录查询当前用户 + HanHaiMember byId = hanHaiMemberService.getById(commonBook.getUserId()); + //分享用户是否存在 + if(null==byId){ + return Result.error("分享用户不存在"); + } + //判断分享用户是否是代理 + if(byId.getIsPay() == 0){ + return Result.error("分享用户不是代理"); + } + //分享权限过期 + if(byId.getEndTime().getTime() < new Date().getTime()){ + return Result.error("分享权限已过期"); + } return Result.OK("文章分享详情",commonBook); } @@ -551,7 +648,12 @@ public class AppletFenServiceImpl implements AppletFenService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); commonMember.setUserId(hanHaiMember.getId()); commonMember.setStatus(0); - commonMemberService.saveOrUpdate(commonMember); +// commonMemberService.saveOrUpdate(commonMember); + if(StringUtils.isEmpty(commonMember.getId())){ + commonMemberService.save(commonMember); + }else{ + commonMemberService.updateById(commonMember); + } return Result.OK("保存成功"); } @@ -562,7 +664,12 @@ public class AppletFenServiceImpl implements AppletFenService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); commonVio.setUserId(hanHaiMember.getId()); commonVio.setStatus(0); - commonVioService.saveOrUpdate(commonVio); +// commonVioService.saveOrUpdate(commonVio); + if(StringUtils.isEmpty(commonVio.getId())){ + commonVioService.save(commonVio); + }else{ + commonVioService.updateById(commonVio); + } return Result.OK("保存成功"); } @@ -573,7 +680,13 @@ public class AppletFenServiceImpl implements AppletFenService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); commonTeam.setUserId(hanHaiMember.getId()); commonTeam.setStatus(0); - commonTeamService.saveOrUpdate(commonTeam); +// commonTeamService.saveOrUpdate(commonTeam); + + if(StringUtils.isEmpty(commonTeam.getId())){ + commonTeamService.save(commonTeam); + }else{ + commonTeamService.updateById(commonTeam); + } return Result.OK("保存成功"); } @@ -584,7 +697,20 @@ public class AppletFenServiceImpl implements AppletFenService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); commonBook.setUserId(hanHaiMember.getId()); commonBook.setStatus(0); - commonBookService.saveOrUpdate(commonBook); + + if(StringUtils.isEmpty(commonBook.getId())){ + + commonBookService.save(commonBook); + }else{ + if(commonBook.getId().equals("null")){ + commonBook.setId(null); + commonBookService.save(commonBook); + }else{ + commonBookService.updateById(commonBook); + } + + } + return Result.OK("保存成功"); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java index c507dca..b816004 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java @@ -141,12 +141,14 @@ public class AppletInfoServiceImpl implements AppletInfoService { IPage pageList = hanHaiMemberService .lambdaQuery() .eq(HanHaiMember::getShareId,hanHaiMember.getId()) + .orderByDesc(HanHaiMember::getCreateTime) .page(page); if(state == 1){ pageList = hanHaiMemberService .lambdaQuery() .eq(HanHaiMember::getVid,hanHaiMember.getId()) + .orderByDesc(HanHaiMember::getCreateTime) .page(page); } return Result.OK(pageList); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index bd8757f..55446e1 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -142,41 +142,41 @@ public class AppletLoginServiceImpl implements AppletLoginService { member.setIntentionCode(String.valueOf(randomNumber)); memberService.save(member); - if(StringUtils.isNotBlank(loginReq.getState())){ - //增加加点击记录id state shareId - if(loginReq.getState().equals("0")){ - //个人分享 - CommonMemberLog memberLog = new CommonMemberLog(); - memberLog.setCreateTime(new Date()); - memberLog.setMemberId(loginReq.getId()); - memberLog.setUserId(member.getId()); - commonMemberLogService.save(memberLog); - }else if(loginReq.getState().equals("1")){ - //视频分享 - CommonVioLog commonVioLog = new CommonVioLog(); - commonVioLog.setCreateTime(new Date()); - commonVioLog.setVid(loginReq.getId()); - commonVioLog.setUserId(member.getId()); - commonVioLogService.save(commonVioLog); - - }else if(loginReq.getState().equals("2")){ - //群分享 - CommonTeamLog commonTeamLog = new CommonTeamLog(); - commonTeamLog.setCreateTime(new Date()); - commonTeamLog.setTeamId(loginReq.getId()); - commonTeamLog.setUserId(member.getId()); - commonTeamLogService.save(commonTeamLog); - - }else{ - //文章分 - CommonBookLog commonBookLog = new CommonBookLog(); - commonBookLog.setCreateTime(new Date()); - commonBookLog.setBookId(loginReq.getId()); - commonBookLog.setUserId(member.getId()); - commonBookLogService.save(commonBookLog); - - } - } +// if(StringUtils.isNotBlank(loginReq.getState())){ +// //增加加点击记录id state shareId +// if(loginReq.getState().equals("0")){ +// //个人分享 +// CommonMemberLog memberLog = new CommonMemberLog(); +// memberLog.setCreateTime(new Date()); +// memberLog.setMemberId(loginReq.getId()); +// memberLog.setUserId(member.getId()); +// commonMemberLogService.save(memberLog); +// }else if(loginReq.getState().equals("1")){ +// //视频分享 +// CommonVioLog commonVioLog = new CommonVioLog(); +// commonVioLog.setCreateTime(new Date()); +// commonVioLog.setVid(loginReq.getId()); +// commonVioLog.setUserId(member.getId()); +// commonVioLogService.save(commonVioLog); +// +// }else if(loginReq.getState().equals("2")){ +// //群分享 +// CommonTeamLog commonTeamLog = new CommonTeamLog(); +// commonTeamLog.setCreateTime(new Date()); +// commonTeamLog.setTeamId(loginReq.getId()); +// commonTeamLog.setUserId(member.getId()); +// commonTeamLogService.save(commonTeamLog); +// +// }else{ +// //文章分 +// CommonBookLog commonBookLog = new CommonBookLog(); +// commonBookLog.setCreateTime(new Date()); +// commonBookLog.setBookId(loginReq.getId()); +// commonBookLog.setUserId(member.getId()); +// commonBookLogService.save(commonBookLog); +// +// } +// } redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); // 设置超时时间 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); @@ -193,45 +193,45 @@ public class AppletLoginServiceImpl implements AppletLoginService { // 设置超时时间 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); - if(StringUtils.isNotBlank(loginReq.getState())){ - //增加加点击记录id state shareId - if(loginReq.getState().equals("0")){ - //个人分享 - CommonMemberLog memberLog = new CommonMemberLog(); - memberLog.setCreateTime(new Date()); - memberLog.setMemberId(loginReq.getId()); - memberLog.setUserId(member.getId()); - memberLog.setShareId(loginReq.getShareId()); - commonMemberLogService.save(memberLog); - }else if(loginReq.getState().equals("1")){ - //视频分享 - CommonVioLog commonVioLog = new CommonVioLog(); - commonVioLog.setCreateTime(new Date()); - commonVioLog.setVid(loginReq.getId()); - commonVioLog.setUserId(member.getId()); - commonVioLog.setShareId(loginReq.getShareId()); - commonVioLogService.save(commonVioLog); - - }else if(loginReq.getState().equals("2")){ - //群分享 - CommonTeamLog commonTeamLog = new CommonTeamLog(); - commonTeamLog.setCreateTime(new Date()); - commonTeamLog.setTeamId(loginReq.getId()); - commonTeamLog.setUserId(member.getId()); - commonTeamLog.setShareId(loginReq.getShareId()); - commonTeamLogService.save(commonTeamLog); - - }else{ - //文章分 - CommonBookLog commonBookLog = new CommonBookLog(); - commonBookLog.setCreateTime(new Date()); - commonBookLog.setBookId(loginReq.getId()); - commonBookLog.setUserId(member.getId()); - commonBookLog.setShareId(loginReq.getShareId()); - commonBookLogService.save(commonBookLog); - - } - } +// if(StringUtils.isNotBlank(loginReq.getState())){ +// //增加加点击记录id state shareId +// if(loginReq.getState().equals("0")){ +// //个人分享 +// CommonMemberLog memberLog = new CommonMemberLog(); +// memberLog.setCreateTime(new Date()); +// memberLog.setMemberId(loginReq.getId()); +// memberLog.setUserId(member.getId()); +// memberLog.setShareId(loginReq.getShareId()); +// commonMemberLogService.save(memberLog); +// }else if(loginReq.getState().equals("1")){ +// //视频分享 +// CommonVioLog commonVioLog = new CommonVioLog(); +// commonVioLog.setCreateTime(new Date()); +// commonVioLog.setVid(loginReq.getId()); +// commonVioLog.setUserId(member.getId()); +// commonVioLog.setShareId(loginReq.getShareId()); +// commonVioLogService.save(commonVioLog); +// +// }else if(loginReq.getState().equals("2")){ +// //群分享 +// CommonTeamLog commonTeamLog = new CommonTeamLog(); +// commonTeamLog.setCreateTime(new Date()); +// commonTeamLog.setTeamId(loginReq.getId()); +// commonTeamLog.setUserId(member.getId()); +// commonTeamLog.setShareId(loginReq.getShareId()); +// commonTeamLogService.save(commonTeamLog); +// +// }else{ +// //文章分 +// CommonBookLog commonBookLog = new CommonBookLog(); +// commonBookLog.setCreateTime(new Date()); +// commonBookLog.setBookId(loginReq.getId()); +// commonBookLog.setUserId(member.getId()); +// commonBookLog.setShareId(loginReq.getShareId()); +// commonBookLogService.save(commonBookLog); +// +// } +// } map.put("userInfo", member); map.put("token", token); diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index cd17da8..3d8a941 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 8002 tomcat: max-swallow-size: -1 error: @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /fission-star-api + context-path: /lbx-api compression: enabled: true min-response-size: 1024 @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://42.194.239.145:3306/fission-star-api-25-03-04?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://49.232.134.43:3306/lbx-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: I5+sHYZQ + password: y-Z!gSiL driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -146,8 +146,8 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 8 - host: 42.194.239.145 + database: 0 + host: 49.232.134.43 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'lzx.123456' + password: 'Abc.123456' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tQSs47izVy8DLVdwUU9 - secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: hanhaiimage - staticDomain: https://image.hhlm1688.com/ + accessKey: LTAI5t61d5SjCLcDg7KYiLZ9 + secretKey: T4QLUqzMaerDvsnH6J1t42k4GPDSyk + endpoint: oss-cn-beijing.aliyuncs.com + bucketName: liebianxing + staticDomain: https://img.liebianxing.site # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES