用户模块

WorkApi/APP/Experience/Items/experience_items_list.py

@@ -39,4 +39,4 @@ class ExperienceItemsList(object):
         base.dict_add_key(_key="itemName", value=self.itemName)
         self._params = base._json
 
-        self.response = self.api.get(url=self._url, params=self._params)
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkApi/APP/Experience/Problem/experience_problem_list.py

@@ -40,4 +40,4 @@ class ExperienceProblemList(object):
         base.dict_add_key(_key="problemName", value=self.problemName)
         self._params = base._json
 
-        self.response = self.api.get(url=self._url, params=self._params)
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkApi/APP/Members/Update/members_update_info.py

@@ -29,6 +29,7 @@ class MembersUpdateInfo(object):
         self.local_json = {}
 
         self.token = None
+        self.loginName = None
         self.name = None
         self.position = None
         self.role = None
@@ -51,6 +52,7 @@ class MembersUpdateInfo(object):
         self._headers = base._json
 
         base = ApiBase()
+        base.dict_add_key(_key="loginName", value=self.loginName)
         base.dict_add_key(_key="name", value=self.name)
         base.dict_add_key(_key="position", value=self.position)
         base.dict_add_key(_key="role", value=self.role)

WorkApi/APP/Members/members_create.py

@@ -27,6 +27,7 @@ class MembersCreate(object):
         self.response = ""
 
         self.token = None
+        self.loginName = None
         self.name = None
         self.position = None
         self.role = None
@@ -48,6 +49,7 @@ class MembersCreate(object):
         self._headers = base._json
 
         base = ApiBase()
+        base.dict_add_key(_key="loginName", value=self.loginName)
         base.dict_add_key(_key="name", value=self.name)
         base.dict_add_key(_key="position", value=self.position)
         base.dict_add_key(_key="role", value=self.role)

WorkApi/APP/Settings/Get/settings_get_member.py

@@ -29,7 +29,6 @@ class SettingsGetMember(object):
         self.local_json = {}
 
         self.token = None
-        self.memberId = None
 
         self.api = UtilsRequest()
 
@@ -38,8 +37,5 @@ class SettingsGetMember(object):
         base.dict_add_key(_key="token", value=self.token)
         self._headers = base._json
 
-        base = ApiBase()
-        base.dict_add_key(_key="memberId", value=self.memberId)
-
         self._params = base._json
         self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkCase/APP/Members/test_members_create.py

@@ -35,6 +35,7 @@ class TestMembersCreate(object):
     base_password = "123456"
 
     base_name = "SS 自动化专用用户"
+    base_login_name = "SS Test"
 
     @classmethod
     def setup_class(cls):
