Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

pom.xml

@@ -132,6 +132,11 @@
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java

@@ -13,6 +13,7 @@ import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
 import com.syjiaer.clinic.server.mapper.social.*;
 import com.syjiaer.clinic.server.service.BaseService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
 /*
  * 医保目录
  */
+@Slf4j
 @Service
 public class SocialDirectoryService extends BaseService {
     @Autowired
@@ -61,7 +63,6 @@ public class SocialDirectoryService extends BaseService {
     @Autowired
     private GoodsMapper goodsMapper;
 
-    private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName());
 
     /*
      * 下载接口
@@ -232,9 +233,6 @@ public class SocialDirectoryService extends BaseService {
         //mongodb分页
 
 
-
-
-
         QueryWrapper<SocialDirectory> codeqw = new QueryWrapper<>();
         if (typeList.size() == 1) {
             codeqw.eq("type", typeList.get(0));
@@ -333,18 +331,19 @@ public class SocialDirectoryService extends BaseService {
         // 资源文件的路径
         String resourceName = "doc_title/" + type + ".json";
         StringBuilder content = new StringBuilder();
-        try (InputStream inputStream = classLoader.getResourceAsStream(resourceName);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
-            if (inputStream != null) {
+        try {
+            InputStream inputStream = classLoader.getResourceAsStream(resourceName);
+            if(inputStream==null){
+                return resultList;
+            }
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
             String line;
             while ((line = reader.readLine()) != null) {
                 content.append(line);
             }
-            } else {
-                logger.info("未找到资源文件: " + resourceName);
-            }
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("doc_title解析错误:{} ", resourceName);
+            return resultList;
         }
         JSONArray list = JSON.parseArray(content.toString());
         for (int i = 0; i < list.size(); i++) {

src/main/resources/application.yml

@@ -10,9 +10,9 @@ spring:
       host: dev.jizhiweb.cn
       port: 6379
   datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://dev.jizhiweb.cn:15321/syjiaer_clinic
-    username: postgres
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://dev.jizhiweb.cn:3306/syjiaer_clinic
+    username: root
     password: i7L0BS91pADGuy7z
   config:
     import: optional:classpath:developer-config.yml