diff --git a/installer/dataease/bin/apisix/init.sh b/installer/dataease/bin/apisix/init.sh deleted file mode 100644 index b9bdbc148a..0000000000 --- a/installer/dataease/bin/apisix/init.sh +++ /dev/null @@ -1,177 +0,0 @@ -#1.create upstream core_api -curl http://127.0.0.1:9180/apisix/admin/upstreams/1 -X PUT -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "nodes": [ - { - "host": "dataease", - "port": 8100, - "weight": 1 - } - ], - "timeout": { - "connect": 6, - "send": 10, - "read": 60 - }, - "type": "roundrobin", - "scheme": "http", - "pass_host": "pass", - "name": "core_api", - "desc": "dataease core service", - "keepalive_pool": { - "idle_timeout": 60, - "requests": 1000, - "size": 320 - } -}' - -#2.create forward auth route -curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "uri": "/de2api/apisix/check", - "name": "auth_check", - "methods": [ - "GET", - "POST", - "PUT", - "DELETE", - "PATCH", - "HEAD", - "OPTIONS", - "CONNECT", - "TRACE", - "PURGE" - ], - "upstream_id": "1", - "status": 1 -}' - -#3.create auth_service -curl http://127.0.0.1:9180/apisix/admin/services/10 -X PUT -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "name": "auth_service", - "desc": "dataease auth service", - "upstream_id": "1", - "plugins": { - "forward-auth": { - "_meta": { - "disable": false - }, - "client_headers": [ - "Location", - "DE-GATEWAY-FLAG", - "DE-FORBIDDEN-FLAG" - ], - "request_headers": [ - "X-DE-TOKEN", - "X-DE-LINK-TOKEN", - "X-EMBEDDED-TOKEN", - "X-DE-ASK-TOKEN", - "Content-Type", - "Origin" - ], - "request_method": "POST", - "upstream_headers": [ - "X-User-ID", - "X-DE-REFRESH-TOKEN", - "X-DE-TOKEN" - ], - "uri": "http://127.0.0.1:9080/de2api/apisix/check" - } - } -}' - -#4.create static resource route -curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "uris": [ - "/js/*", - "/assets/*", - "/vite.svg" - ], - "name": "global_static", - "priority": 1, - "methods": [ - "GET", - "POST", - "PUT", - "DELETE", - "PATCH", - "HEAD", - "OPTIONS", - "CONNECT", - "TRACE", - "PURGE" - ], - "upstream_id": "1", - "status": 1 -}' - -#5.create default index route -curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "uri": "/*", - "name": "default_index", - "priority": 100, - "methods": [ - "GET", - "POST", - "PUT", - "DELETE", - "PATCH", - "HEAD", - "OPTIONS", - "CONNECT", - "TRACE", - "PURGE" - ], - "vars": [ - [ - "http_out_auth_platform", - "!", - "IN", - [ - "ldap", - "oidc", - "cas" - ] - ] - ], - "upstream_id": "1", - "enable_websocket": true, - "status": 1 -}' - -#6.create default api route -curl http://127.0.0.1:9180/apisix/admin/routes -X POST -H "X-API-KEY: $DE_APISIX_KEY" -d ' -{ - "uri": "/de2api/*", - "name": "default_api", - "priority": 6, - "methods": [ - "GET", - "POST", - "PUT", - "DELETE", - "PATCH", - "HEAD", - "OPTIONS", - "CONNECT", - "TRACE", - "PURGE" - ], - "vars": [ - [ - "http_out_auth_platform", - "!", - "IN", - [ - "ldap", - "oidc", - "cas" - ] - ] - ], - "service_id": "10", - "status": 1 -}' diff --git a/installer/dectl b/installer/dectl index 10625f8367..098cb8e542 100644 --- a/installer/dectl +++ b/installer/dectl @@ -75,10 +75,6 @@ function _prepare_apisix() { sed -i -e "s/DE_APISIX_KEY/${DE_APISIX_KEY}/g" $DE_RUNNING_BASE/conf/application.yml fi } -function _init_apisix() { - DE_APISIX_KEY=$DE_APISIX_KEY sh $DE_RUNNING_BASE/bin/apisix/init.sh -} - function _healthcheck() { echo container_name=$(grep "container_name" $DE_RUNNING_BASE/docker-compose.yml | awk -F': ' '{print $2}') @@ -224,9 +220,6 @@ function start() { cd ${DE_RUNNING_BASE} ${compose_cmd} ${compose_files} up -d _healthcheck - if [ $? -eq 0 ] && [[ $need_init_apisix = true ]]; then - _init_apisix - fi } function stop() { echo