diff --git a/src/main/java/me/aurora/app/rest/utils/AliDayuController.java b/src/main/java/me/aurora/app/rest/utils/AliSmsController.java similarity index 57% rename from src/main/java/me/aurora/app/rest/utils/AliDayuController.java rename to src/main/java/me/aurora/app/rest/utils/AliSmsController.java index 66fc08c..fa669ce 100644 --- a/src/main/java/me/aurora/app/rest/utils/AliDayuController.java +++ b/src/main/java/me/aurora/app/rest/utils/AliSmsController.java @@ -3,8 +3,8 @@ package me.aurora.app.rest.utils; import lombok.extern.slf4j.Slf4j; import me.aurora.annotation.Log; import me.aurora.domain.ResponseEntity; -import me.aurora.domain.utils.AliDayuConfig; -import me.aurora.service.AliDayuService; +import me.aurora.domain.utils.AliSmsConfig; +import me.aurora.service.AliSmsService; import me.aurora.util.HttpContextUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -18,36 +18,36 @@ import javax.servlet.http.HttpServletRequest; */ @Slf4j @RestController -@RequestMapping("aliDayu") -public class AliDayuController { +@RequestMapping("aliSms") +public class AliSmsController { @Autowired - private AliDayuService aliDayuService; + private AliSmsService aliSmsService; @GetMapping(value = "/index") public ModelAndView index(){ - AliDayuConfig aliDayuConfig = aliDayuService.findById(1L); + AliSmsConfig aliDayuConfig = aliSmsService.findById(1L); HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); - request.setAttribute("aliDayu",aliDayuConfig); + request.setAttribute("aliSms",aliDayuConfig); if(aliDayuConfig == null){ - request.setAttribute("aliDayu",new AliDayuConfig()); + request.setAttribute("aliSms",new AliSmsConfig()); } - return new ModelAndView("/utils/aliDayu/index"); + return new ModelAndView("/utils/aliSms/index"); } - @Log("配置阿里大鱼") + @Log("配置阿里短信") @PostMapping(value = "/config") - public ResponseEntity emailConfig(@RequestBody @Validated(AliDayuConfig.Update.class) AliDayuConfig aliDayuConfig){ - log.warn("REST request to aliDayu AliDayuConfig : {}" +aliDayuConfig); - aliDayuConfig.setId(1L); - aliDayuService.updateConfig(aliDayuConfig,aliDayuService.findById(1L)); + public ResponseEntity emailConfig(@RequestBody @Validated(AliSmsConfig.Update.class) AliSmsConfig aliSmsConfig){ + log.warn("REST request to aliSmsConfig AliSmsConfig : {}" +aliSmsConfig); + aliSmsConfig.setId(1L); + aliSmsService.updateConfig(aliSmsConfig,aliSmsService.findById(1L)); return ResponseEntity.ok(); } @Log("发送短信") - @PostMapping(value = "send") + @PostMapping(value = "/send") public ResponseEntity send(@RequestParam String phone,@RequestParam String code) throws Exception { log.warn("REST request to send SMS : {}" +phone); - return aliDayuService.send(aliDayuService.findById(1L),phone,code); + return aliSmsService.send(aliSmsService.findById(1L),phone,code); } } diff --git a/src/main/java/me/aurora/domain/utils/AliDayuConfig.java b/src/main/java/me/aurora/domain/utils/AliSmsConfig.java similarity index 91% rename from src/main/java/me/aurora/domain/utils/AliDayuConfig.java rename to src/main/java/me/aurora/domain/utils/AliSmsConfig.java index b5eb67d..86e199a 100644 --- a/src/main/java/me/aurora/domain/utils/AliDayuConfig.java +++ b/src/main/java/me/aurora/domain/utils/AliSmsConfig.java @@ -12,8 +12,8 @@ import java.io.Serializable; */ @Data @Entity -@Table(name = "zj_alidayu_config") -public class AliDayuConfig implements Serializable { +@Table(name = "zj_alisms_config") +public class AliSmsConfig implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/me/aurora/repository/AliDayuRepo.java b/src/main/java/me/aurora/repository/AliSmsRepo.java similarity index 56% rename from src/main/java/me/aurora/repository/AliDayuRepo.java rename to src/main/java/me/aurora/repository/AliSmsRepo.java index 6fd2872..9a142f0 100644 --- a/src/main/java/me/aurora/repository/AliDayuRepo.java +++ b/src/main/java/me/aurora/repository/AliSmsRepo.java @@ -1,11 +1,11 @@ package me.aurora.repository; -import me.aurora.domain.utils.AliDayuConfig; +import me.aurora.domain.utils.AliSmsConfig; import org.springframework.data.jpa.repository.JpaRepository; /** * @author 郑杰 * @date 2018/10/29 16:59:52 */ -public interface AliDayuRepo extends JpaRepository { +public interface AliSmsRepo extends JpaRepository { } diff --git a/src/main/java/me/aurora/service/AliDayuService.java b/src/main/java/me/aurora/service/AliSmsService.java similarity index 50% rename from src/main/java/me/aurora/service/AliDayuService.java rename to src/main/java/me/aurora/service/AliSmsService.java index cf88b10..a4023cd 100644 --- a/src/main/java/me/aurora/service/AliDayuService.java +++ b/src/main/java/me/aurora/service/AliSmsService.java @@ -1,10 +1,8 @@ package me.aurora.service; -import com.aliyuncs.exceptions.ClientException; import me.aurora.domain.ResponseEntity; -import me.aurora.domain.utils.AliDayuConfig; +import me.aurora.domain.utils.AliSmsConfig; import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -12,8 +10,8 @@ import org.springframework.cache.annotation.Cacheable; * @author 郑杰 * @date 2018/10/29 16:59:00 */ -@CacheConfig(cacheNames = "aLiDaYu") -public interface AliDayuService { +@CacheConfig(cacheNames = "aliSms") +public interface AliSmsService { /** * 根据ID查询 @@ -21,10 +19,10 @@ public interface AliDayuService { * @return */ @Cacheable(key = "#p0") - AliDayuConfig findById(long id); + AliSmsConfig findById(long id); @CachePut(key = "#p0.getId()") - AliDayuConfig updateConfig(AliDayuConfig aliDayuConfig, AliDayuConfig old); + AliSmsConfig updateConfig(AliSmsConfig aliSmsConfig, AliSmsConfig old); - ResponseEntity send(AliDayuConfig byId, String phone, String code) throws Exception; + ResponseEntity send(AliSmsConfig aliSmsConfig, String phone, String code) throws Exception; } diff --git a/src/main/java/me/aurora/service/impl/AliDayuServiceImpl.java b/src/main/java/me/aurora/service/impl/AliSmsServiceImpl.java similarity index 82% rename from src/main/java/me/aurora/service/impl/AliDayuServiceImpl.java rename to src/main/java/me/aurora/service/impl/AliSmsServiceImpl.java index d6eee77..0bd7d48 100644 --- a/src/main/java/me/aurora/service/impl/AliDayuServiceImpl.java +++ b/src/main/java/me/aurora/service/impl/AliSmsServiceImpl.java @@ -11,9 +11,9 @@ import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; import me.aurora.config.exception.AuroraException; import me.aurora.domain.ResponseEntity; -import me.aurora.domain.utils.AliDayuConfig; -import me.aurora.repository.AliDayuRepo; -import me.aurora.service.AliDayuService; +import me.aurora.domain.utils.AliSmsConfig; +import me.aurora.repository.AliSmsRepo; +import me.aurora.service.AliSmsService; import me.aurora.util.AuroraConstant; import me.aurora.util.EncryptHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -28,38 +28,38 @@ import java.util.Optional; */ @Service @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class AliDayuServiceImpl implements AliDayuService { +public class AliSmsServiceImpl implements AliSmsService { @Autowired - private AliDayuRepo aliDayuRepo; + private AliSmsRepo aliDayuRepo; @Override - public AliDayuConfig findById(long id) { + public AliSmsConfig findById(long id) { - Optional aliDayuConfig = aliDayuRepo.findById(id); + Optional aliSmsConfig = aliDayuRepo.findById(id); - if(!aliDayuConfig.isPresent()){ + if(!aliSmsConfig.isPresent()){ return null; } - return aliDayuConfig.get(); + return aliSmsConfig.get(); } @Transactional(rollbackFor = Exception.class) @Override - public AliDayuConfig updateConfig(AliDayuConfig aliDayuConfig, AliDayuConfig old) { + public AliSmsConfig updateConfig(AliSmsConfig aliSmsConfig, AliSmsConfig old) { try { - if(!aliDayuConfig.getAccessKeySecret().equals(old.getAccessKeySecret())){ - aliDayuConfig.setAccessKeySecret(EncryptHelper.desEncrypt(aliDayuConfig.getAccessKeySecret())); + if(!aliSmsConfig.getAccessKeySecret().equals(old.getAccessKeySecret())){ + aliSmsConfig.setAccessKeySecret(EncryptHelper.desEncrypt(aliSmsConfig.getAccessKeySecret())); } } catch (Exception e) { e.printStackTrace(); } - return aliDayuRepo.save(aliDayuConfig); + return aliDayuRepo.save(aliSmsConfig); } @Override - public ResponseEntity send(AliDayuConfig config, String phone, String code) throws Exception { + public ResponseEntity send(AliSmsConfig config, String phone, String code) throws Exception { //短信API产品名称（短信产品名固定，无需修改） final String product = "Dysmsapi"; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index a30887f..2f6767c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -33,7 +33,7 @@
-
+