Commit ced8a218 authored by Wallen姚文辉's avatar Wallen姚文辉

修改邮件发送人

parent c9ccc468
......@@ -35,10 +35,17 @@ def getheader(id_):
def sendport():
import yagmail
data=request.json
user = 'wallen.ywh@galaxyoversea.com'
password = 'Ywh940509'
yag = yagmail.SMTP( user=user, password=password, host='smtp.exmail.qq.com',port=465)
yag.send(to=data["to"],cc=data["cc"],subject=data.get("subject"),contents=data.get("contents"))
user_info=db.session.query(User.email_address,User.email_password).filter_by(id=session.get("id")).first()
db.session.close()
if not (user_info.email_address and user_info.email_password):
return jsonify({"code": 502, "message": "请完善个人邮箱"}),502
user = user_info.email_address
password = user_info.email_password
try:
yag = yagmail.SMTP( user=user, password=password, host='smtp.exmail.qq.com',port=465)
yag.send(to=data["to"],cc=data["cc"],subject=data.get("subject"),contents=data.get("contents"))
except:
return jsonify({"code": 502, "message": "发送失败,请检查邮箱信息是否正确或是否开启pop3"}),502
return jsonify({"code": 200, "message": f"{data.get('subject')}邮件发送成功"}),200
@tool.route('/testport/getproject', methods=["GET"])
......@@ -210,6 +217,7 @@ def uploadhistory():
@tool.route('/testcase/upload',methods=["POST"])
def run():
a=Uploadecase(project=request.form.get("projectName"),user_id=session.get("id"),step=0,stepstatus=0,status=0,create_time=time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(time.time())))
if 'file' not in request.files:
a.stepstatus=1
......
......@@ -101,7 +101,7 @@ def adduser():
@user.route("/getuser/<id_>",methods=["GET"])
def getuser(id_):
res=sqlOrmToJson(db.session.query(User.id,User.name,User.role_id,User.organization_id,User.create_date,User.jira_account,User.jira_password,User.create_user,User.email_address).filter_by(id=int(id_)).first())
res=sqlOrmToJson(db.session.query(User.id,User.name,User.role_id,User.organization_id,User.create_date,User.jira_account,User.jira_password,User.create_user,User.email_address,User.email_password).filter_by(id=int(id_)).first())
db.session.close()
return jsonify({"code": 200, "message": "请求成功","data":res}),200
......@@ -127,17 +127,17 @@ def updateuser():
del data["create_date"]
except:
pass
# try:
userinfo=db.session.query(User).filter_by(id=user_id)
userinfo.update(data)
userinfo.try_time=0
db.session.commit()
db.session.close()
return jsonify({"code": 200, "message": "修改成功"})
# except:
# db.session.rollback()
# db.session.close()
# return jsonify({"code": 401, "message": "修改失败"}),401
try:
userinfo=db.session.query(User).filter_by(id=user_id)
userinfo.update(data)
userinfo.try_time=0
db.session.commit()
db.session.close()
return jsonify({"code": 200, "message": "修改成功"})
except:
db.session.rollback()
db.session.close()
return jsonify({"code": 401, "message": "修改失败"}),401
@user.route("/user_list",methods=["GET"])
......
......@@ -70,6 +70,7 @@ class User(db.Model):
jira_account=Column(String(64), nullable=True,comment='jira登录账户')
jira_password=Column(String(64), nullable=True,comment='jira登录密码')
email_address=Column(String(64), nullable=True,comment='邮箱地址')
email_password=Column(String(64), nullable=True,comment='邮箱密码')
create_user=Column(Integer, nullable=False,comment='创建人')
try_time=Column(Integer, nullable=False,server_default=text("0"),comment='重试次数')
token=Column(Text(64), nullable=True,comment='登录token')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment