diff --git a/app/Module/Apps/Apps.php b/app/Module/Apps/Apps.php index 24dcc7f88..c05fce2ef 100644 --- a/app/Module/Apps/Apps.php +++ b/app/Module/Apps/Apps.php @@ -22,7 +22,6 @@ class Apps 'minder', 'approve', 'ai', - 'okr', 'face', 'search', ]; diff --git a/docker-compose.yml b/docker-compose.yml index ac1bd285d..f0636055e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -180,25 +180,6 @@ services: ipv4_address: "${APP_IPPR}.12" restart: unless-stopped - okr: - container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.4.5" - environment: - TZ: "${TIMEZONE:-PRC}" - DOO_TASK_URL: "http://nginx" - MYSQL_HOST: "${DB_HOST}" - MYSQL_PORT: "${DB_PORT}" - MYSQL_DBNAME: "${DB_DATABASE}" - MYSQL_USERNAME: "${DB_USERNAME}" - MYSQL_PASSWORD: "${DB_PASSWORD}" - MYSQL_PREFIX: "${DB_PREFIX}" - DEMO_DATA: true - KEY: ${APP_KEY} - networks: - extnetwork: - ipv4_address: "${APP_IPPR}.13" - restart: unless-stopped - face: container_name: "dootask-face-${APP_ID}" image: "hitosea2020/dooface:0.0.1" diff --git a/docker/nginx/location/okr.conf b/docker/nginx/location/okr.conf deleted file mode 100644 index a6a428e99..000000000 --- a/docker/nginx/location/okr.conf +++ /dev/null @@ -1,3 +0,0 @@ -location /apps/okr/ { - proxy_pass http://okr:5566/apps/okr/; -} diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 4555aa643..b18266add 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -4671,8 +4671,7 @@ export default { // 打开详情页 emitter.emit('openMicroApp', { name: 'okr-details', - url: `http://127.0.0.1:5567/apps/okr/`, - // url: $A.mainUrl('apps/okr/'), + url: $A.mainUrl('apps/okr/'), props: { type: 'details', id: value, @@ -4683,8 +4682,7 @@ export default { // 打开列表、统计 emitter.emit('openMicroApp', { name: `okr-${value}`, - url: `http://127.0.0.1:5567/apps/okr/${value}`, - // url: $A.mainUrl(`apps/okr/${value}`), + url: $A.mainUrl(`apps/okr/${value}`), }); } },