From 6b501993b02a710f3a6aa5f3f5acd36712f3a341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Tue, 12 Sep 2023 09:31:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 4 ++-- api/config.js | 18 +++++++++--------- .../src/layout/components/header/index.jsx | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index e441918..e5a2104 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -24,8 +24,8 @@ "-g postgres://FashionAdmin:123456@10.8.30.166:5432/POMS", "-k 10.8.30.72:29092,10.8.30.73:29092,10.8.30.74:29092", "-e http://10.8.30.60:9200", - "-c https://camundatest.anxinyun.cn", - "-r fs-workflow", + // "-c https://camundatest.anxinyun.cn", + // "-r fs-workflow", // "-e http://10.8.30.60:5601", "--iotaProxy http://10.8.30.157:17007", // diff --git a/api/config.js b/api/config.js index fccf72c..24293ae 100644 --- a/api/config.js +++ b/api/config.js @@ -13,8 +13,8 @@ args.option(['g', 'pg'], 'postgre 服务 URL'); args.option(['f', 'fileHost'], '文件中心本地化存储: WebApi 服务器地址(必填), 该服务器提供文件上传Web服务'); args.option(['k', 'kafka'], 'kafka 服务 URL'); args.option(['e', 'es'], 'es 服务 URL'); -args.option(['c', 'camundaHost'], 'camunda rest host'); -args.option(['r', 'camundaRoot'], 'camunda rest root'); +// args.option(['c', 'camundaHost'], 'camunda rest host'); +// args.option(['r', 'camundaRoot'], 'camunda rest root'); args.option('iotaProxy', '以太代理') args.option('redisHost', 'redisHost'); @@ -66,8 +66,8 @@ const flags = args.parse(process.argv); const POMS_DB = process.env.POMS_DB || flags.pg; const LOCAL_SVR_ORIGIN = process.env.LOCAL_SVR_ORIGIN || flags.fileHost; //项企 -const FS_CAMUNDA_HOST = process.env.CAMUNDA_HOST || flags.camundaHost; -const FS_CAMUNDA_ROOT = process.env.CAMUNDA_ROOT || flags.camundaRoot; +// const FS_CAMUNDA_HOST = process.env.CAMUNDA_HOST || flags.camundaHost; +// const FS_CAMUNDA_ROOT = process.env.CAMUNDA_ROOT || flags.camundaRoot; // kafka const ANXINCLOUD_KAFKA_BROKERS = process.env.ANXINCLOUD_KAFKA_BROKERS || flags.kafka; @@ -137,7 +137,7 @@ const ANXINCLOUD_ES_NODES_REST = process.env.ANXINCLOUD_ES_NODES_REST || flags.e // //business_key // const BUSINESS_KEY=process.env.BUSINESS_KEY||['160','161'] if ( - !FS_CAMUNDA_HOST || !FS_CAMUNDA_ROOT || + // !FS_CAMUNDA_HOST || !FS_CAMUNDA_ROOT || !POMS_DB || !IOTA_REDIS_SERVER_HOST || !IOTA_REDIS_SERVER_PORT || !ANXINCLOUD_KAFKA_BROKERS @@ -179,10 +179,10 @@ const product = { opts: { dev, // BUSINESS_KEY, - camundarest: { - host: FS_CAMUNDA_HOST, - root: FS_CAMUNDA_ROOT - }, + // camundarest: { + // host: FS_CAMUNDA_HOST, + // root: FS_CAMUNDA_ROOT + // }, exclude: [ // "*", { p: '/attachments/:p', o: 'POST' }, diff --git a/web/client/src/layout/components/header/index.jsx b/web/client/src/layout/components/header/index.jsx index d01f168..9c1814e 100644 --- a/web/client/src/layout/components/header/index.jsx +++ b/web/client/src/layout/components/header/index.jsx @@ -287,7 +287,8 @@ const Header = (props) => { {item.hasOwnProperty('items') && item.items.map((ite, idx) => ( From 21056764fa25843dd6bc1eb2191a465beee4c801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Tue, 12 Sep 2023 10:01:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=B3=A8=E9=87=8A=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E4=B8=AD=E9=97=B4=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/app/lib/index.js b/api/app/lib/index.js index b8c4758..0b9bef1 100644 --- a/api/app/lib/index.js +++ b/api/app/lib/index.js @@ -49,7 +49,7 @@ module.exports.entry = function (app, router, opts) { // 鉴权中间件 router.use(authenticator(app, opts)); //camundarest - router.use(camundarest(app, router, opts.camundarest)); + // router.use(camundarest(app, router, opts.camundarest)); // 日志记录 // router.use(apiLog(app, opts));