zuul bug fix

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/resources/application-{{apps}}-prod.yml.hbs

@@ -72,64 +72,64 @@ zuul:
     {{#if system.enableWorkflow}}
     wfcore:
       path: /wfcore/**
-      serviceId: ${ibiz.ref.service.wf:ibzwf-api}}
+      serviceId: ${ibiz.ref.service.wf:ibzwf-api}
       stripPrefix: true
     {{/if}}
     loginv7:
       path: /v7/login
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     changepwd:
       path: /v7/changepwd
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     uaa:
       path: /uaa/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     config:
       path: /configs/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     oucore:
       path: /ibzorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     oudict:
       path: /dictionarys/**/Ibzou**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     ou:
       path: /ibzdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     uaadict:
       path: /dictionarys/**/SysOperator
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     dict:
       path: /dictionarys/**
-      serviceId: ${ibiz.ref.service.dict:ibzdict-api}}
+      serviceId: ${ibiz.ref.service.dict:ibzdict-api}
       stripPrefix: false
     disk:
       path: /net-disk/**
-      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}}
+      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}
       stripPrefix: false
     ou_sys_org:
       path: /sysorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     ou_sys_dept:
       path: /sysdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     lite-core:
       path: /lite/**
-      serviceId: ${ibiz.ref.service.lite:ibzlite-api}}
+      serviceId: ${ibiz.ref.service.lite:ibzlite-api}
       stripPrefix: false
     sysauthlog:
       path: /sysauthlogs
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
   {{#each app.appEntities}}
     {{#serviceId}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-boot/src/main/resources/application-dev.yml.hbs

@@ -6,64 +6,64 @@ zuul:
     {{#if system.enableWorkflow}}
     wfcore:
       path: /wfcore/**
-      serviceId: ${ibiz.ref.service.wf:ibzwf-api}}
+      serviceId: ${ibiz.ref.service.wf:ibzwf-api}
       stripPrefix: true
     {{/if}}
     loginv7:
       path: /v7/login
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     changepwd:
       path: /v7/changepwd
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     uaa:
       path: /uaa/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     config:
       path: /configs/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     oucore:
       path: /ibzorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     oudict:
       path: /dictionarys/**/Ibzou**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     ou:
       path: /ibzdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     uaadict:
       path: /dictionarys/**/SysOperator
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     dict:
       path: /dictionarys/**
-      serviceId: ${ibiz.ref.service.dict:ibzdict-api}}
+      serviceId: ${ibiz.ref.service.dict:ibzdict-api}
       stripPrefix: false
     disk:
       path: /net-disk/**
-      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}}
+      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}
       stripPrefix: false
     ou_sys_org:
       path: /sysorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     ou_sys_dept:
       path: /sysdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}}
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
     lite-core:
       path: /lite/**
-      serviceId: ${ibiz.ref.service.lite:ibzlite-api}}
+      serviceId: ${ibiz.ref.service.lite:ibzlite-api}
       stripPrefix: false
     sysauthlog:
       path: /sysauthlogs
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
   {{#each system.apps as | webapp |}}
     {{#each webapp.appEntities as |appEntity|}}
@@ -71,7 +71,7 @@ zuul:
         {{#appEntity.serviceId}}
     {{lowerCase webapp.codeName}}-{{lowerCase appEntity.codeName}}:
       path: /{{pluralize appEntity.codeName}}/**
-      serviceId: ${ ibiz.ref.service.{{appEntity.serviceId}}:{{appEntity.serviceId}} }
+      serviceId: {{refServiceId}}
       stripPrefix: false
         {{/appEntity.serviceId}}
         {{/eq}}