bugfix

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-boot/pom.xml.hbs

@@ -20,6 +20,42 @@
 			<version>${project.version}</version>
 		</dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>runtime</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>${basedir}/src/main/resources</directory>
+                        <includes>
+                            <include>**/**</include>
+                        </includes>
+                    </resource>
+                </resources>
+
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <configuration>
+                            <finalName>{{projectName}}-boot</finalName>
+                            <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                            <mainClass>{{packageName}}.BootApplication</mainClass>
+                            <outputDirectory>../</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 	<build>
 		<resources>
 			<resource>
@@ -29,12 +65,13 @@
 				</includes>
 			</resource>
 		</resources>
+
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<finalName>{{projectName}}</finalName>
+					<finalName>{{projectName}}-boot</finalName>
 					<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
 					<mainClass>{{packageName}}.BootApplication</mainClass>
 					<outputDirectory>../</outputDirectory>
@@ -78,4 +115,5 @@
 			</plugin>
 		</plugins>
 	</build>
+
 </project>

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-boot/src/main/resources/application-boot.yml.hbs

-
-#zuul网关路由设置
-zuul:
-  routes:
-    {{#if system.enableWorkflow}}
-    wfcore:
-      path: /wfcore/**
-      serviceId: ${ibiz.ref.service.wf:ibzwf-api}
-      stripPrefix: true
-    {{/if}}
-    loginv7:
-      path: /v7/login
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    changepwd:
-      path: /v7/changepwd
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    uaa:
-      path: /uaa/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    config:
-      path: /configs/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    oucore:
-      path: /ibzorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}
-      stripPrefix: false
-    oudict:
-      path: /dictionarys/**/Ibzou**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}
-      stripPrefix: false
-    ou:
-      path: /ibzdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}
-      stripPrefix: false
-    uaadict:
-      path: /dictionarys/**/SysOperator
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    dict:
-      path: /dictionarys/**
-      serviceId: ${ibiz.ref.service.dict:ibzdict-api}
-      stripPrefix: false
-    disk:
-      path: /net-disk/**
-      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}
-      stripPrefix: false
-    ou_sys_org:
-      path: /sysorganizations/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}
-      stripPrefix: false
-    ou_sys_dept:
-      path: /sysdepartments/**
-      serviceId: ${ibiz.ref.service.ou:ibzou-api}
-      stripPrefix: false
-    lite-core:
-      path: /lite/**
-      serviceId: ${ibiz.ref.service.lite:ibzlite-api}
-      stripPrefix: false
-    sysauthlog:
-      path: /sysauthlogs
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-  {{#each system.apps as | webapp |}}
-    {{#each webapp.appEntities as |appEntity|}}
-    {{#if appEntity.entity}}
-        {{#eq appEntity.entity.storage "ServiceAPI"}}
-        {{#appEntity.serviceId}}
-    {{lowerCase webapp.codeName}}-{{lowerCase appEntity.codeName}}:
-      path: /{{pluralize appEntity.codeName}}/**
-      serviceId: {{refServiceId}}
-      stripPrefix: false
-        {{/appEntity.serviceId}}
-        {{/eq}}
-    {{/if}}
-    {{/each}}
-  {{/each}}
-  sensitive-headers:
-    - Cookie,Set-Cookie,Authorization
\ No newline at end of file

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-boot/src/main/resources/application.yml.hbs

@@ -8,4 +8,87 @@ spring:
 server:
   port: 8080
   servlet:
-    contextPath: /{{lowerCase system.name}}
\ No newline at end of file
+    contextPath: /{{lowerCase system.name}}
+
+
+#zuul网关路由设置
+zuul:
+  routes:
+    {{#if system.enableWorkflow}}
+    wfcore:
+      path: /wfcore/**
+      serviceId: ${ibiz.ref.service.wf:ibzwf-api}
+      stripPrefix: true
+    {{/if}}
+    loginv7:
+      path: /v7/login
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    uaa:
+      path: /uaa/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    config:
+      path: /configs/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    oucore:
+      path: /ibzorganizations/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+    oudict:
+      path: /dictionarys/**/Ibzou**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+    ou:
+      path: /ibzdepartments/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+    uaadict:
+      path: /dictionarys/**/SysOperator
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    dict:
+      path: /dictionarys/**
+      serviceId: ${ibiz.ref.service.dict:ibzdict-api}
+      stripPrefix: false
+    disk:
+      path: /net-disk/**
+      serviceId: ${ibiz.ref.service.disk:ibzdisk-api}
+      stripPrefix: false
+    ou_sys_org:
+      path: /sysorganizations/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+    ou_sys_dept:
+      path: /sysdepartments/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+    lite-core:
+      path: /lite/**
+      serviceId: ${ibiz.ref.service.lite:ibzlite-api}
+      stripPrefix: false
+    sysauthlog:
+      path: /sysauthlogs
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+  {{#each system.apps as | webapp |}}
+    {{#each webapp.appEntities as |appEntity|}}
+    {{#if appEntity.entity}}
+        {{#eq appEntity.entity.storage "ServiceAPI"}}
+        {{#appEntity.serviceId}}
+    {{lowerCase webapp.codeName}}-{{lowerCase appEntity.codeName}}:
+      path: /{{pluralize appEntity.codeName}}/**
+      serviceId: {{refServiceId}}
+      stripPrefix: false
+        {{/appEntity.serviceId}}
+        {{/eq}}
+    {{/if}}
+    {{/each}}
+  {{/each}}
+  sensitive-headers:
+    - Cookie,Set-Cookie,Authorization
\ No newline at end of file

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-core/src/main/resources/application-sys.yml.hbs

@@ -38,7 +38,7 @@ spring:
   datasource:
     username: a_LAB01_da1af574b
     password: 'D33f8870'
-    url: jdbc:mysql://172.16.186.185:3306/a_LAB01_da1af574b?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/{{projectName}}?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
     driver-class-name: com.mysql.jdbc.Driver
     isSyncDBSchema: false
     defaultSchema: a_LAB01_da1af574b
@@ -177,7 +177,7 @@ ibiz:
 ### jobs
 jobs:
   #admin-address: http://127.0.0.1:40005
-  app-name: ibznotify
+  app-name: {{lowerCase system.name}}
   app-port: 9999
   #app-ip: 127.0.0.1