@@ -73,11 +74,12 @@ class TestMembersCreate(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, response, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
+    def check_select(self, response, login_name, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
                      silenceTime, period, severity):
         members_id = UtilsResponse().get_data(response=response)
         sql = self.select_members(members_id=members_id)
         for x, y in enumerate(sql):
+            assert y.login_name == login_name
             assert y.name == name
             assert y.position == position
             assert y.role == role
@@ -97,9 +99,10 @@ class TestMembersCreate(object):
     @allure.severity("blocker")
     def test_case_01(self):
         name = self.base_name + "01"
-        response = self.app.members_create(token=self.token, name=name, password=self.base_password, role=0)
+        login_name = self.base_login_name + "01"
+        response = self.app.members_create(token=self.token, loginName=login_name, name=name, password=self.base_password, role=0)
         self.app.check_code(response=response, code=0)
-        self.check_select(response=response, name=name, password=self.base_password, role=0, position=None,
+        self.check_select(response=response, login_name=login_name, name=name, password=self.base_password, role=0, position=None,
                           phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None,
                           silenceTime=None, period=None, severity=None)
 
@@ -107,13 +110,14 @@ class TestMembersCreate(object):
     @allure.story("创建用户：填写所有字段创建")
     def test_case_02(self):
         name = self.base_name + "02"
-        response = self.app.members_create(token=self.token, name=name, password=self.base_password, role=0,
+        login_name = self.base_login_name + "02"
+        response = self.app.members_create(token=self.token, loginName=login_name, name=name, password=self.base_password, role=0,
                                            position="position", phone="phone", email="email",
                                            wechatUrl="wechatUrl", dingdingUrl="dingdingUrl",
                                            remark="remark", silenceTime="1h", period="1-7,00:23:59",
                                            severity="0,1,2,3,4,5")
         self.app.check_code(response=response, code=0)
-        self.check_select(response=response, name=name, password=self.base_password, role=0, position="position",
+        self.check_select(response=response, login_name=login_name, name=name, password=self.base_password, role=0, position="position",
                           phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
                           silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
 

WorkCase/APP/Members/test_members_update_info.py

@@ -74,11 +74,12 @@ class TestMembersUpdateInfo(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, member_id, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
+    def check_select(self, member_id, login_name, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
                      silenceTime, period, severity):
         sql = self.select_members(members_id=member_id)
         assert sql != []
         for x, y in enumerate(sql):
+            assert y.login_name == login_name
             assert y.name == name
             assert y.position == position
             assert y.role == role
@@ -105,7 +106,7 @@ class TestMembersUpdateInfo(object):
                                                 email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
                                                 silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
         self.app.check_code(response=response, code=0)
-        self.check_select(member_id=member_id, name=name + "修改", password="Test", role=1, position="position",
+        self.check_select(member_id=member_id, login_name=name, name=name + "修改", password="Test", role=1, position="position",
                           phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
                           silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
 

WorkCase/APP/Settings/test_settings_changePassword.py

@@ -6,6 +6,8 @@
 
 from __future__ import division
 
+import time
+
 from WorkApi.APP.Members.members_create import MembersCreate
 from WorkCase import CaseBase
 from WorkCase.APP import AppBase
@@ -69,8 +71,8 @@ class TestSettingsChangePassword(object):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
         return session
 
-    @allure.title("settings.changePassword：成功修改密码")
-    @allure.story("修改密码：成功修改密码")
+    @allure.title("settings.changePassword：成功修改密码,token过期")
+    @allure.story("修改密码：成功修改密码,token过期")
     @allure.severity("blocker")
     def test_case_01(self):
         name = self.base_name + "01"
@@ -80,6 +82,15 @@ class TestSettingsChangePassword(object):
                                                     newPassword=new_password)
         self.app.check_code(response=response, code=0)
 
+        time.sleep(10)
+        response = self.app.settings_changePassword(token=self.token, memberId=member_id, oldPassword=self.base_password,
+                                                    newPassword=new_password)
+        self.app.check_code(response=response, code=2002)
+        self.app.check_msg(response=response, msg="账户不存在或密码错误")
+
+        response = self.app.api_login(name=name, password=new_password)
+        self.app.check_code(response=response, code=0)
+
     @allure.title("settings.changePassword：token错误")
     @allure.story("变更密码：token错误")
     def test_case_02(self):
@@ -102,5 +113,6 @@ if __name__ == "__main__":
 
     # a = TestSettingsChangePassword()
     # a.setup_class()
-    # a.test_case_05()
+    # a.setup_method()
+    # a.test_case_01()
     # a.teardown_method()

WorkCase/APP/__init__.py

@@ -473,7 +473,7 @@ class AppBase(object):
     def case_create_member(self, name, password, role=None, position=None, phone=None,
                            email=None, wechatUrl=None, dingdingUrl=None, remark=None,
                            silenceTime=None, period=None, severity=None):
-        response = self.members_create(token=self.token, name=name, password=password, role=role, position=position,
+        response = self.members_create(token=self.token, loginName=name, name=name, password=password, role=role, position=position,
                                        phone=phone, email=email, wechatUrl=wechatUrl, dingdingUrl=dingdingUrl,
                                        remark=remark, silenceTime=silenceTime, period=period, severity=severity)
         self.check_code(response=response, code=0)
@@ -532,11 +532,12 @@ class AppBase(object):
         return api.response
 
     @allure.step("调用接口：members.create")
-    def members_create(self, token=None, name=None, position=None, role=None, password=None,
+    def members_create(self, token=None, loginName=None, name=None, position=None, role=None, password=None,
                        phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None,
                        silenceTime=None, period=None, severity=None):
         api = MembersCreate(_host=self.host)
         api.token = token
+        api.loginName = loginName
         api.name = name
         api.position = position
         api.role = role
@@ -584,11 +585,12 @@ class AppBase(object):
         return api.response
 
     @allure.step("调用接口：members.update.info")
-    def members_update_info(self, token=None, name=None, position=None, role=None, password=None,
+    def members_update_info(self, token=None, loginName=None, name=None, position=None, role=None, password=None,
                             phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None, _id=None,
                             silenceTime=None, period=None, severity=None):
         api = MembersUpdateInfo(_host=self.host)
         api.token = token
+        api.loginName = loginName
         api.name = name
         api.position = position
         api.role = role

WorkData/Argus/members.py

@@ -24,6 +24,7 @@ class Members(Base):
     __tablename__ = "members"
 
     id = Column(BigInteger, primary_key=True)
+    login_name = Column(VARCHAR(50), comment="登录名")
     name = Column(VARCHAR(50), comment="用户名")
     password = Column(VARCHAR(255), comment="密码")
     head_image = Column(VARCHAR(255), comment="头像")