lab_gzf 部署微服务应用

app_BusinessCentral/src/interface/entity/knowledge-article.ts

@@ -30,14 +30,6 @@ export interface KnowledgeArticle {
      */
     statuscode?: any;
 
-    /**
-     * 主要文章
-     *
-     * @returns {*}
-     * @memberof KnowledgeArticle
-     */
-    primary?: any;
-
     /**
      * 过期状态 ID
      *
@@ -533,4 +525,12 @@ export interface KnowledgeArticle {
      * @memberof KnowledgeArticle
      */
     transactioncurrencyname?: any;
+
+    /**
+     * 主要文章
+     *
+     * @returns {*}
+     * @memberof KnowledgeArticle
+     */
+    isprimary?: any;
 }
\ No newline at end of file

app_BusinessCentral/src/locale/lanres/entities/knowledge-article/knowledge-article_en_US.ts

@@ -4,7 +4,6 @@ export default {
     knowledgearticleviews_date: "知识文章视图(上次更新时间)",
     keywords: "关键字",
     statuscode: "状态描述",
-    primary: "主要文章",
     expirationstateid: "过期状态 ID",
     rating_count: "Rating(Count)",
     content: "内容",
@@ -67,6 +66,7 @@ export default {
     rootarticlename: "根文章",
     subjectname: "主题",
     transactioncurrencyname: "货币",
+    isprimary: "主要文章",
   },
 	views: {
 		editview: {

app_BusinessCentral/src/locale/lanres/entities/knowledge-article/knowledge-article_zh_CN.ts

@@ -3,7 +3,6 @@ export default {
     knowledgearticleviews_date: "知识文章视图(上次更新时间)",
     keywords: "关键字",
     statuscode: "状态描述",
-    primary: "主要文章",
     expirationstateid: "过期状态 ID",
     rating_count: "Rating(Count)",
     content: "内容",
@@ -66,6 +65,7 @@ export default {
     rootarticlename: "根文章",
     subjectname: "主题",
     transactioncurrencyname: "货币",
+    isprimary: "主要文章",
   },
 	views: {
 		editview: {

app_BusinessCentral/src/widgets/knowledge-article-incident/main-grid/main-grid.html

@@ -24,7 +24,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('knowledgearticlename')">
-                <el-table-column show-overflow-tooltip :prop="'knowledgearticlename'" :label="$t('entities.knowledgearticleincident.main_grid.columns.knowledgearticlename')" :width="160"  :align="'left'">
+                <el-table-column show-overflow-tooltip :prop="'knowledgearticlename'" :label="$t('entities.knowledgearticleincident.main_grid.columns.knowledgearticlename')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.knowledgearticleincident.main_grid.columns.knowledgearticlename')}}

app_BusinessCentral/src/widgets/knowledge-article/edit-main-form/edit-main-form-model.ts

@@ -41,7 +41,7 @@ export default class Edit_MainModel {
       {
         name: 'srfmajortext',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'srftempmode',
@@ -58,7 +58,7 @@ export default class Edit_MainModel {
       {
         name: 'title',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'keywords',

app_BusinessCentral/src/widgets/knowledge-article/info-knowledge-article-form/info-knowledge-article-form-model.ts

@@ -41,7 +41,7 @@ export default class Info_KnowledgeArticleModel {
       {
         name: 'srfmajortext',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'srftempmode',
@@ -58,7 +58,7 @@ export default class Info_KnowledgeArticleModel {
       {
         name: 'title',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'keywords',

app_BusinessCentral/src/widgets/knowledge-article/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-model.ts

@@ -23,9 +23,6 @@ export default class InfoViewtabexppanelModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'primary',
-      },
       {
         name: 'expirationstateid',
       },
@@ -213,6 +210,9 @@ export default class InfoViewtabexppanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'isprimary',
+      },
     ]
   }
 

app_BusinessCentral/src/widgets/knowledge-article/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel-model.ts

@@ -23,9 +23,6 @@ export default class InfoViewtabviewpanelModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'primary',
-      },
       {
         name: 'expirationstateid',
       },
@@ -213,6 +210,9 @@ export default class InfoViewtabviewpanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'isprimary',
+      },
     ]
   }
 

app_BusinessCentral/src/widgets/knowledge-article/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel-model.ts

@@ -23,9 +23,6 @@ export default class InfoViewtabviewpanel2Model {
       {
         name: 'statuscode',
       },
-      {
-        name: 'primary',
-      },
       {
         name: 'expirationstateid',
       },
@@ -213,6 +210,9 @@ export default class InfoViewtabviewpanel2Model {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'isprimary',
+      },
     ]
   }
 

app_BusinessCentral/src/widgets/knowledge-article/kl-art-info-dashboard/kl-art-info-dashboard-model.ts

@@ -23,9 +23,6 @@ export default class KlArtInfoModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'primary',
-      },
       {
         name: 'expirationstateid',
       },
@@ -213,6 +210,9 @@ export default class KlArtInfoModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'isprimary',
+      },
     ]
   }
 

app_BusinessCentral/src/widgets/knowledge-article/main-grid/main-grid-model.ts

@@ -34,7 +34,7 @@ export default class MainModel {
         {
           name: 'title',
           prop: 'title',
-          dataType: 'LONGTEXT',
+          dataType: 'LONGTEXT_1000',
         },
         {
           name: 'languagelocaleid',
@@ -69,7 +69,7 @@ export default class MainModel {
         {
           name: 'srfmajortext',
           prop: 'title',
-          dataType: 'LONGTEXT',
+          dataType: 'LONGTEXT_1000',
         },
         {
           name: 'previousarticlecontentid',

app_BusinessCentral/src/widgets/knowledge-article/main-grid/main-grid.html

@@ -24,7 +24,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('title')">
-                <el-table-column show-overflow-tooltip :prop="'title'" :label="$t('entities.knowledgearticle.main_grid.columns.title')" :width="150"  :align="'left'">
+                <el-table-column show-overflow-tooltip :prop="'title'" :label="$t('entities.knowledgearticle.main_grid.columns.title')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.knowledgearticle.main_grid.columns.title')}}

app_BusinessCentral/src/widgets/knowledge-article/quick-create-form/quick-create-form-model.ts

@@ -41,7 +41,7 @@ export default class QuickCreateModel {
       {
         name: 'srfmajortext',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'srftempmode',
@@ -58,7 +58,7 @@ export default class QuickCreateModel {
       {
         name: 'title',
         prop: 'title',
-        dataType: 'LONGTEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'keywords',

app_BusinessCentral/src/widgets/knowledge-article/quick-create-form/quick-create-form.html

@@ -8,8 +8,7 @@
     <row>
         <i-col v-show="detailsModel.title.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='title' :itemRules="this.rules.title" class='' :caption="$t('entities.knowledgearticle.quickcreate_form.details.title')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.title.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.title" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.title.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
-
+    <input-box v-model="data.title"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.title.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_BusinessCentral/src/widgets/knowledge-article/view-kl-art-info-portlet/view-kl-art-info-portlet-model.ts

@@ -23,9 +23,6 @@ export default class ViewKlArtInfoModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'primary',
-      },
       {
         name: 'expirationstateid',
       },
@@ -213,6 +210,9 @@ export default class ViewKlArtInfoModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'isprimary',
+      },
     ]
   }
 

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/Dockerfile

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

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml

@@ -3,9 +3,23 @@ services:
   businesscentral-app-businesscentral:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
     ports:
-      - "8080:8080"
+      - "10320:10320"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10320
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-provider-centralapi.jar
 
-EXPOSE 10310
+EXPOSE 8081
 
 ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-provider-centralapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
     ports:
-      - "10310:10310"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10310
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pcentralapi
-      cd businesscentral-provider/businesscentral-provider-centralapi
-      mvn -Pcentralapi docker:build
-      mvn -Pcentralapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-provider-centralapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Pbusinesscentral
+      cd businesscentral-app/businesscentral-app-businesscentral
+      mvn -Pbusinesscentral docker:build
+      mvn -Pbusinesscentral docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-businesscentral.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>