Update

docs/faq_org.rst

@@ -19,3 +19,53 @@
     >>> exit()
 
     # 然后使用 user 用户登录 jumpserver 即可
+
+
+向现有组织加入管理员
+
+.. code-block:: shell
+
+    $ source /opt/py3/bin/activate
+    $ cd /opt/jumpserver/apps
+    $ python manage.py shell
+    >>> from assets.models import Asset
+    >>> from orgs.models import Organization
+    >>> from users.models import User
+    >>> dev_org = Organization.objects.get(name='开发部')
+    >>> user = User.objects.get(username='admin')
+    >>> dev_org.admins.add(user)
+    >>> exit()
+
+
+向现有组织加入已存在用户
+
+.. code-block:: shell
+
+    $ source /opt/py3/bin/activate
+    $ cd /opt/jumpserver/apps
+    $ python manage.py shell
+    >>> from assets.models import Asset
+    >>> from orgs.models import Organization
+    >>> from users.models import User
+    >>> dev_org = Organization.objects.get(name='开发部')
+    >>> user = User.objects.get(username='admin')
+    >>> dev_org.users.add(user)
+    >>> exit()
+
+
+向现有组织加入新建的用户
+
+.. code-block:: shell
+
+    $ source /opt/py3/bin/activate
+    $ cd /opt/jumpserver/apps
+    $ python manage.py shell
+    >>> from assets.models import Asset
+    >>> from orgs.models import Organization
+    >>> from users.models import User
+    >>> dev_org = Organization.objects.get(name='开发部')
+    >>> user = User.objects.create(name='测试用户', username='test', email='test@jumpserver.org')
+    >>> user.set_password('PassWord')
+    >>> user.save()
+    >>> dev_org.users.add(user)
+    >>> exit()

docs/step_by_step.rst

@@ -430,10 +430,8 @@ Guacamole 需要 Tomcat 来运行
     $ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel
     $ yum install -y ffmpeg-devel freerdp-devel pango-devel libssh2-devel libtelnet-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel ghostscript
 
-    $ ln -s /usr/local/lib/freerdp/guacsnd.so /usr/lib64/freerdp/
-    $ ln -s /usr/local/lib/freerdp/guacdr.so /usr/lib64/freerdp/
-    $ ln -s /usr/local/lib/freerdp/guacai.so /usr/lib64/freerdp/
-    $ ln -s /usr/local/lib/freerdp/guacsvc.so /usr/lib64/freerdp/
+    $ mkdir /usr/local/lib/freerdp/
+    $ ln -s /usr/local/lib/freerdp /usr/lib64/freerdp
 
 **5.2 编译安装 guacamole 服务**