Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-boot/src/main/resources/application-local.yml

@@ -11,7 +11,7 @@ junmp:
     epoch: 1656036996843
     max: 9999
   log:
-    type: db
+    type: es
   ds: true #是否多数据源
 
 knife4j:

jyzb-boot/src/main/resources/application.yml

@@ -2,7 +2,11 @@
 #  port: 10030
 # 应用服务器
 
-
+easy-es:
+  enable: true
+  address: 192.168.2.76:9200
+  username:
+  password:
 server:
   tomcat:
     uri-encoding: UTF-8 #tomcat编码