ibizdev提交

app_web/src/environments/environment.ts

@@ -4,7 +4,7 @@ export const Environment = {
     // 应用名称
     AppName: 'web',
     // 应用 title
-    AppTitle: 'gateway',
+    AppTitle: '字典',
     // 应用基础路径
     BaseUrl: '../',
     // 系统名称

app_web/src/mock/app/app-index-view-appmenu/app-index-view-appmenu.ts

@@ -25,7 +25,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto1',
 	resourcetag: '',
 },
         ],

app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.vue

@@ -480,8 +480,8 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
     public click(item: any) {
         if (item) {
             switch (item.appfunctag) {
-                case '_2': 
-                    this.click_2(item);
+                case 'Auto1': 
+                    this.clickAuto1(item);
                     return;
                 default:
                     console.warn('未指定应用功能');
@@ -496,7 +496,7 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof AppIndexView
      */
-    public click_2(item: any = {}) {
+    public clickAuto1(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-model.ts

@@ -29,7 +29,7 @@ export default class AppIndexViewModel {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto1',
 	resourcetag: '',
 },
     ];

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzdict/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzdict/
-      mvn clean package -Papi
-      cd ibzdict-provider/ibzdict-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdict-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzdict-app/ibzdict-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdict-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzdict-app/ibzdict-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdict-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30004
 
 ADD ibzdict-app-web.jar /ibzdict-app-web.jar

ibzdict-app/ibzdict-app-web/src/main/docker/ibzdict-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzdict-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdict-app-web:latest
     ports:
-      - "8080:8080"
+      - "30004:30004"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzdict-app/ibzdict-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 30004
\ No newline at end of file

ibzdict-app/ibzdict-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30004
 
 #zuul网关路由设置
 zuul:

ibzdict-boot/src/main/resources/application-dev.yml

 server:
-  port: 40004
+  port: 8080
 
 
 

ibzdict-provider/ibzdict-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdict-provider-api.jar
 
-EXPOSE 40004
+EXPOSE 8081
 
 ADD ibzdict-provider-api.jar /ibzdict-provider-api.jar

ibzdict-provider/ibzdict-provider-api/src/main/docker/ibzdict-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzdict-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdict-provider-api:latest
     ports:
-      - "40004:40004"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzdict-provider/ibzdict-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40004
\ No newline at end of file
+  port: 8081
\ No newline at end of file

ibzdict-provider/ibzdict-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40004
+  port: 8081