diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index a91ad7d..0093179 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -90,22 +90,6 @@ casic-job-starter ${extension.version} - - - - - - - - - - - - - - - - org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index a91ad7d..0093179 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -90,22 +90,6 @@ casic-job-starter ${extension.version} - - - - - - - - - - - - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java index b64819b..e36eae8 100644 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ b/casic-web/src/main/java/com/casic/missiles/Test.java @@ -2,6 +2,11 @@ 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 @@ -13,6 +18,27 @@ public static void main(String[] args) { String time = String.valueOf(System.currentTimeMillis()); System.out.println(time); - System.out.println(MD5Util.encrypt(time+"geostar999")); + 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/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index a91ad7d..0093179 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -90,22 +90,6 @@ casic-job-starter ${extension.version} - - - - - - - - - - - - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java index b64819b..e36eae8 100644 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ b/casic-web/src/main/java/com/casic/missiles/Test.java @@ -2,6 +2,11 @@ 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 @@ -13,6 +18,27 @@ public static void main(String[] args) { String time = String.valueOf(System.currentTimeMillis()); System.out.println(time); - System.out.println(MD5Util.encrypt(time+"geostar999")); + 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/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 79fcd69..430f706 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic-monitor-web?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203! initial-size: 2 @@ -15,13 +15,6 @@ casic: # kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/**,/ws/**,/api/** - #flowable数据源和多数据源配置账号 nsltt - #密码geostar999 -# 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文件 logging: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index a91ad7d..0093179 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -90,22 +90,6 @@ casic-job-starter ${extension.version} - - - - - - - - - - - - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java index b64819b..e36eae8 100644 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ b/casic-web/src/main/java/com/casic/missiles/Test.java @@ -2,6 +2,11 @@ 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 @@ -13,6 +18,27 @@ public static void main(String[] args) { String time = String.valueOf(System.currentTimeMillis()); System.out.println(time); - System.out.println(MD5Util.encrypt(time+"geostar999")); + 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/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 79fcd69..430f706 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic-monitor-web?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203! initial-size: 2 @@ -15,13 +15,6 @@ casic: # kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/**,/ws/**,/api/** - #flowable数据源和多数据源配置账号 nsltt - #密码geostar999 -# 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文件 logging: diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index e9c125e..f64d604 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -1,10 +1,10 @@ server: - port: 8080 + port: 8081 # context-path: /callcenter/api ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://11.100.6.163:3306/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://11.100.6.163:3306/casic-monitor-web?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 @@ -22,13 +22,8 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/ws/**,/api/** - flowable: - datasource: - url: jdbc:mysql://11.100.6.163:3306/callcenter_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull - username: root - password: Casic203 logging: level.root: info - level.com.casic: debug + level.com.casic: error path: logs/ file: missiles.log \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java index a78cdbe..80a3a49 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ApiController.java @@ -16,7 +16,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; - +/** + *@author lenovo + *@version 1.0 + *@description 后端数据服务API + *@className ApiController + *@date 2021/5/24 15:08 + */ @RestController @RequestMapping({"api"}) public class ApiController { diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e940897..e7c1dc7 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -2110,6 +2110,307 @@ Y + + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index a91ad7d..0093179 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -90,22 +90,6 @@ casic-job-starter ${extension.version} - - - - - - - - - - - - - - - - org.springframework.boot diff --git a/casic-web/src/main/java/com/casic/missiles/Test.java b/casic-web/src/main/java/com/casic/missiles/Test.java index b64819b..e36eae8 100644 --- a/casic-web/src/main/java/com/casic/missiles/Test.java +++ b/casic-web/src/main/java/com/casic/missiles/Test.java @@ -2,6 +2,11 @@ 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 @@ -13,6 +18,27 @@ public static void main(String[] args) { String time = String.valueOf(System.currentTimeMillis()); System.out.println(time); - System.out.println(MD5Util.encrypt(time+"geostar999")); + 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/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 79fcd69..430f706 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic-monitor-web?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203! initial-size: 2 @@ -15,13 +15,6 @@ casic: # kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/**,/ws/**,/api/** - #flowable数据源和多数据源配置账号 nsltt - #密码geostar999 -# 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文件 logging: diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index e9c125e..f64d604 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -1,10 +1,10 @@ server: - port: 8080 + port: 8081 # context-path: /callcenter/api ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://11.100.6.163:3306/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://11.100.6.163:3306/casic-monitor-web?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 @@ -22,13 +22,8 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/ws/**,/api/** - flowable: - datasource: - url: jdbc:mysql://11.100.6.163:3306/callcenter_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull - username: root - password: Casic203 logging: level.root: info - level.com.casic: debug + level.com.casic: error path: logs/ file: 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 c551992..e84e55f 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -11,7 +11,7 @@ mybatis-plus: sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector configuration-properties: - viewDb: casic_sanitation #环卫子系统业务库 + viewDb: casic_optmonitoring #环卫子系统业务库 ################### mybatis-plus配置 ################### ################### guns配置 ################### casic: @@ -35,6 +35,7 @@ userName: rongjiangqu password: a58cc7c077b1ece3fad6923bf8f35d71 appKey: 53a21bdd-626a-4b3b-9170-0c79498193e6 #可视化应用app key + url-exclusion: /view/add,/view/update,/config/add,/config/update elasticjob: enabled: false reg-center: