Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-25 19:56:09 +01:00
Code Issues Projects Releases Wiki Activity
7,873 Commits 53 Branches 317 Tags 354 MiB
506376dd1a
Commit Graph

622 Commits

Author SHA1 Message Date
Ziming Zhang
722e45b20b add swagger for tag retention 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I0f3ed8085e231868de74c273ba85946826181d5b
 2019-09-06 17:27:20 +08:00
Danfeng Liu (c)
13af86dd85 Replace image from tomcat to alpine for small size, then it will not take a long time for replication. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-06 17:26:47 +08:00
danfengliu
8539ce7b77 Add CVE whitelist project level API test into travis tests. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-05 18:02:53 +08:00
danfengliu
8503957eac 1.Add CVE white list API test into API_DB.robot;2.Random data for prject name should use lower case %m%s;3.Replace from harbor to self. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-04 15:50:09 +08:00
danfengliu
5c8890bc6d Replace image from httpd to haproxy:1.5 to make sure serverity is stable for test. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-03 14:04:59 +08:00
Wang Yan
4d5e549731
Merge pull request #8904 from danfengliu/Add-ECR-And-GCR-registry-to-nightly-replication-tests 
Add AWS-ECR and Google-GCR replication test into nighly tests.
 2019-09-03 13:38:57 +08:00
danfengliu
7d681c623b Add AWS-ECR and Google-GCR replication test into nighly tests. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-02 17:53:49 +08:00
Qian Deng
530240d8a3
Merge pull request #8897 from danfengliu/add-a-cve-id-to-add-system 
Fix nightly case to handle new vuln found by Clair.
 2019-09-02 10:10:41 +08:00
danfengliu
68fd128252 Clair scan result is not accurate that when I script this case, only 6 high CVE-ID, but in today nightly result, one more CVE-ID popuped, so I have to add it. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-30 09:55:55 +08:00
Ziming Zhang
8fb6e2f65b verify permission of GetRetentionExecTaskLog 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 15:01:53 +08:00
danfengliu
7217ed5358 Add CVE Whitelist test cases into nightly test, first test case is system CVE Whitelist test. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-28 14:01:43 +08:00
danfengliu
841ac24ebc
Add API test case sign image back to travis, despite codacy block it when pulling a pr. (#8617) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-19 13:35:45 +08:00
Daniel Jiang
747bf849d2
Merge pull request #8670 from reasonerjt/proj-cve-wl-apitest 
API test for project level CVE whitelist
 2019-08-16 18:17:26 +08:00
danfengliu
2aa6f1aed7
Merge branch 'master' into add-sign-api-back-to-travis-despite-codacy-1 2019-08-16 16:28:49 +08:00
wang yan
ddb913f8d0 Add API test case sign image back to travis, despite codacy block it when pulling a pr. 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-16 01:26:36 -07:00
Wang Yan
aab3925dab
Merge pull request #8646 from bitsf/add_harbor_test_ca 
use fix root CA for test
 2019-08-16 15:19:22 +08:00
Daniel Jiang
e4a78ba039 API test for project level CVE whitelist 
This commit update test case to cover project level CVE whitelist.
It also fixes the swagger doc to add missing attributes

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-15 11:37:22 +08:00
stonezdj(Daojun Zhang)
032d57d8b2
Merge pull request #8656 from reasonerjt/cve_whitelist_apitest 
API test for system level CVE whitelist
 2019-08-14 18:26:06 +08:00
Daniel Jiang
d01597ba23 API test for system level CVE whitelist 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-14 14:59:58 +08:00
Ziming Zhang
2ca0b6bd1f use fix root CA for test 
Change-Id: Ic663de04287d0cf963de71c3c18b43ed71f8139f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-14 13:58:20 +08:00
danfengliu
1f53a47102
add replication testcase in api_db.robot file (#8636) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-14 10:45:20 +08:00
wang yan
76c52c2332 append commit to fix core compile error introduced by pr #8606 
Signed-off-by: wang yan <wangyan@vmware.com>

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-14 00:22:55 +08:00
wang yan
699a935c05 temporary disable result checking on coverall service in travis ci 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-13 23:29:26 +08:00
danfengliu
1b0931c034 Since harbor 1.8 released, API test for replication was not update yet, so in this PR, replicaiton test will be adapt for harbor 1.8. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-08 17:06:37 +08:00
Wang Yan
4f7e225e69
Merge pull request #8530 from danfengliu/get-ca-from-harbor-api 
After helm cli test was added to nightly, ca was get by reading from …
 2019-08-06 14:00:41 +08:00
danfengliu
3eeb8cf355 After helm cli test was added to nightly, ca was get by reading from local file, but in helm nighly test, ca file was not in local, it has to be got from harbor api. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-06 11:28:54 +08:00
danfengliu
6818ce9b06
Adding retry for wait element visibility, in nightly test case Developer-Operate-Labels, project didn't show up when checking its visiblity, so add some wait for this check. (#8554) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-05 16:13:39 +08:00
danfengliu
b7803571d4
Currently, nightly test pipeline was only in one level category of auth_mode and upgrade, now we like to add a level base on the original level which is harbor deployment parameters. (#8398) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-01 15:10:54 +08:00
danfengliu
01e3175647
In nightly test, there're some element click error occured in a rare occasion, so add a sleep to give it a try. (#8428) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-29 13:37:02 +08:00
danfengliu
a31d12e01e
modify xpath of project member due to summary tab was added in project. (#8421) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-26 17:18:47 +08:00
danfengliu
8665274406 In nighly test case <Project Level Image Serverity Policy>, scan result of haproxy image is nolonger high but medium, it should be a bug of clair, so we replace haproxy by postgres, and also we pull postgres with sha256 to make sure the image under test is alway the specific one. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-25 10:27:10 +08:00
Wang Yan
04d63f887d
Merge pull request #8324 from ninjadq/ci_build_prepare_locally 
Travis ci build prepare container in local
 2019-07-18 15:14:10 +08:00
DQ
5adc29c07f Travis ci build prepare container in local 
build prepare container before running ut case

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-18 14:46:05 +08:00
danfengliu
554b0771fe
Due to adding new feature for white list, xpath of configuration changed, it caused failure of nightly tests, so it should be fixed. (#8307) 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-07-17 16:46:26 +08:00
danfengliu
9b61bf4fce
In nightly test case 'list helm chart', delete chart (#8280) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-17 15:32:10 +08:00
danfengliu
a8300d91e6
Add a nightly test case helm CLI, in this case, we verify help repo add and helm push. (#8240) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-16 14:00:30 +08:00
danfengliu
fa51ac6406
Add user027 and user028 to ldap service, it was added in ldap_test.ldif for nightly test. (#8158) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-08 15:30:08 +08:00
danfengliu
db012c816d
In nightly test case <Delete Multi Member>, 'action' was clicked, but the dropdown list was't not shown up, so we should add a comfirmation to make sure the expected element show up. (#8146) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-08 15:28:28 +08:00
Wenkai Yin(尹文开)
766d5ee017
Merge pull request #8118 from wy65701436/fix-offline 
Fix issues on packaging offline installer
 2019-06-25 08:41:27 +08:00
Daniel Jiang
736f5ca7fa
Merge pull request #8123 from wy65701436/upload-image-for-release 
Enable push dev images on release branch
 2019-06-24 22:14:42 +08:00
danfengliu
432d0757f0
In nightly test, case Disable-Scan-Schedule always failed at action of edit button click, so we should add a comfirmation to make sure that this button will be disappeared after click action. (#8126) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-06-24 18:09:34 +08:00
wang yan
49ad641d4f Remove duplicate docker push 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-06-24 10:03:42 +08:00
wang yan
f4aa8d062b Enable push dev images on release branch 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-06-21 23:04:15 +08:00
wang yan
f32a8c60b6 Fix issues on packaging offline installer 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-06-21 14:30:06 +08:00
Wang Yan
8cd155088d
Merge pull request #8073 from wy65701436/fix-build-offline 
Fix issue on building package offline and online installer
 2019-06-19 19:53:22 +08:00
danfengliu
74d39afbb0 Modify robot-framework keyword <Retry Double Keywords When Error>, when the second action is success, should quit keyword. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-06-18 16:40:11 +08:00
wang yan
ab5ca5e083 Fix issue on building package offline and online installer 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-06-18 14:57:17 +08:00
Wang Yan
251b481165
Merge pull request #7983 from danfengliu/fix-nightly-keyword-Go-Into-Repo 
Element Clicked returns OK, but the element was not click functionally
 2019-06-17 17:53:38 +08:00
danfengliu
a9998adfae In robot-framework, Element Clicked returns OK, but the element was not click functionally 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-06-17 16:12:38 +08:00
wang yan
02332caaf4 Remove the compile golang image tag setting when to build offline 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-06-14 12:51:29 +08:00
Daniel Jiang
737eaa396c Bump up to go 1.12.5 enable go.mod 
This commit bumps up the version of Go to compile the code to v1.12.5,
and shifts to go.mod for managing depedency.
Some code from "harbor/tests" to "harbor/src/testing" to avoid depedency
loop of modules.

Note that in short term we will still vendor the dependency.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-06-11 00:42:20 +08:00
danfengliu
d8b76c482a
Add 2 UI test cases which is replication rule edit and delete. (#7904) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-06-03 16:58:24 +08:00
danfengliu
9d78038940
Population data tool - prepare.py has been adapted for the latest version due to API changing, but the old version still was needed in other place, so it should be add it back and give it a new name. (#7943) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-31 17:05:27 +08:00
danfengliu
496533296d
Jenkin job cd_daily_master failed due to sign image failure, but there're other failure for replicaiton NG, so API for replication NG need to be updated. (#7778) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-30 15:59:09 +08:00
danfengliu
e66d857fbc Add test case secret-verify for oidc-auth-mode feature by adding some keywords and one test cases. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-27 14:31:14 +08:00
danfengliu
a2b651969c
Fix bug for manage-project-member, due to keywords changed for oidc-auth-mode, test case manage-project-member should be debug at the same time. (#7888) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-24 15:22:28 +08:00
danfengliu
fed310a974
Add test case for oidc auth mode (#7860) 
* Nightly test case user-view-logs failed several times, after debugging, the reason is checking too fast although the operation has not finsished, so I add a checking for end of the operation.

Signed-off-by: danfengliu <danfengl@vmware.com>

* Add test case Manage-Project-Member for oidc auth mode Jenkins pipeline, this test case reuse the same test case in common file.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-23 15:43:59 +08:00
danfengliu
7b7f7a920a
Nightly test case user-view-logs failed several times, after debugging, the reason is checking too fast although the operation has not finsished, so I add a checking for end of the operation. (#7858) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-22 14:06:07 +08:00
danfengliu
a503944110
OIDC authentication is a new feature in version 1.8.0, so add nightly GUI test cases for OIDC authentication scenario. (#7745) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-22 11:19:08 +08:00
Qian Deng
eba20baba5
Merge pull request #7612 from ninjadq/fix_tls_related_issues 
Fix tls related issues
 2019-05-10 16:36:51 +08:00
danfengliu
8a2ee784a4
Missing modification in keyword <Create A New Endpoint>, due to changing of docker-hub select item, it must be modified. (#7754) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-10 14:24:12 +08:00
Qian Deng
6ea0514bb7 Revert "Set default mode to https" 
This reverts commit 8a308a63e2.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 13:18:48 +08:00
Wenkai Yin
b3a344b60e Fix travis failure: read the content of env instead of config_env as the config_env has been removed 
Read the content of env instead of config_env as the config_env has been removed

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-09 17:26:56 +08:00
danfengliu
dffb2bbd98 Due to replication NG feature already in master branch, old replication UI test cases have been moved out of Jenkins pipeline, and here test case <Replication Of Pull Images from DockerHub To Self> and <Replication Of Push Images from Self To Harbor> has been finished and ready for duty. Other modification is add retry for keywords in UserProfile.robot (#7611) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-09 15:44:48 +08:00
Steven Zou
b664b90b86
Merge pull request #7585 from steven-zou/add_get_jobs_API 
add get jobs API to provide powerful job stats management
 2019-05-08 17:17:33 +08:00
Steven Zou
2562146faf adjust the order of robot test case of API_DB 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-05-07 16:13:31 +08:00
danfengliu
9019864446
In API test, there is a dead loop in checking GC status, it's fixed in this PR and add log inmformation in the loop. (#7643) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-06 17:24:33 +08:00
danfengliu
e08c2e757e This API test script was blocked by a swagger error, now this error was fixed, so robot account script can be finished now. In swagger.yaml, robot account can be updated in "disbled" status, it's added into script. (#7636) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-06 11:34:11 +08:00
danfengliu
c4fbcb481e
Due to replication NG feature already in master branch, old replication UI test cases have been moved out of Jenkins pipeline, and here is that test case endpoint add/edit/delete have been finished and ready for duty. (#7496) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-24 11:20:26 +08:00
danfengliu
c3c10a87b2
Due to replication NG feature already in master branch, old replication UI test cases have been moved out of Jenkins pipeline, and here test case add-replication-test-case-Endpoint-Verification has been finished and ready for duty. (#7472) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-23 15:33:04 +08:00
danfengliu
6b9584a71f
Add retry and wait for keyword <View Repo Scan Details>, Jenkins chart CI failed at 1 test case in rare occasion, the reason is lacking of wait and retry to wait. (#7466) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-22 15:47:43 +08:00
danfengliu
4e8d4fca85
Due to replication NG feature already in master branch, old replication UI test cases have been moved out of Jenkins pipline, and here test case Pro-Replication-Rules-Add has been finished and ready for duty. (#7453) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-22 09:58:02 +08:00
Daniel Jiang
71cd51c9f4
Merge pull request #7326 from ninjadq/default_config_to_https 
Set default mode to https
 2019-04-22 09:24:39 +08:00
stonezdj(Daojun Zhang)
36d13e8243
Merge pull request #7328 from stonezdj/debts 
Fix issue 6450 Test LDAP server error without save configuration
 2019-04-19 16:51:57 +08:00
danfengliu
15846ac524
Feature - Replication was upgraded, so the corrsponding UI test cases are nolonger available any more, we left an empty Replication.robot file, then add new test cases step by step. (#7436) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-18 17:07:39 +08:00
stonezdj
41a574e55c Fix issue 6450 Test LDAP server error without save configuration 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-04-18 14:24:21 +08:00
wang yan
e017294f71 merge with master latest 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-17 17:52:39 +08:00
Wang Yan
a6af9e9972
Support well-formatted error returned from the REST APIs. (#6957) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-17 16:43:06 +08:00
Qian Deng
8a308a63e2 Set default mode to https 
Default mode to https
The cert file value is set to previous version style

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-16 15:50:12 +08:00
Wenkai Yin
174a1f5bfa Remove the E2E test cases for replication 
Remove the E2E test cases for replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-12 17:37:14 +08:00
danfengliu
887694019e
Sign-in element xpath has changed, so it need to be modified to the new one. (#7355) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-12 16:15:23 +08:00
danfengliu
c320645ba1
many keywords in ToolKit.robot miss wait or retry when operating elements, and it has cause test case failure one time, so I modify all keywords in ToolKit.robot. (#7340) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-11 15:15:35 +08:00
danfengliu
08b346ee1e
Add API test case for retag, create a user and 2 projects by this new user, push image to 1st project, and retag this image to 2nd project. (#7300) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-11 15:05:46 +08:00
Qian Deng
fdf57f07f0
Merge pull request #7277 from ninjadq/refactor_config_file 
Refactor config file
 2019-04-09 15:48:15 +08:00
Qian Deng
deba378842 Enhance: Refacotr Registry config file 
1. Refactor registry configs
2. cp gcs keyfile is exist

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 14:40:41 +08:00
danfengliu
7c0273e5f9
Add a checkpoint in the end of key word <Add Guest Member To Project>, to make sure that the confirm button was click successfully, to see if this confirm button was dissappered after clicked. (#7320) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-09 13:41:56 +08:00
danfengliu
0e0c691225
In project.robot, many element click or other action keywords missing retry, it will cause innessesary sleep in scripts. (#7274) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-09 10:44:24 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue 
Fix nightly test case failed when login harbor.
 2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e fix login harbor issue with test case 
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-04 09:58:46 +08:00
FangyuanCheng
82716d492d move vulnerability and gc ui 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-04-03 14:39:46 +08:00
danfengliu
3db3f3a62e
add test cases for jenkins upgrade project, wrap test cases body into new keywords, so that case body appears only in one single place (#7243) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-28 14:37:03 +08:00
danfengliu
6b19b99c97
test case Disable Scan Schedule failed at page should contain part, it missing wait until and retry, so add one (#7228) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-27 15:33:31 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-23 20:58:45 +08:00
Yan
8d3946a0e2
Refactor scan all api (#7120) 
* Refactor scan all api

This commit is to let scan all api using admin job to handle schedule
management. After the PR, GC and scan all share unified code path.

Signed-off-by: wang yan <wangyan@vmware.com>

* update admin job api code according to review comments

Signed-off-by: wang yan <wangyan@vmware.com>

* Update test code and comments per review

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-22 17:52:21 +08:00
Qian Deng
ba4764c61d
Merge pull request #6755 from ninjadq/refactor_prepare 
Refactor the prepare script
 2019-03-22 14:54:30 +08:00
Qian Deng
fcdab4d4af Fix: packaging offline in new prepare 
This new prepare script now support offline packaging

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 13:56:15 +08:00
danfengliu
cd33d312fb
Due to domain name was changed to legal valid one with a slash and sub directory, the name of directory for CA notary client is wrong, so it's need to be modified. (#7169) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-20 11:28:57 +08:00
danfengliu
d9eb519e6c
Test case <List Helm Charts> failed occasionally, due to lacking of wail and retry for action word, so this case need to be refected. (#7165) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-18 18:06:46 +08:00
danfengliu
8089ee10ce
add a checkpoint for keyword-Add-Guest-Member-To-Project to make sure the OK button has disapeared, the the following action will not be blocked (#7151) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-15 17:18:44 +08:00
danfengliu
eda6bbf8e6 add checkpoint for keyword Go Into Repo to make sure the tag in repository shown up completly. (#7142) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-14 18:38:08 +08:00