Browse Source

修改依赖

linhuili 3 years ago
parent
commit
e77bccaf54

+ 38 - 4
pom.xml

@@ -40,24 +40,45 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+
+        <repository>
+            <id>osgeo</id>
+            <name>Open Source Geospatial Foundation Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+        </repository>
+
     </repositories>
     <dependencies>
         <!-- 配置中心(包含注册中心) -->
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
         <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>dmp-digital-starter</artifactId>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.18</version>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dmp-server</artifactId>
+            <artifactId>dmp-digital-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dmp-mybatis</artifactId>
+            <artifactId>dmp-server</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.persagy</groupId>
+                    <artifactId>dmp-auth</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
@@ -65,9 +86,22 @@
             <version>1.1.1</version>
         </dependency>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-auth-starter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-mybatis</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

+ 1 - 1
src/main/java/com/persagy/dmp/middleware/client/DmpRwdClient.java

@@ -21,7 +21,7 @@ import java.util.List;
  *@author:lgy
  *@data:2021/8/11 14:56
  */
-@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class)
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,url = "${persagy.bdtp.rwd.service:}")
 public interface DmpRwdClient {
     /**
      * @description: 查询关系

+ 2 - 0
src/main/java/com/persagy/dmp/middleware/dao/WdConstructDescriptionMapper.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.middleware.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @ClassName DefineTypeRelMapper
@@ -10,6 +11,7 @@ import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
  * @Date 2021/9/9 10:24
  * @Version V1.0
  **/
+@Mapper
 public interface WdConstructDescriptionMapper extends BaseMapper<WdConstructDescription> {
 
 }

+ 2 - 0
src/main/java/com/persagy/dmp/middleware/dao/WdDefineTypeRelMapper.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.middleware.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @ClassName DefineTypeRelMapper
@@ -10,5 +11,6 @@ import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
  * @Date 2021/9/9 10:24
  * @Version V1.0
  **/
+@Mapper
 public interface WdDefineTypeRelMapper extends BaseMapper<WdDefineTypeRel> {
 }

+ 5 - 1
src/main/resources/bootstrap.yml

@@ -4,7 +4,11 @@ spring:
   application:
     # 应用名称
     name: persagy-dmp-middleware
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
 config:
   file:
     absolute:
-      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
+      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
+mybatis-plus:
+  type-handlers-package: com.persagy.dmp.basic.config

+ 1 - 1
src/main/resources/md/管理说明书接口缺失整理-后台.md

@@ -48,7 +48,7 @@
 
 {
     “buildId”:"****",   //建筑id(必传)
-    "floorId":"****",   //楼层id (必传,不传查全楼
+    "floorId":"****",   //楼层id (必传)
 }
 ```