Merge remote-tracking branch 'origin/dev' into dev

Server/Resource/migrations/0004_auto_20170502_1705.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-02 09:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Resource', '0003_auto_20170427_1714'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='group_user',
+            name='group_id',
+        ),
+        migrations.RemoveField(
+            model_name='group_user',
+            name='user_id',
+        ),
+        migrations.AddField(
+            model_name='group',
+            name='members',
+            field=models.ManyToManyField(to='Resource.User'),
+        ),
+        migrations.DeleteModel(
+            name='Group_User',
+        ),
+    ]

Server/Resource/migrations/0005_auto_20170502_1713.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-02 09:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Resource', '0004_auto_20170502_1705'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Group_User',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('privilege', models.CharField(max_length=20)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='group',
+            name='members',
+        ),
+        migrations.AddField(
+            model_name='group_user',
+            name='group_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Resource.Group'),
+        ),
+        migrations.AddField(
+            model_name='group_user',
+            name='user_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Resource.User'),
+        ),
+    ]

Server/Resource/migrations/0006_auto_20170502_1720.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-02 09:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Resource', '0005_auto_20170502_1713'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group_user',
+            name='privilege',
+            field=models.CharField(choices=[('owner', 'owner'), ('master', 'master'), ('member', 'member')], max_length=20),
+        ),
+    ]

Server/Resource/migrations/0007_group_user_visible.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-02 09:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Resource', '0006_auto_20170502_1720'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group_user',
+            name='visible',
+            field=models.BooleanField(default=True),
+        ),
+    ]

Server/Resource/migrations/0008_group_user_update_time.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-02 09:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Resource', '0007_group_user_visible'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group_user',
+            name='update_time',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]

Server/Resource/models.py

@@ -47,6 +47,12 @@ class Group(models.Model):
 class Group_User(models.Model):
     group_id = models.ForeignKey(Group, on_delete=models.CASCADE)
     user_id = models.ForeignKey(User, on_delete=models.CASCADE)
-    privilege = models.CharField(max_length=20)
+    privilege = models.CharField(max_length=20, choices=(
+                                ('owner', 'owner'),
+                                ('master', 'master'),
+                                ('member', 'member'),
+                                ))
+    visible = models.BooleanField(default=True)
+    update_time = models.DateTimeField(auto_now_add=True)
     # def __str__(self):
     #     return str(self.group_id.group_name)

Server/Resource/templates/Resource/groupList.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<groups belongs="{{ belongs }}"
+        updateTime="{{ '???' }}">
+    <!-- 可以有群组为隐藏，在界面上不显示出来，用于推送广告、同城交友（逃）-->
+    <!-- privilege 的值可以有owner，master和member-->
+    {% for group in groups %}
+    <group id="{{ group.group_id.group_id }}"
+            name="{{ group.group_id.group_name }}"
+            visible="{{ group.visible }}"
+            privilege="{{ group.privilege }}"
+            />
+    {% endfor %}
+</groups>

Server/Resource/urls.py

@@ -5,4 +5,5 @@ urlpatterns = [
     url(r'^$', views.index, name='index'),
     url(r'^query/user/(?P<user_id>.+)/', views.QueryUser, name='query_user'),
     url(r'^query/group/(?P<group_id>.+)/', views.QueryGroup, name='query_group'),
+    url(r'^query/grouplist/(?P<user_id>.+)/', views.QueryGroupList, name='query_grouplist'),
 ]

Server/Resource/views.py

@@ -50,3 +50,11 @@ def QueryGroup(request, group_id):
     }
 
     return render(request, 'Resource/group.xml', data, content_type='application/xml')
+
+def QueryGroupList(request, user_id):
+    groups = Group_User.objects.filter(user_id=user_id)
+    data = {
+        'belongs': user_id,
+        'groups': groups,
+    }
+    return render(request, 'Resource/groupList.xml', data, content_type='application/xml')