badr_abdellaoui
/
EnglishPal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改访问端口，避免和其他组冲突，同时修改main.py,主页显示 English Pal(SPM-Spring2021-2599-张小飞201831990641)

pull/1/head
张小飞 2021-06-22 12:24:34 +08:00
parent 5c4810aec1
commit 10fd9afa6f
9 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -13,7 +13,7 @@ pipeline {
echo 'Building..' echo 'Building..'
sh 'sudo docker build -t englishpal .' sh 'sudo docker build -t englishpal .'
sh 'sudo docker stop $(docker ps -aq)' sh 'sudo docker stop $(docker ps -aq)'
sh 'sudo docker run -d -p 91:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpal' sh 'sudo docker run -d -p 5000:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpal'
} }
} }
stage('TestIt') { stage('TestIt') {

2
app/main.py
View File

@ -228,7 +228,7 @@ def mainpage():
</head> </head>
<body> <body>
''' '''
page += '<p><b><font size="+3" color="red">English Pal - Learn English in a smart way!</font></b></p>' page += '<p><b><font size="+3" color="red">English Pal(SPM-Spring2021-2599-张小飞201831990641) - Learn English in a smart way!</font></b></p>'
if session.get('logged_in'): if session.get('logged_in'):
page += ' <a href="%s">%s</a></p>\n' % (session['username'], session['username']) page += ' <a href="%s">%s</a></p>\n' % (session['username'], session['username'])
else: else:

2
app/test/test_add_word.py
View File

@ -10,7 +10,7 @@ import string
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'
def has_punctuation(s): def has_punctuation(s):

2
app/test/test_add_word_and_essay_does_not_change.py
View File

@ -10,7 +10,7 @@ import string
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'
def has_punctuation(s): def has_punctuation(s):

2
app/test/test_login.py
View File

@ -9,7 +9,7 @@ import random, string
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'

2
app/test/test_login_security_fix.py
View File

@ -9,7 +9,7 @@ import random, string
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'
def test_login_security_fix(): def test_login_security_fix():
try: try:

2
app/test/test_next_essay.py
View File

@ -9,7 +9,7 @@ import random, string, time
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'

2
app/test/test_signup.py
View File

@ -9,7 +9,7 @@ import random, string
driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
driver.implicitly_wait(10) driver.implicitly_wait(10)
HOME_PAGE = 'http://121.4.94.30:91/' HOME_PAGE = 'http://121.4.94.30:5000/'

BIN
演示视频zhangxf.mp4
View File

Binary file not shown.