Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

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",
             //

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));
 

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' },

web/client/src/layout/components/header/index.jsx

@@ -287,7 +287,8 @@ const Header = (props) => {
                               <Nav.Sub
                                  key={index + 'a'}
                                  itemKey={item.itemKey}
-                                 text={item.text==='工单'?`${item.text}（${111}）`:item.text}
+                                 // text={item.text==='工单'?`${item.text}（${111}）`:item.text}
+                                 text={item.text}
                                  dropdownStyle={{ color: '#F2F3F5' }}
                               >
                                  {item.hasOwnProperty('items') && item.items.map((ite, idx) => (