优化

thyy-scheduled/src/main/java/org/thyy/scheduled/service/CorpwxHttp.java

@@ -29,7 +29,7 @@ public class CorpwxHttp {
     }
 
     public void getAddressBookToken() {
-        if (StrUtil.isNotBlank(corpwx.getAddressBookSecret())) {
+        if (StrUtil.isBlank(corpwx.getAddressBookSecret())) {
             throw new BizException(ExceptionEnum.NO_CONFIGURATION);
         }
         String url = tokenApiUrl + corpwx.getAddressBookSecret();
@@ -43,7 +43,7 @@ public class CorpwxHttp {
     }
 
     public void getHospAppsToken() {
-        if (StrUtil.isNotBlank(corpwx.getHospAppsSecret())) {
+        if (StrUtil.isBlank(corpwx.getHospAppsSecret())) {
             throw new BizException(ExceptionEnum.NO_CONFIGURATION);
         }
         String url = tokenApiUrl + corpwx.getHospAppsSecret();
@@ -57,7 +57,7 @@ public class CorpwxHttp {
     }
 
     public void getClockinToken() {
-        if (StrUtil.isNotBlank(corpwx.getClockinSecret())) {
+        if (StrUtil.isBlank(corpwx.getClockinSecret())) {
             throw new BizException(ExceptionEnum.NO_CONFIGURATION);
         }
         String url = tokenApiUrl + corpwx.getClockinSecret();
@@ -71,7 +71,7 @@ public class CorpwxHttp {
     }
 
     public void getUrgentMsgToken() {
-        if (StrUtil.isNotBlank(corpwx.getUrgentMsgSecret())) {
+        if (StrUtil.isBlank(corpwx.getUrgentMsgSecret())) {
             throw new BizException(ExceptionEnum.NO_CONFIGURATION);
         }
         String url = tokenApiUrl + corpwx.getUrgentMsgSecret();
@@ -85,7 +85,7 @@ public class CorpwxHttp {
     }
 
     public void getFilePushToken() {
-        if (StrUtil.isNotBlank(corpwx.getFilePushSecret())) {
+        if (StrUtil.isBlank(corpwx.getFilePushSecret())) {
             throw new BizException(ExceptionEnum.NO_CONFIGURATION);
         }
         String url = tokenApiUrl + corpwx.getFilePushSecret();

thyy-scheduled/src/main/java/org/thyy/scheduled/service/DpccService.java

@@ -56,10 +56,14 @@ public class DpccService {
         }
         HttpHeaders headers = new HttpHeaders();
         headers.setBasicAuth(dpcc.getClientName(), dpcc.getClientSecret());
+
         String url = dpcc.getTokenUrl()
-                + "?grant_type=access_client&"
-                + "username=" + dpcc.getClientName() + "&"
-                + "password=" + dpcc.getPassword();
+                + "?grant_type=access_client"
+                + "&username=" + dpcc.getClientName()
+                + "&password=" + dpcc.getPassword();
+
+        log.info("DPCC获取TOKEN地址：{}", url);
+
         JSONObject response = template.postForObject(url,
                 new HttpEntity<>(null, headers), JSONObject.class);
         log.info("DPCC获取TOKEN：{}", response);

thyy-scheduled/src/main/java/org/thyy/scheduled/service/ThmzHttp.java

@@ -39,6 +39,7 @@ public class ThmzHttp {
             String thmzToken = json.getString("data");
             AccessTokenUtil.getInstance().set("thmzToken", thmzToken);
             log.info("获取ThmzToken: {}", json.getString("data"));
+            return;
         }
         throw new BizException(ExceptionEnum.API_ERROR, json.getString("message"));
     }

thyy-scheduled/src/main/java/org/thyy/scheduled/task/AccessTokenTask.java

@@ -8,6 +8,7 @@ import org.thyy.scheduled.service.CorpwxHttp;
 import org.thyy.scheduled.service.DpccService;
 import org.thyy.scheduled.service.LisDockSign;
 import org.thyy.scheduled.service.ThmzHttp;
+import org.thyy.utils.TryUtil;
 
 @Slf4j
 @Component
@@ -27,12 +28,12 @@ public class AccessTokenTask {
 
     @Scheduled(fixedRate = 7000 * 1000)
     public void majorTask() {
-        dpccService.getToken();
-        corpwxHttp.getAddressBookToken();
-        corpwxHttp.getHospAppsToken();
-        corpwxHttp.getClockinToken();
-        corpwxHttp.getUrgentMsgToken();
-        corpwxHttp.getFilePushToken();
+        TryUtil.ignoreErr(dpccService::getToken);
+        TryUtil.ignoreErr(corpwxHttp::getAddressBookToken);
+        TryUtil.ignoreErr(corpwxHttp::getHospAppsToken);
+        TryUtil.ignoreErr(corpwxHttp::getClockinToken);
+        TryUtil.ignoreErr(corpwxHttp::getUrgentMsgToken);
+        TryUtil.ignoreErr(corpwxHttp::getFilePushToken);
     }
 
     @Scheduled(fixedRate = 5 * 60 * 1000)

thyy-scheduled/src/main/resources/application-dev.yml

@@ -78,4 +78,4 @@ thyy:
     token-url:
     check-url:
     drug-url:
-    jy-api: http://localhost:21701/thyy/thirdpart/api/inspection
+    jy-api: http://172.16.32.160:21701/thyy/thirdpart/api/inspection

thyy-scheduled/src/main/resources/application-prod.yml

@@ -78,7 +78,7 @@ thyy:
     token-url: https://manage.national-dpcc.com/api/sino-auth/oauth/token
     check-url: https://manage.national-dpcc.com/api/sino-common/access-client/uploadHisCheckData
     drug-url: https://manage.national-dpcc.com/api/sino-common/access-client/uploadHisDrugData
-    jy-api: http://localhost:21701/thyy/thirdpart/api/inspection
+    jy-api: http://172.16.32.160:21701/thyy/thirdpart/api/inspection
   emr:
     api: http://172.16.32.125:8001
 

thyy-scheduled/src/main/resources/logback-spring.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <springProperty name="application_name" scope="context" source="spring.application.name"/>
+    <springProperty scope="context" name="LOG_HOME" source="logging.path"
+                    defaultValue="${user.dir}/logs/${application_name}"/>
+
+    <!-- 日志级别 -->
+    <springProperty scope="context" name="LOG_ROOT_LEVEL" source="logging.level.root" defaultValue="INFO"/>
+
+    <!--  标识这个"STDOUT" 将会添加到这个logger -->
+    <springProperty scope="context" name="STDOUT" source="log.stdout" defaultValue="STDOUT"/>
+
+    <!-- 日志文件名称-->
+    <property name="LOG_PREFIX" value="spring-boot-logback"/>
+
+    <!-- 日志文件编码-->
+    <property name="LOG_CHARSET" value="UTF-8"/>
+
+    <!-- 日志文件路径+日期-->
+    <property name="LOG_DIR" value="${LOG_HOME}/%d{yyyy-MM-dd}"/>
+
+    <!--对日志进行格式化-->
+    <property name="LOG_MSG" value="- [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%level] [%thread] [%logger{16}] --> %msg%n "/>
+
+    <!--文件大小，默认10MB-->
+    <property name="MAX_FILE_SIZE" value="30MB"/>
+
+    <!-- 配置日志的滚动时间 ，value表示保留日志的天数，0表示永久保存 -->
+    <property name="MAX_HISTORY" value="0"/>
+
+
+    <!-- 彩色日志 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="-[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] [%clr(%level)] [%clr(%thread)] [%clr(%logger{16}){cyan}] %clr(-->){red} %clr(%msg%n){yellow}"/>
+
+    <!--输出到控制台-->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- 输出的日志内容格式化-->
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </layout>
+    </appender>
+
+    <!--输出到文件-->
+    <appender name="0" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    </appender>
+
+    <!-- 定义 ALL 日志的输出方式:-->
+    <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--日志文件路径，日志文件名称-->
+        <File>${LOG_HOME}/all_${LOG_PREFIX}.log</File>
+
+        <!-- 设置滚动策略，当天的日志大小超过 ${MAX_FILE_SIZE} 文件大小时候，新的内容写入新的文件， 默认10MB -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+
+            <!--日志文件路径，新的 ALL 日志文件名称，“ i ” 是个变量 -->
+            <FileNamePattern>${LOG_DIR}/all_${LOG_PREFIX}.log</FileNamePattern>
+
+            <!-- 配置日志的滚动时间 ，表示只保留最近 10 天的日志-->
+            <MaxHistory>${MAX_HISTORY}</MaxHistory>
+            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+        </rollingPolicy>
+
+        <!-- 输出的日志内容格式化-->
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>${LOG_MSG}</pattern>
+        </layout>
+    </appender>
+
+    <!-- 定义 ERROR 日志的输出方式:-->
+    <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 下面为配置只输出error级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <OnMismatch>DENY</OnMismatch>
+            <OnMatch>ACCEPT</OnMatch>
+        </filter>
+        <!--日志文件路径，日志文件名称-->
+        <File>${LOG_HOME}/err_${LOG_PREFIX}.log</File>
+
+        <!-- 设置滚动策略，当天的日志大小超过 ${MAX_FILE_SIZE} 文件大小时候，新的内容写入新的文件， 默认10MB -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+
+            <!--日志文件路径，新的 ERR 日志文件名称，“ i ” 是个变量 -->
+            <FileNamePattern>${LOG_DIR}/err_${LOG_PREFIX}.log</FileNamePattern>
+
+            <!-- 配置日志的滚动时间 ，表示只保留最近 10 天的日志-->
+            <MaxHistory>${MAX_HISTORY}</MaxHistory>
+            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+        </rollingPolicy>
+
+        <!-- 输出的日志内容格式化-->
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>${LOG_MSG}</Pattern>
+        </layout>
+    </appender>
+
+    <!-- additivity 设为false,则logger内容不附加至root ，配置以配置包下的所有类的日志的打印，级别是 ERROR-->
+
+    <logger name="org.springframework" level="ERROR"/>
+    <logger name="org.apache.commons" level="ERROR"/>
+    <!--    <logger name="th.itcenter.apps.controller.logger.LoggingController" level="WARN"/>-->
+    <!-- ${LOG_ROOT_LEVEL} 日志级别 -->
+    <root level="${LOG_ROOT_LEVEL}">
+
+        <!-- 标识这个"${STDOUT}"将会添加到这个logger -->
+        <appender-ref ref="${STDOUT}"/>
+
+        <!-- FILE_ALL 日志输出添加到 logger -->
+        <appender-ref ref="FILE_ALL"/>
+
+        <!-- FILE_ERROR 日志输出添加到 logger -->
+        <appender-ref ref="FILE_ERROR"/>
+    </root>
+
+</configuration>

thyy-utils/src/main/java/org/thyy/utils/config/RestTemplateConfig.java

@@ -13,8 +13,8 @@ public class RestTemplateConfig {
     @Bean
     public RestTemplate restTemplate(RestTemplateBuilder builder) {
         return builder
-                .connectTimeout(Duration.ofSeconds(3))
-                .readTimeout(Duration.ofSeconds(5))
+                .connectTimeout(Duration.ofSeconds(5))
+                .readTimeout(Duration.ofSeconds(30))
                 .build();
     }
 }