diff --git a/tiesheng-ademo/pom.xml b/tiesheng-ademo/pom.xml
index fb714f3..11f7c58 100644
--- a/tiesheng-ademo/pom.xml
+++ b/tiesheng-ademo/pom.xml
@@ -23,12 +23,6 @@
com.tiesheng
tiesheng-web
-
-
- com.alibaba
- easyexcel
-
-
diff --git a/tiesheng-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/tiesheng-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
index 2309092..e7af80c 100644
--- a/tiesheng-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
+++ b/tiesheng-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
@@ -1,21 +1,14 @@
package com.tiesheng.demo.controller;
-import cn.hutool.json.JSONUtil;
import com.tiesheng.annotation.token.TokenIgnore;
-import com.tiesheng.demo.pojos.TestFile;
-import com.tiesheng.message.config.aliyun.AliyunSmsConfig;
import com.tiesheng.message.pojos.MessageReqResp;
-import com.tiesheng.poi.util.PoiWriteUtil;
import com.tiesheng.util.config.GlobalConfig;
import com.tiesheng.util.pojos.ApiResp;
-import com.tiesheng.util.pojos.FileUploadPath;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author hao
@@ -26,8 +19,8 @@ public class TestController {
@Autowired
GlobalConfig globalConfig;
- @Autowired
- AliyunSmsConfig aliyunSmsConfig;
+// @Autowired
+// AliyunSmsConfig aliyunSmsConfig;
@RequestMapping("/index")
@TokenIgnore
@@ -45,9 +38,9 @@ public class TestController {
@RequestMapping("/send")
@TokenIgnore
public ApiResp sendMessage() {
- MessageReqResp reqResp = aliyunSmsConfig.sendSms("13567116463", "SMS_126361543",
- JSONUtil.createObj().putOpt("code", "123456"));
- return ApiResp.respOK(reqResp);
+// MessageReqResp reqResp = aliyunSmsConfig.sendSms("13567116463", "SMS_126361543",
+// JSONUtil.createObj().putOpt("code", "123456"));
+ return ApiResp.respOK(new MessageReqResp());
}
@@ -55,14 +48,14 @@ public class TestController {
@TokenIgnore
public ApiResp export() {
- List list = new ArrayList<>();
- list.add(new TestFile("11111"));
- list.add(new TestFile("22222"));
- list.add(new TestFile("33333"));
- list.add(new TestFile("44444"));
-
- FileUploadPath fileUploadPath = FileUploadPath.random("xlsx");
- PoiWriteUtil.export(list, TestFile.class, fileUploadPath.getAbsolutePath(), "hahah");
+// List list = new ArrayList<>();
+// list.add(new TestFile("11111"));
+// list.add(new TestFile("22222"));
+// list.add(new TestFile("33333"));
+// list.add(new TestFile("44444"));
+//
+// FileUploadPath fileUploadPath = FileUploadPath.random("xlsx");
+// PoiWriteUtil.export(list, TestFile.class, fileUploadPath.getAbsolutePath(), "hahah");
return ApiResp.respOK("");
}
diff --git a/tiesheng-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java b/tiesheng-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java
index 384c9c3..80f46eb 100644
--- a/tiesheng-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java
+++ b/tiesheng-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java
@@ -1,27 +1,27 @@
-package com.tiesheng.demo.pojos;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.tiesheng.poi.pojos.PoiWriteBase;
-
-public class TestFile implements PoiWriteBase {
-
-
- @ExcelProperty("测试")
- private String test;
-
- public TestFile(String test) {
- this.test = test;
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // setter、getter
- ///////////////////////////////////////////////////////////////////////////
-
- public String getTest() {
- return test;
- }
-
- public void setTest(String test) {
- this.test = test;
- }
-}
+//package com.tiesheng.demo.pojos;
+//
+//import com.alibaba.excel.annotation.ExcelProperty;
+//import com.tiesheng.poi.pojos.PoiWriteBase;
+//
+//public class TestFile implements PoiWriteBase {
+//
+//
+// @ExcelProperty("测试")
+// private String test;
+//
+// public TestFile(String test) {
+// this.test = test;
+// }
+//
+// ///////////////////////////////////////////////////////////////////////////
+// // setter、getter
+// ///////////////////////////////////////////////////////////////////////////
+//
+// public String getTest() {
+// return test;
+// }
+//
+// public void setTest(String test) {
+// this.test = test;
+// }
+//}
diff --git a/tiesheng-db-migration/pom.xml b/tiesheng-db-migration/pom.xml
index 8af39f1..9942cf8 100644
--- a/tiesheng-db-migration/pom.xml
+++ b/tiesheng-db-migration/pom.xml
@@ -26,7 +26,7 @@
org.springframework.boot
spring-boot-starter-web
- compile
+ provided
diff --git a/tiesheng-encrypt/pom.xml b/tiesheng-encrypt/pom.xml
index c0da0d6..c23bd8b 100644
--- a/tiesheng-encrypt/pom.xml
+++ b/tiesheng-encrypt/pom.xml
@@ -27,7 +27,7 @@
org.springframework.boot
spring-boot-starter-web
- compile
+ provided
diff --git a/tiesheng-login/pom.xml b/tiesheng-login/pom.xml
index fb25e11..0836e07 100644
--- a/tiesheng-login/pom.xml
+++ b/tiesheng-login/pom.xml
@@ -23,7 +23,7 @@
org.springframework.boot
spring-boot-starter-aop
- compile
+ provided
diff --git a/tiesheng-message/pom.xml b/tiesheng-message/pom.xml
index 9a3066a..3316dc5 100644
--- a/tiesheng-message/pom.xml
+++ b/tiesheng-message/pom.xml
@@ -28,12 +28,12 @@
com.aliyun
tea-openapi
- compile
+ provided
com.aliyun
dysmsapi20170525
- compile
+ provided
diff --git a/tiesheng-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsConfig.java b/tiesheng-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsConfig.java
index d15ab16..157e41b 100644
--- a/tiesheng-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsConfig.java
+++ b/tiesheng-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsConfig.java
@@ -9,6 +9,7 @@ import com.aliyun.teaopenapi.models.Config;
import com.tiesheng.message.pojos.MessageReqResp;
import com.tiesheng.message.service.TieshengMessageConfigurer;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -19,6 +20,7 @@ import java.util.Objects;
*/
@Configuration
@ConfigurationProperties(prefix = "tiesheng.aliyun")
+@ConditionalOnClass(SendSmsResponse.class)
public class AliyunSmsConfig {
@Autowired
diff --git a/tiesheng-poi/pom.xml b/tiesheng-poi/pom.xml
index 252dceb..b8f4f5e 100644
--- a/tiesheng-poi/pom.xml
+++ b/tiesheng-poi/pom.xml
@@ -21,7 +21,7 @@
com.alibaba
easyexcel
- compile
+ provided
diff --git a/tiesheng-web/pom.xml b/tiesheng-web/pom.xml
index 728217e..ac4cf4e 100644
--- a/tiesheng-web/pom.xml
+++ b/tiesheng-web/pom.xml
@@ -30,6 +30,10 @@
spring-boot-starter-json
org.springframework.boot
+
+ org.ehcache
+ ehcache
+