diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..4b4cb0e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99ae653..a2518c5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ab26eff..e6b2a6b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,11 @@ - - - - - + + + + + - - + - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mybatis + jdbc + Sql + student + sql + + - + + + + - - @@ -104,9 +314,10 @@ - + + - + @@ -120,32 +331,109 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/springboot.iml b/springboot.iml index 2e84804..c4e32f7 100644 --- a/springboot.iml +++ b/springboot.iml @@ -97,6 +97,12 @@ + + + + + + @@ -107,12 +113,6 @@ - - - - - - diff --git a/springboot/pom.xml b/springboot/pom.xml index 9fc4f3b..a38adb4 100644 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -114,6 +114,11 @@ org.springframework.boot spring-boot-starter-cache + + + org.springframework.boot + spring-boot-starter-actuator + net.sf.ehcache diff --git a/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java b/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java index a6e3710..4197a13 100644 --- a/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java +++ b/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java @@ -40,7 +40,7 @@ public class BaiduController { Map body = new HashMap<>(); body.put("url",param); - String result = ApiHelper.doPost(url+postToken,headMap,body); + String result = ApiHelper.doPost(url+postToken,headMap, body); BaiduResult baiduResult = JSON.parseObject(result, BaiduResult.class); diff --git a/springboot/src/main/resources/application-dev.properties b/springboot/src/main/resources/application-dev.properties new file mode 100644 index 0000000..6b56846 --- /dev/null +++ b/springboot/src/main/resources/application-dev.properties @@ -0,0 +1 @@ +server.port = 1111 \ No newline at end of file diff --git a/springboot/src/main/resources/application-prod.properties b/springboot/src/main/resources/application-prod.properties new file mode 100644 index 0000000..df198a8 --- /dev/null +++ b/springboot/src/main/resources/application-prod.properties @@ -0,0 +1 @@ +server.port = 3333 diff --git a/springboot/src/main/resources/application-test.properties b/springboot/src/main/resources/application-test.properties new file mode 100644 index 0000000..9ebc58f --- /dev/null +++ b/springboot/src/main/resources/application-test.properties @@ -0,0 +1 @@ +server.port = 2222 \ No newline at end of file diff --git a/springboot/src/main/resources/application.properties b/springboot/src/main/resources/application.properties index 818fd37..42e8a13 100644 --- a/springboot/src/main/resources/application.properties +++ b/springboot/src/main/resources/application.properties @@ -1,5 +1,6 @@ spring.application.name=iot-api -#server.port=8088 + +spring.profiles.active=dev spring.datasource.username=thd spring.datasource.password=pmd19930415A diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml new file mode 100644 index 0000000..796c7d5 --- /dev/null +++ b/springboot/src/main/resources/application.yml @@ -0,0 +1,11 @@ +#server: +# port:8080 +# +#eureka: +# instance: +# hostname: 121.40.109.21 +# client: +# registerWithEureka: false +# fetchRegistry: false +# serviceUrl: +# defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ \ No newline at end of file -- libgit2 0.21.0