Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-12 11:56:56 +01:00
Code Issues Projects Releases Wiki Activity
7,506 Commits 54 Branches 318 Tags 336 MiB
069f884a7c
Commit Graph

578 Commits

Author SHA1 Message Date
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
De Chen
41e290a17f
Merge pull request #6877 from yeya24/patch/fixtypo 
fix some typos
 2019-03-12 20:07:15 +08:00
danfengliu
a618a2c2ac
Button was not clicked successfully in keyword < Delete Repo>, but the click action returned pass, so I add a checkpoint after clicking the delete button, make sure the pop info had disappeared, it means delete button was clicked successfully. (#7071) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-11 10:34:53 +08:00
Qian Deng
ab7c81dac6 Fix: the adminserver caused regression 
Remove some code related to adminserver
Fix some issues by adminserver removeing

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-08 16:46:13 +08:00
Qian Deng
5f80fe7b8a Refacotr the prepare script base on the proposal https://github.com/goharbor/community/pull/22 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-08 16:46:13 +08:00
Wenkai Yin
db7a709aad
Merge pull request #7063 from heww/users-search 
Add users search API
 2019-03-07 15:58:26 +08:00
He Weiwei
20556aebd2 Add users search API 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-03-07 12:47:26 +08:00
danfengliu
98c6889053 Configuration item verify_remote_cert is no longer useful, so it was delete from data population script 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-05 15:53:14 +08:00
danfengliu
62bb10d2e4
Nightly test case <List Helm Charts> is not stable, due to keyword <Go Back To Versions And Delete> failed at delete button click on a rare occasion, so I wrap 2 related action into one transaction, it does help. (#7050) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-01 18:25:45 +08:00
danfengliu
340577076c
add a jenkins job for migrate harbor from 1.6 to the latest, make some modification in prepare.py to adapt harbor 1.6 (#7025) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-27 14:27:39 +08:00
danfengliu
4dc983d419 In nightly tests, keyword <Multi Delete Object> failed on a rare occasion, so add retry for elemnet click in this keyword. (#7022) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-26 18:43:24 +08:00
danfengliu
a9b27b0071 In nightly test, 2 errors occurred, chrome webdrive initializtion failed, and delete repoitory on card view failed too, so add a retry for ffailure and add some sleep. (#7012) 
Add retry in keyword "Delete Repo".

Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-26 13:37:16 +08:00
danfengliu
c7d1e18477
In Nightly-CI keyword <Delete Repo> failed on the rare occasion. The appearance is that the repo check-box is not checked, although Click action keyword returned success, it effected the following actions. (#7003) 
For now, add a sleep to make it a try, and also add Capture Page Screenshot for debugging.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-25 10:48:04 +08:00
stonezdj
0cba36d79f Remove everything of adminserver 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-22 16:34:39 +08:00
danfengliu
a1063edae6
Add GUI test script for new feature of master-role, without adding a new case for master-role, I add new test steps in old test case named Manage-Project-Members, because master-role is a sub function in project members. (#6945) 
In this PR, I also modify a public action keyword to make it suitble for indefinite numbers of parameters.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-22 14:11:56 +08:00
stonezdj
36e1c13a43 fix ut error in systeminfo_test.go 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 14:06:19 +08:00
stonezdj
1ae5126bb4 Refactor adminserver stage 3: replace config api and change ut settings 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 14:06:19 +08:00
danfengliu
eaedd89c25 add api test case for robot user, and modify swagger.yaml for wrong type of return value. (#6900) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-18 13:47:16 +08:00
danfengliu
b83cf2e4c0
GC function hbas been change, verify criteria must be changed by add manifests (#6934) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-15 11:06:22 +08:00
Wenkai Yin
cd57f70f2f
Merge pull request #6901 from wy65701436/upgrade-registry-270 
Upgrade registry binary to v2.7.1
 2019-02-13 19:01:37 +08:00
danfengliu
275a917dbf add Capture Page Screenshot in retry keyword (#6897) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-02-13 14:48:09 +08:00
wang yan
c77b387c53 Upgrade registry binary to v2.7.0 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-02-13 10:24:08 +08:00
yeya24
628b94db19 fix some typos 
Signed-off-by: yeya24 <ben.ye@daocloud.io>
 2019-02-05 12:03:52 +08:00
jwangyangls
3d726219e5
Merge pull request #6758 from jwangyangls/privilege_escalation 
user permission change and add master role
 2019-01-31 18:57:22 +08:00
System Administrator
1a551690d3 promission reset 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-01-31 18:06:49 +08:00
danfengliu
47530cd62e
remove some sleep and add retry common keyword (#6875) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-31 17:58:05 +08:00
danfengliu
e5efbfe490
add retry keyword for docker pull and push image command. (#6857) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-31 16:08:58 +08:00
danfengliu
e12fd13c56
Encapsulate keyword <element click> and add it into keyword <Go Back To Versions And Delete>, this porblem caused case failure of <List Helm Charts> randomly. (#6834) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-30 14:22:31 +08:00
Daniel Jiang
bf663df0e7
Merge pull request #6820 from wy65701436/robot-service 
Add robot account authn & authz implementation
 2019-01-29 16:08:25 +08:00
He Weiwei
1da0a66fe5
Merge pull request #6781 from heww/user-permissions-api 
Implement api for get current user permissions
 2019-01-29 01:58:51 +08:00
He Weiwei
8b5e68073d Implement api for get current user permissions 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-28 18:06:52 +08:00
Yan
71f37fb820 * Add robot account authn & authz implementation. 
This commit is to add the jwt token service, and do the authn & authz for robot account.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-28 17:39:57 +08:00
danfengliu
9aeb626fe3
The former way to verify project creation is by API calling, but it's not a GUI operation, which is not a goal for operator, so I replace it with GUI verification (#6816) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-28 16:32:45 +08:00
danfengliu
923432a172
resort test case, 2 test cases failed due to unfinish chart data preparation, so resort the test cases, move the verification test case ahead of the 2 failed cases. (#6818) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-25 10:26:14 +08:00
danfengliu
b0c1adab8d
add retry for make swagger client (#6813) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-24 17:09:32 +08:00
danfengliu
257eebfebe
Add space adaptor for regexp when create a new project, we loose the criteria to match the project name because the return json datat may be shown in different lines . (#6768) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-24 09:38:46 +08:00
danfengliu
f29960628a Keyword <Go Into Project> has modified, but verify.robot didn't adapt this keyword. 
Modifications:
	1.Add paramenter hasimage in data.json
	2.Modify Harbor-Pages\Verify.robot to pass it to <Go Into Project>
	3.Add loop and exception-catch in <Go Into Project> to prevent using Sleep and failure by exception(this exception was caused by short time of paga loading)

Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-17 17:46:17 +08:00
danfengliu
fd5e109583 add wait until in keyword <Create An New Project> 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-15 17:46:46 +08:00
Wenkai Yin
60425676ac
Merge pull request #6733 from danfengliu/Add-WaitUntil-In-Keywords-Stage2 
Add wait until in <Multi-delete Object> and <Project Should Display>
 2019-01-14 17:22:39 +08:00
danfengliu
73b9e95464 Add wait until in <Multi-delete Object> and <Project Should Display> 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-14 15:19:30 +08:00
danfengliu
de30438d01
modify a code error by copy mistake (#6736) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-14 11:02:11 +08:00
Daniel Jiang
a1d4bfd332
Merge pull request #6344 from reasonerjt/bump-up-golang 
Bump up golang to 1.11.2
 2019-01-11 16:15:59 +08:00
Daniel Jiang
5d59d6fab8 Bump up golang to 1.11.2 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-01-11 14:44:32 +08:00
danfengliu
0b27037e34
Two modifications in PR:1. Due to GUI change on position of "project creation" configuration, script must be adjust with the corresponding change; 2. Fixed a issue of no exception caught when http request has error, all the system config will be set by a common request function. (#6715) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-01-11 13:40:08 +08:00
System Administrator
27c180bf20 fix_bug 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-01-11 11:00:46 +08:00