diff --git a/README.md b/README.md index 2ec84fdb..a8edad2a 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_ #### 移动端 -移动端功能展示 +移动端功能展示 diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index bfb58582..d99be26a 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -66,7 +66,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { Map params = new HashMap<>(); params.put("code", code); cache.put(cacheKey(verificationEnums, mobile, uuid), code, 300L); - this.sendSmsCode("北京宏业汇成科技有限公司",mobile, params, "SMS_205755300"); + this.sendSmsCode("北京宏业汇成科技有限公司", mobile, params, "SMS_205755300"); break; } case UPDATE_PASSWORD: { @@ -79,7 +79,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { Map params = new HashMap<>(); params.put("code", code); cache.put(cacheKey(verificationEnums, memberMobile, uuid), code, 300L); - this.sendSmsCode("北京宏业汇成科技有限公司",mobile, params, "SMS_205755297"); + this.sendSmsCode("北京宏业汇成科技有限公司", mobile, params, "SMS_205755297"); break; } //如果不是有效的验证码手段，则此处不进行短信操作 @@ -160,23 +160,24 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { public void addSmsSign(SmsSign smsSign) throws Exception { //设置参数添加短信签名 com.aliyun.dysmsapi20170525.Client client = this.createClient(); - System.out.println(smsSign.getBusinessLicense().substring(smsSign.getBusinessLicense().lastIndexOf(".") + 1)); + System.out.println(smsSign.getLicense().substring(smsSign.getLicense().lastIndexOf("."))); //营业执照 AddSmsSignRequest.AddSmsSignRequestSignFileList signFileList0 = new AddSmsSignRequest.AddSmsSignRequestSignFileList() .setFileContents(Base64Utils.encode(smsSign.getBusinessLicense())) .setFileSuffix(smsSign.getBusinessLicense().substring(smsSign.getBusinessLicense().lastIndexOf(".") + 1)); //授权委托书 -// AddSmsSignRequest.AddSmsSignRequestSignFileList signFileList1 = new AddSmsSignRequest.AddSmsSignRequestSignFileList() -// .setFileContents(Base64Utils.encode(smsSign.getLicense())) -// .setFileSuffix(smsSign.getLicense().substring(smsSign.getLicense().lastIndexOf(".") + 1)); + AddSmsSignRequest.AddSmsSignRequestSignFileList signFileList1 = new AddSmsSignRequest.AddSmsSignRequestSignFileList() + .setFileContents(Base64Utils.encode(smsSign.getLicense())) + .setFileSuffix(smsSign.getLicense().substring(smsSign.getLicense().lastIndexOf(".")) + 1); //添加短信签名 AddSmsSignRequest addSmsSignRequest = new AddSmsSignRequest() .setSignName(smsSign.getSignName()) .setSignSource(smsSign.getSignSource()) .setRemark(smsSign.getRemark()) .setSignFileList(java.util.Arrays.asList( - signFileList0 + signFileList0, + signFileList1 )); AddSmsSignResponse response = client.addSmsSign(addSmsSignRequest); if (!response.getBody().getCode().equals("OK")) { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index ca194358..421f8cef 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,9 +34,6 @@ import java.util.List; @Transactional public class ArticleServiceImpl extends ServiceImpl implements ArticleService { - @Autowired - private ArticleMapper articleMapper; - @Override public IPage articlePage(ArticleSearchParams articleSearchParams) { articleSearchParams.setSort("a.sort"); diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index afe8386b..92165a49 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.page.serviceimpl; -import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; @@ -18,8 +18,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -30,8 +28,6 @@ import org.springframework.stereotype.Service; */ @Service public class PageDataServiceImpl extends ServiceImpl implements PageDataService { - @Autowired - private PageDataMapper pageDataMapper; @Override public void addStorePageData(String storeId) { @@ -116,7 +112,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq(pageData.getNum() != null, "num", pageData.getNum()); } //判断是否为唯一的页面 - if (pageDataMapper.getPageDataNum(queryWrapper) == 1) { + if (this.baseMapper.getPageDataNum(queryWrapper) == 1) { throw new ServiceException(ResultCode.PAGE_DELETE_ERROR); } return this.removeById(id); @@ -136,7 +132,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq("page_client_type", pageDataDTO.getPageClientType()); - return pageDataMapper.getPageData(queryWrapper); + return this.baseMapper.getPageData(queryWrapper); } @Override @@ -146,7 +142,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq(pageDataDTO.getNum() != null, "num", pageDataDTO.getNum()); queryWrapper.eq(pageDataDTO.getPageClientType() != null, "page_client_type", pageDataDTO.getPageClientType()); - return pageDataMapper.getPageDataList(PageUtil.initPage(pageVO), queryWrapper); + return this.baseMapper.getPageDataList(PageUtil.initPage(pageVO), queryWrapper); } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java index 85a19ed7..09b6a4f8 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java @@ -18,9 +18,6 @@ import org.springframework.stereotype.Service; @Service public class SpecialServiceImpl extends ServiceImpl implements SpecialService { - //专题 - @Autowired - private SpecialMapper specialMapper; //页面数据 @Autowired private PageDataService pageDataService;