diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3b8281..cbb3569 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -38,10 +38,6 @@ - - org.springframework.boot - spring-boot-starter-web - @@ -52,10 +48,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - com.casic @@ -63,11 +55,11 @@ ${core.version} - - com.casic - casic-alarm - ${pro.version} - + + + + + com.casic casic-server @@ -132,17 +124,16 @@ casic-data-analysis ${pro.version} - + + com.casic + casic-cache-redis + ${pro.version} + com.casic casic-device ${pro.version} - - - - - org.springframework.boot diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3b8281..cbb3569 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -38,10 +38,6 @@ - - org.springframework.boot - spring-boot-starter-web - @@ -52,10 +48,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - com.casic @@ -63,11 +55,11 @@ ${core.version} - - com.casic - casic-alarm - ${pro.version} - + + + + + com.casic casic-server @@ -132,17 +124,16 @@ casic-data-analysis ${pro.version} - + + com.casic + casic-cache-redis + ${pro.version} + com.casic casic-device ${pro.version} - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 460d4db..804177e 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -15,6 +15,7 @@ * @author lwh * @Date 2021/06/06 12:06 */ + @SpringBootApplication @EnableCaching @EnableScheduling diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3b8281..cbb3569 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -38,10 +38,6 @@ - - org.springframework.boot - spring-boot-starter-web - @@ -52,10 +48,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - com.casic @@ -63,11 +55,11 @@ ${core.version} - - com.casic - casic-alarm - ${pro.version} - + + + + + com.casic casic-server @@ -132,17 +124,16 @@ casic-data-analysis ${pro.version} - + + com.casic + casic-cache-redis + ${pro.version} + com.casic casic-device ${pro.version} - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 460d4db..804177e 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -15,6 +15,7 @@ * @author lwh * @Date 2021/06/06 12:06 */ + @SpringBootApplication @EnableCaching @EnableScheduling diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ef0f2fc..0515293 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -7,8 +7,6 @@ url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 - session: - store-type: redis redis: host: 111.198.10.15 port: 11412 @@ -55,8 +53,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: error - level.com.casic: error + level.root: info + level.com.casic: debug file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3b8281..cbb3569 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -38,10 +38,6 @@ - - org.springframework.boot - spring-boot-starter-web - @@ -52,10 +48,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - com.casic @@ -63,11 +55,11 @@ ${core.version} - - com.casic - casic-alarm - ${pro.version} - + + + + + com.casic casic-server @@ -132,17 +124,16 @@ casic-data-analysis ${pro.version} - + + com.casic + casic-cache-redis + ${pro.version} + com.casic casic-device ${pro.version} - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 460d4db..804177e 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -15,6 +15,7 @@ * @author lwh * @Date 2021/06/06 12:06 */ + @SpringBootApplication @EnableCaching @EnableScheduling diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ef0f2fc..0515293 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -7,8 +7,6 @@ url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 - session: - store-type: redis redis: host: 111.198.10.15 port: 11412 @@ -55,8 +53,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: error - level.com.casic: error + level.root: info + level.com.casic: debug file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 76627ee..b436e3c 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -1,28 +1,62 @@ server: - port: 11307 + port: 11309 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_template?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203! - initial-size: 2 - min-idle: 1 + password: Casic203 + session: + store-type: redis + redis: + host: 111.198.10.15 + port: 11412 + password: ew5T4K3#203lwh + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true -# session: -# store-type: redis + # session: + # store-type: redis + redis-config: + host: 127.0.0.1 + port: 6379 + password: + activemq: + user: + password: + broker-url: tcp://192.168.0.203:61616 +#flowable数据源和多数据源配置 casic: - # kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/workflow/** - #flowable数据源和多数据源配置 - flowable: - datasource: - url: jdbc:mysql://localhost:3306/template_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull - username: root - password: Casic203! -flowable: - checkProcessDefinitions: false #不校验process文件 + kaptcha-open: false #是否开启登录时验证码 (true/false) + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + db: + init: + enable: false + file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + spring-session-open: false #开启spring session +smartcity: + config: + export-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/export/ + #export-path: D:\export\ + image-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/image/ + config-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/temp/ + download-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/download/ + device: + redis: + invalid-time: 86400 + host: 127.0.0.1 + port: 6379 + password: ew5T4K3#203lwh + config-prefix: 'Casic:' + getui: + appId: H9jSTE2bAt8QWq2K2GNOB3 + appKey: bhPeCutJVdAyOasevQFtN9 + masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: info - level.com.casic: debug + level.root: error + level.com.casic: error + file: + path: logs/ + name: missiles.log \ No newline at end of file diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 577bd26..00f55fd 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -41,16 +41,16 @@ spring-boot-starter-web ${boot.version} - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - + + + + + + + + + + com.casic diff --git a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java index 2f87ba3..9e75c88 100644 --- a/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java +++ b/casic-device/src/main/java/com/casic/missiles/util/HttpsUtil.java @@ -15,8 +15,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; +//import org.apache.http.entity.mime.MultipartEntityBuilder; +//import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; @@ -162,11 +162,11 @@ HttpPost request = new HttpPost(url); addRequestHeader(request, headerMap); - FileBody fileBody = new FileBody(file); - // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b - HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); - request.setEntity(reqEntity); - +// FileBody fileBody = new FileBody(file); +// // Content-Type:multipart/form-data; boundary=----WebKitFormBoundarypJTQXMOZ3dLEzJ4b +// HttpEntity reqEntity = (HttpEntity) MultipartEntityBuilder.create().addPart("file", fileBody).build(); +// request.setEntity(reqEntity); +// return (StreamClosedHttpResponse) executeHttpRequest(request); } diff --git a/casic-quartz/pom.xml b/casic-quartz/pom.xml index 56e3929..2da9661 100644 --- a/casic-quartz/pom.xml +++ b/casic-quartz/pom.xml @@ -16,14 +16,14 @@ - org.springframework.boot - spring-boot-starter-aop - - - org.quartz-scheduler quartz 2.3.0 + + com.casic + casic-core + ${core.version} + \ No newline at end of file diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 3edad2b..08fd42a 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -40,10 +40,6 @@ ${pro.version} - org.springframework.boot - spring-boot-starter-web - - com.casic casic-server-support ${pro.version} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3b8281..cbb3569 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -38,10 +38,6 @@ - - org.springframework.boot - spring-boot-starter-web - @@ -52,10 +48,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - com.casic @@ -63,11 +55,11 @@ ${core.version} - - com.casic - casic-alarm - ${pro.version} - + + + + + com.casic casic-server @@ -132,17 +124,16 @@ casic-data-analysis ${pro.version} - + + com.casic + casic-cache-redis + ${pro.version} + com.casic casic-device ${pro.version} - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 460d4db..804177e 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -15,6 +15,7 @@ * @author lwh * @Date 2021/06/06 12:06 */ + @SpringBootApplication @EnableCaching @EnableScheduling diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ef0f2fc..0515293 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -7,8 +7,6 @@ url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 - session: - store-type: redis redis: host: 111.198.10.15 port: 11412 @@ -55,8 +53,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: error - level.com.casic: error + level.root: info + level.com.casic: debug file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 76627ee..b436e3c 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -1,28 +1,62 @@ server: - port: 11307 + port: 11309 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_template?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203! - initial-size: 2 - min-idle: 1 + password: Casic203 + session: + store-type: redis + redis: + host: 111.198.10.15 + port: 11412 + password: ew5T4K3#203lwh + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true -# session: -# store-type: redis + # session: + # store-type: redis + redis-config: + host: 127.0.0.1 + port: 6379 + password: + activemq: + user: + password: + broker-url: tcp://192.168.0.203:61616 +#flowable数据源和多数据源配置 casic: - # kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/workflow/** - #flowable数据源和多数据源配置 - flowable: - datasource: - url: jdbc:mysql://localhost:3306/template_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull - username: root - password: Casic203! -flowable: - checkProcessDefinitions: false #不校验process文件 + kaptcha-open: false #是否开启登录时验证码 (true/false) + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + db: + init: + enable: false + file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + spring-session-open: false #开启spring session +smartcity: + config: + export-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/export/ + #export-path: D:\export\ + image-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/image/ + config-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/temp/ + download-path: /casic/smartwell/smartwellProd3/casic-web-2.0.0.alpha/config/download/ + device: + redis: + invalid-time: 86400 + host: 127.0.0.1 + port: 6379 + password: ew5T4K3#203lwh + config-prefix: 'Casic:' + getui: + appId: H9jSTE2bAt8QWq2K2GNOB3 + appKey: bhPeCutJVdAyOasevQFtN9 + masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: info - level.com.casic: debug + level.root: error + level.com.casic: error + file: + path: logs/ + name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 8870fcf..aab0124 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -16,8 +16,10 @@ mybatis-plus: global-config: enable-sql-runner: true -#mybatis-plus: -# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector + configuration: + # 配置结果集属性为空时 是否映射返回结果 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 +# log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl ################### mybatis-plus配置 ################### ################### casic配置 ################### flowable: