配置修改及问题修复

@@ -308,7 +308,7 @@ public class MaterialINController {
             }
             }
 			result.setResult(materialIN);
 			result.setResult(materialIN);
 			result.setSuccess(true);
 			result.setSuccess(true);
-		}*/
+		}
 		return result;
 		return result;
 	}
 	}
 
 

@@ -89,21 +89,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: root
-          password: jkauto@123
-          driver-class-name: com.mysql.jdbc.Driver
-        # 恩菲数据同步
-        nf-db:
-          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://47.104.179.187:6003/sk-se-group-zfst?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           username: root
           password: jkauto@123
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver
         # 多数据源配置
         # 多数据源配置
         pg-db:
         pg-db:
-          url: jdbc:postgresql://113.249.91.27:10086/postgres?useUnicode=true&characterEncoding=UTF8
+          url: jdbc:postgresql://139.129.230.214:10086/postgres?useUnicode=true&characterEncoding=UTF8
           username: postgres
           username: postgres
-          password: jkauto@123
+          password: Jkpostgres@zz
           driver-class-name: org.postgresql.Driver
           driver-class-name: org.postgresql.Driver
   #redis 配置
   #redis 配置
   redis:
   redis:
@@ -162,11 +156,11 @@ skua:
   isRunTimeInterval: 3600
   isRunTimeInterval: 3600
   #视频对接相关配置,未使用，待完善
   #视频对接相关配置,未使用，待完善
   video:
   video:
-    lan: 113.249.91.27
-    ip: 113.249.91.27
+    lan: 118.190.97.62
+    ip: 118.190.97.62
     port: 8667
     port: 8667
-    appkey: 21656155
-    secretkey: llQvkzDIzmYnNiXNYxDN
+    appkey: 23259573
+    secretkey: 0zoBqIJeudIhgCysCe0r
   #消息推送
   #消息推送
   push:
   push:
     #是否开启流程消息推送
     #是否开启流程消息推送