完善资产的授权功能

pkg/api/asset.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"github.com/labstack/echo/v4"
 	"next-terminal/pkg/model"
 	"next-terminal/pkg/utils"
@@ -31,7 +32,17 @@ func AssetPagingEndpoint(c echo.Context) error {
 	protocol := c.QueryParam("protocol")
 	tags := c.QueryParam("tags")
 
-	items, total, _ := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags)
+	var (
+		total int64
+		items []model.AssetVo
+	)
+
+	account, _ := GetCurrentAccount(c)
+	if account.Role == model.RoleUser {
+		items, total, _ = model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account.ID)
+	} else {
+		items, total, _ = model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, "")
+	}
 
 	return Success(c, H{
 		"total": total,
@@ -124,3 +135,27 @@ func AssetTagsEndpoint(c echo.Context) (err error) {
 	}
 	return Success(c, items)
 }
+
+func AssetChangeOwnerEndpoint(c echo.Context) (err error) {
+	id := c.Param("id")
+
+	if err := PreCheckAssetPermission(c, id); err != nil {
+		return err
+	}
+
+	owner := c.QueryParam("owner")
+	model.UpdateAssetById(&model.Asset{Owner: owner}, id)
+	return Success(c, "")
+}
+
+func PreCheckAssetPermission(c echo.Context, id string) error {
+	item, err := model.FindAssetById(id)
+	if err != nil {
+		return err
+	}
+
+	if !HasPermission(c, item.Owner) {
+		return errors.New("permission denied")
+	}
+	return nil
+}

pkg/api/credential.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"github.com/labstack/echo/v4"
 	"next-terminal/pkg/model"
 	"next-terminal/pkg/utils"
@@ -79,6 +80,10 @@ func CredentialPagingEndpoint(c echo.Context) error {
 func CredentialUpdateEndpoint(c echo.Context) error {
 	id := c.Param("id")
 
+	if err := PreCheckCredentialPermission(c, id); err != nil {
+		return err
+	}
+
 	var item model.Credential
 	if err := c.Bind(&item); err != nil {
 		return err
@@ -118,6 +123,9 @@ func CredentialDeleteEndpoint(c echo.Context) error {
 	id := c.Param("id")
 	split := strings.Split(id, ",")
 	for i := range split {
+		if err := PreCheckCredentialPermission(c, split[i]); err != nil {
+			return err
+		}
 		model.DeleteCredentialById(split[i])
 	}
 
@@ -126,17 +134,39 @@ func CredentialDeleteEndpoint(c echo.Context) error {
 
 func CredentialGetEndpoint(c echo.Context) error {
 	id := c.Param("id")
+
 	item, err := model.FindCredentialById(id)
 	if err != nil {
 		return err
 	}
 
+	if !HasPermission(c, item.Owner) {
+		return errors.New("permission denied")
+	}
+
 	return Success(c, item)
 }
 
 func CredentialChangeOwnerEndpoint(c echo.Context) error {
 	id := c.Param("id")
+
+	if err := PreCheckCredentialPermission(c, id); err != nil {
+		return err
+	}
+
 	owner := c.QueryParam("owner")
 	model.UpdateCredentialById(&model.Credential{Owner: owner}, id)
 	return Success(c, "")
 }
+
+func PreCheckCredentialPermission(c echo.Context, id string) error {
+	item, err := model.FindCredentialById(id)
+	if err != nil {
+		return err
+	}
+
+	if !HasPermission(c, item.Owner) {
+		return errors.New("permission denied")
+	}
+	return nil
+}

pkg/api/resource.go

@@ -18,9 +18,10 @@ func ResourceGetAssignEndPoint(c echo.Context) error {
 func ResourceOverwriteAssignEndPoint(c echo.Context) error {
 	resourceId := c.Param("id")
 	userIds := c.QueryParam("userIds")
+	resourceType := c.QueryParam("type")
 	uIds := strings.Split(userIds, ",")
 
-	model.OverwriteUserIdsByResourceId(resourceId, uIds)
+	model.OverwriteUserIdsByResourceId(resourceId, resourceType, uIds)
 
 	return Success(c, "")
 }

pkg/api/routes.go

@@ -60,6 +60,7 @@ func SetupRoutes() *echo.Echo {
 		assets.PUT("/:id", AssetUpdateEndpoint)
 		assets.DELETE("/:id", AssetDeleteEndpoint)
 		assets.GET("/:id", AssetGetEndpoint)
+		assets.POST("/:id/change-owner", AssetChangeOwnerEndpoint)
 	}
 
 	e.GET("/tags", AssetTagsEndpoint)
@@ -157,3 +158,19 @@ func GetCurrentAccount(c echo.Context) (model.User, bool) {
 	}
 	return model.User{}, false
 }
+
+func HasPermission(c echo.Context, owner string) bool {
+	// 检测是否为创建者
+	account, found := GetCurrentAccount(c)
+	if !found {
+		return false
+	}
+	if model.RoleAdmin == account.Role {
+		return true
+	}
+
+	if owner == account.ID {
+		return true
+	}
+	return false
+}

pkg/handle/runner.go

@@ -18,7 +18,7 @@ func RunTicker() {
 	c := cron.New(cron.WithSeconds()) //精确到秒
 
 	// 定时任务，每隔一小时删除一次未使用的会话信息
-	_, _ = c.AddFunc("0 0/1 0/1 * * ?", func() {
+	_, _ = c.AddFunc("0 0 0/1 * * ?", func() {
 		sessions, _ := model.FindSessionByStatusIn([]string{model.NoConnect, model.Connecting})
 		if sessions != nil && len(sessions) > 0 {
 			now := time.Now()
@@ -26,7 +26,7 @@ func RunTicker() {
 				if now.Sub(sessions[i].ConnectedTime.Time) > time.Hour*1 {
 					model.DeleteSessionById(sessions[i].ID)
 					s := sessions[i].Username + "@" + sessions[i].IP + ":" + strconv.Itoa(sessions[i].Port)
-					logrus.Debugf("会话「%v」ID「%v」超过1小时未打开，已删除。", s, sessions[i].ID)
+					logrus.Infof("会话「%v」ID「%v」超过1小时未打开，已删除。", s, sessions[i].ID)
 				}
 			}
 		}
@@ -37,11 +37,11 @@ func RunTicker() {
 		sessions, _ := model.FindSessionByStatus(model.Connected)
 		if sessions != nil && len(sessions) > 0 {
 			for i := range sessions {
-				_, found := global.Cache.Get(sessions[i].ID)
+				_, found := global.Store.Get(sessions[i].ID)
 				if !found {
 					api.CloseSessionById(sessions[i].ID, api.Normal, "")
 					s := sessions[i].Username + "@" + sessions[i].IP + ":" + strconv.Itoa(sessions[i].Port)
-					logrus.Debugf("会话「%v」ID「%v」已离线，修改状态为「关闭」。", s, sessions[i].ID)
+					logrus.Infof("会话「%v」ID「%v」已离线，修改状态为「关闭」。", s, sessions[i].ID)
 				}
 			}
 		}

pkg/model/asset.go

@@ -36,6 +36,7 @@ type AssetVo struct {
 	Tags        string         `json:"tags"`
 	Owner       string         `json:"owner"`
 	OwnerName   string         `json:"ownerName"`
+	SharerCount int64          `json:"sharerCount"`
 }
 
 func (r *Asset) TableName() string {
@@ -57,9 +58,14 @@ func FindAssetByConditions(protocol string) (o []Asset, err error) {
 	return
 }
 
-func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string) (o []AssetVo, total int64, err error) {
+func FindPageAsset(pageIndex, pageSize int, name, protocol, tags, owner string) (o []AssetVo, total int64, err error) {
-	db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name").Joins("left join users on assets.owner = users.id")
+	db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resources on assets.id = resources.resource_id").Group("assets.id")
-	dbCounter := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name").Joins("left join users on assets.owner = users.id")
+	dbCounter := global.DB.Table("assets").Select("DISTINCT assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name").Joins("left join users on assets.owner = users.id").Joins("left join resources on assets.id = resources.resource_id")
+
+	if len(owner) > 0 {
+		db = db.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
+		dbCounter = dbCounter.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
+	}
 
 	if len(name) > 0 {
 		db = db.Where("assets.name like ?", "%"+name+"%")

pkg/model/credential.go

@@ -38,7 +38,12 @@ type CredentialVo struct {
 	SharerCount int64          `json:"sharerCount"`
 }
 
-func FindAllCredential() (o []Credential, err error) {
+type CredentialSimpleVo struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
+func FindAllCredential() (o []CredentialSimpleVo, err error) {
 	err = global.DB.Find(&o).Error
 	return
 }

pkg/model/resource.go

@@ -8,6 +8,7 @@ import (
 type Resource struct {
 	ID           string `gorm:"primary_key" json:"name"`
 	ResourceId   string `json:"resourceId"`
+	ResourceType string `json:"resourceType"`
 	UserId       string `json:"userId"`
 }
 
@@ -24,7 +25,7 @@ func FindUserIdsByResourceId(resourceId string) (r []string, err error) {
 	return
 }
 
-func OverwriteUserIdsByResourceId(resourceId string, userIds []string) {
+func OverwriteUserIdsByResourceId(resourceId, resourceType string, userIds []string) {
 	db := global.DB.Begin()
 	db.Where("resource_id = ?", resourceId).Delete(&Resource{})
 
@@ -33,10 +34,11 @@ func OverwriteUserIdsByResourceId(resourceId string, userIds []string) {
 		if len(userId) == 0 {
 			continue
 		}
-		id := utils.Sign([]string{resourceId, userId})
+		id := utils.Sign([]string{resourceId, resourceType, userId})
 		resource := &Resource{
 			ID:           id,
 			ResourceId:   resourceId,
+			ResourceType: resourceType,
 			UserId:       userId,
 		}
 		_ = db.Create(resource).Error

web/src/components/asset/Asset.js

@@ -1,11 +1,13 @@
 import React, {Component} from 'react';
 
 import {
+    Alert,
     Badge,
     Button,
     Col,
     Divider,
     Dropdown,
+    Form,
     Input,
     Layout,
     Menu,
@@ -17,6 +19,7 @@ import {
     Table,
     Tag,
     Tooltip,
+    Transfer,
     Typography
 } from "antd";
 import qs from "qs";
@@ -36,6 +39,7 @@ import {
 } from '@ant-design/icons';
 import {PROTOCOL_COLORS} from "../../common/constants";
 import Logout from "../user/Logout";
+import {hasPermission, isAdmin} from "../../service/permission";
 
 const confirm = Modal.confirm;
 const {Search} = Input;
@@ -55,6 +59,7 @@ const routes = [
 class Asset extends Component {
 
     inputRefOfName = React.createRef();
+    changeOwnerFormRef = React.createRef();
 
     state = {
         items: [],
@@ -73,6 +78,13 @@ class Asset extends Component {
         model: {},
         selectedRowKeys: [],
         delBtnLoading: false,
+        changeOwnerModalVisible: false,
+        changeSharerModalVisible: false,
+        changeOwnerConfirmLoading: false,
+        changeSharerConfirmLoading: false,
+        users: [],
+        selected: {},
+        selectedSharers: [],
     };
 
     async componentDidMount() {
@@ -331,6 +343,49 @@ class Asset extends Component {
         }
     }
 
+    handleSearchByNickname = async nickname => {
+        const result = await request.get(`/users/paging?pageIndex=1&pageSize=100&nickname=${nickname}`);
+        if (result.code !== 1) {
+            message.error(result.message, 10);
+            return;
+        }
+
+        const items = result['data']['items'].map(item => {
+            return {'key': item['id'], ...item}
+        })
+
+        this.setState({
+            users: items
+        })
+    }
+
+    handleSharersChange = async targetKeys => {
+        this.setState({
+            selectedSharers: targetKeys
+        })
+    }
+
+    handleShowSharer = async (record) => {
+        let r1 = this.handleSearchByNickname('');
+        let r2 = request.get(`/resources/${record['id']}/assign`);
+
+        await r1;
+        let result = await r2;
+
+        let selectedSharers = [];
+        if (result['code'] !== 1) {
+            message.error(result['message']);
+        } else {
+            selectedSharers = result['data'];
+        }
+
+        this.setState({
+            selectedSharers: selectedSharers,
+            selected: record,
+            changeSharerModalVisible: true
+        })
+    }
+
     render() {
 
         const columns = [{
@@ -408,6 +463,37 @@ class Asset extends Component {
                                         onClick={() => this.copy(record.id)}>复制</Button>
                             </Menu.Item>
 
+                            {isAdmin() ?
+                                <Menu.Item key="1">
+                                    <Button type="text" size='small'
+                                            disabled={!hasPermission(record['owner'])}
+                                            onClick={() => {
+                                                this.handleSearchByNickname('')
+                                                    .then(() => {
+                                                        this.setState({
+                                                            changeOwnerModalVisible: true,
+                                                            selected: record,
+                                                        })
+                                                        this.changeOwnerFormRef
+                                                            .current
+                                                            .setFieldsValue({
+                                                                owner: record['owner']
+                                                            })
+                                                    });
+
+                                            }}>更换所有者</Button>
+                                </Menu.Item> : undefined
+                            }
+
+
+                            <Menu.Item key="2">
+                                <Button type="text" size='small'
+                                        disabled={!hasPermission(record['owner'])}
+                                        onClick={async () => {
+                                            await this.handleShowSharer(record);
+                                        }}>更新授权人</Button>
+                            </Menu.Item>
+
                             <Menu.Divider/>
                             <Menu.Item key="3">
                                 <Button type="text" size='small' danger
@@ -432,6 +518,19 @@ class Asset extends Component {
             }
         ];
 
+        if (isAdmin()) {
+            columns.splice(6, 0, {
+                title: '授权人数',
+                dataIndex: 'sharerCount',
+                key: 'sharerCount',
+                render: (text, record, index) => {
+                    return <Button type='link' onClick={async () => {
+                        await this.handleShowSharer(record, true);
+                    }}>{text}</Button>
+                }
+            });
+        }
+
         const selectedRowKeys = this.state.selectedRowKeys;
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -584,6 +683,113 @@ class Asset extends Component {
                             : null
                     }
 
+
+                    <Modal title={<text>更换资源「<strong style={{color: '#1890ff'}}>{this.state.selected['name']}</strong>」的所有者
+                    </text>}
+                           visible={this.state.changeOwnerModalVisible}
+                           confirmLoading={this.state.changeOwnerConfirmLoading}
+                           onOk={() => {
+                               this.setState({
+                                   changeOwnerConfirmLoading: true
+                               });
+
+                               let changeOwnerModalVisible = false;
+                               this.changeOwnerFormRef
+                                   .current
+                                   .validateFields()
+                                   .then(async values => {
+                                       let result = await request.post(`/assets/${this.state.selected['id']}/change-owner?owner=${values['owner']}`);
+                                       if (result['code'] === 1) {
+                                           message.success('操作成功');
+                                           this.loadTableData();
+                                       } else {
+                                           message.success(result['message'], 10);
+                                           changeOwnerModalVisible = true;
+                                       }
+                                   })
+                                   .catch(info => {
+
+                                   })
+                                   .finally(() => {
+                                       this.setState({
+                                           changeOwnerConfirmLoading: false,
+                                           changeOwnerModalVisible: changeOwnerModalVisible
+                                       })
+                                   });
+                           }}
+                           onCancel={() => {
+                               this.setState({
+                                   changeOwnerModalVisible: false
+                               })
+                           }}
+                    >
+
+                        <Form ref={this.changeOwnerFormRef}>
+
+                            <Form.Item name='owner' rules={[{required: true, message: '请选择所有者'}]}>
+                                <Select
+                                    showSearch
+                                    placeholder='请选择所有者'
+                                    onSearch={this.handleSearchByNickname}
+                                    filterOption={false}
+                                >
+                                    {this.state.users.map(d => <Select.Option key={d.id}
+                                                                              value={d.id}>{d.nickname}</Select.Option>)}
+                                </Select>
+                            </Form.Item>
+                            <Alert message="更换资源所有者不会影响授权凭证的所有者" type="info" showIcon/>
+
+                        </Form>
+                    </Modal>
+
+                    <Modal title={<text>更新资源「<strong style={{color: '#1890ff'}}>{this.state.selected['name']}</strong>」的授权人
+                    </text>}
+                           visible={this.state.changeSharerModalVisible}
+                           confirmLoading={this.state.changeSharerConfirmLoading}
+                           onOk={async () => {
+                               this.setState({
+                                   changeSharerConfirmLoading: true
+                               });
+
+                               let changeSharerModalVisible = false;
+
+                               let result = await request.post(`/resources/${this.state.selected['id']}/assign?type=asset&userIds=${this.state.selectedSharers.join(',')}`);
+                               if (result['code'] === 1) {
+                                   message.success('操作成功');
+                                   this.loadTableData();
+                               } else {
+                                   message.error(result['message'], 10);
+                                   changeSharerModalVisible = true;
+                               }
+
+                               this.setState({
+                                   changeSharerConfirmLoading: false,
+                                   changeSharerModalVisible: changeSharerModalVisible
+                               })
+                           }}
+                           onCancel={() => {
+                               this.setState({
+                                   changeSharerModalVisible: false
+                               })
+                           }}
+                           okButtonProps={{disabled: !hasPermission(this.state.selected['owner'])}}
+                    >
+
+                        <Transfer
+                            dataSource={this.state.users}
+                            disabled={!hasPermission(this.state.selected['owner'])}
+                            showSearch
+                            titles={['未授权', '已授权']}
+                            operations={['授权', '移除']}
+                            listStyle={{
+                                width: 250,
+                                height: 300,
+                            }}
+                            targetKeys={this.state.selectedSharers}
+                            onChange={this.handleSharersChange}
+                            render={item => `${item.nickname}`}
+                        />
+                    </Modal>
                 </Content>
             </>
         );

web/src/components/credential/Credential.js

@@ -34,7 +34,7 @@ import {
 } from '@ant-design/icons';
 import {itemRender} from "../../utils/utils";
 import Logout from "../user/Logout";
-import {hasPermission} from "../../service/permission";
+import {hasPermission, isAdmin} from "../../service/permission";
 
 const confirm = Modal.confirm;
 const {Search} = Input;
@@ -55,7 +55,6 @@ class Credential extends Component {
 
     inputRefOfName = React.createRef();
     changeOwnerFormRef = React.createRef();
-    changeSharerFormRef = React.createRef();
 
     state = {
         items: [],
@@ -173,6 +172,9 @@ class Credential extends Component {
     showModal = async (title, id = null, index) => {
 
         let items = this.state.items;
+
+        let model = {}
+        if (id) {
             items[index].updateBtnLoading = true;
             this.setState({
                 items: items
@@ -189,10 +191,13 @@ class Credential extends Component {
             }
 
             items[index].updateBtnLoading = false;
+            model = result['data']
+        }
+
         this.setState({
             modalTitle: title,
             modalVisible: true,
-            model: result['data'],
+            model: model,
             items: items
         });
     };
@@ -287,7 +292,7 @@ class Credential extends Component {
         })
     }
 
-    handleShowSharer = async (record, disabled) => {
+    handleShowSharer = async (record) => {
         let r1 = this.handleSearchByNickname('');
         let r2 = request.get(`/resources/${record['id']}/assign`);
 
@@ -368,6 +373,7 @@ class Credential extends Component {
 
                     const menu = (
                         <Menu>
+                            {isAdmin() ?
                                 <Menu.Item key="1">
                                     <Button type="text" size='small'
                                             disabled={!hasPermission(record['owner'])}
@@ -386,14 +392,16 @@ class Credential extends Component {
                                                     });
 
                                             }}>更换所有者</Button>
-                            </Menu.Item>
+                                </Menu.Item> : undefined
+                            }
+
 
                             <Menu.Item key="2">
                                 <Button type="text" size='small'
                                         disabled={!hasPermission(record['owner'])}
                                         onClick={async () => {
-                                            await this.handleShowSharer(record, false);
+                                            await this.handleShowSharer(record);
-                                        }}>授权</Button>
+                                        }}>更新授权人</Button>
                             </Menu.Item>
 
                             <Menu.Divider/>
@@ -421,14 +429,14 @@ class Credential extends Component {
             }
         ];
 
-        if(hasPermission()){
+        if (isAdmin()) {
             columns.splice(5, 0, {
                 title: '授权人数',
                 dataIndex: 'sharerCount',
                 key: 'sharerCount',
                 render: (text, record, index) => {
                     return <Button type='link' onClick={async () => {
-                        await this.handleShowSharer(record, true);
+                        await this.handleShowSharer(record);
                     }}>{text}</Button>
                 }
             });
@@ -490,7 +498,7 @@ class Credential extends Component {
 
                                     <Tooltip title="新增">
                                         <Button type="dashed" icon={<PlusOutlined/>}
-                                                onClick={() => this.showModal('新增凭证', null)}>
+                                                onClick={() => this.showModal('新增凭证')}>
 
                                         </Button>
                                     </Tooltip>
@@ -559,14 +567,13 @@ class Credential extends Component {
                                 handleCancel={this.handleCancelModal}
                                 confirmLoading={this.state.modalConfirmLoading}
                                 model={this.state.model}
-                                footer={this.state.modalTitle.indexOf('查看') > -1 ? null : undefined}
                             >
 
                             </CredentialModal>
                             : null
                     }
 
-                    <Modal title={`更换授权凭证「${this.state.selected['name']}」的所有者`}
+                    <Modal title={<text>更换资源「<strong style={{color: '#1890ff'}}>{this.state.selected['name']}</strong>」的所有者</text>}
                            visible={this.state.changeOwnerModalVisible}
                            confirmLoading={this.state.changeOwnerConfirmLoading}
                            onOk={() => {
@@ -620,7 +627,7 @@ class Credential extends Component {
                         </Form>
                     </Modal>
 
-                    <Modal title={`授权凭证「${this.state.selected['name']}」的授权者`}
+                    <Modal title={<text>更新资源「<strong style={{color: '#1890ff'}}>{this.state.selected['name']}</strong>」的授权人</text>}
                            visible={this.state.changeSharerModalVisible}
                            confirmLoading={this.state.changeSharerConfirmLoading}
                            onOk={async () => {
@@ -630,12 +637,12 @@ class Credential extends Component {
 
                                let changeSharerModalVisible = false;
 
-                               let result = await request.post(`/resources/${this.state.selected['id']}/assign?userIds=${this.state.selectedSharers.join(',')}`);
+                               let result = await request.post(`/resources/${this.state.selected['id']}/assign?type=credential&userIds=${this.state.selectedSharers.join(',')}`);
                                if (result['code'] === 1) {
                                    message.success('操作成功');
                                    this.loadTableData();
                                } else {
-                                   message.success(result['message'], 10);
+                                   message.error(result['message'], 10);
                                    changeSharerModalVisible = true;
                                }
 
@@ -658,6 +665,10 @@ class Credential extends Component {
                             showSearch
                             titles={['未授权', '已授权']}
                             operations={['授权', '移除']}
+                            listStyle={{
+                                width: 250,
+                                height: 300,
+                            }}
                             targetKeys={this.state.selectedSharers}
                             onChange={this.handleSharersChange}
                             render={item => `${item.nickname}`}

web/src/service/permission.js

@@ -7,3 +7,10 @@ export function hasPermission(owner) {
 
     return user['id'] === owner;
 }
+
+export function isAdmin(){
+    let userJsonStr = sessionStorage.getItem('user');
+    let user = JSON.parse(userJsonStr);
+    return user['role'] === 'admin';
+
+}