diff --git a/Jenkinsfile b/Jenkinsfile index 434c00f..9366ee4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { echo 'Building..' sh 'sudo docker build -t englishpal .' 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') { diff --git a/app/main.py b/app/main.py index 9c60b6f..72cfd6e 100644 --- a/app/main.py +++ b/app/main.py @@ -228,7 +228,7 @@ def mainpage(): ''' - page += '

English Pal - Learn English in a smart way!

' + page += '

English Pal(SPM-Spring2021-2599-张小飞201831990641) - Learn English in a smart way!

' if session.get('logged_in'): page += ' %s

\n' % (session['username'], session['username']) else: diff --git a/app/test/test_add_word.py b/app/test/test_add_word.py index 05f7961..0cf1865 100644 --- a/app/test/test_add_word.py +++ b/app/test/test_add_word.py @@ -10,7 +10,7 @@ import string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' def has_punctuation(s): diff --git a/app/test/test_add_word_and_essay_does_not_change.py b/app/test/test_add_word_and_essay_does_not_change.py index 61af4b8..348521e 100644 --- a/app/test/test_add_word_and_essay_does_not_change.py +++ b/app/test/test_add_word_and_essay_does_not_change.py @@ -10,7 +10,7 @@ import string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' def has_punctuation(s): diff --git a/app/test/test_login.py b/app/test/test_login.py index 2fc5d49..11b9abf 100644 --- a/app/test/test_login.py +++ b/app/test/test_login.py @@ -9,7 +9,7 @@ import random, string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' diff --git a/app/test/test_login_security_fix.py b/app/test/test_login_security_fix.py index b836b6b..3baf18a 100644 --- a/app/test/test_login_security_fix.py +++ b/app/test/test_login_security_fix.py @@ -9,7 +9,7 @@ import random, string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) 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(): try: diff --git a/app/test/test_next_essay.py b/app/test/test_next_essay.py index bed6a92..6cf8c80 100644 --- a/app/test/test_next_essay.py +++ b/app/test/test_next_essay.py @@ -9,7 +9,7 @@ import random, string, time driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' diff --git a/app/test/test_signup.py b/app/test/test_signup.py index 596e53d..f46c5cd 100644 --- a/app/test/test_signup.py +++ b/app/test/test_signup.py @@ -9,7 +9,7 @@ import random, string driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME) driver.implicitly_wait(10) -HOME_PAGE = 'http://121.4.94.30:91/' +HOME_PAGE = 'http://121.4.94.30:5000/' diff --git a/演示视频zhangxf.mp4 b/演示视频zhangxf.mp4 deleted file mode 100644 index eddf7ab..0000000 Binary files a/演示视频zhangxf.mp4 and /dev/null differ