企业返回所在区

3 months ago · 158f523314
4 changed files with 5 additions and 101 deletions
--- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
+++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
@ -32,7 +32,7 @@ public class IdCardCryptoUtil {
        String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
        System.out.println("====================== 示例 ======================");
        // 加密
-        String source_dec = "19166279367";
+        String source_dec = "13418867033";
        String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
        System.out.println(source_dec+" 加密后 : "+enc);
        // 解密
--- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java
+++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java
@ -53,7 +53,7 @@ public final class JasyptUtils {
         String s = encryptWithMD5("jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8", "ATPfOhpnAVp6yBas7RU");
         System.out.println(s);
        String channelcs1 = decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU");
-        String channelcs2 = decryptWithMD5("nCzTixQexFdZNVhREOMMps2pNJ5gxrZb", "ATPfOhpnAVp6yBas7RU");
+        String channelcs2 = decryptWithMD5("Ogi+/4PPtXiuILnVlNg4Lw==", "ATPfOhpnAVp6yBas7RU");
        System.out.println(channelcs1);
        System.out.println(channelcs2);
    }
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/logback.xml
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/logback.xml
@ -1,99 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
    <contextName>logback</contextName>
    <property name="zdxtEmergencyBootStart.path" value="/usr/local/zdxtEmergencyBootStart/logs/zdxtEmergencyBootStart.log"/>
    <property name="zdxtEmergencyBootStart.error.path" value="/usr/local/zdxtEmergencyBootStart/logs/zdxtEmergencyBootStart.error.log"/>
    <!--有线报警数据日志-->
 <!--    <property name="zdxtEmergencyBootStart.realtimeWarnHandler.path" value="/usr/local/zdxtEmergencyBootStart/logs/realtimeWarnHandler.log"/>-->
    <!--mqtt数据日志-->
 <!--    <property name="zdxtEmergencyBootStart.warningMessageCallback.path" value="/usr/local/zdxtEmergencyBootStart/logs/warningMessageCallback.log"/>-->
    <!--mqtt缓存数据日志-->
 <!--    <property name="zdxtEmergencyBootStart.iotMessageTask.path" value="/usr/local/zdxtEmergencyBootStart/logs/iotMessageTask.log"/>-->
    <property name="historyLogPath" value="/usr/local/zdxtEmergencyBootStart/logs/history"/>
    <!-- 异步任务日志 -->
 <!--    <property name="zdxtEmergencyBootStart.asyncTask.path" value="/usr/local/qn-worksite/logs/zdxtEmergencyBootStart.asyncTask.log"/>-->
    <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>INFO</level>
        </filter>
        <encoder>
            <pattern>
                %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
            <charset>UTF-8</charset>
        </encoder>
    </appender>
    <appender name="zdxtEmergencyBootStart" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${zdxtEmergencyBootStart.path}</file>
        <!-- 过滤日志 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>ERROR</level>
            <onMatch>DENY</onMatch>  <!-- 如果命中就禁止这条日志 -->
            <onMismatch>ACCEPT</onMismatch>  <!-- 如果没有命中就使用这条规则 -->
        </filter>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${historyLogPath}/%d{yyyy-MM-dd}/zdxtEmergencyBootStart.zip</fileNamePattern>
            <maxHistory>180</maxHistory>
 <!--            <maxFileSize>500MB</maxFileSize>-->
        </rollingPolicy>
        <encoder>
            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n</pattern>
            <charset>UTF-8</charset>
        </encoder>
    </appender>
    <appender name="zdxtEmergencyBootStart-error" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${zdxtEmergencyBootStart.error.path}</file>
        <!-- 过滤日志 -->
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>ERROR</level>
        </filter>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${historyLogPath}/%d{yyyy-MM-dd}/zdxtEmergencyBootStart-error.zip</fileNamePattern>
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n</pattern>
            <charset>UTF-8</charset>
        </encoder>
    </appender>
    <logger name="com.zdxt" level="INFO" additivity="false">
        <appender-ref ref="zdxtEmergencyBootStart" />
        <appender-ref ref="zdxtEmergencyBootStart-error"/>
 <!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
    </logger>
    <logger name="org.springframework" level="INFO" additivity="false">
        <appender-ref ref="zdxtEmergencyBootStart" />
        <appender-ref ref="zdxtEmergencyBootStart-error"/>
 <!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
    </logger>
    <root level="INFO">
        <appender-ref ref="zdxtEmergencyBootStart"/>
        <appender-ref ref="zdxtEmergencyBootStart-error"/>
 <!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
 <!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
        <appender-ref ref="consoleAppender"/>
    </root>
 <!--    <root level="ERROR">
        <appender-ref ref="zdxtEmergencyBootStart"/>
        <appender-ref ref="zdxtEmergencyBootStart-error"/>
        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>
        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>
        <appender-ref ref="consoleAppender"/>
    </root>-->
 </configuration>
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java
@ -192,6 +192,9 @@ public class HttpUtil {
    public static String httpSendPost(String url,String params,Map<String,Object> heardMap){
        try {
            URL uri = new URL(url);
            log.info("url{}",url);
            log.info("params{}",params);
            log.info("heardMap{}",heardMap);
            HttpURLConnection connection = (HttpURLConnection) uri.openConnection();
            connection.setRequestMethod("POST");
            connection.setRequestProperty("Content-Type","application/json");