xignzi006 部署微服务应用

app_WebSite/public/assets/json/view-config.json

@@ -41,7 +41,7 @@
     },
     "websiteeditview": {
         "title": "实体编辑视图",
-        "caption": "网站",
+        "caption": "站点",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "WebSite",
         "viewname": "WebSiteEditView",
@@ -61,7 +61,7 @@
     },
     "websitegridview": {
         "title": "实体表格视图",
-        "caption": "网站",
+        "caption": "站点",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "WebSite",
         "viewname": "WebSiteGridView",

app_WebSite/src/interface/entity/web-site-content.ts

@@ -71,7 +71,7 @@ export interface WebSiteContent {
     websitechannelid?: any;
 
     /**
-     * 频道名称
+     * 频道
      *
      * @returns {*}
      * @memberof WebSiteContent
@@ -85,4 +85,84 @@ export interface WebSiteContent {
      * @memberof WebSiteContent
      */
     websitename?: any;
+
+    /**
+     * 内容类型
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    contenttype?: any;
+
+    /**
+     * 业务标识
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    contentcode?: any;
+
+    /**
+     * 作者
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    author?: any;
+
+    /**
+     * 内容
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    content?: any;
+
+    /**
+     * 子标题
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    subtitle?: any;
+
+    /**
+     * 标题
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    title?: any;
+
+    /**
+     * 内容链接
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    link?: any;
+
+    /**
+     * 是否启用
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    validflag?: any;
+
+    /**
+     * 序号
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    sn?: any;
+
+    /**
+     * 备注
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    memo?: any;
 }
\ No newline at end of file

app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_en_US.ts

@@ -9,8 +9,18 @@ export default {
     updateman: "更新人",
     websiteid: "网站标识",
     websitechannelid: "频道标识",
-    websitechannelname: "频道名称",
+    websitechannelname: "频道",
     websitename: "站点",
+    contenttype: "内容类型",
+    contentcode: "业务标识",
+    author: "作者",
+    content: "内容",
+    subtitle: "子标题",
+    title: "标题",
+    link: "内容链接",
+    validflag: "是否启用",
+    sn: "序号",
+    memo: "备注",
   },
 	views: {
 		editview: {
@@ -43,6 +53,16 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			websitename: "站点",
+			websitechannelname: "频道",
+			sn: "序号",
+			websitecontentname: "内容名称",
+			contenttype: "内容类型",
+			contentcode: "业务标识",
+			title: "标题",
+			author: "作者",
+			validflag: "是否启用",
+			memo: "备注",
 		},
 		uiactions: {
 		},

app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_zh_CN.ts

@@ -8,8 +8,18 @@ export default {
     updateman: "更新人",
     websiteid: "网站标识",
     websitechannelid: "频道标识",
-    websitechannelname: "频道名称",
+    websitechannelname: "频道",
     websitename: "站点",
+    contenttype: "内容类型",
+    contentcode: "业务标识",
+    author: "作者",
+    content: "内容",
+    subtitle: "子标题",
+    title: "标题",
+    link: "内容链接",
+    validflag: "是否启用",
+    sn: "序号",
+    memo: "备注",
   },
 	views: {
 		editview: {
@@ -42,6 +52,16 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			websitename: "站点",
+			websitechannelname: "频道",
+			sn: "序号",
+			websitecontentname: "内容名称",
+			contenttype: "内容类型",
+			contentcode: "业务标识",
+			title: "标题",
+			author: "作者",
+			validflag: "是否启用",
+			memo: "备注",
 		},
 		uiactions: {
 		},

app_WebSite/src/locale/lanres/entities/web-site/web-site_en_US.ts

@@ -13,11 +13,11 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "网站",
+			caption: "站点",
       		title: "实体编辑视图",
 		},
 		gridview: {
-			caption: "网站",
+			caption: "站点",
       		title: "实体表格视图",
 		},
 	},

app_WebSite/src/locale/lanres/entities/web-site/web-site_zh_CN.ts

@@ -12,11 +12,11 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "网站",
+			caption: "站点",
       		title: "实体编辑视图",
 		},
 		gridview: {
-			caption: "网站",
+			caption: "站点",
       		title: "实体表格视图",
 		},
 	},

app_WebSite/src/mock/viewconfig/viewconfig.ts

@@ -41,7 +41,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "websiteeditview": {
             "title": "实体编辑视图",
-            "caption": "网站",
+            "caption": "站点",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "WebSite",
             "viewname": "WebSiteEditView",
@@ -57,7 +57,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "websitegridview": {
             "title": "实体表格视图",
-            "caption": "网站",
+            "caption": "站点",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "WebSite",
             "viewname": "WebSiteGridView",

app_WebSite/src/service/web-site/web-site-service.ts

@@ -3,7 +3,7 @@ import WebSiteServiceBase from './web-site-service-base';
 
 
 /**
- * 网站服务对象
+ * 站点服务对象
  *
  * @export
  * @class WebSiteService

app_WebSite/src/uiservice/web-site/web-site-ui-service-base.ts

@@ -5,7 +5,7 @@ import { Subject } from 'rxjs';
 import WebSiteService from '@/service/web-site/web-site-service';
 
 /**
- * 网站UI服务对象基类
+ * 站点UI服务对象基类
  *
  * @export
  * @class WebSiteUIServiceBase

app_WebSite/src/uiservice/web-site/web-site-ui-service.ts

 import WebSiteUIServiceBase from './web-site-ui-service-base';
 
 /**
- * 网站UI服务对象
+ * 站点UI服务对象
  *
  * @export
  * @class WebSiteUIService

app_WebSite/src/widgets/web-site-content/main-grid/main-grid-base.tsx

@@ -56,6 +56,76 @@ export class MainGridBase extends GridControllerBase {
      * @memberof MainGridBase
      */
     public allColumns: any[] = [
+        {
+            name: 'websitename',
+            label: '站点',
+            langtag: 'entities.websitecontent.main_grid.columns.websitename',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'websitechannelname',
+            label: '频道',
+            langtag: 'entities.websitecontent.main_grid.columns.websitechannelname',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'sn',
+            label: '序号',
+            langtag: 'entities.websitecontent.main_grid.columns.sn',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'websitecontentname',
+            label: '内容名称',
+            langtag: 'entities.websitecontent.main_grid.columns.websitecontentname',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'contenttype',
+            label: '内容类型',
+            langtag: 'entities.websitecontent.main_grid.columns.contenttype',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'contentcode',
+            label: '业务标识',
+            langtag: 'entities.websitecontent.main_grid.columns.contentcode',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'title',
+            label: '标题',
+            langtag: 'entities.websitecontent.main_grid.columns.title',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'author',
+            label: '作者',
+            langtag: 'entities.websitecontent.main_grid.columns.author',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'validflag',
+            label: '是否启用',
+            langtag: 'entities.websitecontent.main_grid.columns.validflag',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'memo',
+            label: '备注',
+            langtag: 'entities.websitecontent.main_grid.columns.memo',
+            show: true,
+            util: 'STAR'
+        },
     ]
 
     /**
@@ -90,6 +160,16 @@ export class MainGridBase extends GridControllerBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
+        'websitename':false,
+        'websitechannelname':false,
+        'sn':false,
+        'websitecontentname':false,
+        'contenttype':false,
+        'contentcode':false,
+        'title':false,
+        'author':false,
+        'validflag':false,
+        'memo':false,
     };
 
     /**
@@ -104,4 +184,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'validflag',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_WebSite/src/widgets/web-site-content/main-grid/main-grid-model.ts

@@ -27,14 +27,19 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'websitechannelid',
-          prop: 'websitechannelid',
-          dataType: 'PICKUP',
+          name: 'sn',
+          prop: 'sn',
+          dataType: 'INT',
         },
         {
-          name: 'websiteid',
-          prop: 'websiteid',
-          dataType: 'PICKUP',
+          name: 'memo',
+          prop: 'memo',
+          dataType: 'LONGTEXT_1000',
+        },
+        {
+          name: 'contenttype',
+          prop: 'contenttype',
+          dataType: 'SSCODELIST',
         },
         {
           name: 'srfmajortext',
@@ -42,15 +47,60 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'websitechannelname',
+          prop: 'websitechannelname',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'srfkey',
           prop: 'websitecontentid',
           dataType: 'GUID',
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'websitecontentid',
           dataType: 'GUID',
         },
+        {
+          name: 'validflag',
+          prop: 'validflag',
+          dataType: 'YESNO',
+        },
+        {
+          name: 'author',
+          prop: 'author',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'title',
+          prop: 'title',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'websitechannelid',
+          prop: 'websitechannelid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'websitecontentname',
+          prop: 'websitecontentname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'websiteid',
+          prop: 'websiteid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'contentcode',
+          prop: 'contentcode',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'websitename',
+          prop: 'websitename',
+          dataType: 'PICKUPTEXT',
+        },
         {
           name: 'websitecontent',
           prop: 'websitecontentid',

app_WebSite/src/widgets/web-site-content/main-grid/main-grid.html

@@ -23,6 +23,128 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('websitename')">
+                <el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.websitecontent.main_grid.columns.websitename')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.websitename')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.websitename}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('websitechannelname')">
+                <el-table-column show-overflow-tooltip :prop="'websitechannelname'" :label="$t('entities.websitecontent.main_grid.columns.websitechannelname')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.websitechannelname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.websitechannelname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('sn')">
+                <el-table-column show-overflow-tooltip :prop="'sn'" :label="$t('entities.websitecontent.main_grid.columns.sn')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.sn')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.sn}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('websitecontentname')">
+                <el-table-column show-overflow-tooltip :prop="'websitecontentname'" :label="$t('entities.websitecontent.main_grid.columns.websitecontentname')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.websitecontentname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.websitecontentname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('contenttype')">
+                <el-table-column show-overflow-tooltip :prop="'contenttype'" :label="$t('entities.websitecontent.main_grid.columns.contenttype')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.contenttype')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.contenttype}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('contentcode')">
+                <el-table-column show-overflow-tooltip :prop="'contentcode'" :label="$t('entities.websitecontent.main_grid.columns.contentcode')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.contentcode')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.contentcode}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('title')">
+                <el-table-column show-overflow-tooltip :prop="'title'" :label="$t('entities.websitecontent.main_grid.columns.title')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.title')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.title}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('author')">
+                <el-table-column show-overflow-tooltip :prop="'author'" :label="$t('entities.websitecontent.main_grid.columns.author')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.author')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.author}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('validflag')">
+                <el-table-column show-overflow-tooltip :prop="'validflag'" :label="$t('entities.websitecontent.main_grid.columns.validflag')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.validflag')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.validflag" tag='YesNo' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('memo')">
+                <el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.websitecontent.main_grid.columns.memo')" :min-width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.websitecontent.main_grid.columns.memo')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.memo}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>

app_WebSite/src/widgets/web-site/default-searchform/default-searchform-service.ts

@@ -13,7 +13,7 @@ import DefaultModel from './default-searchform-model';
 export default class DefaultService extends ControlService {
 
     /**
-     * 网站服务对象
+     * 站点服务对象
      *
      * @type {WebSiteService}
      * @memberof DefaultService

app_WebSite/src/widgets/web-site/main-form/main-form-service.ts

@@ -13,7 +13,7 @@ import MainModel from './main-form-model';
 export default class MainService extends ControlService {
 
     /**
-     * 网站服务对象
+     * 站点服务对象
      *
      * @type {WebSiteService}
      * @memberof MainService

app_WebSite/src/widgets/web-site/main-grid/main-grid-service.ts

@@ -13,7 +13,7 @@ import MainModel from './main-grid-model';
 export default class MainService extends ControlService {
 
     /**
-     * 网站服务对象
+     * 站点服务对象
      *
      * @type {WebSiteService}
      * @memberof MainService

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

@@ -9,6 +9,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-crm.jar
 
-EXPOSE 8080
+EXPOSE 10324
 
 ADD businesscentral-app-crm.jar /businesscentral-app-crm.jar

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

@@ -3,9 +3,23 @@ services:
   businesscentral-app-crm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-crm:latest
     ports:
-      - "8080:8080"
+      - "10324:10324"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10324
+      - 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-app/businesscentral-app-website/src/main/docker/Dockerfile

@@ -9,6 +9,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-website.jar
 
-EXPOSE 8080
+EXPOSE 10324
 
 ADD businesscentral-app-website.jar /businesscentral-app-website.jar

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

@@ -3,9 +3,23 @@ services:
   businesscentral-app-website:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-website:latest
     ports:
-      - "8080:8080"
+      - "10324:10324"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10324
+      - 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-core/src/main/java/cn/ibizlab/businesscentral/core/website/domain/WebSite.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.businesscentral.util.domain.EntityMP;
 
 /**
- * 实体[网站]
+ * 实体[站点]
  */
 @Getter
 @Setter

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/website/domain/WebSiteContent.java

@@ -103,7 +103,7 @@ public class WebSiteContent extends EntityMP implements Serializable {
     @JsonProperty("websitechannelid")
     private String websitechannelid;
     /**
-     * 频道名称
+     * 频道
      */
     @TableField(exist = false)
     @JSONField(name = "websitechannelname")
@@ -116,6 +116,76 @@ public class WebSiteContent extends EntityMP implements Serializable {
     @JSONField(name = "websitename")
     @JsonProperty("websitename")
     private String websitename;
+    /**
+     * 内容类型
+     */
+    @TableField(value = "contenttype")
+    @JSONField(name = "contenttype")
+    @JsonProperty("contenttype")
+    private String contenttype;
+    /**
+     * 业务标识
+     */
+    @TableField(value = "contentcode")
+    @JSONField(name = "contentcode")
+    @JsonProperty("contentcode")
+    private String contentcode;
+    /**
+     * 作者
+     */
+    @TableField(value = "author")
+    @JSONField(name = "author")
+    @JsonProperty("author")
+    private String author;
+    /**
+     * 内容
+     */
+    @TableField(value = "content")
+    @JSONField(name = "content")
+    @JsonProperty("content")
+    private String content;
+    /**
+     * 子标题
+     */
+    @TableField(value = "subtitle")
+    @JSONField(name = "subtitle")
+    @JsonProperty("subtitle")
+    private String subtitle;
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    @JSONField(name = "title")
+    @JsonProperty("title")
+    private String title;
+    /**
+     * 内容链接
+     */
+    @TableField(value = "link")
+    @JSONField(name = "link")
+    @JsonProperty("link")
+    private String link;
+    /**
+     * 是否启用
+     */
+    @TableField(value = "validflag")
+    @JSONField(name = "validflag")
+    @JsonProperty("validflag")
+    private Integer validflag;
+    /**
+     * 序号
+     */
+    @TableField(value = "sn")
+    @JSONField(name = "sn")
+    @JsonProperty("sn")
+    private Integer sn;
+    /**
+     * 备注
+     */
+    @TableField(value = "memo")
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
 
     /**
      * 
@@ -159,6 +229,86 @@ public class WebSiteContent extends EntityMP implements Serializable {
         this.modify("websitechannelid",websitechannelid);
     }
 
+    /**
+     * 设置 [内容类型]
+     */
+    public void setContenttype(String contenttype){
+        this.contenttype = contenttype ;
+        this.modify("contenttype",contenttype);
+    }
+
+    /**
+     * 设置 [业务标识]
+     */
+    public void setContentcode(String contentcode){
+        this.contentcode = contentcode ;
+        this.modify("contentcode",contentcode);
+    }
+
+    /**
+     * 设置 [作者]
+     */
+    public void setAuthor(String author){
+        this.author = author ;
+        this.modify("author",author);
+    }
+
+    /**
+     * 设置 [内容]
+     */
+    public void setContent(String content){
+        this.content = content ;
+        this.modify("content",content);
+    }
+
+    /**
+     * 设置 [子标题]
+     */
+    public void setSubtitle(String subtitle){
+        this.subtitle = subtitle ;
+        this.modify("subtitle",subtitle);
+    }
+
+    /**
+     * 设置 [标题]
+     */
+    public void setTitle(String title){
+        this.title = title ;
+        this.modify("title",title);
+    }
+
+    /**
+     * 设置 [内容链接]
+     */
+    public void setLink(String link){
+        this.link = link ;
+        this.modify("link",link);
+    }
+
+    /**
+     * 设置 [是否启用]
+     */
+    public void setValidflag(Integer validflag){
+        this.validflag = validflag ;
+        this.modify("validflag",validflag);
+    }
+
+    /**
+     * 设置 [序号]
+     */
+    public void setSn(Integer sn){
+        this.sn = sn ;
+        this.modify("sn",sn);
+    }
+
+    /**
+     * 设置 [备注]
+     */
+    public void setMemo(String memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/website/filter/WebSiteContentSearchContext.java

@@ -48,14 +48,14 @@ public class WebSiteContentSearchContext extends QueryWrapperContext<WebSiteCont
             this.getSearchCond().eq("websitechannelid", n_websitechannelid_eq);
         }
     }
-	private String n_websitechannelname_eq;//[频道名称]
+	private String n_websitechannelname_eq;//[频道]
 	public void setN_websitechannelname_eq(String n_websitechannelname_eq) {
         this.n_websitechannelname_eq = n_websitechannelname_eq;
         if(!ObjectUtils.isEmpty(this.n_websitechannelname_eq)){
             this.getSearchCond().eq("websitechannelname", n_websitechannelname_eq);
         }
     }
-	private String n_websitechannelname_like;//[频道名称]
+	private String n_websitechannelname_like;//[频道]
 	public void setN_websitechannelname_like(String n_websitechannelname_like) {
         this.n_websitechannelname_like = n_websitechannelname_like;
         if(!ObjectUtils.isEmpty(this.n_websitechannelname_like)){
@@ -76,6 +76,13 @@ public class WebSiteContentSearchContext extends QueryWrapperContext<WebSiteCont
             this.getSearchCond().like("websitename", n_websitename_like);
         }
     }
+	private String n_contenttype_eq;//[内容类型]
+	public void setN_contenttype_eq(String n_contenttype_eq) {
+        this.n_contenttype_eq = n_contenttype_eq;
+        if(!ObjectUtils.isEmpty(this.n_contenttype_eq)){
+            this.getSearchCond().eq("contenttype", n_contenttype_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/website/service/impl/WebSiteServiceImpl.java

@@ -38,7 +38,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
- * 实体[网站] 服务对象接口实现
+ * 实体[站点] 服务对象接口实现
  */
 @Slf4j
 @Service("WebSiteServiceImpl")

businesscentral-core/src/main/resources/mapper/website/websitecontent/WebSiteContentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="WebSiteContentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  ) t1 where websitecontentid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`CONTENT`, t1.`CONTENTCODE`, t1.`CONTENTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LINK`, t1.`MEMO`, t1.`SN`, t1.`SUBTITLE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDFLAG`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  ) t1 where websitecontentid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`CONTENTCODE`, t1.`CONTENTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LINK`, t1.`MEMO`, t1.`SN`, t1.`SUBTITLE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDFLAG`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`CONTENT`, t1.`CONTENTCODE`, t1.`CONTENTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LINK`, t1.`MEMO`, t1.`SN`, t1.`SUBTITLE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDFLAG`, t1.`WEBSITECHANNELID`, t11.`WEBSITECHANNELNAME`, t1.`WEBSITECONTENTID`, t1.`WEBSITECONTENTNAME`, t1.`WEBSITEID`, t21.`WEBSITENAME` FROM `WEBSITECONTENT` t1  LEFT JOIN WEBSITECHANNEL t11 ON t1.WEBSITECHANNELID = t11.WEBSITECHANNELID  LEFT JOIN WEBSITE t21 ON t1.WEBSITEID = t21.WEBSITEID  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -429,7 +429,7 @@
      }
     ,    {
     "dename":"WebSite",
-    "delogicname":"网站",
+    "delogicname":"站点",
     "sysmoudle":{"id":"WEBSITE","name":"WebSite"},
     "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/WebSiteContentDTO.java

@@ -105,6 +105,86 @@ public class WebSiteContentDTO extends DTOBase implements Serializable {
     @JsonProperty("websitename")
     private String websitename;
 
+    /**
+     * 属性 [CONTENTTYPE]
+     *
+     */
+    @JSONField(name = "contenttype")
+    @JsonProperty("contenttype")
+    private String contenttype;
+
+    /**
+     * 属性 [CONTENTCODE]
+     *
+     */
+    @JSONField(name = "contentcode")
+    @JsonProperty("contentcode")
+    private String contentcode;
+
+    /**
+     * 属性 [AUTHOR]
+     *
+     */
+    @JSONField(name = "author")
+    @JsonProperty("author")
+    private String author;
+
+    /**
+     * 属性 [CONTENT]
+     *
+     */
+    @JSONField(name = "content")
+    @JsonProperty("content")
+    private String content;
+
+    /**
+     * 属性 [SUBTITLE]
+     *
+     */
+    @JSONField(name = "subtitle")
+    @JsonProperty("subtitle")
+    private String subtitle;
+
+    /**
+     * 属性 [TITLE]
+     *
+     */
+    @JSONField(name = "title")
+    @JsonProperty("title")
+    private String title;
+
+    /**
+     * 属性 [LINK]
+     *
+     */
+    @JSONField(name = "link")
+    @JsonProperty("link")
+    private String link;
+
+    /**
+     * 属性 [VALIDFLAG]
+     *
+     */
+    @JSONField(name = "validflag")
+    @JsonProperty("validflag")
+    private Integer validflag;
+
+    /**
+     * 属性 [SN]
+     *
+     */
+    @JSONField(name = "sn")
+    @JsonProperty("sn")
+    private Integer sn;
+
+    /**
+     * 属性 [MEMO]
+     *
+     */
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+
 
     /**
      * 设置 [WEBSITECONTENTNAME]
@@ -130,6 +210,86 @@ public class WebSiteContentDTO extends DTOBase implements Serializable {
         this.modify("websitechannelid",websitechannelid);
     }
 
+    /**
+     * 设置 [CONTENTTYPE]
+     */
+    public void setContenttype(String  contenttype){
+        this.contenttype = contenttype ;
+        this.modify("contenttype",contenttype);
+    }
+
+    /**
+     * 设置 [CONTENTCODE]
+     */
+    public void setContentcode(String  contentcode){
+        this.contentcode = contentcode ;
+        this.modify("contentcode",contentcode);
+    }
+
+    /**
+     * 设置 [AUTHOR]
+     */
+    public void setAuthor(String  author){
+        this.author = author ;
+        this.modify("author",author);
+    }
+
+    /**
+     * 设置 [CONTENT]
+     */
+    public void setContent(String  content){
+        this.content = content ;
+        this.modify("content",content);
+    }
+
+    /**
+     * 设置 [SUBTITLE]
+     */
+    public void setSubtitle(String  subtitle){
+        this.subtitle = subtitle ;
+        this.modify("subtitle",subtitle);
+    }
+
+    /**
+     * 设置 [TITLE]
+     */
+    public void setTitle(String  title){
+        this.title = title ;
+        this.modify("title",title);
+    }
+
+    /**
+     * 设置 [LINK]
+     */
+    public void setLink(String  link){
+        this.link = link ;
+        this.modify("link",link);
+    }
+
+    /**
+     * 设置 [VALIDFLAG]
+     */
+    public void setValidflag(Integer  validflag){
+        this.validflag = validflag ;
+        this.modify("validflag",validflag);
+    }
+
+    /**
+     * 设置 [SN]
+     */
+    public void setSn(Integer  sn){
+        this.sn = sn ;
+        this.modify("sn",sn);
+    }
+
+    /**
+     * 设置 [MEMO]
+     */
+    public void setMemo(String  memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/WebSiteResource.java

@@ -35,7 +35,7 @@ import cn.ibizlab.businesscentral.core.website.filter.WebSiteSearchContext;
 import cn.ibizlab.businesscentral.util.annotation.VersionCheck;
 
 @Slf4j
-@Api(tags = {"网站" })
+@Api(tags = {"站点" })
 @RestController("CentralApi-website")
 @RequestMapping("")
 public class WebSiteResource {
@@ -48,7 +48,7 @@ public class WebSiteResource {
     public WebSiteMapping websiteMapping;
 
     @PreAuthorize("hasPermission(this.websiteMapping.toDomain(#websitedto),'iBizBusinessCentral-WebSite-Create')")
-    @ApiOperation(value = "新建网站", tags = {"网站" },  notes = "新建网站")
+    @ApiOperation(value = "新建站点", tags = {"站点" },  notes = "新建站点")
 	@RequestMapping(method = RequestMethod.POST, value = "/websites")
     @Transactional
     public ResponseEntity<WebSiteDTO> create(@RequestBody WebSiteDTO websitedto) {
@@ -59,7 +59,7 @@ public class WebSiteResource {
     }
 
     @PreAuthorize("hasPermission(this.websiteMapping.toDomain(#websitedtos),'iBizBusinessCentral-WebSite-Create')")
-    @ApiOperation(value = "批量新建网站", tags = {"网站" },  notes = "批量新建网站")
+    @ApiOperation(value = "批量新建站点", tags = {"站点" },  notes = "批量新建站点")
 	@RequestMapping(method = RequestMethod.POST, value = "/websites/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WebSiteDTO> websitedtos) {
         websiteService.createBatch(websiteMapping.toDomain(websitedtos));
@@ -68,7 +68,7 @@ public class WebSiteResource {
 
     @VersionCheck(entity = "website" , versionfield = "updatedate")
     @PreAuthorize("hasPermission(this.websiteService.get(#website_id),'iBizBusinessCentral-WebSite-Update')")
-    @ApiOperation(value = "更新网站", tags = {"网站" },  notes = "更新网站")
+    @ApiOperation(value = "更新站点", tags = {"站点" },  notes = "更新站点")
 	@RequestMapping(method = RequestMethod.PUT, value = "/websites/{website_id}")
     @Transactional
     public ResponseEntity<WebSiteDTO> update(@PathVariable("website_id") String website_id, @RequestBody WebSiteDTO websitedto) {
@@ -80,7 +80,7 @@ public class WebSiteResource {
     }
 
     @PreAuthorize("hasPermission(this.websiteService.getWebsiteByEntities(this.websiteMapping.toDomain(#websitedtos)),'iBizBusinessCentral-WebSite-Update')")
-    @ApiOperation(value = "批量更新网站", tags = {"网站" },  notes = "批量更新网站")
+    @ApiOperation(value = "批量更新站点", tags = {"站点" },  notes = "批量更新站点")
 	@RequestMapping(method = RequestMethod.PUT, value = "/websites/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WebSiteDTO> websitedtos) {
         websiteService.updateBatch(websiteMapping.toDomain(websitedtos));
@@ -88,7 +88,7 @@ public class WebSiteResource {
     }
 
     @PreAuthorize("hasPermission(this.websiteService.get(#website_id),'iBizBusinessCentral-WebSite-Remove')")
-    @ApiOperation(value = "删除网站", tags = {"网站" },  notes = "删除网站")
+    @ApiOperation(value = "删除站点", tags = {"站点" },  notes = "删除站点")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/websites/{website_id}")
     @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("website_id") String website_id) {
@@ -96,7 +96,7 @@ public class WebSiteResource {
     }
 
     @PreAuthorize("hasPermission(this.websiteService.getWebsiteByIds(#ids),'iBizBusinessCentral-WebSite-Remove')")
-    @ApiOperation(value = "批量删除网站", tags = {"网站" },  notes = "批量删除网站")
+    @ApiOperation(value = "批量删除站点", tags = {"站点" },  notes = "批量删除站点")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/websites/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         websiteService.removeBatch(ids);
@@ -104,7 +104,7 @@ public class WebSiteResource {
     }
 
     @PostAuthorize("hasPermission(this.websiteMapping.toDomain(returnObject.body),'iBizBusinessCentral-WebSite-Get')")
-    @ApiOperation(value = "获取网站", tags = {"网站" },  notes = "获取网站")
+    @ApiOperation(value = "获取站点", tags = {"站点" },  notes = "获取站点")
 	@RequestMapping(method = RequestMethod.GET, value = "/websites/{website_id}")
     public ResponseEntity<WebSiteDTO> get(@PathVariable("website_id") String website_id) {
         WebSite domain = websiteService.get(website_id);
@@ -112,27 +112,27 @@ public class WebSiteResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取网站草稿", tags = {"网站" },  notes = "获取网站草稿")
+    @ApiOperation(value = "获取站点草稿", tags = {"站点" },  notes = "获取站点草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/websites/getdraft")
     public ResponseEntity<WebSiteDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(websiteMapping.toDto(websiteService.getDraft(new WebSite())));
     }
 
-    @ApiOperation(value = "检查网站", tags = {"网站" },  notes = "检查网站")
+    @ApiOperation(value = "检查站点", tags = {"站点" },  notes = "检查站点")
 	@RequestMapping(method = RequestMethod.POST, value = "/websites/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WebSiteDTO websitedto) {
         return  ResponseEntity.status(HttpStatus.OK).body(websiteService.checkKey(websiteMapping.toDomain(websitedto)));
     }
 
     @PreAuthorize("hasPermission(this.websiteMapping.toDomain(#websitedto),'iBizBusinessCentral-WebSite-Save')")
-    @ApiOperation(value = "保存网站", tags = {"网站" },  notes = "保存网站")
+    @ApiOperation(value = "保存站点", tags = {"站点" },  notes = "保存站点")
 	@RequestMapping(method = RequestMethod.POST, value = "/websites/save")
     public ResponseEntity<Boolean> save(@RequestBody WebSiteDTO websitedto) {
         return ResponseEntity.status(HttpStatus.OK).body(websiteService.save(websiteMapping.toDomain(websitedto)));
     }
 
     @PreAuthorize("hasPermission(this.websiteMapping.toDomain(#websitedtos),'iBizBusinessCentral-WebSite-Save')")
-    @ApiOperation(value = "批量保存网站", tags = {"网站" },  notes = "批量保存网站")
+    @ApiOperation(value = "批量保存站点", tags = {"站点" },  notes = "批量保存站点")
 	@RequestMapping(method = RequestMethod.POST, value = "/websites/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<WebSiteDTO> websitedtos) {
         websiteService.saveBatch(websiteMapping.toDomain(websitedtos));
@@ -140,7 +140,7 @@ public class WebSiteResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-WebSite-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-WebSite-Get')")
-	@ApiOperation(value = "获取DEFAULT", tags = {"网站" } ,notes = "获取DEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"站点" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/websites/fetchdefault")
 	public ResponseEntity<List<WebSiteDTO>> fetchDefault(WebSiteSearchContext context) {
         Page<WebSite> domains = websiteService.searchDefault(context) ;
@@ -153,7 +153,7 @@ public class WebSiteResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-WebSite-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-WebSite-Get')")
-	@ApiOperation(value = "查询DEFAULT", tags = {"网站" } ,notes = "查询DEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"站点" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/websites/searchdefault")
 	public ResponseEntity<Page<WebSiteDTO>> searchDefault(@RequestBody WebSiteSearchContext context) {
         Page<WebSite> domains = websiteService.searchDefault(context) ;

config.xml

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