diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 0093179..320c628 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -77,83 +77,19 @@ com.casic - casic-etl-starter - ${extension.version} - - - com.casic casic-elastic-db ${extension.version} com.casic - casic-job-starter + casic-etl-starter ${extension.version} - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - - - org.apache.shiro - shiro-core - - - slf4j-api - org.slf4j - - - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-ehcache - - - slf4j-api - org.slf4j - - - - - org.ehcache - ehcache + com.casic + casic-job-starter + ${extension.version} @@ -161,35 +97,6 @@ - commons-io - commons-io - - - com.github.penggle - kaptcha - - - com.google.zxing - core - - - com.ibeetl - beetl - - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy groovy-all true @@ -198,12 +105,13 @@ org.springframework.boot spring-boot-starter-data-redis + com.sun.jersey jersey-client 1.19 - + com.sun.jersey.contribs jersey-apache-client4 @@ -222,7 +130,6 @@ 3.1.0 provided - diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 0093179..320c628 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -77,83 +77,19 @@ com.casic - casic-etl-starter - ${extension.version} - - - com.casic casic-elastic-db ${extension.version} com.casic - casic-job-starter + casic-etl-starter ${extension.version} - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - - - org.apache.shiro - shiro-core - - - slf4j-api - org.slf4j - - - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-ehcache - - - slf4j-api - org.slf4j - - - - - org.ehcache - ehcache + com.casic + casic-job-starter + ${extension.version} @@ -161,35 +97,6 @@ - commons-io - commons-io - - - com.github.penggle - kaptcha - - - com.google.zxing - core - - - com.ibeetl - beetl - - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy groovy-all true @@ -198,12 +105,13 @@ org.springframework.boot spring-boot-starter-data-redis + com.sun.jersey jersey-client 1.19 - + com.sun.jersey.contribs jersey-apache-client4 @@ -222,7 +130,6 @@ 3.1.0 provided - diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java deleted file mode 100644 index e36eae8..0000000 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.MD5Util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.List; - -/** - * @ClassName Tesi - * @Description TODO - * @Author lenovo - * @Date 2021/4/22 15:55 - * @Version 1.0 - */ -public class Test { - public static void main(String[] args) { - String time = String.valueOf(System.currentTimeMillis()); - System.out.println(time); - System.out.println(MD5Util.encrypt(time + "geostar999")); - - try { - encodeHex(MessageDigest.getInstance("MD5").digest("456".getBytes())); - } catch (NoSuchAlgorithmException var2) { - throw new IllegalStateException(var2.getMessage(), var2); - } - Object[] params = "".split(","); - java.util.List list = java.util.Arrays.asList(params); - - } - - - private static String encodeHex(byte[] bytes) { - StringBuffer buffer = new StringBuffer(bytes.length * 2); - for (int i = 0; i < bytes.length; ++i) { - if ((bytes[i] & 255) < 16) { - buffer.append("0"); - } - buffer.append(Long.toString((long) (bytes[i] & 255), 16)); - } - return buffer.toString(); - } -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 0093179..320c628 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -77,83 +77,19 @@ com.casic - casic-etl-starter - ${extension.version} - - - com.casic casic-elastic-db ${extension.version} com.casic - casic-job-starter + casic-etl-starter ${extension.version} - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - - - org.apache.shiro - shiro-core - - - slf4j-api - org.slf4j - - - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-ehcache - - - slf4j-api - org.slf4j - - - - - org.ehcache - ehcache + com.casic + casic-job-starter + ${extension.version} @@ -161,35 +97,6 @@ - commons-io - commons-io - - - com.github.penggle - kaptcha - - - com.google.zxing - core - - - com.ibeetl - beetl - - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy groovy-all true @@ -198,12 +105,13 @@ org.springframework.boot spring-boot-starter-data-redis + com.sun.jersey jersey-client 1.19 - + com.sun.jersey.contribs jersey-apache-client4 @@ -222,7 +130,6 @@ 3.1.0 provided - diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java deleted file mode 100644 index e36eae8..0000000 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.MD5Util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.List; - -/** - * @ClassName Tesi - * @Description TODO - * @Author lenovo - * @Date 2021/4/22 15:55 - * @Version 1.0 - */ -public class Test { - public static void main(String[] args) { - String time = String.valueOf(System.currentTimeMillis()); - System.out.println(time); - System.out.println(MD5Util.encrypt(time + "geostar999")); - - try { - encodeHex(MessageDigest.getInstance("MD5").digest("456".getBytes())); - } catch (NoSuchAlgorithmException var2) { - throw new IllegalStateException(var2.getMessage(), var2); - } - Object[] params = "".split(","); - java.util.List list = java.util.Arrays.asList(params); - - } - - - private static String encodeHex(byte[] bytes) { - StringBuffer buffer = new StringBuffer(bytes.length * 2); - for (int i = 0; i < bytes.length; ++i) { - if ((bytes[i] & 255) < 16) { - buffer.append("0"); - } - buffer.append(Long.toString((long) (bytes[i] & 255), 16)); - } - return buffer.toString(); - } -} diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 1283383..be43c5f 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller; -import com.casic.missiles.TestEtlJob; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; @@ -14,8 +13,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.constant.PermissionContant; import com.casic.missiles.modular.system.dto.LoginResult; -import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.ElasticJobConfigurationProperties; -import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +44,7 @@ */ @PostMapping("/testJob") @ResponseBody - public Object testJob(String simcardnum) { - System.out.println(simcardnum); + public Object testJob(String jobName) { return ResponseData.success(); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 0093179..320c628 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -77,83 +77,19 @@ com.casic - casic-etl-starter - ${extension.version} - - - com.casic casic-elastic-db ${extension.version} com.casic - casic-job-starter + casic-etl-starter ${extension.version} - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - - - org.apache.shiro - shiro-core - - - slf4j-api - org.slf4j - - - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-ehcache - - - slf4j-api - org.slf4j - - - - - org.ehcache - ehcache + com.casic + casic-job-starter + ${extension.version} @@ -161,35 +97,6 @@ - commons-io - commons-io - - - com.github.penggle - kaptcha - - - com.google.zxing - core - - - com.ibeetl - beetl - - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy groovy-all true @@ -198,12 +105,13 @@ org.springframework.boot spring-boot-starter-data-redis + com.sun.jersey jersey-client 1.19 - + com.sun.jersey.contribs jersey-apache-client4 @@ -222,7 +130,6 @@ 3.1.0 provided - diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java deleted file mode 100644 index e36eae8..0000000 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.MD5Util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.List; - -/** - * @ClassName Tesi - * @Description TODO - * @Author lenovo - * @Date 2021/4/22 15:55 - * @Version 1.0 - */ -public class Test { - public static void main(String[] args) { - String time = String.valueOf(System.currentTimeMillis()); - System.out.println(time); - System.out.println(MD5Util.encrypt(time + "geostar999")); - - try { - encodeHex(MessageDigest.getInstance("MD5").digest("456".getBytes())); - } catch (NoSuchAlgorithmException var2) { - throw new IllegalStateException(var2.getMessage(), var2); - } - Object[] params = "".split(","); - java.util.List list = java.util.Arrays.asList(params); - - } - - - private static String encodeHex(byte[] bytes) { - StringBuffer buffer = new StringBuffer(bytes.length * 2); - for (int i = 0; i < bytes.length; ++i) { - if ((bytes[i] & 255) < 16) { - buffer.append("0"); - } - buffer.append(Long.toString((long) (bytes[i] & 255), 16)); - } - return buffer.toString(); - } -} diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 1283383..be43c5f 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller; -import com.casic.missiles.TestEtlJob; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; @@ -14,8 +13,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.constant.PermissionContant; import com.casic.missiles.modular.system.dto.LoginResult; -import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.ElasticJobConfigurationProperties; -import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +44,7 @@ */ @PostMapping("/testJob") @ResponseBody - public Object testJob(String simcardnum) { - System.out.println(simcardnum); + public Object testJob(String jobName) { return ResponseData.success(); } diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index e84e55f..1af6682 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -37,11 +37,15 @@ appKey: 53a21bdd-626a-4b3b-9170-0c79498193e6 #可视化应用app key url-exclusion: /view/add,/view/update,/config/add,/config/update elasticjob: - enabled: false + enabled: true + tracing: + type: RDB reg-center: serverLists: zookeeper.com:2181 namespace: elasticjob-lite-springboot digest: admin:Casic203 + dump: + enabled: true monitor: session: time: 90 diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a29fa43..c50fb06 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -28,10 +28,10 @@ ${extension.version} - - org.springframework.boot - spring-boot-starter-websocket - + + + + org.java-websocket Java-WebSocket @@ -52,70 +52,6 @@ casic-job-support ${extension.version} - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - commons-io - commons-io - - - com.github.penggle - kaptcha - - - - com.ibeetl - beetl - - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy - groovy-all - true - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java index 43b2b97..9d7f74a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -3,7 +3,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.TableViewConfig; import com.casic.missiles.modular.system.tools.DataSqlUtil; -import org.beetl.ext.fn.StringUtil; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 0093179..320c628 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -77,83 +77,19 @@ com.casic - casic-etl-starter - ${extension.version} - - - com.casic casic-elastic-db ${extension.version} com.casic - casic-job-starter + casic-etl-starter ${extension.version} - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - - - org.apache.shiro - shiro-core - - - slf4j-api - org.slf4j - - - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-ehcache - - - slf4j-api - org.slf4j - - - - - org.ehcache - ehcache + com.casic + casic-job-starter + ${extension.version} @@ -161,35 +97,6 @@ - commons-io - commons-io - - - com.github.penggle - kaptcha - - - com.google.zxing - core - - - com.ibeetl - beetl - - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - - - org.apache.commons - commons-lang3 - - - org.codehaus.groovy groovy-all true @@ -198,12 +105,13 @@ org.springframework.boot spring-boot-starter-data-redis + com.sun.jersey jersey-client 1.19 - + com.sun.jersey.contribs jersey-apache-client4 @@ -222,7 +130,6 @@ 3.1.0 provided - diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java deleted file mode 100644 index e36eae8..0000000 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.MD5Util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.List; - -/** - * @ClassName Tesi - * @Description TODO - * @Author lenovo - * @Date 2021/4/22 15:55 - * @Version 1.0 - */ -public class Test { - public static void main(String[] args) { - String time = String.valueOf(System.currentTimeMillis()); - System.out.println(time); - System.out.println(MD5Util.encrypt(time + "geostar999")); - - try { - encodeHex(MessageDigest.getInstance("MD5").digest("456".getBytes())); - } catch (NoSuchAlgorithmException var2) { - throw new IllegalStateException(var2.getMessage(), var2); - } - Object[] params = "".split(","); - java.util.List list = java.util.Arrays.asList(params); - - } - - - private static String encodeHex(byte[] bytes) { - StringBuffer buffer = new StringBuffer(bytes.length * 2); - for (int i = 0; i < bytes.length; ++i) { - if ((bytes[i] & 255) < 16) { - buffer.append("0"); - } - buffer.append(Long.toString((long) (bytes[i] & 255), 16)); - } - return buffer.toString(); - } -} diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 1283383..be43c5f 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller; -import com.casic.missiles.TestEtlJob; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; @@ -14,8 +13,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.constant.PermissionContant; import com.casic.missiles.modular.system.dto.LoginResult; -import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.ElasticJobConfigurationProperties; -import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +44,7 @@ */ @PostMapping("/testJob") @ResponseBody - public Object testJob(String simcardnum) { - System.out.println(simcardnum); + public Object testJob(String jobName) { return ResponseData.success(); } diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index e84e55f..1af6682 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -37,11 +37,15 @@ appKey: 53a21bdd-626a-4b3b-9170-0c79498193e6 #可视化应用app key url-exclusion: /view/add,/view/update,/config/add,/config/update elasticjob: - enabled: false + enabled: true + tracing: + type: RDB reg-center: serverLists: zookeeper.com:2181 namespace: elasticjob-lite-springboot digest: admin:Casic203 + dump: + enabled: true monitor: session: time: 90 diff --git a/pom.xml b/pom.xml index 8dbc02a..b5ccc38 100644 --- a/pom.xml +++ b/pom.xml @@ -63,103 +63,11 @@ casic-core ${core.version} - - - com.baomidou - mybatisplus-spring-boot-starter - ${mybatisplus-spring-boot-starter.version} - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - org.apache.shiro - shiro-spring - ${shiro.version} - - - org.apache.shiro - shiro-ehcache - ${shiro.version} - mysql mysql-connector-java ${mysql-connector-java.version} - - com.baomidou - mybatis-plus - ${mybatis-plus.version} - - - com.alibaba - druid - ${druid.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - com.casic - casic-view-starter - ${extension.version} - - - commons-io - commons-io - ${commons.io.version} - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - org.ehcache - ehcache - ${ehcache.version} - - - com.google.zxing - core - ${zxing.version} - - - org.apache.velocity - velocity - ${velocity.version} - - - com.ibeetl - beetl - ${beetl.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - net.sf.ehcache - ehcache-core - ${ehcache.core.version} -