update server

Author: lifei825

api/authentication/model.py

@@ -82,6 +82,7 @@ def can(self, gid, permissions=Permission.VIEW):
             return False
         # 判断是否在组中 [ r for r in self.roles if 组 == r.组]
         permissions_list = [r.permissions for r in self.roles if r.groups_id == int(gid) or r.groups_id == 2]
+        print("can:", permissions_list, gid)
         if permissions_list:
             all_perms = reduce(lambda x, y: x | y, permissions_list)
         else:
@@ -106,10 +107,10 @@ def password(self, password):
     def verify_password(self, password):
         return check_password_hash(self.password_hash, password)
 
-    def to_json(self):
+    def to_json(self, gid):
         doc = self.__dict__
-        print("roles", self.roles)
-        print(doc)
+        doc['roles'] = self.roles
+        # print(self.username, self.roles)
         if "_sa_instance_state" in doc:
             del doc["_sa_instance_state"]
 
@@ -126,9 +127,7 @@ def to_json(self):
             doc['last_login_at'] = doc['last_login_at'].split('.')[0]
 
         if doc.get('roles', None):
-            doc['roles'] = [r.to_json() for r in doc['roles']]
-
-        print('json:', doc)
+            doc['roles'] = [str(r.permissions) for r in doc['roles'] if r.groups_id == gid]
 
         return doc
 

api/authentication/view.py

@@ -101,11 +101,13 @@ def post(self):
             email = request.values.get('email', None)
             password = request.values.get('password', None)
             _secret = current_app.config.get('SECRET_KEY')
+            print("identfied", email, password)
 
             with current_app.test_client() as c:
                 resp = c.post('/auth', headers={'Content-Type': 'application/json'},
                               data=json.dumps({"username": email, "password": password}))
                 data = json.loads(resp.data.decode('utf8'))
+                print("auth", data)
                 if data.get('error'):
                     raise ErrorCode(451, data.get('description', "Bad Request"))
 
@@ -120,7 +122,10 @@ def post(self):
             logging.error("get token error: %s." % str(e))
             state = isinstance(e, ErrorCode) and e or ErrorCode(451, "unknown error:" + str(e))
 
-        return {'result': {'username': email, 'token': token, 'exp': exp}, 'state': state.message}, state.eid
+        return {'result': {'username': email,
+                           'token': token,
+                           'exp': exp,
+                           'permission': Permission.PERMISSION_MAP}, 'state': state.message}, state.eid
 
 
 class Users(Resource):
@@ -129,6 +134,9 @@ def __init__(self):
         self.parser.add_argument('user', type=str, required=True, location='form')
         self.parser.add_argument('passwd', type=str, required=True, location='form')
 
+        self.parser_post = reqparse.RequestParser()
+        self.parser_post.add_argument('roles', type=list, action='append', location=['form', 'values', 'json'])
+
         self.parser_get = reqparse.RequestParser()
         self.parser_get.add_argument('user', type=str, required=False, location='args')
         super(Users, self).__init__()
@@ -149,14 +157,14 @@ def get(self):
                 description: "JWT <token>"
               - in: query
                 name: gid
-                type: string
+                type: integer
               - in: query
                 name: page
-                type: string
+                type: integer
                 description: 当前页
               - in: query
                 name: pageSize
-                type: string
+                type: integer
                 description: 每页显示量
             responses:
               200:
@@ -171,19 +179,16 @@ def get(self):
             page_size = int(request.values.get('pageSize', 10))
             keyword = request.values.get('keyword', "")
 
-            print(1, page_size)
             # 如果是超级管理员可获取所有用户信息
-            if self.gid == 2:
-                print(2, page_size)
+            if self.gid == 0:
                 users_class = User.query.filter(or_(User.username.like("%"+keyword+"%"),
                                                     User.email.like("%"+keyword+"%"),
                                                     User.phone.like("%"+keyword+"%"),
                                                     User.job.like("%"+keyword+"%"),)
-                                                ).order_by(User.id.desc()).paginate(page, page_size, error_out=False)
+                                                ).order_by(User.id.desc()).paginate(page, page_size, error_out=True)
 
             # 否则获取指定项目下的所有用户
             else:
