feat: uuwaf 升级到 v2.6.0

apps/alist/data.yml

@@ -14,7 +14,7 @@ additionalProperties:
     type: tool
     crossVersionUpdate: true
     limit: 0
-    recommend: 8
+    recommend: 9
     website: https://github.com/alist-org/alist
     github: https://github.com/alist-org/alist
     document: https://alist.nn.ci/zh/

apps/dataease/data.yml

@@ -14,7 +14,7 @@ additionalProperties:
     type: tool
     crossVersionUpdate: true
     limit: 0
-    recommend: 6
+    recommend: 7
     website: https://dataease.io/
     github: https://github.com/dataease/dataease
     document: https://dataease.io/docs/

apps/jumpserver/data.yml

@@ -14,7 +14,7 @@ additionalProperties:
   type: tool
   crossVersionUpdate: true
   limit: 1
-  recommend: 7
+  recommend: 8
   website: https://www.jumpserver.org
   github: https://github.com/jumpserver/jumpserver
   document: https://docs.jumpserver.org

apps/openresty/1.21.4.2/data.yml

@@ -1,14 +1,12 @@
 additionalProperties:
     formFields:
         - default: 80
-          disabled: true
           envKey: PANEL_APP_PORT_HTTP
           labelEn: HTTP Port
           labelZh: HTTP 端口
           required: true
           type: number
         - default: 443
-          disabled: true
           envKey: PANEL_APP_PORT_HTTPS
           labelEn: HTTPS Port
           labelZh: HTTPS 端口

apps/uuwaf/2.6.0/docker-compose.yml

@@ -1,18 +1,10 @@
 networks:
-  wafnet:
+  1panel-network:
-    name: wafnet
+    external: true
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - gateway: 172.22.0.1
-          subnet: 172.22.0.0/24
-    driver_opts:
-      com.docker.network.bridge.name: wafnet
 
 services:
   uuwaf:
-    image: uusec/nanqiang:v2.5.1
+    image: uusec/nanqiang:v2.6.0
     ulimits:
       nproc: 65535
       nofile:
@@ -20,8 +12,7 @@ services:
         hard: 102400
     container_name: uuwaf
     networks:
-      wafnet:
+      - 1panel-network
-        ipv4_address: 172.22.0.3
     ports:
       - ${PANEL_APP_PORT_HTTP1}:80
       - ${PANEL_APP_PORT_HTTPS2}:443
@@ -40,8 +31,7 @@ services:
     image: percona:8
     container_name: wafdb
     networks:
-      wafnet:
+      - 1panel-network
-        ipv4_address: 172.22.0.7
     volumes:
       - wafshared:/docker-entrypoint-initdb.d
       - wafdata:/var/lib/mysql

apps/uuwaf/data.yml

@@ -14,7 +14,7 @@ additionalProperties:
   type: tool
   crossVersionUpdate: false
   limit: 1
-  recommend: 0
+  recommend: 6
   website: https://waf.uusec.com/#/
   github: https://github.com/Safe3/uuWAF
   document: https://waf.uusec.com/#/?id=main

apps/zentao/data.yml

@@ -14,7 +14,7 @@ additionalProperties:
   type: tool
   crossVersionUpdate: true
   limit: 0
-  recommend: 9
+  recommend: 10
   website: https://www.zentao.net/index.html
   github: https://github.com/easysoft/zentaopms
   document: https://www.zentao.net/book/zentaopms/38.html

data.yaml

@@ -16,3 +16,4 @@ additionalProperties:
       name: CI/CD
     - key: Local
       name: 本地
+  version: v1.5.0