Merge branch 'prod'

kgraph-admin/pom.xml

@@ -87,44 +87,44 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.10</version>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            <configuration>
-                <failOnMissingWebXml>false</failOnMissingWebXml>
-                <warName>${project.artifactId}</warName>
-            </configuration>
-           </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.10</version>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>1.4.10</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            <configuration>-->
+<!--                <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!--                <warName>${project.artifactId}</warName>-->
+<!--            </configuration>-->
+<!--           </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>1.4.10</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${project.artifactId}</repository>-->
+<!--                    <tag>${project.version}</tag>-->
+<!--                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

kgraph-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.108.150.237:3306/kgraph2?userUnicode=ture&characterEncoding=utf8&&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false#
+                url: jdbc:mysql://127.0.0.1:3306/kgraph?userUnicode=ture&characterEncoding=utf8&&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false#
                 username: root
-                password: w.cf123321
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

kgraph-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ kgraph:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/kgraph/uploadPath，Linux配置 /home/kgraph/uploadPath）
-  profile: C:/kgraph/uploadPath
+  profile: D:/kgraph/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.108.150.237
+    host: 127.0.0.1
     # 端口，默认为6379
-    port: 4406
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: w.cf123321
+    password: 123456
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -91,7 +91,7 @@ spring:
         max-wait: -1ms
   data:
     neo4j:
-      uri: bolt://localhost:7687
+      uri: bolt://127.0.0.1:7687
       username: neo4j
       password: 123456
 

kgraph-admin/src/main/resources/mapper/ledger/AirPartInfoMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectAirPartInfoById" parameterType="Long" resultMap="AirPartInfoResult">
         <include refid="selectAirPartInfoVo"/>
-        where asi.id = #{id}
+        where api.id = #{id}
     </select>
         
     <insert id="insertAirPartInfo" parameterType="AirPartInfo" useGeneratedKeys="true" keyProperty="id">

kgraph-graph/pom.xml

@@ -70,6 +70,12 @@
 			<version>4.5.14</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.14</version>
+		</dependency>
+
     </dependencies>
 
 </project>