-                print(page_size)
                 users_class = User.query.join(User.roles).filter(
                     and_(Role.groups_id == self.gid,
                          or_(User.email.like("%"+keyword+"%"),
@@ -194,9 +199,8 @@ def get(self):
 
             users = users_class.items
             users_total = users_class.total
-            print("user:", users)
 
-            doc = [u.to_json() for u in users]
+            doc = [u.to_json(self.gid) for u in users]
 
         except Exception as e:
             logging.error("get user info error: %s." % str(e))
@@ -205,9 +209,10 @@ def get(self):
         return {'result': {'doc': doc, 'total': users_total}, 'state': state.message}, state.eid
 
     @jwt_required()
+    @permission_required(Permission.VIEW)
     def post(self):
         """
-            员工信息修改接口
+            用户添加修改
             ---
             tags:
             - USER
@@ -217,6 +222,18 @@ def post(self):
                 type: string
                 required: true
                 description: "JWT <token>"
+              - in: formData
+                name: id
+                type: integer
+                description: "用户ID"
+              - in: formData
+                name: username
+                type: string
+                description: "用户名"
+              - in: formData
+                name: job
+                type: string
+                description: "职位"
               - in: formData
                 name: phone
                 type: string
@@ -225,6 +242,14 @@ def post(self):
                 name: email
                 type: string
                 description: "邮箱"
+              - in: formData
+                name: active
+                type: string
+                description: "是否激活"
+              - in: formData
+                name: roles
+                type: array
+                description: "角色"
             responses:
               200:
                 description: 员工信息修改接口
@@ -233,24 +258,52 @@ def post(self):
         state = STATE_OK
         rs = False
         try:
-            uid = current_identity.__dict__.get('id')
+            request_param = dict(request.values.items())
+            print("user post:", request_param)
+            uid = request.values.get("id", None)
+            username = request.values.get("username", None)
             phone = request.values.get("phone", None)
             email = request.values.get("email", None)
-            user = User.query.get(int(uid))
-            if phone or email:
-                if phone:
-                    user.phone = phone
+            job = request.values.get("job", None)
+            roles = request.values.get("roles", "").split(',')
+            print(roles, type(roles))
 
-                if email:
-                    user.email = email
+            if not username and not email:
+                raise STATE_PARAM_ERR
 
-                db.session.add(user)
-                db.session.commit()
+            if not uid:
+                user = User(username=username,
+                            email=email,
+                            phone=phone,
+                            job=job,
+                            active=True)
 
-                rs = True
+                password = current_app.config.get('PASSWORD_KEY')
+                user.password = password
 
             else:
-                raise STATE_PARAM_ERR
+                user = User.query.get(int(uid))
+                user.username = username,
+                user.email = email,
+                user.phone = phone,
+                user.job = job
+                user.active = True
+
+            if roles:
+                print("roles", roles)
+                for r in roles:
+                    role = Role.query.filter_by(groups_id=self.gid, permissions=int(r)).first()
+                    print("role s", role)
+                    if role not in user.roles:
+                        print("not role s")
+                        user.roles.append(role)
+
+                # user.roles
+            print("db sssss")
+            db.session.add(user)
+            db.session.commit()
+
+            rs = True
 
         except Exception as e:
             logging.error("get user info error: %s." % str(e))
@@ -305,7 +358,7 @@ def get(self):
             page_size = int(request.values.get('pageSize', 10))
             keyword = request.values.get('keyword', "")
 
-            if self.gid == 2:
+            if self.gid == 2 and [r for r in self.user.roles if r.groups_id == 2]:
                 groups_class = Groups.query.filter(Groups.name.like('%{0}%'.format(keyword))).order_by(
                     Groups.id.desc()).paginate(page, page_size, error_out=False)
 

utils/ErrorCode.py

@@ -13,7 +13,7 @@ def __str__(self):
 STATE_CREATE_OK = ErrorCode(201, '创建资源ok')
 STATE_UNKNOWN = ErrorCode(451, '未知错误')
 STATE_LOGIN_ERR = ErrorCode(401, '登陆验证错误')
-STATE_PARAM_ERR = ErrorCode(402, '参数错误')
+STATE_PARAM_ERR = ErrorCode(400, '参数错误')
 STATE_DB_UPDATE_ERR = ErrorCode(422, '数据库更新错误')
-STATE_EmptyData_ERR = ErrorCode(400, '数据库查询为空数据')
+STATE_EmptyData_ERR = ErrorCode(402, '数据库查询为空数')
 STATE_PreconditionFailed = ErrorCode(412, '字段中给出先决条件时，没能满足其中的一个或多个')

utils/permission.py

@@ -23,11 +23,13 @@ def decorator(f):
         @wraps(f)
         def _deco(self, *args, **kwargs):
             print("self post", dict(request.values.items()))
+            self.gid = request.values.get("gid", 2)
+
             if permission == Permission.SUPER_ADMIN:
                 self.gid = 2
 
             else:
-                self.gid = int(request.values.get("gid", 2))
+                self.gid = int(self.gid) if self.gid else 2
 
             uid = current_identity.__dict__.get('id')
             self.user = User.query.get(int(uid))

vue-init/src/api/auth.js

@@ -96,6 +96,24 @@ export const getUsers = (token, gid=2, page=1, pageSize=10, keyword=null) => {
   })
 };
 
+export const postUsers = (token, data) => {
+  let l = new Array()
+  for (let r of data.roles) {
+    l.push(r)
+  }
+  delete data.roles
+  data["roles"] = l.join()
+  
+  return axios({
+    method: 'post',
+    url: baseUrl + '/api/v1/user',
+    headers: {
+      'Authorization': 'JWT '+token,
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    data: Qs.stringify(data)
+  })
+};
 export default {
   getUsers,
   deleteGroups,

vue-init/src/components/layout.vue

@@ -176,12 +176,18 @@
                 menus: [
                   {name: 'Overview', icon:'speedometer', path: '/'},
                   {name: '资产管理', icon:'ios-paper', path: [
-                    {name: '服务器管理', icon:'ios-navigate', path: '/'},
-                    {name: 'IDC管理', icon:'android-list', path: '/user'}
+                    {name: '服务器列表', icon:'ios-navigate', path: '/server'},
+                    {name: 'IDC管理', icon:'android-list', path: '/user'},
+                    {name: '服务器分组', icon:'android-list', path: '/server_group'}
                   ]},
                   {name: '权限管理', icon:'ios-paper', path: [
                     {name: '用户管理', icon:'ios-navigate', path: '/user'},
                     {name: '项目管理', icon:'android-list', path: '/group'}
+                  ]},
+                  {name: '服务器操作', icon:'ios-paper', path: [
+                    {name: '代码发布', icon:'ios-navigate', path: '/user'},
+                    {name: 'Pipeline', icon:'android-list', path: '/group'},
+                    {name: '批量操作', icon:'android-list', path: '/group'}
                   ]}
                 ]
             }

vue-init/src/components/login.vue

@@ -151,7 +151,8 @@
                 this.$store.dispatch('save_token', {
                   'user': res.data.result.username,
                   'token': res.data.result.token,
-                  'src': res.data.result.src
+                  'src': res.data.result.src,
+                  'roles': res.data.result.permission
                 });
                 this.$Message.success('提交成功!');
                 this.$router.push('/');