diff --git a/public/static/theme/css/console.css b/public/static/theme/css/console.css index 63036e5cb..13ce2110b 100644 --- a/public/static/theme/css/console.css +++ b/public/static/theme/css/console.css @@ -1 +1,1226 @@ -@charset "UTF-8";::selection{color:#fff!important;background-color:#ec494e!important}::-moz-selection{color:#fff!important;background-color:#ec494e!important}::-webkit-scrollbar-track{background:#ccc!important}::-webkit-scrollbar-thumb{background-color:#666!important}::-webkit-input-placeholder{color:#aaa}div.layui-side>div.layui-side-scroll::-webkit-scrollbar{width:3px}div.layui-side>div.layui-side-scroll::-webkit-scrollbar-track{background:#ccc!important}div.layui-side>div.layui-side-scroll::-webkit-scrollbar-thumb{background-color:#666!important}:-webkit-autofill,:-webkit-autofill:active,:-webkit-autofill:focus,:-webkit-autofill:hover{box-shadow:0 2px 3px 0 rgba(0,0,0,.1) inset!important;-webkit-transition:color 9999s ease-out,background-color 9999s ease-out!important;-webkit-transition-delay:9999s!important;-webkit-text-fill-color:#333!important}body{color:#333;font-size:12px}body a{color:#06C;cursor:pointer}body a:hover{color:#039}body input::-ms-clear{display:none}fieldset{margin:0;border:1px solid #e6e6e6;padding:10px 20px 5px 20px}fieldset legend{color:#666;padding:0 10px;font-size:14px}.form-search .layui-btn{height:32px;line-height:28px;font-size:12px;padding:0 10px}.form-search .layui-form-label{width:auto!important;padding:0 8px;height:32px;line-height:30px}.form-search .layui-input-inline{width:170px}.form-search .layui-input-inline input,.form-search .layui-input-inline select{width:100%;height:32px;padding:2px 8px;line-height:1em}.form-search .layui-form-select dl{top:31px;padding:0}.layui-form input.layui-input,.layui-form select.layui-select{line-height:1em}.label-required-prev:before{width:1em;color:red;content:'*';display:inline-block;position:absolute;text-align:left;font-weight:700;line-height:1.6em;margin-left:-.8em}.label-required-next:after,.label-required:after{top:6px;right:5px;color:red;content:'*';position:absolute;margin-left:4px;font-weight:700;line-height:1.8em}.label-required-null:before{content:none!important}.think-form-label{padding:9px 15px;font-weight:400;line-height:20px;text-align:right}.think-form-group-right{border-left:none;border-top-left-radius:0;border-bottom-left-radius:0}.think-form-group-left input{border-right:none;border-top-right-radius:0;border-bottom-right-radius:0}.think-box-shadow{background:#fff;padding:20px 20px!important;box-shadow:0 2px 3px 0 rgba(0,0,0,.1)}label.think-checkbox,label.think-radio{margin-right:10px;display:inline-block}.think-checkbox,.think-radio{cursor:pointer;margin-top:10px;font-weight:400;line-height:17px}.think-checkbox input[type=checkbox]{width:18px;height:18px;border:1px solid #dcdcdc;cursor:pointer;margin:0 5px 0 0;position:relative;display:inline-block!important;background:#fff;appearance:none;box-sizing:border-box!important;border-radius:1px;vertical-align:bottom;-webkit-appearance:none}.think-checkbox input[type=checkbox]:checked:after{color:#666;padding:2px;display:block;content:"\e605";font-size:12px;font-style:normal;font-weight:700;position:absolute;font-family:layui-icon!important;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.think-radio input[type=radio]{width:18px;height:18px;cursor:pointer;margin:0 5px 0 0;position:relative;border:1px solid #dcdcdc;display:inline-block!important;box-sizing:border-box!important;appearance:none;background:#fff;border-radius:1em;vertical-align:bottom;-webkit-appearance:none}.think-radio input[type=radio]:checked:after{top:4px;left:4px;width:8px;height:8px;content:'';display:block;position:relative;background:#666;border-radius:1em}bu.layui-form.layui-card{box-shadow:none}.layui-layer-content .layui-form.layui-card .layui-card-body{padding:30px 40px 0 0}.layui-layer-dialog .layui-layer-content .layui-layer-ico{top:50%!important;margin-top:-15px!important}.laydate-footer-btns span{line-height:24px!important}.layui-input,.layui-select{line-height:38px}.layui-btn-primary.layui-btn-xs{line-height:20px}.layui-btn-primary.layui-btn-sm{line-height:28px}.layui-table td,.layui-table th{font-size:12px}.layui-table .list-table-image{width:22px;cursor:pointer}.layui-table .list-table-sort-td{width:10px!important;text-align:center!important;padding-left:5px!important;padding-right:5px!important}.layui-table .list-table-sort-td button{width:56px;background:#009688}.layui-table .list-table-sort-td input{width:50px;color:#666;padding:2px;border:1px solid #e6e6e6;text-align:center;font-size:9pt;line-height:18px}.layui-table .list-table-check-td{width:10px!important;text-align:center;padding-left:15px!important;padding-right:15px!important}.layui-table .list-table-check-td input{margin:0!important;vertical-align:middle}.layui-table td .text-explode{color:#ccc!important;margin:0 4px!important}.layui-table td .text-explode:first-child{display:none;opacity:0}.layui-table td .background-image{float:left;width:40px;height:40px;display:inline-block;margin-right:5px;background:no-repeat center center;background-size:cover;vertical-align:middle}.mobile-preview{width:317px;height:580px;position:relative;background:url(../img/wechat/mobile_head.png) no-repeat 0 0}.mobile-preview .mobile-header{color:#fff;width:auto;margin:0 30px;overflow:hidden;font-size:15px;padding-top:30px;text-align:center;white-space:nowrap;text-overflow:ellipsis;word-wrap:normal;user-select:none;pointer-events:none;-moz-user-select:none;-webkit-user-select:none;-webkit-pointer-events:none}.mobile-preview .mobile-body{top:60px;left:0;right:0;bottom:0;position:absolute;border:1px solid #ccc;background:#f5f5f5}.mobile-preview .mobile-body iframe{width:100%;height:100%}.mobile-preview .mobile-footer{left:0;right:0;bottom:0;margin:0;position:absolute;padding-left:43px;border:1px solid #ccc;list-style-type:none;background:url(../img/wechat/mobile_foot.png) no-repeat 0 0}.mobile-preview .mobile-footer li{float:left;width:33.33%;position:relative;text-align:center;line-height:50px}.mobile-preview .mobile-footer li a{width:auto;display:block;overflow:hidden;border:1px solid hsla(0,0%,100%,0);border-left:1px solid #e7e7eb;margin-top:-1px;margin-bottom:-1px;color:#616161;white-space:nowrap;text-decoration:none;text-overflow:ellipsis;word-wrap:normal}.mobile-preview .mobile-footer li a:hover{background:rgba(0,0,0,.02)}.mobile-preview .mobile-footer li a.active{border:1px solid #44b549!important;box-shadow:0 0 1px #44b549}.mobile-preview .mobile-footer li a span:before{width:1px;height:1px;content:'';display:inline-block}.mobile-preview .mobile-footer li>.close{top:1px;right:1px;width:18px;height:18px;display:none;cursor:pointer;position:absolute;text-align:center;line-height:18px}.mobile-preview .mobile-footer li:hover>.close{display:inline-block}.mobile-preview .mobile-footer li:hover>.close:hover{color:#fff!important;background:#999!important}.mobile-preview .mobile-footer .icon-add{width:14px;height:14px;border-bottom:none!important;background:url(../img/wechat/index.png) 0 0 no-repeat}.mobile-preview .mobile-footer .icon-add,.mobile-preview .mobile-footer .icon-sub{display:inline-block;vertical-align:middle}.mobile-preview .mobile-footer .icon-sub{width:7px;height:7px;margin-right:2px;background:url(../img/wechat/index.png) 0 -3pc no-repeat}.mobile-preview .mobile-footer .sub-menu{width:100%;bottom:60px;margin:-1px;display:block;position:absolute;border:1px solid #d0d0d0;background-color:#fafafa}.mobile-preview .mobile-footer .sub-menu ul,.mobile-preview .mobile-footer .sub-menu ul li{float:none;padding:0;z-index:11;display:block;width:100%}.mobile-preview .mobile-footer .sub-menu ul li a{padding:0 5px;border:1px solid hsla(0,0%,100%,0)}.mobile-preview .mobile-footer .sub-menu ul li a.bottom-border{margin:-1px -1px 0;border-bottom:1px solid #e7e7eb}.mobile-preview .mobile-footer .sub-menu ul li:last-child a.bottom-border{border-bottom-color:#fff}.mobile-preview .mobile-footer .arrow{left:50%;position:absolute;margin-left:-6px}.mobile-preview .mobile-footer .arrow_in,.mobile-preview .mobile-footer .arrow_out{width:0;height:0;z-index:10;display:inline-block;border:6px dashed transparent;border-bottom-width:0;border-top-style:solid}.mobile-preview .mobile-footer .arrow_in{z-index:3;bottom:-5px;border-top-color:#fafafa}.mobile-preview .mobile-footer .arrow_out{z-index:2;bottom:-6px;border-top-color:#d0d0d0}.layui-layout>.layui-side{top:50px;bottom:0;overflow:auto}.layui-layout>.layui-body{top:50px;bottom:0;overflow:auto}.layui-layout>.layui-body>.layui-card{overflow:visible;position:absolute;min-width:100%;min-height:100%;box-shadow:none;background:0 0!important}.layui-layout>.layui-body>.layui-card>.layui-card-header{left:200px;right:0;z-index:3;height:50px;border:none;position:fixed;background:#fff;line-height:50px;box-shadow:0 2px 3px 0 rgba(0,0,0,.22)}.layui-layout>.layui-body>.layui-card>.layui-card-header+.layui-card-body{top:50px}.layui-layout>.layui-body>.layui-card>.layui-card-body{z-index:2;padding:15px}.layui-layout>.layui-body>.layui-card>.layui-card-body>.layui-tab.layui-tab-card{border:none;box-shadow:0 2px 3px 0 rgba(0,0,0,.22)}.layui-layout>.layui-body>.layui-card>.layui-card-body>.layui-tab.layui-tab-card>.layui-tab-content.think-box-shadow{box-shadow:none}.layui-header{height:50px;background:#393D49!important}.layui-header [data-target-menu-type]{border-left:1px solid transparent;border-right:1px solid rgba(0,0,0,.15)}.layui-header .layui-layout-left,.layui-header .layui-layout-right{margin:0;padding:0}.layui-header .layui-logo{color:#fff;width:199px;height:auto;font-size:18px;line-height:49px;border-right:1px solid rgba(0,0,0,.15);border-bottom:1px solid rgba(0,0,0,.15)}.layui-header .layui-logo sup{font-size:9px;line-height:9px;padding-left:5px}.layui-header .layui-nav-item{height:50px;line-height:50px}.layui-header .layui-nav-item.layui-this{background:#009688}.layui-header .layui-nav-item>a{color:#fff!important}.layui-header .layui-nav-item .layui-nav-child{top:49px;border:0;padding:0;background:#eef;line-height:45px}.layui-header .layui-nav-item .layui-nav-child+a.layui-elip{padding-right:35px}.layui-header .layui-nav-item .layui-nav-child+a.layui-elip img{width:20px;height:20px;border-radius:50%}.layui-header .layui-nav-item .layui-nav-child+a.layui-elip span{padding-left:5px}.layui-header .layui-nav-item .layui-nav-child.layui-show+a{background:#fff}.layui-header .layui-nav-item .layui-nav-child.layui-show+a span{color:#333}.layui-header .layui-nav-item .layui-nav-child dd{background:#fff}.layui-header .layui-nav-item .layui-nav-child dd a{padding:0;color:#333;margin-top:1px;text-align:center}.layui-header .layui-nav-item .layui-nav-child dd a .layui-icon{margin-right:5px}.layui-header .layui-nav-bar,.layui-header .layui-nav-item:after{display:none!important}.layui-header .layui-layout-right>li>a{border-left:1px solid rgba(0,0,0,.15);border-right:1px solid transparent}.layui-layout>.layui-side .layui-nav-bar{display:none!important}.layui-layout>.layui-side .layui-side-scroll{width:100%!important}.layui-layout>.layui-side .layui-nav-item{border-bottom:1px solid rgba(0,0,0,.2)}.layui-layout>.layui-side .layui-nav-item a{height:45px;display:block;line-height:45px;color:#fff!important}.layui-layout>.layui-side .layui-nav-item a:hover{background:hsla(0,0%,39%,.2)!important}.layui-layout>.layui-side .layui-nav-item a .nav-icon,.layui-layout>.layui-side .layui-nav-item a .nav-text{padding-left:5px}.layui-layout>.layui-side .layui-nav-itemed{border-bottom:none!important}.layui-layout>.layui-side .layui-nav-tree-top a{height:28px!important;line-height:28px!important}.layui-layout.layui-layout-left-mini>.layui-body{left:50px}.layui-layout.layui-layout-left-mini>.layui-body>.layui-card>.layui-card-header{left:50px}.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-more{display:none!important}.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item a{padding:0}.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item .nav-text{display:none}.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item .nav-icon{display:inline-block!important;padding:0!important}.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item .layui-nav-child{padding:0;display:block!important;background-color:rgba(0,0,0,.3)!important}.layui-layout.layui-layout-left-mini>.layui-side,.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-tree,.layui-layout.layui-layout-left-mini>.layui-side .layui-side-scroll{width:50px;text-align:center}.layui-layout.layui-layout-left-mini [data-target-menu-type] i{display:inline-block;transform:rotate(180deg);-ms-transform:rotate(180deg);-webkit-transform:rotate(180deg)}.layui-layout.layui-layout-left-hide>.layui-body{left:0!important}.layui-layout.layui-layout-left-hide>.layui-body>.layui-card>.layui-card-header{left:0!important}.layui-layout.layui-layout-left-hide>.layui-side{display:none}.layui-layout.layui-layout-left-hide [data-target-menu-type]{display:none}.layui-nav .layui-nav-item .layui-nav-more{top:0;right:15px;width:auto;height:auto;border:none;margin-top:0;font-size:14px;font-style:normal;font-family:layui-icon!important;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}.layui-nav .layui-nav-item .layui-nav-more::before{content:"\e619"}.layui-nav .layui-nav-item .layui-nav-mored,.layui-nav .layui-nav-itemed .layui-nav-more{border:none;margin-top:0;transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)}.iframe-pagination{padding:20px 20px 45px 20px}.iframe-pagination .pagination-container{left:0;right:0;bottom:0;padding:5px 20px;position:fixed;background:#fff;border-top:1px solid #ddd}.notdata{padding:15px;display:block;font-size:13px;text-align:center;line-height:22px;letter-spacing:8px;border:1px solid #e6e6e6;background-color:#f2f2f2;border-radius:0 2px 2px 0}.notselect{user-select:none;-ms-user-select:none;-moz-user-select:none;-webkit-user-select:none}.transition{transition:all .2s linear;-o-transition:all .2s linear;-moz-transition:all .2s linear;-webkit-transition:all .2s linear}.absolute{position:absolute!important}.relative{position:relative!important}.block{display:block!important}.pointer{cursor:pointer!important}.nowrap{white-space:nowrap!important}.help-block{color:#999;font-size:12px}.inline-block{display:inline-block!important}.pull-left{float:left!important}.pull-right{float:right!important}.full-width{width:100%!important}.full-height{height:100%!important}.color-red{color:#ec494e!important}.color-blue{color:#2494f2!important}.color-desc{color:#999!important}.color-text{color:#333!important}.color-green{color:#090!important}.text-top{vertical-align:top!important}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}.text-middle{vertical-align:middle!important}.text-bottom{vertical-align:bottom!important}.think-bg-white{background:#fff!important}.think-bg-blue{background:linear-gradient(-125deg,#57bdbf,#2f9de2)!important}.think-bg-orig{background:linear-gradient(-141deg,#ecca1b,#f39526)!important}.think-bg-red{background:linear-gradient(-125deg,#ff7d7d,#fb2c95)!important}.think-bg-violet{background:linear-gradient(-113deg,#c543d8,#925cc3)!important}.hr-line-dashed{color:#fff;height:1px;margin:15px 0;background-color:#fff;border-top:1px dashed #e7eaec}.hr-line-solid{margin-top:15px;margin-bottom:15px;border-bottom:1px solid #e7eaec;background-color:rgba(0,0,0,0)}.border-0{border:0!important}.border-radius-0{border-radius:0!important}.border-radius-left-0{border-top-left-radius:0!important;border-bottom-left-radius:0!important}.border-radius-right-0{border-top-right-radius:0!important;border-bottom-right-radius:0!important}.font-s10{font-size:10px!important}.font-s11{font-size:11px!important}.font-s12{font-size:12px!important}.font-s13{font-size:13px!important}.font-s14{font-size:14px!important}.font-s15{font-size:15px!important}.font-s16{font-size:16px!important}.font-s18{font-size:18px!important}.font-s20{font-size:20px!important}.font-s30{font-size:30px!important}.font-s40{font-size:40px!important}.font-w1{font-weight:100!important}.font-w2{font-weight:200!important}.font-w3{font-weight:300!important}.font-w4{font-weight:400!important}.font-w5{font-weight:500!important}.font-w6{font-weight:600!important}.font-w7{font-weight:700!important}.font-w8{font-weight:800!important}.font-w9{font-weight:900!important}.padding-0{padding:0!important}.padding-5{padding:5px!important}.padding-10{padding:10px!important}.padding-15{padding:15px!important}.padding-20{padding:20px!important}.padding-25{padding:25px!important}.padding-30{padding:30px!important}.padding-40{padding:40px!important}.padding-top-0{padding-top:0!important}.padding-top-5{padding-top:5px!important}.padding-top-10{padding-top:10px!important}.padding-top-15{padding-top:15px!important}.padding-top-20{padding-top:20px!important}.padding-top-30{padding-top:30px!important}.padding-top-40{padding-top:40px!important}.padding-left-0{padding-left:0!important}.padding-left-5{padding-left:5px!important}.padding-left-10{padding-left:10px!important}.padding-left-15{padding-left:15px!important}.padding-left-20{padding-left:20px!important}.padding-left-30{padding-left:30px!important}.padding-left-40{padding-left:40px!important}.padding-right-0{padding-right:0!important}.padding-right-5{padding-right:5px!important}.padding-right-10{padding-right:10px!important}.padding-right-15{padding-right:15px!important}.padding-right-20{padding-right:20px!important}.padding-right-30{padding-right:30px!important}.padding-right-40{padding-right:40px!important}.padding-bottom-0{padding-bottom:0!important}.padding-bottom-5{padding-bottom:5px!important}.padding-bottom-10{padding-bottom:10px!important}.padding-bottom-15{padding-bottom:15px!important}.padding-bottom-20{padding-bottom:20px!important}.padding-bottom-30{padding-bottom:30px!important}.padding-bottom-40{padding-bottom:40px!important}.margin-0{margin:0!important}.margin-5{margin:5px!important}.margin-10{margin:10px!important}.margin-15{margin:15px!important}.margin-20{margin:20px!important}.margin-25{margin:25px!important}.margin-30{margin:30px!important}.margin-40{margin:40px!important}.margin-top-0{margin-top:0!important}.margin-top-5{margin-top:5px!important}.margin-top-10{margin-top:10px!important}.margin-top-15{margin-top:15px!important}.margin-top-20{margin-top:20px!important}.margin-top-25{margin-top:25px!important}.margin-top-30{margin-top:30px!important}.margin-top-40{margin-top:40px!important}.margin-left-0{margin-left:0!important}.margin-left-5{margin-left:5px!important}.margin-left-10{margin-left:10px!important}.margin-left-15{margin-left:15px!important}.margin-left-20{margin-left:20px!important}.margin-left-25{margin-left:25px!important}.margin-left-30{margin-left:30px!important}.margin-left-40{margin-left:40px!important}.margin-right-0{margin-right:0!important}.margin-right-5{margin-right:5px!important}.margin-right-10{margin-right:10px!important}.margin-right-15{margin-right:15px!important}.margin-right-20{margin-right:20px!important}.margin-right-25{margin-right:25px!important}.margin-right-30{margin-right:30px!important}.margin-right-40{margin-right:40px!important}.margin-bottom-0{margin-bottom:0!important}.margin-bottom-5{margin-bottom:5px!important}.margin-bottom-10{margin-bottom:10px!important}.margin-bottom-15{margin-bottom:15px!important}.margin-bottom-20{margin-bottom:20px!important}.margin-bottom-25{margin-bottom:25px!important}.margin-bottom-30{margin-bottom:30px!important}.margin-bottom-40{margin-bottom:40px!important}.version-debug{width:100%;color:#fff;height:100px;font-size:20px;text-align:center;line-height:100px;margin-bottom:40px;background-color:#E90D24}.pace-inactive{display:none}.pace-progress{top:0;right:100%;width:100%;height:2px;z-index:2000;position:fixed;background:#22df80}.moxie-shim{display:none!important}.uploadimage{width:5pc;height:5pc;cursor:pointer;display:inline-block;background:url(../img/image.png) no-repeat center center;background-size:cover}.uploadimagemtl{margin-right:8px}.uploadimagemtl a{color:#fff;width:20px;height:20px;float:right;display:none;text-align:center;line-height:22px;background:rgba(0,0,0,.5)}.uploadimagemtl:hover a{cursor:pointer;display:inline-block}.uploadimagemtl:hover a:hover{color:#fff;text-decoration:none}.pagination-container{line-height:40px}.pagination-container>span{color:#666;font-size:9pt}.pagination-container>ul{float:right;display:inline-block;margin:0;padding:0}.pagination-container>ul>li{z-index:1;display:inline-block}.pagination-container>ul>li.active{z-index:2}.pagination-container>ul>li.active>span{color:#fff;border-color:#098;padding-right:1px;background:#009688!important}.pagination-container>ul>li>a,.pagination-container>ul>li>span{color:#333;width:33px;height:30px;border:1px solid #dcdcdc;display:inline-block;margin-left:-1px;text-align:center;line-height:28px}.pagination-container>ul>li>span{background:#dcdcdc;cursor:default}.pagination-container>ul>li>a:hover{background:#dcdcdc;border-color:#dcdcdc}[data-tips-image]{cursor:zoom-in!important}/*# sourceMappingURL=console.css.map */ \ No newline at end of file +@charset "UTF-8"; +::selection { + color: #fff !important; + background-color: #ec494e !important; +} +::-moz-selection { + color: #fff !important; + background-color: #ec494e !important; +} +::-webkit-scrollbar-track { + background: #ccc !important; +} +::-webkit-scrollbar-thumb { + background-color: #666 !important; +} +::-webkit-input-placeholder { + color: #aaa; +} +div.layui-side > div.layui-side-scroll::-webkit-scrollbar { + width: 3px; +} +div.layui-side > div.layui-side-scroll::-webkit-scrollbar-track { + background: #ccc !important; +} +div.layui-side > div.layui-side-scroll::-webkit-scrollbar-thumb { + background-color: #666 !important; +} +:-webkit-autofill, +:-webkit-autofill:hover, +:-webkit-autofill:focus, +:-webkit-autofill:active { + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.1) inset !important; + -webkit-transition: color 9999s ease-out, background-color 9999s ease-out !important; + -webkit-transition-delay: 9999s !important; + -webkit-text-fill-color: #333 !important; +} +body { + color: #333; + font-size: 12px; +} +body a { + color: #06C; + cursor: pointer; +} +body a:hover { + color: #039; +} +body input::-ms-clear { + display: none; +} +/* 弹框层表单 */ +fieldset { + margin: 0; + border: 1px solid #e6e6e6; + padding: 10px 20px 5px 20px; +} +fieldset legend { + color: #666; + padding: 0 10px; + font-size: 14px; +} +.form-search .layui-btn { + height: 32px; + line-height: 28px; + font-size: 12px; + padding: 0 10px; +} +.form-search .layui-form-label { + width: auto !important; + padding: 0 8px; + height: 32px; + line-height: 30px; +} +.form-search .layui-input-inline { + width: 170px; +} +.form-search .layui-input-inline input, +.form-search .layui-input-inline select { + width: 100%; + height: 32px; + padding: 2px 8px; + line-height: 1em; +} +.form-search .layui-form-select dl { + top: 31px; + padding: 0; +} +.layui-form input.layui-input, +.layui-form select.layui-select { + line-height: 1em; +} +/* 表单验证异常提示 */ +.label-required-prev:before { + width: 1em; + color: red; + content: '*'; + display: inline-block; + position: absolute; + text-align: left; + font-weight: 700; + line-height: 1.6em; + margin-left: -0.8em; +} +.label-required:after, +.label-required-next:after { + top: 6px; + right: 5px; + color: red; + content: '*'; + position: absolute; + margin-left: 4px; + font-weight: 700; + line-height: 1.8em; +} +.label-required-null:before { + content: none !important; +} +/** 自定义表单样式 */ +.think-form-label { + padding: 9px 15px; + font-weight: 400; + line-height: 20px; + text-align: right; +} +.think-form-group-right { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.think-form-group-left input { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.think-box-shadow { + background: #fff; + padding: 20px 20px !important; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.1); +} +/** checkbox & radio */ +label.think-checkbox, +label.think-radio { + margin-right: 10px; + display: inline-block; +} +.think-checkbox, +.think-radio { + cursor: pointer; + margin-top: 10px; + font-weight: 400; + line-height: 17px; +} +.think-checkbox input[type=checkbox] { + width: 18px; + height: 18px; + border: 1px solid #dcdcdc; + cursor: pointer; + margin: 0 5px 0 0; + position: relative; + display: inline-block !important; + background: #fff; + appearance: none; + box-sizing: border-box !important; + border-radius: 1px; + vertical-align: bottom; + -webkit-appearance: none; +} +.think-checkbox input[type=checkbox]:checked:after { + color: #666; + padding: 2px; + display: block; + content: "\e605"; + font-size: 12px; + font-style: normal; + font-weight: 700; + position: absolute; + font-family: layui-icon !important; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.think-radio input[type=radio] { + width: 18px; + height: 18px; + cursor: pointer; + margin: 0 5px 0 0; + position: relative; + border: 1px solid #dcdcdc; + display: inline-block !important; + box-sizing: border-box !important; + appearance: none; + background: #fff; + border-radius: 1em; + vertical-align: bottom; + -webkit-appearance: none; +} +.think-radio input[type=radio]:checked:after { + top: 4px; + left: 4px; + width: 8px; + height: 8px; + content: ''; + display: block; + position: relative; + background: #666; + border-radius: 1em; +} +bu.layui-form.layui-card { + box-shadow: none; +} +.layui-layer-content .layui-form.layui-card .layui-card-body { + padding: 30px 40px 0 0; +} +.layui-layer-dialog .layui-layer-content .layui-layer-ico { + top: 50% !important; + margin-top: -15px !important; +} +.laydate-footer-btns span { + line-height: 24px !important; +} +/** Layui样式调整 */ +.layui-input, +.layui-select { + line-height: 38px; +} +.layui-btn-primary.layui-btn-xs { + line-height: 20px; +} +.layui-btn-primary.layui-btn-sm { + line-height: 28px; +} +.layui-table td, +.layui-table th { + font-size: 12px; +} +.layui-table .list-table-image { + width: 22px; + cursor: pointer; +} +.layui-table .list-table-sort-td { + width: 10px !important; + text-align: center !important; + padding-left: 5px !important; + padding-right: 5px !important; +} +.layui-table .list-table-sort-td button { + width: 56px; + background: #009688; +} +.layui-table .list-table-sort-td input { + width: 50px; + color: #666; + padding: 2px; + border: 1px solid #e6e6e6; + text-align: center; + font-size: 9pt; + line-height: 18px; +} +.layui-table .list-table-check-td { + width: 10px !important; + text-align: center; + padding-left: 15px !important; + padding-right: 15px !important; +} +.layui-table .list-table-check-td input { + margin: 0 !important; + vertical-align: middle; +} +.layui-table td .text-explode { + color: #ccc !important; + margin: 0 4px !important; +} +.layui-table td .text-explode:first-child { + display: none; + opacity: 0; +} +.layui-table td .background-image { + float: left; + width: 40px; + height: 40px; + display: inline-block; + margin-right: 5px; + background: no-repeat center center; + background-size: cover; + vertical-align: middle; +} +/** 手机盒子及微信菜单 */ +.mobile-preview { + width: 317px; + height: 580px; + position: relative; + background: url(../img/wechat/mobile_head.png) no-repeat 0 0; +} +.mobile-preview .mobile-header { + color: #fff; + width: auto; + margin: 0 30px; + overflow: hidden; + font-size: 15px; + padding-top: 30px; + text-align: center; + white-space: nowrap; + text-overflow: ellipsis; + word-wrap: normal; + user-select: none; + pointer-events: none; + -moz-user-select: none; + -webkit-user-select: none; + -webkit-pointer-events: none; +} +.mobile-preview .mobile-body { + top: 60px; + left: 0; + right: 0; + bottom: 0; + position: absolute; + border: 1px solid #ccc; + background: #f5f5f5; +} +.mobile-preview .mobile-body iframe { + width: 100%; + height: 100%; +} +.mobile-preview .mobile-footer { + left: 0; + right: 0; + bottom: 0; + margin: 0; + position: absolute; + padding-left: 43px; + border: 1px solid #ccc; + list-style-type: none; + background: url(../img/wechat/mobile_foot.png) no-repeat 0 0; +} +.mobile-preview .mobile-footer li { + float: left; + width: 33.33%; + position: relative; + text-align: center; + line-height: 50px; +} +.mobile-preview .mobile-footer li a { + width: auto; + display: block; + overflow: hidden; + border: 1px solid hsla(0, 0%, 100%, 0); + border-left: 1px solid #e7e7eb; + margin-top: -1px; + margin-bottom: -1px; + color: #616161; + white-space: nowrap; + text-decoration: none; + text-overflow: ellipsis; + word-wrap: normal; +} +.mobile-preview .mobile-footer li a:hover { + background: rgba(0, 0, 0, 0.02); +} +.mobile-preview .mobile-footer li a.active { + border: 1px solid #44b549 !important; + box-shadow: 0 0 1px #44b549; +} +.mobile-preview .mobile-footer li a span:before { + width: 1px; + height: 1px; + content: ''; + display: inline-block; +} +.mobile-preview .mobile-footer li > .close { + top: 1px; + right: 1px; + width: 18px; + height: 18px; + display: none; + cursor: pointer; + position: absolute; + text-align: center; + line-height: 18px; +} +.mobile-preview .mobile-footer li:hover > .close { + display: inline-block; +} +.mobile-preview .mobile-footer li:hover > .close:hover { + color: #fff !important; + background: #999 !important; +} +.mobile-preview .mobile-footer .icon-add { + width: 14px; + height: 14px; + border-bottom: none !important; + background: url(../img/wechat/index.png) 0 0 no-repeat; +} +.mobile-preview .mobile-footer .icon-add, +.mobile-preview .mobile-footer .icon-sub { + display: inline-block; + vertical-align: middle; +} +.mobile-preview .mobile-footer .icon-sub { + width: 7px; + height: 7px; + margin-right: 2px; + background: url(../img/wechat/index.png) 0 -3pc no-repeat; +} +.mobile-preview .mobile-footer .sub-menu { + width: 100%; + bottom: 60px; + margin: -1px; + display: block; + position: absolute; + border: 1px solid #d0d0d0; + background-color: #fafafa; +} +.mobile-preview .mobile-footer .sub-menu ul, +.mobile-preview .mobile-footer .sub-menu ul li { + float: none; + padding: 0; + z-index: 11; + display: block; + width: 100%; +} +.mobile-preview .mobile-footer .sub-menu ul li a { + padding: 0 5px; + border: 1px solid hsla(0, 0%, 100%, 0); +} +.mobile-preview .mobile-footer .sub-menu ul li a.bottom-border { + margin: -1px -1px 0; + border-bottom: 1px solid #e7e7eb; +} +.mobile-preview .mobile-footer .sub-menu ul li:last-child a.bottom-border { + border-bottom-color: #fff; +} +.mobile-preview .mobile-footer .arrow { + left: 50%; + position: absolute; + margin-left: -6px; +} +.mobile-preview .mobile-footer .arrow_in, +.mobile-preview .mobile-footer .arrow_out { + width: 0; + height: 0; + z-index: 10; + display: inline-block; + border: 6px dashed transparent; + border-bottom-width: 0; + border-top-style: solid; +} +.mobile-preview .mobile-footer .arrow_in { + z-index: 3; + bottom: -5px; + border-top-color: #fafafa; +} +.mobile-preview .mobile-footer .arrow_out { + z-index: 2; + bottom: -6px; + border-top-color: #d0d0d0; +} +.layui-layout > .layui-side { + top: 50px; + bottom: 0; + overflow: auto; +} +.layui-layout > .layui-body { + top: 50px; + bottom: 0; + overflow: auto; +} +.layui-layout > .layui-body > .layui-card { + overflow: visible; + position: absolute; + min-width: 100%; + min-height: 100%; + box-shadow: none; + background: none !important; +} +.layui-layout > .layui-body > .layui-card > .layui-card-header { + left: 200px; + right: 0; + z-index: 3; + height: 50px; + border: none; + position: fixed; + background: #fff; + line-height: 50px; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.22); +} +.layui-layout > .layui-body > .layui-card > .layui-card-header + .layui-card-body { + top: 50px; +} +.layui-layout > .layui-body > .layui-card > .layui-card-body { + z-index: 2; + padding: 15px; +} +.layui-layout > .layui-body > .layui-card > .layui-card-body > .layui-tab.layui-tab-card { + border: none; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.22); +} +.layui-layout > .layui-body > .layui-card > .layui-card-body > .layui-tab.layui-tab-card > .layui-tab-content.think-box-shadow { + box-shadow: none; +} +/* 页面布局 - 头部 */ +.layui-header { + height: 50px; + background: #393D49 !important; +} +.layui-header [data-target-menu-type] { + border-left: 1px solid rgba(0, 0, 0, 0); + border-right: 1px solid rgba(0, 0, 0, 0.15); +} +.layui-header .layui-layout-left, +.layui-header .layui-layout-right { + margin: 0; + padding: 0; +} +.layui-header .layui-logo { + color: #fff; + width: 199px; + height: auto; + font-size: 18px; + line-height: 49px; + border-right: 1px solid rgba(0, 0, 0, 0.15); + border-bottom: 1px solid rgba(0, 0, 0, 0.15); +} +.layui-header .layui-logo sup { + font-size: 9px; + line-height: 9px; + padding-left: 5px; +} +.layui-header .layui-nav-item { + height: 50px; + line-height: 50px; +} +.layui-header .layui-nav-item.layui-this { + background: #009688; +} +.layui-header .layui-nav-item > a { + color: #fff !important; +} +.layui-header .layui-nav-item .layui-nav-child { + top: 49px; + border: 0; + padding: 0; + background: #eef; + line-height: 45px; +} +.layui-header .layui-nav-item .layui-nav-child + a.layui-elip { + padding-right: 35px; +} +.layui-header .layui-nav-item .layui-nav-child + a.layui-elip img { + width: 20px; + height: 20px; + border-radius: 50%; +} +.layui-header .layui-nav-item .layui-nav-child + a.layui-elip span { + padding-left: 5px; +} +.layui-header .layui-nav-item .layui-nav-child.layui-show + a { + background: #fff; +} +.layui-header .layui-nav-item .layui-nav-child.layui-show + a span { + color: #333; +} +.layui-header .layui-nav-item .layui-nav-child dd { + background: #fff; +} +.layui-header .layui-nav-item .layui-nav-child dd a { + padding: 0; + color: #333; + margin-top: 1px; + text-align: center; +} +.layui-header .layui-nav-item .layui-nav-child dd a .layui-icon { + margin-right: 5px; +} +.layui-header .layui-nav-bar, +.layui-header .layui-nav-item:after { + display: none !important; +} +.layui-header .layui-layout-right > li > a { + border-left: 1px solid rgba(0, 0, 0, 0.15); + border-right: 1px solid rgba(0, 0, 0, 0); +} +/* 页面布局 - 左则 */ +.layui-layout > .layui-side .layui-nav-bar { + display: none !important; +} +.layui-layout > .layui-side .layui-side-scroll { + width: 100% !important; +} +.layui-layout > .layui-side .layui-nav-item { + border-bottom: 1px solid rgba(0, 0, 0, 0.2); +} +.layui-layout > .layui-side .layui-nav-item a { + height: 45px; + display: block; + line-height: 45px; + color: #fff !important; +} +.layui-layout > .layui-side .layui-nav-item a:hover { + background: hsla(0, 0%, 39%, 0.2) !important; +} +.layui-layout > .layui-side .layui-nav-item a .nav-icon, +.layui-layout > .layui-side .layui-nav-item a .nav-text { + padding-left: 5px; +} +.layui-layout > .layui-side .layui-nav-itemed { + border-bottom: none !important; +} +.layui-layout > .layui-side .layui-nav-tree-top a { + height: 28px !important; + line-height: 28px !important; +} +.layui-layout.layui-layout-left-mini > .layui-body { + left: 50px; +} +.layui-layout.layui-layout-left-mini > .layui-body > .layui-card > .layui-card-header { + left: 50px; +} +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-more { + display: none !important; +} +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-item a { + padding: 0; +} +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-item .nav-text { + display: none; +} +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-item .nav-icon { + display: inline-block !important; + padding: 0 !important; +} +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-item .layui-nav-child { + padding: 0; + display: block !important; + background-color: rgba(0, 0, 0, 0.3) !important; +} +.layui-layout.layui-layout-left-mini > .layui-side, +.layui-layout.layui-layout-left-mini > .layui-side .layui-nav-tree, +.layui-layout.layui-layout-left-mini > .layui-side .layui-side-scroll { + width: 50px; + text-align: center; +} +.layui-layout.layui-layout-left-mini [data-target-menu-type] i { + display: inline-block; + transform: rotate(180deg); + -ms-transform: rotate(180deg); + -webkit-transform: rotate(180deg); +} +.layui-layout.layui-layout-left-hide > .layui-body { + left: 0 !important; +} +.layui-layout.layui-layout-left-hide > .layui-body > .layui-card > .layui-card-header { + left: 0 !important; +} +.layui-layout.layui-layout-left-hide > .layui-side { + display: none; +} +.layui-layout.layui-layout-left-hide [data-target-menu-type] { + display: none; +} +/* 下拉样式 */ +.layui-nav .layui-nav-item .layui-nav-more { + top: 0; + right: 15px; + width: auto; + height: auto; + border: none; + margin-top: 0; + font-size: 14px; + font-style: normal; + font-family: "layui-icon" !important; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; +} +.layui-nav .layui-nav-item .layui-nav-more::before { + content: "\e619"; +} +.layui-nav .layui-nav-item .layui-nav-mored, +.layui-nav .layui-nav-itemed .layui-nav-more { + border: none; + margin-top: 0; + transform: rotate(180deg); + -o-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -webkit-transform: rotate(180deg); +} +.iframe-pagination { + padding: 20px 20px 45px 20px; +} +.iframe-pagination .pagination-container { + left: 0; + right: 0; + bottom: 0; + padding: 5px 20px; + position: fixed; + background: #fff; + border-top: 1px solid #ddd; +} +.notdata { + padding: 15px; + display: block; + font-size: 13px; + text-align: center; + line-height: 22px; + letter-spacing: 8px; + border: 1px solid #e6e6e6; + background-color: #f2f2f2; + border-radius: 0 2px 2px 0; +} +.notselect { + user-select: none; + -ms-user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +} +.transition { + transition: all 0.2s linear; + -o-transition: all 0.2s linear; + -moz-transition: all 0.2s linear; + -webkit-transition: all 0.2s linear; +} +.absolute { + position: absolute !important; +} +.relative { + position: relative !important; +} +.block { + display: block !important; +} +.pointer { + cursor: pointer !important; +} +.nowrap { + white-space: nowrap !important; +} +.help-block { + color: #999; + font-size: 12px; +} +.inline-block { + display: inline-block !important; +} +.pull-left { + float: left !important; +} +.pull-right { + float: right !important; +} +.full-width { + width: 100% !important; +} +.full-height { + height: 100% !important; +} +.color-red { + color: #ec494e !important; +} +.color-blue { + color: #2494f2 !important; +} +.color-desc { + color: #999 !important; +} +.color-text { + color: #333 !important; +} +.color-green { + color: #090 !important; +} +.text-top { + vertical-align: top !important; +} +.text-left { + text-align: left !important; +} +.text-right { + text-align: right !important; +} +.text-center { + text-align: center !important; +} +.text-middle { + vertical-align: middle !important; +} +.text-bottom { + vertical-align: bottom !important; +} +.think-bg-white { + background: white !important; +} +.think-bg-blue { + background: linear-gradient(-125deg, #57bdbf, #2f9de2) !important; +} +.think-bg-orig { + background: linear-gradient(-141deg, #ecca1b, #f39526) !important; +} +.think-bg-red { + background: linear-gradient(-125deg, #ff7d7d, #fb2c95) !important; +} +.think-bg-violet { + background: linear-gradient(-113deg, #c543d8, #925cc3) !important; +} +/* 分隔线条 */ +.hr-line-dashed { + color: #fff; + height: 1px; + margin: 15px 0; + background-color: #fff; + border-top: 1px dashed #e7eaec; +} +.hr-line-solid { + margin-top: 15px; + margin-bottom: 15px; + border-bottom: 1px solid #e7eaec; + background-color: rgba(0, 0, 0, 0); +} +/* 文字大小 */ +.border-0 { + border: 0 !important; +} +.border-radius-0 { + border-radius: 0 !important; +} +.border-radius-left-0 { + border-top-left-radius: 0 !important; + border-bottom-left-radius: 0 !important; +} +.border-radius-right-0 { + border-top-right-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} +.font-s10 { + font-size: 10px !important; +} +.font-s11 { + font-size: 11px !important; +} +.font-s12 { + font-size: 12px !important; +} +.font-s13 { + font-size: 13px !important; +} +.font-s14 { + font-size: 14px !important; +} +.font-s15 { + font-size: 15px !important; +} +.font-s16 { + font-size: 16px !important; +} +.font-s18 { + font-size: 18px !important; +} +.font-s20 { + font-size: 20px !important; +} +.font-s30 { + font-size: 30px !important; +} +.font-s40 { + font-size: 40px !important; +} +.font-w1 { + font-weight: 100 !important; +} +.font-w2 { + font-weight: 200 !important; +} +.font-w3 { + font-weight: 300 !important; +} +.font-w4 { + font-weight: 400 !important; +} +.font-w5 { + font-weight: 500 !important; +} +.font-w6 { + font-weight: 600 !important; +} +.font-w7 { + font-weight: 700 !important; +} +.font-w8 { + font-weight: 800 !important; +} +.font-w9 { + font-weight: 900 !important; +} +.padding-0 { + padding: 0 !important; +} +.padding-5 { + padding: 5px !important; +} +.padding-10 { + padding: 10px !important; +} +.padding-15 { + padding: 15px !important; +} +.padding-20 { + padding: 20px !important; +} +.padding-25 { + padding: 25px !important; +} +.padding-30 { + padding: 30px !important; +} +.padding-40 { + padding: 40px !important; +} +.padding-top-0 { + padding-top: 0 !important; +} +.padding-top-5 { + padding-top: 5px !important; +} +.padding-top-10 { + padding-top: 10px !important; +} +.padding-top-15 { + padding-top: 15px !important; +} +.padding-top-20 { + padding-top: 20px !important; +} +.padding-top-30 { + padding-top: 30px !important; +} +.padding-top-40 { + padding-top: 40px !important; +} +.padding-left-0 { + padding-left: 0 !important; +} +.padding-left-5 { + padding-left: 5px !important; +} +.padding-left-10 { + padding-left: 10px !important; +} +.padding-left-15 { + padding-left: 15px !important; +} +.padding-left-20 { + padding-left: 20px !important; +} +.padding-left-30 { + padding-left: 30px !important; +} +.padding-left-40 { + padding-left: 40px !important; +} +.padding-right-0 { + padding-right: 0 !important; +} +.padding-right-5 { + padding-right: 5px !important; +} +.padding-right-10 { + padding-right: 10px !important; +} +.padding-right-15 { + padding-right: 15px !important; +} +.padding-right-20 { + padding-right: 20px !important; +} +.padding-right-30 { + padding-right: 30px !important; +} +.padding-right-40 { + padding-right: 40px !important; +} +.padding-bottom-0 { + padding-bottom: 0 !important; +} +.padding-bottom-5 { + padding-bottom: 5px !important; +} +.padding-bottom-10 { + padding-bottom: 10px !important; +} +.padding-bottom-15 { + padding-bottom: 15px !important; +} +.padding-bottom-20 { + padding-bottom: 20px !important; +} +.padding-bottom-30 { + padding-bottom: 30px !important; +} +.padding-bottom-40 { + padding-bottom: 40px !important; +} +.margin-0 { + margin: 0 !important; +} +.margin-5 { + margin: 5px !important; +} +.margin-10 { + margin: 10px !important; +} +.margin-15 { + margin: 15px !important; +} +.margin-20 { + margin: 20px !important; +} +.margin-25 { + margin: 25px !important; +} +.margin-30 { + margin: 30px !important; +} +.margin-40 { + margin: 40px !important; +} +.margin-top-0 { + margin-top: 0 !important; +} +.margin-top-5 { + margin-top: 5px !important; +} +.margin-top-10 { + margin-top: 10px !important; +} +.margin-top-15 { + margin-top: 15px !important; +} +.margin-top-20 { + margin-top: 20px !important; +} +.margin-top-25 { + margin-top: 25px !important; +} +.margin-top-30 { + margin-top: 30px !important; +} +.margin-top-40 { + margin-top: 40px !important; +} +.margin-left-0 { + margin-left: 0 !important; +} +.margin-left-5 { + margin-left: 5px !important; +} +.margin-left-10 { + margin-left: 10px !important; +} +.margin-left-15 { + margin-left: 15px !important; +} +.margin-left-20 { + margin-left: 20px !important; +} +.margin-left-25 { + margin-left: 25px !important; +} +.margin-left-30 { + margin-left: 30px !important; +} +.margin-left-40 { + margin-left: 40px !important; +} +.margin-right-0 { + margin-right: 0 !important; +} +.margin-right-5 { + margin-right: 5px !important; +} +.margin-right-10 { + margin-right: 10px !important; +} +.margin-right-15 { + margin-right: 15px !important; +} +.margin-right-20 { + margin-right: 20px !important; +} +.margin-right-25 { + margin-right: 25px !important; +} +.margin-right-30 { + margin-right: 30px !important; +} +.margin-right-40 { + margin-right: 40px !important; +} +.margin-bottom-0 { + margin-bottom: 0 !important; +} +.margin-bottom-5 { + margin-bottom: 5px !important; +} +.margin-bottom-10 { + margin-bottom: 10px !important; +} +.margin-bottom-15 { + margin-bottom: 15px !important; +} +.margin-bottom-20 { + margin-bottom: 20px !important; +} +.margin-bottom-25 { + margin-bottom: 25px !important; +} +.margin-bottom-30 { + margin-bottom: 30px !important; +} +.margin-bottom-40 { + margin-bottom: 40px !important; +} +/* 浏览器DEBUG */ +.version-debug { + width: 100%; + color: #fff; + height: 100px; + font-size: 20px; + text-align: center; + line-height: 100px; + margin-bottom: 40px; + background-color: #E90D24; +} +/** 加载进度 */ +.pace-inactive { + display: none; +} +.pace-progress { + top: 0; + right: 100%; + width: 100%; + height: 2px; + z-index: 2000; + position: fixed; + background: #22df80; +} +/* 图片上传 */ +.moxie-shim { + display: none !important; +} +.uploadimage { + width: 5pc; + height: 5pc; + cursor: pointer; + display: inline-block; + background: url('../img/image.png') no-repeat center center; + background-size: cover; +} +.uploadimagemtl { + margin-right: 8px; +} +.uploadimagemtl a { + color: #fff; + width: 20px; + height: 20px; + float: right; + display: none; + text-align: center; + line-height: 22px; + background: rgba(0, 0, 0, 0.5); +} +.uploadimagemtl:hover a { + cursor: pointer; + display: inline-block; +} +.uploadimagemtl:hover a:hover { + color: #fff; + text-decoration: none; +} +/* 通用分页 */ +.pagination-container { + line-height: 40px; +} +.pagination-container > span { + color: #666; + font-size: 9pt; +} +.pagination-container > ul { + float: right; + display: inline-block; + margin: 0; + padding: 0; +} +.pagination-container > ul > li { + z-index: 1; + display: inline-block; +} +.pagination-container > ul > li.active { + z-index: 2; +} +.pagination-container > ul > li.active > span { + color: #fff; + border-color: #098; + padding-right: 1px; + background: #009688 !important; +} +.pagination-container > ul > li > a, +.pagination-container > ul > li > span { + color: #333; + width: 33px; + height: 30px; + border: 1px solid #dcdcdc; + display: inline-block; + margin-left: -1px; + text-align: center; + line-height: 28px; +} +.pagination-container > ul > li > span { + background: #dcdcdc; + cursor: default; +} +.pagination-container > ul > li > a:hover { + background: #dcdcdc; + border-color: #dcdcdc; +} +[data-tips-image] { + cursor: zoom-in !important; +} +/*# sourceMappingURL=console.css.map */ \ No newline at end of file diff --git a/public/static/theme/css/console.css.map b/public/static/theme/css/console.css.map index 0fbea17c6..323669c02 100644 --- a/public/static/theme/css/console.css.map +++ b/public/static/theme/css/console.css.map @@ -1 +1 @@ -{"version":3,"sources":["console.less","console.form.less","console.layui.less","console.layout.less","console.custom.less"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"sources":["console.less","console.form.less","console.layui.less","console.layout.less","console.custom.less"],"names":[],"mappings":"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","file":"console.css"} \ No newline at end of file diff --git a/public/static/theme/css/login.css b/public/static/theme/css/login.css index 9c3c2182b..22fd66027 100644 --- a/public/static/theme/css/login.css +++ b/public/static/theme/css/login.css @@ -1 +1,218 @@ -@charset "UTF-8";body,html{height:100%;display:block}body{background:url(../img/login/bg1.jpg) no-repeat center center;background-size:cover}.login-container{height:100%}.login-container .header{top:0;left:0;width:100%;height:47px;position:absolute;text-shadow:#000 .1em .1em .1em}.login-container .header .title{color:#fff;float:left;font-size:18px;line-height:47px;text-indent:40px;letter-spacing:1px}.login-container .header a,.login-container .header a:focus,.login-container .header a:hover{color:#fff;letter-spacing:1px;text-decoration:none}.login-container .header ul{float:right}.login-container .header ul li{float:left;line-height:47px;margin-left:10px}.login-container form{top:50%;left:50%;width:300px;position:absolute;margin-top:-250px;margin-left:-150px}.login-container form h2{color:#fff;padding:20px 0;font-size:25px;text-align:center;font-weight:700;letter-spacing:3px;text-shadow:#000 .05em .05em .05em}.login-container form ul li{position:relative;margin-top:20px;text-shadow:#000 .1em .1em .1em}.login-container form ul li.verify label{width:200px}.login-container form ul li.verify input.layui-input{text-transform:uppercase}.login-container form ul li.verify img{width:95px;height:44px;cursor:pointer;position:absolute;margin-left:5px;border-radius:5px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.login-container form ul li i.layui-icon{color:#fff;font-size:18px;position:absolute;padding:14px 15px 13px 20px}.login-container form ul li input{color:#fff;height:45px;padding:0 15px;font-size:14px;line-height:1em;text-indent:35px;border-radius:6px;letter-spacing:1px;background:rgba(0,0,0,.12);text-shadow:#000 .1em .1em .1em;-webkit-text-fill-color:#fff!important;box-shadow:0 2px 3px 0 rgba(0,0,0,.3) inset!important}.login-container form ul li input:-webkit-autofill,.login-container form ul li input:-webkit-autofill:active,.login-container form ul li input:-webkit-autofill:focus,.login-container form ul li input:-webkit-autofill:hover,.login-container form ul li input:active,.login-container form ul li input:focus,.login-container form ul li input:hover{text-shadow:#000 .1em .1em .1em;box-shadow:0 2px 3px 0 rgba(0,0,0,.3) inset!important;-webkit-text-fill-color:#fff!important;-webkit-transition-delay:9999s!important;-webkit-transition:color 9999s ease-out,background-color 9999s ease-out!important}.login-container form ul li span{letter-spacing:1px;color:#ff0!important}.login-container form ul li button{color:#333!important;height:45px!important;background:#fff!important;border-radius:4px!important;letter-spacing:1px!important;box-shadow:0 15px 30px 0 hsla(0,0%,100%,.25) inset,0 2px 7px 0 rgba(0,0,0,.2)}.login-container .footer{left:0;bottom:0;color:#fff;width:100%;position:absolute;text-align:center;line-height:30px;padding-bottom:10px;text-shadow:#000 .1em .1em .1em}.login-container .footer a,.login-container .footer span{color:#fff}.login-container .footer a:hover{color:#ccc}#supersized{top:0;left:0;width:100%;height:100%;z-index:-999;display:block;position:fixed;overflow:hidden}#supersized img{border:0;width:auto;height:auto;display:none;outline:0;position:relative;max-width:none!important}#supersized.speed img{image-rendering:-moz-crisp-edges;-ms-interpolation-mode:nearest-neighbor}#supersized.quality img{image-rendering:optimizeQuality;-ms-interpolation-mode:bicubic}#supersized a,#supersized li{width:100%;height:100%;display:block;cursor:default}#supersized li{top:0;left:0;z-index:-30;position:fixed;overflow:hidden;list-style:none}#supersized li.prevslide{z-index:-20}#supersized li.prevslide img{display:inline}#supersized li.activeslide{z-index:-10}#supersized li.activeslide img{display:inline}#supersized li.image-loading{width:100%;height:100%;background:url(../../plugs/supersized/progress.gif) no-repeat center center}#supersized li.image-loading img{visibility:hidden}#supersized-loader{top:50%;left:50%;z-index:0;width:60px;height:60px;position:absolute;text-indent:-999em;margin:-30px 0 0 -30px;background:url(../../plugs/supersized/progress.gif) no-repeat center center}/*# sourceMappingURL=login.css.map */ \ No newline at end of file +@charset "UTF-8"; +body, +html { + height: 100%; + display: block; +} +body { + background: url("../img/login/bg1.jpg") no-repeat center center; + background-size: cover; +} +.login-container { + height: 100%; +} +.login-container .header { + top: 0; + left: 0; + width: 100%; + height: 47px; + position: absolute; + text-shadow: #000 0.1em 0.1em 0.1em; +} +.login-container .header .title { + color: #fff; + float: left; + font-size: 18px; + line-height: 47px; + text-indent: 40px; + letter-spacing: 1px; +} +.login-container .header a, +.login-container .header a:focus, +.login-container .header a:hover { + color: #fff; + letter-spacing: 1px; + text-decoration: none; +} +.login-container .header ul { + float: right; +} +.login-container .header ul li { + float: left; + line-height: 47px; + margin-left: 10px; +} +.login-container form { + top: 50%; + left: 50%; + width: 300px; + position: absolute; + margin-top: -250px; + margin-left: -150px; +} +.login-container form h2 { + color: #fff; + padding: 20px 0; + font-size: 25px; + text-align: center; + font-weight: 700; + letter-spacing: 3px; + text-shadow: #000 0.05em 0.05em 0.05em; +} +.login-container form ul li { + position: relative; + margin-top: 20px; + text-shadow: #000 0.1em 0.1em 0.1em; +} +.login-container form ul li.verify label { + width: 200px; +} +.login-container form ul li.verify input.layui-input { + text-transform: uppercase; +} +.login-container form ul li.verify img { + width: 95px; + height: 44px; + cursor: pointer; + position: absolute; + margin-left: 5px; + border-radius: 5px; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1); +} +.login-container form ul li i.layui-icon { + color: #fff; + font-size: 18px; + position: absolute; + padding: 14px 15px 13px 20px; +} +.login-container form ul li input { + color: #fff; + height: 45px; + padding: 0 15px; + font-size: 14px; + line-height: 1em; + text-indent: 35px; + border-radius: 6px; + letter-spacing: 1px; + background: rgba(0, 0, 0, 0.12); + text-shadow: #000 0.1em 0.1em 0.1em; + -webkit-text-fill-color: #fff !important; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.3) inset !important; +} +.login-container form ul li input:hover, +.login-container form ul li input:focus, +.login-container form ul li input:active, +.login-container form ul li input:-webkit-autofill, +.login-container form ul li input:-webkit-autofill:hover, +.login-container form ul li input:-webkit-autofill:focus, +.login-container form ul li input:-webkit-autofill:active { + text-shadow: #000 0.1em 0.1em 0.1em; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.3) inset !important; + -webkit-text-fill-color: #fff !important; + -webkit-transition-delay: 9999s !important; + -webkit-transition: color 9999s ease-out, background-color 9999s ease-out !important; +} +.login-container form ul li span { + letter-spacing: 1px; + color: #ff0 !important; +} +.login-container form ul li button { + color: #333 !important; + height: 45px !important; + background: #fff !important; + border-radius: 4px !important; + letter-spacing: 1px !important; + box-shadow: 0 15px 30px 0 hsla(0, 0%, 100%, 0.25) inset, 0 2px 7px 0 rgba(0, 0, 0, 0.2); +} +.login-container .footer { + left: 0; + bottom: 0; + color: #fff; + width: 100%; + position: absolute; + text-align: center; + line-height: 30px; + padding-bottom: 10px; + text-shadow: #000 0.1em 0.1em 0.1em; +} +.login-container .footer a, +.login-container .footer span { + color: #fff; +} +.login-container .footer a:hover { + color: #ccc; +} +#supersized { + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -999; + display: block; + position: fixed; + overflow: hidden; +} +#supersized img { + border: 0; + width: auto; + height: auto; + display: none; + outline: 0; + position: relative; + max-width: none !important; +} +#supersized.speed img { + image-rendering: -moz-crisp-edges; + -ms-interpolation-mode: nearest-neighbor; +} +#supersized.quality img { + image-rendering: optimizeQuality; + -ms-interpolation-mode: bicubic; +} +#supersized a, +#supersized li { + width: 100%; + height: 100%; + display: block; + cursor: default; +} +#supersized li { + top: 0; + left: 0; + z-index: -30; + position: fixed; + overflow: hidden; + list-style: none; +} +#supersized li.prevslide { + z-index: -20; +} +#supersized li.prevslide img { + display: inline; +} +#supersized li.activeslide { + z-index: -10; +} +#supersized li.activeslide img { + display: inline; +} +#supersized li.image-loading { + width: 100%; + height: 100%; + background: url(../../plugs/supersized/progress.gif) no-repeat center center; +} +#supersized li.image-loading img { + visibility: hidden; +} +#supersized-loader { + top: 50%; + left: 50%; + z-index: 0; + width: 60px; + height: 60px; + position: absolute; + text-indent: -999em; + margin: -30px 0 0 -30px; + background: url(../../plugs/supersized/progress.gif) no-repeat center center; +} +/*# sourceMappingURL=login.css.map */ \ No newline at end of file diff --git a/public/static/theme/css/login.css.map b/public/static/theme/css/login.css.map index 8c9457f31..b3793e5ac 100644 --- a/public/static/theme/css/login.css.map +++ b/public/static/theme/css/login.css.map @@ -1 +1 @@ -{"version":3,"sources":["login.less"],"names":[],"mappings":"iBAeA,KAAM,KACJ,OAAA,KACA,QAAA,MAGF,KACE,WAAgB,0BAAA,UAAA,OAAA,OAChB,gBAAA,MAGF,iBACE,OAAA,KAEA,yBACE,IAAA,EACA,KAAA,EACA,MAAA,KACA,OAAA,KACA,SAAA,SACA,YAAA,KAAA,KAAA,KAAA,KAEA,gCACE,MAAA,KACA,MAAA,KACA,UAAA,KACA,YAAA,KACA,YAAA,KACA,eAAA,IAGF,2BACM,iCAAS,iCACX,MAAA,KACA,eAAA,IACA,gBAAA,KAIJ,4BACE,MAAA,MAEA,+BACE,MAAA,KACA,YAAA,KACA,YAAA,KAKN,sBACE,IAAA,IACA,KAAA,IACA,MAAA,MACA,SAAA,SACA,WAAA,OACA,YAAA,OAEA,yBACE,MAAA,KACA,QAAA,KAAA,EACA,UAAA,KACA,WAAA,OACA,YAAA,IACA,eAAA,IACA,YAAA,KAAA,MAAA,MAAA,MAGC,4BACD,SAAA,SACA,WAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAGE,yCACE,MAAA,MAGG,qDACH,eAAA,UAGF,uCACE,MAAA,KACA,OAAA,KACA,OAAA,QACA,SAAA,SACA,YAAA,IACA,cAAA,IACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAIH,yCACC,MAAA,KACA,UAAA,KACA,SAAA,SACA,QAAA,KAAA,KAAA,KAAA,KAGF,kCACE,MAAA,KACA,OAAA,KACA,QAAA,EAAA,KACA,UAAA,KACA,YAAA,IACA,YAAA,KACA,cAAA,IACA,eAAA,IACA,WAAA,gBACA,YAAA,KAAA,KAAA,KAAA,KACA,wBAAA,eACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBAGC,mDAC2C,0DAA1B,yDADoB,yDADnB,yCAAT,wCAAT,wCAGC,YAAA,KAAA,KAAA,KAAA,KACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBACA,wBAAA,eACA,yBAAA,gBACA,mBAAA,MAAA,MAAA,SAAA,iBAAA,MAAA,mBAIJ,iCACE,eAAA,IACA,MAAA,eAGF,mCACE,MAAA,eACA,OAAA,eACA,WAAA,eACA,cAAA,cACA,eAAA,cACA,WAAA,EAAA,KAAA,KAAA,EAAA,oBAAA,MAAA,EAAA,IAAA,IAAA,EAAA,eAKN,yBACE,KAAA,EACA,OAAA,EACA,MAAA,KACA,MAAA,KACA,SAAA,SACA,WAAA,OACA,YAAA,KACA,eAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAEA,2BAAG,8BACD,MAAA,KAGD,iCACC,MAAA,KAKN,YACE,IAAA,EACA,KAAA,EACA,MAAA,KACA,OAAA,KACA,QAAA,KACA,QAAA,MACA,SAAA,MACA,SAAA,OAEA,gBACE,OAAA,EACA,MAAA,KACA,OAAA,KACA,QAAA,KACA,QAAA,EACA,SAAA,SACA,UAAA,eAGM,sBACN,gBAAA,iBACA,uBAAA,iBAGQ,wBACR,gBAAA,gBACA,uBAAA,QAGF,cAAG,eACD,MAAA,KACA,OAAA,KACA,QAAA,MACA,OAAA,QAGF,eACE,IAAA,EACA,KAAA,EACA,QAAA,IACA,SAAA,MACA,SAAA,OACA,WAAA,KAEC,yBACC,QAAA,IAEA,6BACE,QAAA,OAIH,2BACC,QAAA,IAEA,+BACE,QAAA,OAIH,6BACC,MAAA,KACA,OAAA,KACA,WAAA,yCAAA,UAAA,OAAA,OAEA,iCACE,WAAA,OAMR,mBACE,IAAA,IACA,KAAA,IACA,QAAA,EACA,MAAA,KACA,OAAA,KACA,SAAA,SACA,YAAA,OACA,OAAA,MAAA,EAAA,EAAA,MACA,WAAA,yCAAA,UAAA,OAAA"} \ No newline at end of file +{"version":3,"sources":["login.less"],"names":[],"mappings":"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","file":"login.css"} \ No newline at end of file diff --git a/thinkphp/README.md b/thinkphp/README.md index b2a791b8b..1339e6c7b 100644 --- a/thinkphp/README.md +++ b/thinkphp/README.md @@ -35,7 +35,7 @@ ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特 + 内置控制器扩展类 + 模型自动验证 -> ThinkPHP5.1的运行环境要求PHP5.6+。 +> ThinkPHP5.1的运行环境要求PHP5.6+ 兼容PHP8.0。 ## 安装 @@ -70,6 +70,12 @@ composer update topthink/framework + [完全开发手册](https://www.kancloud.cn/manual/thinkphp5_1/content) + [升级指导](https://www.kancloud.cn/manual/thinkphp5_1/354155) + +## 官方服务 + ++ [应用服务市场](https://market.topthink.com/) ++ [ThinkAPI——统一API服务](https://docs.topthink.com/think-api) + ## 命名规范 `ThinkPHP5.1`遵循PSR-2命名规范和PSR-4自动加载规范。 diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php index 5cd55a8b7..35924a5ba 100644 --- a/thinkphp/library/think/App.php +++ b/thinkphp/library/think/App.php @@ -20,7 +20,7 @@ use think\route\Dispatch; */ class App extends Container { - const VERSION = '5.1.39 LTS'; + const VERSION = '5.1.41 LTS'; /** * 当前模块路径 @@ -548,12 +548,10 @@ class App extends Container public function routeInit() { // 路由检测 - $files = scandir($this->routePath); - foreach ($files as $file) { - if (strpos($file, '.php')) { - $filename = $this->routePath . $file; - // 导入路由配置 - $rules = include $filename; + if (is_dir($this->routePath)) { + $files = glob($this->routePath . '*.php'); + foreach ($files as $file) { + $rules = include $file; if (is_array($rules)) { $this->route->import($rules); } diff --git a/thinkphp/library/think/Collection.php b/thinkphp/library/think/Collection.php index 8251fc8f1..d7454ec59 100644 --- a/thinkphp/library/think/Collection.php +++ b/thinkphp/library/think/Collection.php @@ -400,7 +400,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria */ public function column($columnKey, $indexKey = null) { - return array_column($this->items, $columnKey, $indexKey); + return array_column($this->toArray(), $columnKey, $indexKey); } /** diff --git a/thinkphp/library/think/Container.php b/thinkphp/library/think/Container.php index cd7954c06..91b32aa63 100644 --- a/thinkphp/library/think/Container.php +++ b/thinkphp/library/think/Container.php @@ -461,6 +461,25 @@ class Container implements ArrayAccess, IteratorAggregate, Countable $type = key($vars) === 0 ? 1 : 0; $params = $reflect->getParameters(); + if (PHP_VERSION > 8.0) { + $args = $this->parseParamsForPHP8($params, $vars, $type); + } else { + $args = $this->parseParams($params, $vars, $type); + } + + return $args; + } + + /** + * 解析参数 + * @access protected + * @param array $params 参数列表 + * @param array $vars 参数数据 + * @param int $type 参数类别 + * @return array + */ + protected function parseParams($params, $vars, $type) + { foreach ($params as $param) { $name = $param->getName(); $lowerName = Loader::parseName($name); @@ -480,7 +499,38 @@ class Container implements ArrayAccess, IteratorAggregate, Countable throw new InvalidArgumentException('method param miss:' . $name); } } + return $args; + } + /** + * 解析参数 + * @access protected + * @param array $params 参数列表 + * @param array $vars 参数数据 + * @param int $type 参数类别 + * @return array + */ + protected function parseParamsForPHP8($params, $vars, $type) + { + foreach ($params as $param) { + $name = $param->getName(); + $lowerName = Loader::parseName($name); + $reflectionType = $param->getType(); + + if ($reflectionType && $reflectionType->isBuiltin() === false) { + $args[] = $this->getObjectParam($reflectionType->getName(), $vars); + } elseif (1 == $type && !empty($vars)) { + $args[] = array_shift($vars); + } elseif (0 == $type && array_key_exists($name, $vars)) { + $args[] = $vars[$name]; + } elseif (0 == $type && array_key_exists($lowerName, $vars)) { + $args[] = $vars[$lowerName]; + } elseif ($param->isDefaultValueAvailable()) { + $args[] = $param->getDefaultValue(); + } else { + throw new InvalidArgumentException('method param miss:' . $name); + } + } return $args; } diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php index 93be3dc01..4544ab21f 100644 --- a/thinkphp/library/think/Model.php +++ b/thinkphp/library/think/Model.php @@ -18,34 +18,43 @@ use think\db\Query; * Class Model * @package think * @mixin Query - * @method Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件 - * @method Query whereRaw(string $where, array $bind = []) static 表达式查询 - * @method Query whereExp(string $field, string $condition, array $bind = []) static 字段表达式查询 - * @method Query when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询 - * @method Query join(mixed $join, mixed $condition = null, string $type = 'INNER') static JOIN查询 - * @method Query view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询 - * @method Query with(mixed $with) static 关联预载入 - * @method Query count(string $field) static Count统计查询 - * @method Query min(string $field) static Min统计查询 - * @method Query max(string $field) static Max统计查询 - * @method Query sum(string $field) static SUM统计查询 - * @method Query avg(string $field) static Avg统计查询 - * @method Query field(mixed $field, boolean $except = false) static 指定查询字段 - * @method Query fieldRaw(string $field, array $bind = []) static 指定查询字段 - * @method Query union(mixed $union, boolean $all = false) static UNION查询 - * @method Query limit(mixed $offset, integer $length = null) static 查询LIMIT - * @method Query order(mixed $field, string $order = null) static 查询ORDER - * @method Query orderRaw(string $field, array $bind = []) static 查询ORDER - * @method Query cache(mixed $key = null , integer $expire = null) static 设置查询缓存 - * @method mixed value(string $field) static 获取某个字段的值 + * @method $this scope(string|array $scope) static 查询范围 + * @method $this where(mixed $field, string $op = null, mixed $condition = null) static 查询条件 + * @method $this whereRaw(string $where, array $bind = [], string $logic = 'AND') static 表达式查询 + * @method $this whereExp(string $field, string $condition, array $bind = [], string $logic = 'AND') static 字段表达式查询 + * @method $this when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询 + * @method $this join(mixed $join, mixed $condition = null, string $type = 'INNER', array $bind = []) static JOIN查询 + * @method $this view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询 + * @method $this with(mixed $with, callable $callback = null) static 关联预载入 + * @method $this count(string $field = '*') static Count统计查询 + * @method $this min(string $field, bool $force = true) static Min统计查询 + * @method $this max(string $field, bool $force = true) static Max统计查询 + * @method $this sum(string $field) static SUM统计查询 + * @method $this avg(string $field) static Avg统计查询 + * @method $this field(mixed $field, boolean $except = false, string $tableName = '', string $prefix = '', string $alias = '') static 指定查询字段 + * @method $this fieldRaw(string $field) static 指定查询字段 + * @method $this union(mixed $union, boolean $all = false) static UNION查询 + * @method $this limit(mixed $offset, integer $length = null) static 查询LIMIT + * @method $this order(mixed $field, string $order = null) static 查询ORDER + * @method $this orderRaw(string $field, array $bind = []) static 查询ORDER + * @method $this cache(mixed $key = null , integer|\DateTime $expire = null, string $tag = null) static 设置查询缓存 + * @method mixed value(string $field, mixed $default = null) static 获取某个字段的值 * @method array column(string $field, string $key = '') static 获取某个列的值 - * @method mixed find(mixed $data = null) static 查询单个记录 - * @method mixed select(mixed $data = null) static 查询多个记录 - * @method mixed get(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 支持关联预载入 - * @method mixed getOrFail(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 不存在则抛出异常 - * @method mixed findOrEmpty(mixed $data = null,mixed $with =[],bool $cache= false) static 查询单个记录 不存在则返回空模型 - * @method mixed all(mixed $data = null,mixed $with =[],bool $cache= false) static 查询多个记录 支持关联预载入 - * @method \think\Model withAttr(array $name,\Closure $closure) 动态定义获取器 + * @method $this find(mixed $data = null) static 查询单个记录 + * @method $this findOrFail(mixed $data = null) 查询单个记录 + * @method Collection|$this[] select(mixed $data = null) static 查询多个记录 + * @method $this get(mixed $data = null,mixed $with = [],bool $cache = false, bool $failException = false) static 查询单个记录 支持关联预载入 + * @method $this getOrFail(mixed $data = null,mixed $with = [],bool $cache = false) static 查询单个记录 不存在则抛出异常 + * @method $this findOrEmpty(mixed $data = null) static 查询单个记录 不存在则返回空模型 + * @method Collection|$this[] all(mixed $data = null,mixed $with = [],bool $cache = false) static 查询多个记录 支持关联预载入 + * @method $this withAttr(array $name,\Closure $closure = null) static 动态定义获取器 + * @method $this withJoin(string|array $with, string $joinType = '') static + * @method $this withCount(string|array $relation, bool $subQuery = true) static 关联统计 + * @method $this withSum(string|array $relation, string $field, bool $subQuery = true) static 关联SUM统计 + * @method $this withMax(string|array $relation, string $field, bool $subQuery = true) static 关联MAX统计 + * @method $this withMin(string|array $relation, string $field, bool $subQuery = true) static 关联Min统计 + * @method $this withAvg(string|array $relation, string $field, bool $subQuery = true) static 关联Avg统计 + * @method Paginator|$this paginate() static 分页 */ abstract class Model implements \JsonSerializable, \ArrayAccess { diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php index 92a401d73..6b6dd4b41 100644 --- a/thinkphp/library/think/Request.php +++ b/thinkphp/library/think/Request.php @@ -1800,7 +1800,7 @@ class Request public function host($strict = false) { if (!$this->host) { - $this->host = $this->server('HTTP_X_REAL_HOST') ?: $this->server('HTTP_HOST'); + $this->host = $this->server('HTTP_X_REAL_HOST') ?: $this->server('HTTP_X_FORWARDED_HOST') ?: $this->server('HTTP_HOST'); } return true === $strict && strpos($this->host, ':') ? strstr($this->host, ':', true) : $this->host; diff --git a/thinkphp/library/think/Route.php b/thinkphp/library/think/Route.php index 44af9871b..97f6dc7d4 100644 --- a/thinkphp/library/think/Route.php +++ b/thinkphp/library/think/Route.php @@ -13,9 +13,11 @@ namespace think; use think\exception\RouteNotFoundException; use think\route\AliasRule; +use think\route\Dispatch; use think\route\dispatch\Url as UrlDispatch; use think\route\Domain; use think\route\Resource; +use think\route\Rule; use think\route\RuleGroup; use think\route\RuleItem; diff --git a/thinkphp/library/think/Validate.php b/thinkphp/library/think/Validate.php index f58d7a88d..5fde7f310 100644 --- a/thinkphp/library/think/Validate.php +++ b/thinkphp/library/think/Validate.php @@ -408,6 +408,7 @@ class Validate foreach ($this->append as $key => $rule) { if (!isset($rules[$key])) { $rules[$key] = $rule; + unset($this->append[$key]); } } @@ -520,6 +521,7 @@ class Validate if (isset($this->append[$field])) { // 追加额外的验证规则 $rules = array_unique(array_merge($rules, $this->append[$field]), SORT_REGULAR); + unset($this->append[$field]); } $i = 0; diff --git a/thinkphp/library/think/cache/driver/Redis.php b/thinkphp/library/think/cache/driver/Redis.php index 813746e77..4eff2cf5e 100644 --- a/thinkphp/library/think/cache/driver/Redis.php +++ b/thinkphp/library/think/cache/driver/Redis.php @@ -90,7 +90,7 @@ class Redis extends Driver */ public function has($name) { - return $this->handler->exists($this->getCacheKey($name)); + return $this->handler->exists($this->getCacheKey($name)) ? true : false; } /** diff --git a/thinkphp/library/think/db/Builder.php b/thinkphp/library/think/db/Builder.php index a0faada87..60b470e86 100644 --- a/thinkphp/library/think/db/Builder.php +++ b/thinkphp/library/think/db/Builder.php @@ -684,7 +684,7 @@ abstract class Builder */ protected function parseClosure(Query $query, $call, $show = true) { - $newQuery = $query->newQuery()->setConnection($this->connection); + $newQuery = $query->newQuery()->removeOption(); $call($newQuery); return $newQuery->buildSql($show); diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php index 0c3df8995..ba082794a 100644 --- a/thinkphp/library/think/db/Query.php +++ b/thinkphp/library/think/db/Query.php @@ -1764,7 +1764,7 @@ class Query * var_page:分页变量, * list_rows:每页数量 * type:分页类名 - * @return \think\Paginator + * @return $this[]|\think\Paginator * @throws DbException */ public function paginate($listRows = null, $simple = false, $config = []) @@ -3464,7 +3464,7 @@ class Query } /** - * 查找单条记录 如果不存在则抛出异常 + * 查找单条记录 不存在则返回空模型 * @access public * @param array|string|Query|\Closure $data * @return array|\PDOStatement|string|Model diff --git a/thinkphp/library/think/db/builder/Mysql.php b/thinkphp/library/think/db/builder/Mysql.php index af364dff0..f7384b31e 100644 --- a/thinkphp/library/think/db/builder/Mysql.php +++ b/thinkphp/library/think/db/builder/Mysql.php @@ -125,7 +125,13 @@ class Mysql extends Builder $key = trim($key); - if (strpos($key, '->') && false === strpos($key, '(')) { + if(strpos($key, '->>') && false === strpos($key, '(')){ + // JSON字段支持 + list($field, $name) = explode('->>', $key, 2); + + return $this->parseKey($query, $field, true) . '->>\'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->>', '.', $name) . '\''; + } + elseif (strpos($key, '->') && false === strpos($key, '(')) { // JSON字段支持 list($field, $name) = explode('->', $key, 2); diff --git a/thinkphp/library/think/db/connector/Mysql.php b/thinkphp/library/think/db/connector/Mysql.php index 1713b99b9..cfd2ac72b 100644 --- a/thinkphp/library/think/db/connector/Mysql.php +++ b/thinkphp/library/think/db/connector/Mysql.php @@ -97,10 +97,10 @@ class Mysql extends Connection $info[$val['field']] = [ 'name' => $val['field'], 'type' => $val['type'], - 'notnull' => (bool) ('' === $val['null']), // not null is empty, null is yes + 'notnull' => 'NO' == $val['null'], 'default' => $val['default'], - 'primary' => (strtolower($val['key']) == 'pri'), - 'autoinc' => (strtolower($val['extra']) == 'auto_increment'), + 'primary' => strtolower($val['key']) == 'pri', + 'autoinc' => strtolower($val['extra']) == 'auto_increment', ]; } } @@ -187,7 +187,7 @@ class Mysql extends Connection return false; } - $this->execute("XA START '$xid'"); + $this->linkID->exec("XA START '$xid'"); } /** @@ -199,8 +199,8 @@ class Mysql extends Connection public function prepareXa($xid) { $this->initConnect(true); - $this->execute("XA END '$xid'"); - $this->execute("XA PREPARE '$xid'"); + $this->linkID->exec("XA END '$xid'"); + $this->linkID->exec("XA PREPARE '$xid'"); } /** @@ -212,7 +212,7 @@ class Mysql extends Connection public function commitXa($xid) { $this->initConnect(true); - $this->execute("XA COMMIT '$xid'"); + $this->linkID->exec("XA COMMIT '$xid'"); } /** @@ -224,6 +224,6 @@ class Mysql extends Connection public function rollbackXa($xid) { $this->initConnect(true); - $this->execute("XA ROLLBACK '$xid'"); + $this->linkID->exec("XA ROLLBACK '$xid'"); } } diff --git a/thinkphp/library/think/facade/Route.php b/thinkphp/library/think/facade/Route.php index 77196dfe4..6457ba4b8 100644 --- a/thinkphp/library/think/facade/Route.php +++ b/thinkphp/library/think/facade/Route.php @@ -27,7 +27,7 @@ use think\Facade; * @method void import(array $rules, string $type = '*') static 导入配置文件的路由规则 * @method \think\route\RuleItem rule(string $rule, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由规则 * @method void rules(array $rules, string $method = '*', array $option = [], array $pattern = []) static 批量注册路由规则 - * @method \think\route\RuleGroup group(string|array $name, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由分组 + * @method \think\route\RuleGroup group(string|array $name, array|\Closure $route, array $method = '*', array $option = [], array $pattern = []) static 注册路由分组 * @method \think\route\RuleItem any(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由 * @method \think\route\RuleItem get(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由 * @method \think\route\RuleItem post(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由 diff --git a/thinkphp/library/think/model/Collection.php b/thinkphp/library/think/model/Collection.php index 34ec067e7..fc0967cfe 100644 --- a/thinkphp/library/think/model/Collection.php +++ b/thinkphp/library/think/model/Collection.php @@ -32,6 +32,22 @@ class Collection extends BaseCollection return $this; } + /** + * 绑定（一对一）关联属性到当前模型 + * @access protected + * @param string $relation 关联名称 + * @param array $attrs 绑定属性 + * @return $this + */ + public function bindAttr($relation, array $attrs = []) + { + $this->each(function (Model $model) use ($relation, $attrs) { + $model->bindAttr($relation, $attrs); + }); + + return $this; + } + /** * 设置需要隐藏的输出属性 * @access public diff --git a/thinkphp/library/think/model/concern/Conversion.php b/thinkphp/library/think/model/concern/Conversion.php index 28a6f9991..de4db9311 100644 --- a/thinkphp/library/think/model/concern/Conversion.php +++ b/thinkphp/library/think/model/concern/Conversion.php @@ -87,7 +87,7 @@ trait Conversion if (isset($this->data[$key])) { throw new Exception('bind attr has exists:' . $key); } else { - $this->data[$key] = $model->$attr; + $this->data[$key] = $model->getAttr($attr); } } } diff --git a/thinkphp/library/think/model/concern/RelationShip.php b/thinkphp/library/think/model/concern/RelationShip.php index 9ca709a5e..48579b700 100644 --- a/thinkphp/library/think/model/concern/RelationShip.php +++ b/thinkphp/library/think/model/concern/RelationShip.php @@ -13,6 +13,7 @@ namespace think\model\concern; use think\Collection; use think\db\Query; +use think\Exception; use think\Loader; use think\Model; use think\model\Relation; @@ -115,6 +116,32 @@ trait RelationShip return $this; } + /** + * 绑定（一对一）关联属性到当前模型 + * @access protected + * @param string $relation 关联名称 + * @param array $attrs 绑定属性 + * @return $this + * @throws Exception + */ + public function bindAttr($relation, array $attrs = []) + { + $relation = $this->getRelation($relation); + + foreach ($attrs as $key => $attr) { + $key = is_numeric($key) ? $attr : $key; + $value = $this->getOrigin($key); + + if (!is_null($value)) { + throw new Exception('bind attr has exists:' . $key); + } + + $this->setAttr($key, $relation ? $relation->getAttr($attr) : null); + } + + return $this; + } + /** * 关联数据写入 * @access public diff --git a/thinkphp/library/think/model/concern/SoftDelete.php b/thinkphp/library/think/model/concern/SoftDelete.php index 679aa34c4..ec866ac06 100644 --- a/thinkphp/library/think/model/concern/SoftDelete.php +++ b/thinkphp/library/think/model/concern/SoftDelete.php @@ -139,6 +139,10 @@ trait SoftDelete */ public static function destroy($data, $force = false) { + // 传入空不执行删除，但是0可以删除 + if (empty($data) && 0 !== $data) { + return false; + } // 包含软删除数据 $query = (new static())->db(false); diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php index 2d64f683c..6105e233c 100644 --- a/thinkphp/library/think/model/relation/BelongsToMany.php +++ b/thinkphp/library/think/model/relation/BelongsToMany.php @@ -19,6 +19,7 @@ use think\Loader; use think\Model; use think\model\Pivot; use think\model\Relation; +use think\Paginator; class BelongsToMany extends Relation { @@ -582,7 +583,7 @@ class BelongsToMany extends Relation * 判断是否存在关联数据 * @access public * @param mixed $data 数据 可以使用关联模型对象 或者 关联对象的主键 - * @return Pivot + * @return Pivot|false * @throws Exception */ public function attached($data) diff --git a/thinkphp/library/think/model/relation/HasManyThrough.php b/thinkphp/library/think/model/relation/HasManyThrough.php index 6e39f2ad5..be0b0cd9a 100644 --- a/thinkphp/library/think/model/relation/HasManyThrough.php +++ b/thinkphp/library/think/model/relation/HasManyThrough.php @@ -81,7 +81,7 @@ class HasManyThrough extends Relation */ public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER') { - $model = App::parseName(App::classBaseName($this->parent)); + $model = Loader::parseName(basename(str_replace('\\', '/', get_class($this->parent)))); $throughTable = $this->through->getTable(); $pk = $this->throughPk; $throughKey = $this->throughKey; @@ -114,7 +114,7 @@ class HasManyThrough extends Relation */ public function hasWhere($where = [], $fields = null) { - $model = App::parseName(App::classBaseName($this->parent)); + $model = Loader::parseName(basename(str_replace('\\', '/', get_class($this->parent)))); $throughTable = $this->through->getTable(); $pk = $this->throughPk; $throughKey = $this->throughKey; @@ -169,7 +169,7 @@ class HasManyThrough extends Relation ], $foreignKey, $relation, $subRelation, $closure); // 关联属性名 - $attr = App::parseName($relation); + $attr = Loader::parseName($relation); // 关联数据封装 foreach ($resultSet as $result) { @@ -218,7 +218,7 @@ class HasManyThrough extends Relation $relationModel->setParent(clone $result); } - $result->setRelation(App::parseName($relation), $this->resultSetBuild($data[$pk])); + $result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$pk])); } /** @@ -279,7 +279,7 @@ class HasManyThrough extends Relation } } - $alias = App::parseName(App::classBaseName($this->model)); + $alias = Loader::parseName(basename(str_replace('\\', '/', $this->model))); $throughTable = $this->through->getTable(); $pk = $this->throughPk; $throughKey = $this->throughKey; @@ -315,7 +315,7 @@ class HasManyThrough extends Relation } } - $alias = App::parseName(App::classBaseName($this->model)); + $alias = Loader::parseName(basename(str_replace('\\', '/', $this->model))); $throughTable = $this->through->getTable(); $pk = $this->throughPk; $throughKey = $this->throughKey; diff --git a/thinkphp/library/think/model/relation/HasOne.php b/thinkphp/library/think/model/relation/HasOne.php index e036bba4e..fe09443c9 100644 --- a/thinkphp/library/think/model/relation/HasOne.php +++ b/thinkphp/library/think/model/relation/HasOne.php @@ -144,7 +144,7 @@ class HasOne extends OneToOne return $this->parent->db() ->alias($model) - ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) { + ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey, $softDelete) { $query->table([$table => $relation]) ->field($relation . '.' . $foreignKey) ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey) diff --git a/thinkphp/library/think/model/relation/MorphTo.php b/thinkphp/library/think/model/relation/MorphTo.php index 17771ce86..0786c2fe0 100644 --- a/thinkphp/library/think/model/relation/MorphTo.php +++ b/thinkphp/library/think/model/relation/MorphTo.php @@ -186,8 +186,16 @@ class MorphTo extends Relation foreach ($range as $key => $val) { // 多态类型映射 $model = $this->parseModel($key); - $obj = new $model; + $obj = (new $model)->db(); $pk = $obj->getPk(); + // 预载入关联查询 支持嵌套预载入 + if ($closure instanceof \Closure) { + $closure($obj); + + if ($field = $obj->getOptions('with_field')) { + $obj->field($field)->removeOption('with_field'); + } + } $list = $obj->all($val, $subRelation); $data = []; diff --git a/thinkphp/library/think/model/relation/OneToOne.php b/thinkphp/library/think/model/relation/OneToOne.php index a0333c863..5e22b8002 100644 --- a/thinkphp/library/think/model/relation/OneToOne.php +++ b/thinkphp/library/think/model/relation/OneToOne.php @@ -282,20 +282,22 @@ abstract class OneToOne extends Relation /** * 绑定关联属性到父模型 * @access protected - * @param Model $model 关联模型对象 - * @param Model $result 父模型对象 + * @param Model $result 关联模型对象 + * @param Model $model 父模型对象 * @return void * @throws Exception */ protected function bindAttr($model, &$result) { foreach ($this->bindAttr as $key => $attr) { - $key = is_numeric($key) ? $attr : $key; - if (isset($result->$key)) { + $key = is_numeric($key) ? $attr : $key; + $value = $result->getOrigin($key); + + if (!is_null($value)) { throw new Exception('bind attr has exists:' . $key); - } else { - $result->setAttr($key, $model ? $model->$attr : null); } + + $result->setAttr($key, $model ? $model->getAttr($attr) : null); } } diff --git a/thinkphp/library/think/route/Domain.php b/thinkphp/library/think/route/Domain.php index 80950dc28..923d9b427 100644 --- a/thinkphp/library/think/route/Domain.php +++ b/thinkphp/library/think/route/Domain.php @@ -13,6 +13,7 @@ namespace think\route; use think\Container; use think\Loader; +use think\Request; use think\Route; use think\route\dispatch\Callback as CallbackDispatch; use think\route\dispatch\Controller as ControllerDispatch; diff --git a/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md b/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md index 0ee11a758..47f6853e6 100644 --- a/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md +++ b/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md @@ -1,5 +1,15 @@ # ChangeLog - Aliyun OSS SDK for PHP +## v2.4.2 / 2021-06-04 +* Compatible with PHP8. +* Fixed: compatible with PHP5.4. +* Fixed: the signature is incorrect in some scenarios +* Update: change $requestUrl from a member variable to a local variable. + +## v2.4.1 / 2020-09-29 +* Fixed: the getBucketPolicy bug. + + ## v2.4.0 / 2020-08-31 * Added: disable Expect: 100-continue diff --git a/vendor/aliyuncs/oss-sdk-php/composer.json b/vendor/aliyuncs/oss-sdk-php/composer.json index 1ecb58c94..29e280b98 100644 --- a/vendor/aliyuncs/oss-sdk-php/composer.json +++ b/vendor/aliyuncs/oss-sdk-php/composer.json @@ -14,8 +14,8 @@ "php":">=5.3" }, "require-dev" : { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~1.0" + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "*" }, "minimum-stability": "stable", "autoload": { diff --git a/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php b/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php index f4cff08ce..54bb10572 100644 --- a/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php +++ b/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php @@ -439,7 +439,8 @@ BBB; $sub_object = $xml->addChild('Object'); $key = OssUtil::sReplace($object->getKey()); $sub_object->addChild('Key', $key); - if (!empty($object->getVersionId())) { + $versionId = $object->getVersionId(); + if (!empty($versionId)) { $sub_object->addChild('VersionId', $object->getVersionId()); } } diff --git a/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php b/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php index a78f19be6..c8089b419 100644 --- a/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php +++ b/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php @@ -777,7 +777,7 @@ class RequestCore * data stored in the `curl_handle` and `response` properties unless replacement data is passed in via * parameters. * - * @param resource $curl_handle (Optional) The reference to the already executed cURL request. + * @param resource|\CurlHandle|null|false $curl_handle (Optional) The reference to the already executed cURL request. Receive CurlHandle instance from PHP8.0 * @param string $response (Optional) The actual response content itself that needs to be parsed. * @return ResponseCore A object containing a parsed HTTP response. */ @@ -788,8 +788,8 @@ class RequestCore $this->response = $response; } - // As long as this came back as a valid resource... - if (is_resource($curl_handle)) { + // As long as this came back as a valid resource or CurlHandle instance... + if (is_resource($curl_handle) || (is_object($curl_handle) && get_class($curl_handle) === 'CurlHandle')) { // Determine what's what. $header_size = curl_getinfo($curl_handle, CURLINFO_HEADER_SIZE); $this->response_headers = substr($this->response, 0, $header_size); @@ -844,12 +844,13 @@ class RequestCore $this->response = curl_exec($curl_handle); if ($this->response === false) { - throw new RequestCore_Exception('cURL resource: ' . (string)$curl_handle . '; cURL error: ' . curl_error($curl_handle) . ' (' . curl_errno($curl_handle) . ')'); + throw new RequestCore_Exception('cURL error: ' . curl_error($curl_handle) . ' (' . curl_errno($curl_handle) . ')'); } $parsed_response = $this->process_response($curl_handle, $this->response); curl_close($curl_handle); + unset($curl_handle); if ($parse) { return $parsed_response; diff --git a/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php b/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php index caaf253c4..c41cacdab 100644 --- a/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php +++ b/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php @@ -1132,7 +1132,8 @@ class OssClient $options[self::OSS_OBJECT] = '/'; $options[self::OSS_SUB_RESOURCE] = 'policy'; $response = $this->auth($options); - return $response->body; + $result = new BodyResult($response); + return $result->getData(); } /** @@ -2842,10 +2843,10 @@ class OssClient $non_signable_resource .= $conjunction . $query_string; $conjunction = '&'; } - $this->requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource; + $requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource; //Creates the request - $request = new RequestCore($this->requestUrl, $this->requestProxy); + $request = new RequestCore($requestUrl, $this->requestProxy); $request->set_useragent($this->generateUserAgent()); // Streaming uploads if (isset($options[self::OSS_FILE_UPLOAD])) { @@ -2942,10 +2943,10 @@ class OssClient $request->add_header('Authorization', 'OSS ' . $this->accessKeyId . ':' . $signature); if (isset($options[self::OSS_PREAUTH]) && (integer)$options[self::OSS_PREAUTH] > 0) { - $signed_url = $this->requestUrl . $conjunction . self::OSS_URL_ACCESS_KEY_ID . '=' . rawurlencode($this->accessKeyId) . '&' . self::OSS_URL_EXPIRES . '=' . $options[self::OSS_PREAUTH] . '&' . self::OSS_URL_SIGNATURE . '=' . rawurlencode($signature); + $signed_url = $requestUrl . $conjunction . self::OSS_URL_ACCESS_KEY_ID . '=' . rawurlencode($this->accessKeyId) . '&' . self::OSS_URL_EXPIRES . '=' . $options[self::OSS_PREAUTH] . '&' . self::OSS_URL_SIGNATURE . '=' . rawurlencode($signature); return $signed_url; } elseif (isset($options[self::OSS_PREAUTH])) { - return $this->requestUrl; + return $requestUrl; } if ($this->timeout !== 0) { @@ -2961,7 +2962,7 @@ class OssClient throw(new OssException('RequestCoreException: ' . $e->getMessage())); } $response_header = $request->get_response_header(); - $response_header['oss-request-url'] = $this->requestUrl; + $response_header['oss-request-url'] = $requestUrl; $response_header['oss-redirects'] = $this->redirects; $response_header['oss-stringtosign'] = $string_to_sign; $response_header['oss-requestheaders'] = $request->request_headers; @@ -3256,7 +3257,12 @@ class OssClient $queryStringSorted = substr($queryStringSorted, 0, -1); - return $explodeResult[0] . '?' . $queryStringSorted; + $result = ''; + for ($i = 0; $i < $index -1; $i++) + { + $result .= $explodeResult[$i] . '?'; + } + return $result . $queryStringSorted; } /** @@ -3502,8 +3508,8 @@ class OssClient ); // OssClient version information const OSS_NAME = "aliyun-sdk-php"; - const OSS_VERSION = "2.4.0"; - const OSS_BUILD = "20200831"; + const OSS_VERSION = "2.4.2"; + const OSS_BUILD = "20210604"; const OSS_AUTHOR = ""; const OSS_OPTIONS_ORIGIN = 'Origin'; const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method'; @@ -3516,7 +3522,6 @@ class OssClient // user's domain type. It could be one of the four: OSS_HOST_TYPE_NORMAL, OSS_HOST_TYPE_IP, OSS_HOST_TYPE_SPECIAL, OSS_HOST_TYPE_CNAME private $hostType = self::OSS_HOST_TYPE_NORMAL; - private $requestUrl; private $requestProxy = null; private $accessKeyId; private $accessKeySecret; diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php index 12f4b1a7e..82168d05d 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\AclResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class AclResultTest extends \PHPUnit_Framework_TestCase +class AclResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<client = Common::getOssClient(); $this->bucketName = 'php-sdk-test-bucket-' . strval(rand(0, 10000)); $this->client->createBucket($this->bucketName); } - public function tearDown() + protected function tearDown(): void { $this->client->deleteBucket($this->bucketName); } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php index 80fa25c8e..f99bcee60 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php @@ -8,7 +8,7 @@ use OSS\Model\BucketInfo; * Class BucketInfoTest * @package OSS\Tests */ -class BucketInfoTest extends \PHPUnit_Framework_TestCase +class BucketInfoTest extends \PHPUnit\Framework\TestCase { public function testConstruct() { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php index aaebadb1e..cedf884d4 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php @@ -7,12 +7,12 @@ require_once __DIR__ . '/Common.php'; use OSS\Model\LiveChannelConfig; use OSS\Core\OssException; -class BucketLiveChannelTest extends \PHPUnit_Framework_TestCase +class BucketLiveChannelTest extends \PHPUnit\Framework\TestCase { private $bucketName; private $client; - public function setUp() + protected function setUp(): void { $this->client = Common::getOssClient(); $this->bucketName = 'php-sdk-test-rtmp-bucket-name-' . strval(rand(0, 10000)); @@ -20,7 +20,7 @@ class BucketLiveChannelTest extends \PHPUnit_Framework_TestCase Common::waitMetaSync(); } - public function tearDown() + protected function tearDown(): void { ////to delete created bucket //1. delele live channel diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php index 337ea2435..31df548d8 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php @@ -289,7 +289,7 @@ class CallbackTest extends TestOssClientBase } } - public function setUp() + protected function setUp(): void { parent::setUp(); } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php index e3c1ce902..8f7529c99 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php @@ -6,7 +6,7 @@ namespace OSS\Tests; use OSS\Model\CnameConfig; use OSS\Core\OssException; -class CnameConfigTest extends \PHPUnit_Framework_TestCase +class CnameConfigTest extends \PHPUnit\Framework\TestCase { private $xml1 = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php index 171d4c84d..7d1b0fbaa 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php @@ -6,7 +6,7 @@ use OSS\Core\OssException; use OSS\Http\ResponseCore; use OSS\Result\CopyObjectResult; -class CopyObjectResultTest extends \PHPUnit_Framework_TestCase +class CopyObjectResultTest extends \PHPUnit\Framework\TestCase { private $body = << @@ -45,7 +45,7 @@ BBBB; new CopyObjectResult($response); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php index ddc4d3ab8..3329b1af8 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php @@ -7,7 +7,7 @@ use OSS\Model\CorsConfig; use OSS\Model\CorsRule; use OSS\Core\OssException; -class CorsConfigTest extends \PHPUnit_Framework_TestCase +class CorsConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php index ed6b95e1c..890b1a5d6 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\DeleteObjectVersionsResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class DeleteObjectVersionsResultTest extends \PHPUnit_Framework_TestCase +class DeleteObjectVersionsResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php index 4512eb4d5..6f0e0d279 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\GetBucketEncryptionResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class GetBucketEncryptionResultTest extends \PHPUnit_Framework_TestCase +class GetBucketEncryptionResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php index aefc8ab6b..4d5d91297 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\GetBucketWormResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class GetBucketWormResultTest extends \PHPUnit_Framework_TestCase +class GetBucketWormResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -58,10 +58,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetCorsResult($response); + $result = new GetCorsResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php index 92ae2086a..e6d9a725f 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php @@ -8,7 +8,7 @@ use OSS\Core\OssException; use OSS\Model\LifecycleConfig; use OSS\Result\GetLifecycleResult; -class GetLifecycleResultTest extends \PHPUnit_Framework_TestCase +class GetLifecycleResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -49,10 +49,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetLifecycleResult($response); + $result = new GetLifecycleResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php index 619501481..35f743664 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php @@ -8,7 +8,7 @@ use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetLoggingResultTest extends \PHPUnit_Framework_TestCase +class GetLoggingResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -42,10 +42,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetLoggingResult($response); + $result = new GetLoggingResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php index 072aa43ac..774aae956 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php @@ -7,7 +7,7 @@ use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetRefererResultTest extends \PHPUnit_Framework_TestCase +class GetRefererResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -42,10 +42,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetRefererResult($response); + $result = new GetRefererResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php index 70e155943..d85330664 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php @@ -7,7 +7,7 @@ use OSS\Result\GetWebsiteResult; use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetWebsiteResultTest extends \PHPUnit_Framework_TestCase +class GetWebsiteResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -41,10 +41,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetWebsiteResult($response); + $result = new GetWebsiteResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php index dae497544..9354422b0 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php @@ -9,7 +9,7 @@ use OSS\Http\ResponseCore; * Class HeaderResultTest * @package OSS\Tests */ -class HeaderResultTest extends \PHPUnit_Framework_TestCase +class HeaderResultTest extends \PHPUnit\Framework\TestCase { public function testGetHeader() { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php index a59dfcd2d..989644cf1 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php @@ -7,7 +7,7 @@ use OSS\Http\ResponseCore; use OSS\Http\RequestCore_Exception; use Symfony\Component\Config\Definition\Exception\Exception; -class HttpTest extends \PHPUnit_Framework_TestCase +class HttpTest extends \PHPUnit\Framework\TestCase { public function testResponseCore() @@ -33,7 +33,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase $httpResponse = $httpCore->send_request(); $this->assertTrue(false); } catch (RequestCore_Exception $e) { - + $this->assertTrue(true); } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php index 9f6c7a53e..76b10a65a 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Result\InitiateMultipartUploadResult; use OSS\Http\ResponseCore; -class InitiateMultipartUploadResultTest extends \PHPUnit_Framework_TestCase +class InitiateMultipartUploadResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -41,7 +41,7 @@ BBBB; $result = new InitiateMultipartUploadResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php index 7bd033185..063e43644 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php @@ -7,7 +7,7 @@ use OSS\Model\LifecycleAction; use OSS\Model\LifecycleConfig; use OSS\Model\LifecycleRule; -class LifecycleConfigTest extends \PHPUnit_Framework_TestCase +class LifecycleConfigTest extends \PHPUnit\Framework\TestCase { private $validLifecycle = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php index 5c757d315..88bd0a774 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php @@ -9,7 +9,7 @@ use OSS\Http\ResponseCore; * Class ListMultipartUploadResultTest * @package OSS\Tests */ -class ListMultipartUploadResultTest extends \PHPUnit_Framework_TestCase +class ListMultipartUploadResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php index f386c68e4..8ddbdaa1b 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\ListObjectVersionsResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class ListObjectVersionsResultTest extends \PHPUnit_Framework_TestCase +class ListObjectVersionsResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<getData(); + $this->assertTrue(true); } public function testParseInvalidXml() @@ -209,5 +210,6 @@ class ListObjectVersionsResultTest extends \PHPUnit_Framework_TestCase $response = new ResponseCore(array(), $this->invalidXml, 200); $result = new ListObjectVersionsResult($response); $stat = $result->getData(); + $this->assertTrue(true); } } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php index 85f262ca4..c977ce715 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php @@ -6,7 +6,7 @@ namespace OSS\Tests; use OSS\Result\ListObjectsResult; use OSS\Http\ResponseCore; -class ListObjectsResultTest extends \PHPUnit_Framework_TestCase +class ListObjectsResultTest extends \PHPUnit\Framework\TestCase { private $validXml1 = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php index 5fb5d6e7b..b69ef7cbe 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php @@ -12,7 +12,7 @@ use OSS\Model\GetLiveChannelStatus; use OSS\Model\GetLiveChannelHistory; use OSS\Model\LiveChannelHistory; -class LiveChannelXmlTest extends \PHPUnit_Framework_TestCase +class LiveChannelXmlTest extends \PHPUnit\Framework\TestCase { private $config = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php index 01496bb8f..05336c815 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Model\LoggingConfig; -class LoggingConfigTest extends \PHPUnit_Framework_TestCase +class LoggingConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php index 0697409e1..1403d09a2 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Core\MimeTypes; -class MimeTypesTest extends \PHPUnit_Framework_TestCase +class MimeTypesTest extends \PHPUnit\Framework\TestCase { public function testGetMimeType() { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketPolicyTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketPolicyTest.php index 58cd05a3a..4f0c5ee66 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketPolicyTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketPolicyTest.php @@ -29,9 +29,10 @@ class OssClientBucketPolicyTest extends TestOssClientBase try { $this->ossClient->deleteBucketPolicy($this->bucket); $policy = $this->ossClient->getBucketPolicy($this->bucket); + $this->assertTrue(false); } catch (OssException $e) { $this->assertTrue(true); - $this->assertEquals("NoSuchBucketPolicy", $e->getCode()); + $this->assertEquals("NoSuchBucketPolicy", $e->getErrorCode()); } try { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php index df44fbaf6..6bac445e3 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php @@ -98,7 +98,7 @@ class OssClientBucketTest extends TestOssClientBase } } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -125,7 +125,7 @@ class OssClientBucketTest extends TestOssClientBase $this->ossClient->createBucket($this->standardBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php index 17b9b9836..6def9f971 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php @@ -14,7 +14,7 @@ class OssClinetImageTest extends TestOssClientBase private $object; private $download_file; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -28,7 +28,7 @@ class OssClinetImageTest extends TestOssClientBase $this->client->uploadFile($this->bucketName, $this->object, $this->local_file); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); unlink($this->download_file); diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php index de4735b2d..8ee47a2e9 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php @@ -145,7 +145,7 @@ class OssClientListObjectsTest extends TestOssClientBase $this->assertEquals("true", $listObjectInfo->getIsTruncated()); } - public function setUp() + protected function setUp(): void { parent::setUp(); //folder @@ -177,7 +177,7 @@ class OssClientListObjectsTest extends TestOssClientBase } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php index b7d0e26d0..8f4065484 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php @@ -330,6 +330,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file, $options); + $this->assertFalse(false); } catch (OssException $e) { $this->assertFalse(true); } @@ -343,6 +344,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file, $options); + $this->assertFalse(false); } catch (OssException $e) { $this->assertFalse(true); } @@ -385,6 +387,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file); + $this->assertTrue(false); } catch (OssException $e) { $this->assertTrue(true); if (strpos($e, "parameter invalid, file is empty") == false) diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php index d9b8d060d..41e18cf12 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php @@ -426,6 +426,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase $object = 'mpu/multipart-bigfile-test.tmp'; try { $this->ossClient->multiuploadFile($this->bucket, $object, $bigFileName, $options); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -446,7 +447,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase unlink($bigFileName); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->payerClient = new OssClient( @@ -464,7 +465,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase $this->ossClient->putSymlink($this->bucket, "default-symlink", "default-object"); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php index 2d3880598..228a394d1 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php @@ -622,49 +622,158 @@ class OssClientObjectTest extends TestOssClientBase public function testUploadStream() { - $object = "oss-php-sdk-test/put-from-stream.txt"; - $options = array(OssClient::OSS_CHECK_MD5 => true); + $object = "oss-php-sdk-test/put-from-stream.txt"; + $options = array(OssClient::OSS_CHECK_MD5 => true); $handle = fopen(__FILE__, 'rb'); - /** - * Upload data to start MD5 - */ - try { - $this->ossClient->uploadStream($this->bucket, $object, $handle, $options); - } catch (OssException $e) { - $this->assertFalse(true); - } - - /** - * Check if the replication is the same - */ - try { - $content = $this->ossClient->getObject($this->bucket, $object); - $this->assertEquals($content, file_get_contents(__FILE__)); - } catch (OssException $e) { - $this->assertFalse(true); - } + /** + * Upload data to start MD5 + */ + try { + $this->ossClient->uploadStream($this->bucket, $object, $handle, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } - $object = "oss-php-sdk-test/put-from-stream-without-md5.txt"; + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + $object = "oss-php-sdk-test/put-from-stream-without-md5.txt"; $handle = fopen(__FILE__, 'rb'); - try { - $this->ossClient->uploadStream($this->bucket, $object, $handle); - } catch (OssException $e) { - $this->assertFalse(true); - } - - /** - * Check if the replication is the same - */ - try { - $content = $this->ossClient->getObject($this->bucket, $object); - $this->assertEquals($content, file_get_contents(__FILE__)); - } catch (OssException $e) { - $this->assertFalse(true); - } + try { + $this->ossClient->uploadStream($this->bucket, $object, $handle); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } } - - public function setUp() + + public function testObjectKeyWithQuestionMark() + { + /** + * Upload the local variable to bucket + */ + $object = "oss-php-sdk-test/??/upload-test-object-name???123??123??.txt"; + $content = file_get_contents(__FILE__); + $options = array( + OssClient::OSS_LENGTH => strlen($content), + OssClient::OSS_HEADERS => array( + 'Expires' => 'Fri, 28 Feb 2020 05:38:42 GMT', + 'Cache-Control' => 'no-cache', + 'Content-Disposition' => 'attachment;filename=oss_download.log', + 'Content-Language' => 'zh-CN', + 'x-oss-server-side-encryption' => 'AES256', + 'x-oss-meta-self-define-title' => 'user define meta info', + ), + ); + + try { + $this->ossClient->putObject($this->bucket, $object, $content, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } + + try { + $this->ossClient->putObject($this->bucket, $object, $content, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * GetObject to the local variable and check for match + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * GetObject first five bytes + */ + try { + $options = array(OssClient::OSS_RANGE => '0-4'); + $content = $this->ossClient->getObject($this->bucket, $object, $options); + $this->assertEquals($content, 'assertFalse(true); + } + + + /** + * Upload the local file to object + */ + try { + $this->ossClient->uploadFile($this->bucket, $object, __FILE__); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Download the file to the local variable and check for match. + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Copy object + */ + $to_bucket = $this->bucket; + $to_object = $object . '.copy'; + $options = array(); + try { + $result = $this->ossClient->copyObject($this->bucket, $object, $to_bucket, $to_object, $options); + $this->assertFalse(empty($result)); + $this->assertEquals(strlen("2016-11-21T03:46:58.000Z"), strlen($result[0])); + $this->assertEquals(strlen("\"5B3C1A2E053D763E1B002CC607C5A0FE\""), strlen($result[1])); + } catch (OssException $e) { + $this->assertFalse(true); + var_dump($e->getMessage()); + + } + + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $to_object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + + try { + $this->assertTrue($this->ossClient->doesObjectExist($this->bucket, $object)); + $this->ossClient->deleteObject($this->bucket, $object); + $this->assertFalse($this->ossClient->doesObjectExist($this->bucket, $object)); + } catch (OssException $e) { + $this->assertFalse(true); + } + } + + protected function setUp(): void { parent::setUp(); $this->ossClient->putObject($this->bucket, 'oss-php-sdk-test/upload-test-object-name.txt', file_get_contents(__FILE__)); diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php index f13ca01dd..66f204ac5 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php @@ -569,7 +569,7 @@ class OssClientObjectVersioningTest extends TestOssClientBase $this->assertEquals(0, count($deleteMarkerList)); } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -577,7 +577,7 @@ class OssClientObjectVersioningTest extends TestOssClientBase } - public function tearDown() + protected function tearDown(): void { if (!$this->ossClient->doesBucketExist($this->bucket)) { return; diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php index 6840813be..9aa0b9b7a 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php @@ -141,7 +141,7 @@ class OssClientRestoreObjectTest extends TestOssClientBase } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -160,7 +160,7 @@ class OssClientRestoreObjectTest extends TestOssClientBase $this->ossClient->createBucket($this->archiveBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php index 2b72253c7..cd329cbce 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php @@ -131,13 +131,13 @@ class OssClientSignatureTest extends TestOssClientBase $this->assertTrue(strpos($signedUrl1, 'Expires='.$expiration) !== false); } - public function tearDown() + protected function tearDown(): void { $this->ossClient->deleteObject($this->bucket, "a.file"); parent::tearDown(); } - public function setUp() + protected function setUp(): void { parent::setUp(); /** diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php index f850f7ab8..b7c676f5a 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php @@ -111,7 +111,7 @@ class OssClientTest extends TestOssClientBase $ossClient->listBuckets(); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } @@ -123,6 +123,7 @@ class OssClientTest extends TestOssClientBase $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ '; $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->listBuckets(); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -196,6 +197,7 @@ class OssClientTest extends TestOssClientBase try { $object='test-dir'; $ossClient->createObjectDir($bucket,$object); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -204,6 +206,7 @@ class OssClientTest extends TestOssClientBase $object='0'; $ossClient->createObjectDir($bucket,$object); $ossClient->putObject($bucket,$object, ''); + $this->assertTrue(true); } catch (OssException $e) { var_dump($e); $this->assertFalse(true); @@ -219,6 +222,7 @@ class OssClientTest extends TestOssClientBase $bucket = getenv('OSS_BUCKET'); $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->getBucketCors($bucket); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -233,6 +237,7 @@ class OssClientTest extends TestOssClientBase $bucket = $this->bucket; $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->getBucketCname($bucket); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php index 4a418d53e..91de9bb5d 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Core\OssException; -class OssExceptionTest extends \PHPUnit_Framework_TestCase +class OssExceptionTest extends \PHPUnit\Framework\TestCase { public function testOSS_exception() { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php index ba2f1a006..85ee07b96 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Core\OssUtil; use OSS\OssClient; -class OssUtilTest extends \PHPUnit_Framework_TestCase +class OssUtilTest extends \PHPUnit\Framework\TestCase { public function testIsChinese() { @@ -147,10 +147,10 @@ BBBB; $this->assertNotNull($list); } - public function testIsWin() - { - //$this->assertTrue(OssUtil::isWin()); - } + //public function testIsWin() + //{ + // //$this->assertTrue(OssUtil::isWin()); + //} public function testGetMd5SumForFile() { diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php index b298e4418..202f173f1 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php @@ -6,7 +6,7 @@ use OSS\Core\OssException; use OSS\Http\ResponseCore; use OSS\Result\PutSetDeleteResult; -class ResultTest extends \PHPUnit_Framework_TestCase +class ResultTest extends \PHPUnit\Framework\TestCase { public function testNullResponse() @@ -50,16 +50,16 @@ class ResultTest extends \PHPUnit_Framework_TestCase new PutSetDeleteResult($response); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } - public function setUp() + protected function setUp(): void { } - public function tearDown() + protected function tearDown(): void { } diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php index 8360a242c..5112da891 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php @@ -5,7 +5,7 @@ namespace OSS\Tests; use OSS\Model\RefererConfig; -class RefererConfigTest extends \PHPUnit_Framework_TestCase +class RefererConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php index 4562da7c3..8d2a9dffd 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php @@ -6,7 +6,7 @@ use OSS\Model\StorageCapacityConfig; use OSS\Result\GetStorageCapacityResult; use OSS\Core\OssException; -class StorageCapacityTest extends \PHPUnit_Framework_TestCase +class StorageCapacityTest extends \PHPUnit\Framework\TestCase { private $inValidXml = <<assertTrue(false); - } catch (OssException $e) {} + } catch (OssException $e) { + $this->assertTrue(true); + } } public function testParseEmptyXml() @@ -38,7 +40,9 @@ BBBB; try { new GetStorageCapacityResult($response); $this->assertTrue(false); - } catch (OssException $e) {} + } catch (OssException $e) { + $this->assertTrue(true); + } } public function testParseValidXml() diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php index 233568a39..b20487120 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php @@ -6,7 +6,7 @@ use OSS\OssClient; require_once __DIR__ . DIRECTORY_SEPARATOR . 'Common.php'; -class TestOssClientBase extends \PHPUnit_Framework_TestCase +class TestOssClientBase extends \PHPUnit\Framework\TestCase { /** * @var OssClient @@ -18,7 +18,7 @@ class TestOssClientBase extends \PHPUnit_Framework_TestCase */ protected $bucket; - public function setUp() + protected function setUp(): void { $this->bucket = Common::getBucketName() .'-'. time(); $this->ossClient = Common::getOssClient(); @@ -26,7 +26,7 @@ class TestOssClientBase extends \PHPUnit_Framework_TestCase Common::waitMetaSync(); } - public function tearDown() + protected function tearDown(): void { if (!$this->ossClient->doesBucketExist($this->bucket)) { return; diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php index e4789efe6..df4ad9454 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Result\UploadPartResult; use OSS\Http\ResponseCore; -class UploadPartResultTest extends \PHPUnit_Framework_TestCase +class UploadPartResultTest extends \PHPUnit\Framework\TestCase { private $validHeader = array('etag' => '7265F4D211B56873A381D321F586E4A9'); private $invalidHeader = array(); diff --git a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php index 2ec0fcbb5..d04b42c16 100644 --- a/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php +++ b/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php @@ -5,7 +5,7 @@ namespace OSS\Tests; use OSS\Model\WebsiteConfig; -class WebsiteConfigTest extends \PHPUnit_Framework_TestCase +class WebsiteConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index fce8549f0..6d0c3f2d0 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -37,11 +37,13 @@ namespace Composer\Autoload; * * @author Fabien Potencier * @author Jordi Boggiano - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ */ class ClassLoader { + private $vendorDir; + // PSR-4 private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); @@ -57,10 +59,17 @@ class ClassLoader private $missingClasses = array(); private $apcuPrefix; + private static $registeredLoaders = array(); + + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + } + public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); @@ -300,6 +309,17 @@ class ClassLoader public function register($prepend = false) { spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } } /** @@ -308,13 +328,17 @@ class ClassLoader public function unregister() { spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } } /** * Loads the given class or interface. * * @param string $class The name of the class - * @return bool|null True if loaded, null otherwise + * @return true|null True if loaded, null otherwise */ public function loadClass($class) { @@ -323,6 +347,8 @@ class ClassLoader return true; } + + return null; } /** @@ -367,6 +393,16 @@ class ClassLoader return $file; } + /** + * Returns the currently registered loaders indexed by their corresponding vendor directories. + * + * @return self[] + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + private function findFileWithExtension($class, $ext) { // PSR-4 lookup diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php new file mode 100644 index 000000000..b3a4e1611 --- /dev/null +++ b/vendor/composer/InstalledVersions.php @@ -0,0 +1,337 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer; + +use Composer\Autoload\ClassLoader; +use Composer\Semver\VersionParser; + +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require it's presence, you can require `composer-runtime-api ^2.0` + */ +class InstalledVersions +{ + private static $installed; + private static $canGetVendors; + private static $installedByVendor = array(); + + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + + if (1 === \count($packages)) { + return $packages[0]; + } + + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + + return $packagesByType; + } + + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints($constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + + if (self::$canGetVendors) { + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $installed[count($installed) - 1]; + } + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = require __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + $installed[] = self::$installed; + + return $installed; + } +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 5a681facd..cd314f90e 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -14,6 +14,7 @@ return array( 'AliPay\\Transfer' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Transfer.php', 'AliPay\\Wap' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Wap.php', 'AliPay\\Web' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Web.php', + 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', 'Endroid\\QrCode\\Bundle\\Controller\\QrCodeController' => $vendorDir . '/endroid/qr-code/src/Bundle/Controller/QrCodeController.php', 'Endroid\\QrCode\\Bundle\\DependencyInjection\\Configuration' => $vendorDir . '/endroid/qr-code/src/Bundle/DependencyInjection/Configuration.php', 'Endroid\\QrCode\\Bundle\\DependencyInjection\\EndroidQrCodeExtension' => $vendorDir . '/endroid/qr-code/src/Bundle/DependencyInjection/EndroidQrCodeExtension.php', @@ -211,8 +212,14 @@ return array( 'WeOpen\\Login' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/Login.php', 'WeOpen\\MiniApp' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/MiniApp.php', 'WeOpen\\Service' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/Service.php', + 'WePayV3\\Cert' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Cert.php', + 'WePayV3\\Contracts\\BasicWePay' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Contracts/BasicWePay.php', + 'WePayV3\\Contracts\\DecryptAes' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Contracts/DecryptAes.php', + 'WePayV3\\Order' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Order.php', + 'WePayV3\\Refund' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Refund.php', 'WePay\\Bill' => $vendorDir . '/zoujingli/wechat-developer/WePay/Bill.php', 'WePay\\Coupon' => $vendorDir . '/zoujingli/wechat-developer/WePay/Coupon.php', + 'WePay\\Custom' => $vendorDir . '/zoujingli/wechat-developer/WePay/Custom.php', 'WePay\\Order' => $vendorDir . '/zoujingli/wechat-developer/WePay/Order.php', 'WePay\\Redpack' => $vendorDir . '/zoujingli/wechat-developer/WePay/Redpack.php', 'WePay\\Refund' => $vendorDir . '/zoujingli/wechat-developer/WePay/Refund.php', @@ -265,7 +272,9 @@ return array( 'library\\tools\\JsonRpcServer' => $vendorDir . '/zoujingli/think-library/src/tools/JsonRpcServer.php', 'library\\tools\\Node' => $vendorDir . '/zoujingli/think-library/src/tools/Node.php', 'library\\tools\\Options' => $vendorDir . '/zoujingli/think-library/src/tools/Options.php', + 'think\\composer\\LibraryInstaller' => $vendorDir . '/topthink/think-installer/src/LibraryInstaller.php', 'think\\composer\\Plugin' => $vendorDir . '/topthink/think-installer/src/Plugin.php', + 'think\\composer\\Promise' => $vendorDir . '/topthink/think-installer/src/Promise.php', 'think\\composer\\ThinkExtend' => $vendorDir . '/topthink/think-installer/src/ThinkExtend.php', 'think\\composer\\ThinkFramework' => $vendorDir . '/topthink/think-installer/src/ThinkFramework.php', 'think\\composer\\ThinkTesting' => $vendorDir . '/topthink/think-installer/src/ThinkTesting.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 98b81e657..7a493ab11 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -9,6 +9,7 @@ return array( 'think\\composer\\' => array($vendorDir . '/topthink/think-installer/src'), 'library\\' => array($vendorDir . '/zoujingli/think-library/src'), 'WePay\\' => array($vendorDir . '/zoujingli/wechat-developer/WePay'), + 'WePayV3\\' => array($vendorDir . '/zoujingli/wechat-developer/WePayV3'), 'WeOpen\\' => array($vendorDir . '/zoujingli/weopen-developer/WeOpen'), 'WeMini\\' => array($vendorDir . '/zoujingli/wechat-developer/WeMini', $vendorDir . '/zoujingli/weopen-developer/WeMini'), 'WeChat\\' => array($vendorDir . '/zoujingli/wechat-developer/WeChat', $vendorDir . '/zoujingli/weopen-developer/WeChat'), diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 8c30f7ea6..c5d5c681f 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -22,13 +22,15 @@ class ComposerAutoloaderInit4d241e9f8bb10d006cd7432f945fdb5b return self::$loader; } + require __DIR__ . '/platform_check.php'; + spl_autoload_register(array('ComposerAutoloaderInit4d241e9f8bb10d006cd7432f945fdb5b', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); spl_autoload_unregister(array('ComposerAutoloaderInit4d241e9f8bb10d006cd7432f945fdb5b', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { - require_once __DIR__ . '/autoload_static.php'; + require __DIR__ . '/autoload_static.php'; call_user_func(\Composer\Autoload\ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b::getInitializer($loader)); } else { diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b92a35ef8..1b488bbf0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -23,6 +23,7 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b 'W' => array ( 'WePay\\' => 6, + 'WePayV3\\' => 8, 'WeOpen\\' => 7, 'WeMini\\' => 7, 'WeChat\\' => 7, @@ -62,6 +63,10 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b array ( 0 => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay', ), + 'WePayV3\\' => + array ( + 0 => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3', + ), 'WeOpen\\' => array ( 0 => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen', @@ -107,6 +112,7 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b 'AliPay\\Transfer' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Transfer.php', 'AliPay\\Wap' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Wap.php', 'AliPay\\Web' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Web.php', + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', 'Endroid\\QrCode\\Bundle\\Controller\\QrCodeController' => __DIR__ . '/..' . '/endroid/qr-code/src/Bundle/Controller/QrCodeController.php', 'Endroid\\QrCode\\Bundle\\DependencyInjection\\Configuration' => __DIR__ . '/..' . '/endroid/qr-code/src/Bundle/DependencyInjection/Configuration.php', 'Endroid\\QrCode\\Bundle\\DependencyInjection\\EndroidQrCodeExtension' => __DIR__ . '/..' . '/endroid/qr-code/src/Bundle/DependencyInjection/EndroidQrCodeExtension.php', @@ -304,8 +310,14 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b 'WeOpen\\Login' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/Login.php', 'WeOpen\\MiniApp' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/MiniApp.php', 'WeOpen\\Service' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/Service.php', + 'WePayV3\\Cert' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Cert.php', + 'WePayV3\\Contracts\\BasicWePay' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Contracts/BasicWePay.php', + 'WePayV3\\Contracts\\DecryptAes' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Contracts/DecryptAes.php', + 'WePayV3\\Order' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Order.php', + 'WePayV3\\Refund' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Refund.php', 'WePay\\Bill' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Bill.php', 'WePay\\Coupon' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Coupon.php', + 'WePay\\Custom' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Custom.php', 'WePay\\Order' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Order.php', 'WePay\\Redpack' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Redpack.php', 'WePay\\Refund' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Refund.php', @@ -358,7 +370,9 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b 'library\\tools\\JsonRpcServer' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/JsonRpcServer.php', 'library\\tools\\Node' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Node.php', 'library\\tools\\Options' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Options.php', + 'think\\composer\\LibraryInstaller' => __DIR__ . '/..' . '/topthink/think-installer/src/LibraryInstaller.php', 'think\\composer\\Plugin' => __DIR__ . '/..' . '/topthink/think-installer/src/Plugin.php', + 'think\\composer\\Promise' => __DIR__ . '/..' . '/topthink/think-installer/src/Promise.php', 'think\\composer\\ThinkExtend' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkExtend.php', 'think\\composer\\ThinkFramework' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkFramework.php', 'think\\composer\\ThinkTesting' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkTesting.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ae986aeb7..1dea0872c 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,586 +1,627 @@ -[ - { - "name": "aliyuncs/oss-sdk-php", - "version": "v2.4.0", - "version_normalized": "2.4.0.0", - "source": { - "type": "git", - "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "bd9c2bba3d167de821cbb33b5c03fe6e41e8e363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/bd9c2bba3d167de821cbb33b5c03fe6e41e8e363", - "reference": "bd9c2bba3d167de821cbb33b5c03fe6e41e8e363", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~1.0" - }, - "time": "2020-08-31T08:39:59+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "OSS\\": "src/OSS" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Aliyuncs", - "homepage": "http://www.aliyun.com" - } - ], - "description": "Aliyun OSS SDK for PHP", - "homepage": "http://www.aliyun.com/product/oss/" - }, - { - "name": "endroid/qr-code", - "version": "1.9.3", - "version_normalized": "1.9.3.0", - "source": { - "type": "git", - "url": "https://github.com/endroid/qr-code.git", - "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/endroid/qr-code/zipball/c9644bec2a9cc9318e98d1437de3c628dcd1ef93", - "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "ext-gd": "*", - "php": ">=5.4", - "symfony/options-resolver": "^2.3|^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0", - "sensio/framework-extra-bundle": "^3.0", - "symfony/browser-kit": "^2.3|^3.0", - "symfony/framework-bundle": "^2.3|^3.0", - "symfony/http-kernel": "^2.3|^3.0" - }, - "time": "2017-04-08T09:13:59+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Endroid\\QrCode\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeroen van den Enden", - "email": "info@endroid.nl", - "homepage": "http://endroid.nl/" - } - ], - "description": "Endroid QR Code", - "homepage": "https://github.com/endroid/QrCode", - "keywords": [ - "bundle", - "code", - "endroid", - "qr", - "qrcode", - "symfony" - ] - }, - { - "name": "qiniu/php-sdk", - "version": "v7.2.10", - "version_normalized": "7.2.10.0", - "source": { - "type": "git", - "url": "https://github.com/qiniu/php-sdk.git", - "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8", - "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.3" - }, - "time": "2019-10-28T10:23:23+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Qiniu\\": "src/Qiniu" +{ + "packages": [ + { + "name": "aliyuncs/oss-sdk-php", + "version": "v2.4.2", + "version_normalized": "2.4.2.0", + "source": { + "type": "git", + "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6" }, - "files": [ - "src/Qiniu/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Qiniu", - "email": "sdk@qiniu.com", - "homepage": "http://www.qiniu.com" - } - ], - "description": "Qiniu Resource (Cloud) Storage SDK for PHP", - "homepage": "http://developer.qiniu.com/", - "keywords": [ - "cloud", - "qiniu", - "sdk", - "storage" - ] - }, - { - "name": "symfony/options-resolver", - "version": "v3.4.44", - "version_normalized": "3.4.44.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", - "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "time": "2020-07-08T17:07:26+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/0c9d902c33847c07efc66c4cdf823deaea8fc2b6", + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "require": { + "php": ">=5.3" }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony OptionsResolver Component", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" + "require-dev": { + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "*" }, - { - "url": "https://github.com/fabpot", - "type": "github" + "time": "2021-06-04T06:55:06+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "OSS\\": "src/OSS" + } }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ] - }, - { - "name": "topthink/framework", - "version": "v5.1.39", - "version_normalized": "5.1.39.0", - "source": { - "type": "git", - "url": "https://github.com/top-think/framework.git", - "reference": "5762858f3d58faafb3a39427f8788884b2927007" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/5762858f3d58faafb3a39427f8788884b2927007", - "reference": "5762858f3d58faafb3a39427f8788884b2927007", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.6.0", - "topthink/think-installer": "2.*" - }, - "require-dev": { - "johnkary/phpunit-speedtrap": "^1.0", - "mikey179/vfsstream": "~1.6", - "phpdocumentor/reflection-docblock": "^2.0", - "phploc/phploc": "2.*", - "phpunit/phpunit": "^5.0|^6.0", - "sebastian/phpcpd": "2.*", - "squizlabs/php_codesniffer": "2.*" - }, - "time": "2019-11-17T23:22:02+00:00", - "type": "think-framework", - "installation-source": "dist", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - }, - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "description": "the new thinkphp framework", - "homepage": "http://thinkphp.cn/", - "keywords": [ - "framework", - "orm", - "thinkphp" - ] - }, - { - "name": "topthink/think-installer", - "version": "v2.0.0", - "version_normalized": "2.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-installer.git", - "reference": "f5400a12c60e513911aef41fe443fa6920952675" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/top-think/think-installer/zipball/f5400a12c60e513911aef41fe443fa6920952675", - "reference": "f5400a12c60e513911aef41fe443fa6920952675", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "composer-plugin-api": "^1.0" - }, - "require-dev": { - "composer/composer": "1.0.*@dev" - }, - "time": "2018-05-11T06:45:42+00:00", - "type": "composer-plugin", - "extra": { - "class": "think\\composer\\Plugin" - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "think\\composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ] - }, - { - "name": "zoujingli/ip2region", - "version": "v1.0.8", - "version_normalized": "1.0.8.0", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/ip2region.git", - "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6", - "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3" - }, - "time": "2020-07-06T05:33:26+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "Ip2Region.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "http://ctolog.com" - } - ], - "description": "Ip2Region for PHP", - "homepage": "https://github.com/zoujingli/Ip2Region", - "keywords": [ - "Ip2Region" - ] - }, - { - "name": "zoujingli/think-library", - "version": "v5.1.x-dev", - "version_normalized": "5.1.9999999.9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "5e91c776c2111fa0cc7635a6f018ba0e553e3f49" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5e91c776c2111fa0cc7635a6f018ba0e553e3f49", - "reference": "5e91c776c2111fa0cc7635a6f018ba0e553e3f49", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "aliyuncs/oss-sdk-php": "^2.3", - "ext-curl": "*", - "ext-gd": "*", - "ext-iconv": "*", - "ext-json": "*", - "ext-openssl": "*", - "php": ">=5.5", - "qiniu/php-sdk": "^7.2", - "topthink/framework": "5.1.*" - }, - "time": "2020-09-04T04:16:04+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "src/common.php" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "psr-4": { - "library\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "ThinkPHP Basic Development Library", - "homepage": "http://framework.thinkadmin.top" - }, - { - "name": "zoujingli/wechat-developer", - "version": "v1.2.25", - "version_normalized": "1.2.25.0", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "6fcb6504904ee4276b358b3f9b80ffc992eb385c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/6fcb6504904ee4276b358b3f9b80ffc992eb385c", - "reference": "6fcb6504904ee4276b358b3f9b80ffc992eb385c", - "shasum": "", - "mirrors": [ + "authors": [ { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true + "name": "Aliyuncs", + "homepage": "http://www.aliyun.com" } - ] - }, - "require": { - "ext-bcmath": "*", - "ext-curl": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-simplexml": "*", - "ext-xml": "*", - "php": ">=5.4" - }, - "time": "2020-08-19T08:52:11+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "We.php" ], - "psr-4": { - "WePay\\": "WePay", - "WeChat\\": "WeChat", - "WeMini\\": "WeMini", - "AliPay\\": "AliPay" - } + "description": "Aliyun OSS SDK for PHP", + "homepage": "http://www.aliyun.com/product/oss/", + "support": { + "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", + "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.4.2" + }, + "install-path": "../aliyuncs/oss-sdk-php" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "https://thinkadmin.top" - } - ], - "description": "WeChat platform and WeChat payment development tools", - "homepage": "https://github.com/zoujingli/WeChatDeveloper", - "keywords": [ - "WeChatDeveloper", - "WeMini", - "alipay", - "wechat", - "wechatpay", - "wepay" - ] - }, - { - "name": "zoujingli/weopen-developer", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/WeOpenDeveloper.git", - "reference": "4d0d3c064e54556621453845fc65ba52de58a880" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/4d0d3c064e54556621453845fc65ba52de58a880", - "reference": "4d0d3c064e54556621453845fc65ba52de58a880", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true + { + "name": "endroid/qr-code", + "version": "1.9.3", + "version_normalized": "1.9.3.0", + "source": { + "type": "git", + "url": "https://github.com/endroid/qr-code.git", + "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/endroid/qr-code/zipball/c9644bec2a9cc9318e98d1437de3c628dcd1ef93", + "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-gd": "*", + "php": ">=5.4", + "symfony/options-resolver": "^2.3|^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0", + "sensio/framework-extra-bundle": "^3.0", + "symfony/browser-kit": "^2.3|^3.0", + "symfony/framework-bundle": "^2.3|^3.0", + "symfony/http-kernel": "^2.3|^3.0" + }, + "time": "2017-04-08T09:13:59+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" } - ] + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Endroid\\QrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen van den Enden", + "email": "info@endroid.nl", + "homepage": "http://endroid.nl/" + } + ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/QrCode", + "keywords": [ + "bundle", + "code", + "endroid", + "qr", + "qrcode", + "symfony" + ], + "install-path": "../endroid/qr-code" }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-openssl": "*", - "php": ">=5.4", - "zoujingli/wechat-developer": "^1.0" + { + "name": "qiniu/php-sdk", + "version": "v7.3.0", + "version_normalized": "7.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/qiniu/php-sdk.git", + "reference": "0a461e13b09545b23df361843c6a65fdd3a26426" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/0a461e13b09545b23df361843c6a65fdd3a26426", + "reference": "0a461e13b09545b23df361843c6a65fdd3a26426", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.3" + }, + "time": "2020-09-24T07:31:29+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Qiniu\\": "src/Qiniu" + }, + "files": [ + "src/Qiniu/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Qiniu", + "email": "sdk@qiniu.com", + "homepage": "http://www.qiniu.com" + } + ], + "description": "Qiniu Resource (Cloud) Storage SDK for PHP", + "homepage": "http://developer.qiniu.com/", + "keywords": [ + "cloud", + "qiniu", + "sdk", + "storage" + ], + "support": { + "issues": "https://github.com/qiniu/php-sdk/issues", + "source": "https://github.com/qiniu/php-sdk/tree/v7.3.0" + }, + "install-path": "../qiniu/php-sdk" }, - "time": "2019-10-10T10:18:05+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "WeOpen\\": "WeOpen", - "WeChat\\": "WeChat", - "WeMini\\": "WeMini" - } + { + "name": "symfony/options-resolver", + "version": "v3.4.47", + "version_normalized": "3.4.47.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744", + "reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "time": "2020-10-24T10:57:07+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v3.4.47" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "install-path": "../symfony/options-resolver" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "http://ctolog.com" - } - ], - "description": "WeChat Open development of SDK", - "homepage": "https://github.com/zoujingli/WeOpenDeveloper", - "keywords": [ - "WeChatOpen", - "WeChatOpenDeveloper", - "wechat" - ] - } -] + { + "name": "topthink/framework", + "version": "v5.1.41", + "version_normalized": "5.1.41.0", + "source": { + "type": "git", + "url": "https://github.com/top-think/framework.git", + "reference": "7137741a323a4a60cfca334507cd1812fac91bb2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/framework/zipball/7137741a323a4a60cfca334507cd1812fac91bb2", + "reference": "7137741a323a4a60cfca334507cd1812fac91bb2", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=5.6.0", + "topthink/think-installer": "2.*" + }, + "require-dev": { + "johnkary/phpunit-speedtrap": "^1.0", + "mikey179/vfsstream": "~1.6", + "phpdocumentor/reflection-docblock": "^2.0", + "phploc/phploc": "2.*", + "phpunit/phpunit": "^5.0|^6.0", + "sebastian/phpcpd": "2.*", + "squizlabs/php_codesniffer": "2.*" + }, + "time": "2021-01-11T02:51:29+00:00", + "type": "think-framework", + "installation-source": "dist", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "email": "liu21st@gmail.com" + }, + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "description": "the new thinkphp framework", + "homepage": "http://thinkphp.cn/", + "keywords": [ + "framework", + "orm", + "thinkphp" + ], + "support": { + "issues": "https://github.com/top-think/framework/issues", + "source": "https://github.com/top-think/framework/tree/v5.1.41" + }, + "install-path": "../../thinkphp" + }, + { + "name": "topthink/think-installer", + "version": "v2.0.5", + "version_normalized": "2.0.5.0", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-installer.git", + "reference": "38ba647706e35d6704b5d370c06f8a160b635f88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-installer/zipball/38ba647706e35d6704b5d370c06f8a160b635f88", + "reference": "38ba647706e35d6704b5d370c06f8a160b635f88", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "composer-plugin-api": "^1.0||^2.0" + }, + "require-dev": { + "composer/composer": "^1.0||^2.0" + }, + "time": "2021-01-14T12:12:14+00:00", + "type": "composer-plugin", + "extra": { + "class": "think\\composer\\Plugin" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "think\\composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "support": { + "issues": "https://github.com/top-think/think-installer/issues", + "source": "https://github.com/top-think/think-installer/tree/v2.0.5" + }, + "install-path": "../topthink/think-installer" + }, + { + "name": "zoujingli/ip2region", + "version": "v1.0.10", + "version_normalized": "1.0.10.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/ip2region.git", + "reference": "453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0", + "reference": "453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=5.3" + }, + "time": "2021-03-23T10:29:05+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "Ip2Region.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "http://ctolog.com" + } + ], + "description": "Ip2Region for PHP", + "homepage": "https://github.com/zoujingli/Ip2Region", + "keywords": [ + "Ip2Region" + ], + "support": { + "issues": "https://github.com/zoujingli/ip2region/issues", + "source": "https://github.com/zoujingli/ip2region/tree/v1.0.10" + }, + "install-path": "../zoujingli/ip2region" + }, + { + "name": "zoujingli/think-library", + "version": "v5.1.x-dev", + "version_normalized": "5.1.9999999.9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/ThinkLibrary.git", + "reference": "38c150e2a61280f1f16d16a08aeabdc18b551151" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/38c150e2a61280f1f16d16a08aeabdc18b551151", + "reference": "38c150e2a61280f1f16d16a08aeabdc18b551151", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "aliyuncs/oss-sdk-php": "^2.3", + "ext-curl": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-json": "*", + "ext-openssl": "*", + "php": ">=5.5", + "qiniu/php-sdk": "^7.2", + "topthink/framework": "5.1.*" + }, + "time": "2020-09-08T01:49:52+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "files": [ + "src/common.php" + ], + "psr-4": { + "library\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "ThinkPHP Basic Development Library", + "homepage": "http://framework.thinkadmin.top", + "support": { + "issues": "https://github.com/zoujingli/ThinkLibrary/issues", + "source": "https://github.com/zoujingli/ThinkLibrary/tree/v5.1" + }, + "install-path": "../zoujingli/think-library" + }, + { + "name": "zoujingli/wechat-developer", + "version": "v1.2.31", + "version_normalized": "1.2.31.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/WeChatDeveloper.git", + "reference": "0cf699c725f69d66657a50e60d22f71c9e5a5e16" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/0cf699c725f69d66657a50e60d22f71c9e5a5e16", + "reference": "0cf699c725f69d66657a50e60d22f71c9e5a5e16", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-bcmath": "*", + "ext-curl": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-openssl": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "php": ">=5.4" + }, + "time": "2021-05-19T06:25:20+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "We.php" + ], + "psr-4": { + "WePay\\": "WePay", + "WeChat\\": "WeChat", + "WeMini\\": "WeMini", + "AliPay\\": "AliPay", + "WePayV3\\": "WePayV3" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "https://thinkadmin.top" + } + ], + "description": "WeChat platform and WeChat payment development tools", + "homepage": "https://github.com/kentwangit/WeChatDeveloper", + "keywords": [ + "WeChatDeveloper", + "WeMini", + "alipay", + "wechat", + "wechatpay", + "wepay" + ], + "support": { + "issues": "https://github.com/zoujingli/WeChatDeveloper/issues", + "source": "https://github.com/zoujingli/WeChatDeveloper/tree/v1.2.31" + }, + "install-path": "../zoujingli/wechat-developer" + }, + { + "name": "zoujingli/weopen-developer", + "version": "dev-master", + "version_normalized": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/WeOpenDeveloper.git", + "reference": "4d0d3c064e54556621453845fc65ba52de58a880" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/4d0d3c064e54556621453845fc65ba52de58a880", + "reference": "4d0d3c064e54556621453845fc65ba52de58a880", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-openssl": "*", + "php": ">=5.4", + "zoujingli/wechat-developer": "^1.0" + }, + "time": "2019-10-10T10:18:05+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "WeOpen\\": "WeOpen", + "WeChat\\": "WeChat", + "WeMini\\": "WeMini" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "http://ctolog.com" + } + ], + "description": "WeChat Open development of SDK", + "homepage": "https://github.com/zoujingli/WeOpenDeveloper", + "keywords": [ + "WeChatOpen", + "WeChatOpenDeveloper", + "wechat" + ], + "install-path": "../zoujingli/weopen-developer" + } + ], + "dev": false, + "dev-package-names": [] +} diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php new file mode 100644 index 000000000..63b6f9322 --- /dev/null +++ b/vendor/composer/installed.php @@ -0,0 +1,115 @@ + array( + 'pretty_version' => '5.x-dev', + 'version' => '5.9999999.9999999.9999999-dev', + 'type' => 'project', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'reference' => '6e2a989be5a020078f58c5f6fa4db0c577ffbb8f', + 'name' => 'zoujingli/thinkadmin', + 'dev' => false, + ), + 'versions' => array( + 'aliyuncs/oss-sdk-php' => array( + 'pretty_version' => 'v2.4.2', + 'version' => '2.4.2.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../aliyuncs/oss-sdk-php', + 'aliases' => array(), + 'reference' => '0c9d902c33847c07efc66c4cdf823deaea8fc2b6', + 'dev_requirement' => false, + ), + 'endroid/qr-code' => array( + 'pretty_version' => '1.9.3', + 'version' => '1.9.3.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../endroid/qr-code', + 'aliases' => array(), + 'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93', + 'dev_requirement' => false, + ), + 'qiniu/php-sdk' => array( + 'pretty_version' => 'v7.3.0', + 'version' => '7.3.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../qiniu/php-sdk', + 'aliases' => array(), + 'reference' => '0a461e13b09545b23df361843c6a65fdd3a26426', + 'dev_requirement' => false, + ), + 'symfony/options-resolver' => array( + 'pretty_version' => 'v3.4.47', + 'version' => '3.4.47.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/options-resolver', + 'aliases' => array(), + 'reference' => 'c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744', + 'dev_requirement' => false, + ), + 'topthink/framework' => array( + 'pretty_version' => 'v5.1.41', + 'version' => '5.1.41.0', + 'type' => 'think-framework', + 'install_path' => __DIR__ . '/../../thinkphp', + 'aliases' => array(), + 'reference' => '7137741a323a4a60cfca334507cd1812fac91bb2', + 'dev_requirement' => false, + ), + 'topthink/think-installer' => array( + 'pretty_version' => 'v2.0.5', + 'version' => '2.0.5.0', + 'type' => 'composer-plugin', + 'install_path' => __DIR__ . '/../topthink/think-installer', + 'aliases' => array(), + 'reference' => '38ba647706e35d6704b5d370c06f8a160b635f88', + 'dev_requirement' => false, + ), + 'zoujingli/ip2region' => array( + 'pretty_version' => 'v1.0.10', + 'version' => '1.0.10.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../zoujingli/ip2region', + 'aliases' => array(), + 'reference' => '453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0', + 'dev_requirement' => false, + ), + 'zoujingli/think-library' => array( + 'pretty_version' => 'v5.1.x-dev', + 'version' => '5.1.9999999.9999999-dev', + 'type' => 'library', + 'install_path' => __DIR__ . '/../zoujingli/think-library', + 'aliases' => array(), + 'reference' => '38c150e2a61280f1f16d16a08aeabdc18b551151', + 'dev_requirement' => false, + ), + 'zoujingli/thinkadmin' => array( + 'pretty_version' => '5.x-dev', + 'version' => '5.9999999.9999999.9999999-dev', + 'type' => 'project', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'reference' => '6e2a989be5a020078f58c5f6fa4db0c577ffbb8f', + 'dev_requirement' => false, + ), + 'zoujingli/wechat-developer' => array( + 'pretty_version' => 'v1.2.31', + 'version' => '1.2.31.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../zoujingli/wechat-developer', + 'aliases' => array(), + 'reference' => '0cf699c725f69d66657a50e60d22f71c9e5a5e16', + 'dev_requirement' => false, + ), + 'zoujingli/weopen-developer' => array( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'type' => 'library', + 'install_path' => __DIR__ . '/../zoujingli/weopen-developer', + 'aliases' => array( + 0 => '9999999-dev', + ), + 'reference' => '4d0d3c064e54556621453845fc65ba52de58a880', + 'dev_requirement' => false, + ), + ), +); diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php new file mode 100644 index 000000000..8b379f446 --- /dev/null +++ b/vendor/composer/platform_check.php @@ -0,0 +1,26 @@ += 50600)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 5.6.0". You are running ' . PHP_VERSION . '.'; +} + +if ($issues) { + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); + } elseif (!headers_sent()) { + echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; + } + } + trigger_error( + 'Composer detected issues in your platform: ' . implode(' ', $issues), + E_USER_ERROR + ); +} diff --git a/vendor/qiniu/php-sdk/.scrutinizer.yml b/vendor/qiniu/php-sdk/.scrutinizer.yml index 8d9304c52..6a2d0d80c 100644 --- a/vendor/qiniu/php-sdk/.scrutinizer.yml +++ b/vendor/qiniu/php-sdk/.scrutinizer.yml @@ -33,3 +33,10 @@ tools: php_cpd: enabled: true excluded_dirs: [vendor, tests] +build: + nodes: + analysis: + tests: + override: + - php-scrutinizer-run + diff --git a/vendor/qiniu/php-sdk/.travis.yml b/vendor/qiniu/php-sdk/.travis.yml index e4eee7bea..1f0ba2738 100644 --- a/vendor/qiniu/php-sdk/.travis.yml +++ b/vendor/qiniu/php-sdk/.travis.yml @@ -1,4 +1,3 @@ -sudo: false language: php php: @@ -8,6 +7,7 @@ php: - 7.0 dist: trusty +os: linux before_script: - export QINIU_TEST_ENV="travis" @@ -18,13 +18,12 @@ script: - ./vendor/bin/phpcs --standard=PSR2 src - ./vendor/bin/phpcs --standard=PSR2 examples - ./vendor/bin/phpcs --standard=PSR2 tests - - ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover tests/Qiniu/Tests/ - -after_script: - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + - ./vendor/bin/phpunit --coverage-clover=coverage.xml env: global: + - QINIU_ACCESS_KEY=vHg2e7nOh7Jsucv2Azr5FH6omPgX22zoJRWa0FN5 - secure: "V9BsntXQZwvO9EOD6itzaae2uq+GemzyTUTxMTJx1/jFoUNpCU2O2UAgjA2XSEr5sgci0KWDV4Krbzv3EBB4uplOFLMI3w32256UHbT9E0x3YjhfPJZk68MH1iS1be7X81LDHON7yveavK8987s3qzjeUcbfLSPgccT+cvf7+dc=" - - QINIU_ACCESS_KEY=vHg2e7nOh7Jsucv2Azr5FH6omPgX22zoJRWa0FN5 \ No newline at end of file + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/qiniu/php-sdk/CHANGELOG.md b/vendor/qiniu/php-sdk/CHANGELOG.md index 8a284bdf6..469ae4b9c 100644 --- a/vendor/qiniu/php-sdk/CHANGELOG.md +++ b/vendor/qiniu/php-sdk/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## 7.3.0 (2020-09-24) +### 新增 +* 【对象存储】增加异步抓取方法与demo +* 【融合cdn】增加查询CDN刷新记录、查询CDN预取记录方法与demo +* 【云短信】增加查询短信发送记录的方法 +* 【实时音视频】增加rtc停止房间的合流转推方法 +* 【内容审核】增加图片审核、视频审核方法与demo + +### 修复 +* 【对象存储】修复签算 token 时上传策略中的 forceSaveKey 字段不生效的问题 +* 【对象存储】修复更新空间事件通知规则方法 + +### 优化 +* 【对象存储】创建空间迁移到mkbucketv3 api +* 优化对 http2 返回头的判断 +* 优化 demo 中的文档注释说明 +* docs 目录下的 rtc demo 移动至 examples/rtc 目录下 +* docs 目录下的 sms demo 移动至 examples/sms 目录下 + +## 7.2.10 (2019-10-28) +* 去除云短信类类型指定 +* 修改不传文件名时存在表单上传错误的情况 + +## 7.2.9 (2019-07-09) +* 添加空间管理、云短信接口 +* 去除无效参数 + ## 7.2.7 (2018-11-06) * 添加 QVM 内网上传到 KODO 的 zone 设置 diff --git a/vendor/qiniu/php-sdk/README.md b/vendor/qiniu/php-sdk/README.md index 16c8b49f5..447a07d9f 100644 --- a/vendor/qiniu/php-sdk/README.md +++ b/vendor/qiniu/php-sdk/README.md @@ -1,21 +1,22 @@ # Qiniu Cloud SDK for PHP -[![doxygen.io](http://doxygen.io/github.com/qiniu/php-sdk/?status.svg)](http://doxygen.io/github.com/qiniu/php-sdk/) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE) [![Build Status](https://travis-ci.org/qiniu/php-sdk.svg)](https://travis-ci.org/qiniu/php-sdk) +[![GitHub release](https://img.shields.io/github/v/tag/qiniu/php-sdk.svg?label=release)](https://github.com/qiniu/php-sdk/releases) [![Latest Stable Version](https://img.shields.io/packagist/v/qiniu/php-sdk.svg)](https://packagist.org/packages/qiniu/php-sdk) [![Total Downloads](https://img.shields.io/packagist/dt/qiniu/php-sdk.svg)](https://packagist.org/packages/qiniu/php-sdk) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/qiniu/php-sdk/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/qiniu/php-sdk/?branch=master) -[![Code Coverage](https://scrutinizer-ci.com/g/qiniu/php-sdk/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/qiniu/php-sdk/?branch=master) +[![Coverage Status](https://codecov.io/gh/qiniu/php-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/php-sdk) [![Join Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/qiniu/php-sdk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![@qiniu on weibo](http://img.shields.io/badge/weibo-%40qiniutek-blue.svg)](http://weibo.com/qiniutek) + ## 安装 -* 通过composer，这是推荐的方式，可以使用composer.json 声明依赖，或者运行下面的命令。SDK 包已经放到这里 [`qiniu/php-sdk`][install-packagist] 。 +* 推荐使用 `composer` 进行安装。可以使用 composer.json 声明依赖，或者运行下面的命令。SDK 包已经放到这里 [`qiniu/php-sdk`][install-packagist] 。 ```bash $ composer require qiniu/php-sdk ``` -* 直接下载安装，SDK 没有依赖其他第三方库，但需要参照 composer的autoloader，增加一个自己的autoloader程序。 +* 直接下载安装，SDK 没有依赖其他第三方库，但需要参照 composer 的 autoloader，增加一个自己的 autoloader 程序。 ## 运行环境 @@ -31,10 +32,10 @@ $ composer require qiniu/php-sdk use Qiniu\Storage\UploadManager; use Qiniu\Auth; ... - $upManager = new UploadManager(); + $uploadMgr = new UploadManager(); $auth = new Auth($accessKey, $secretKey); - $token = $auth->uploadToken($bucketName); - list($ret, $error) = $upManager->put($token, 'formput', 'hello world'); + $token = $auth->uploadToken($bucket); + list($ret, $error) = $uploadMgr->putFile($token, 'key', 'filePath'); ... ``` @@ -46,8 +47,8 @@ $ ./vendor/bin/phpunit tests/Qiniu/Tests/ ## 常见问题 -- $error保留了请求响应的信息，失败情况下ret 为none, 将$error可以打印出来，提交给我们。 -- API 的使用 demo 可以参考 [单元测试](https://github.com/qiniu/php-sdk/blob/master/tests)。 +- `$error` 保留了请求响应的信息，失败情况下 `ret` 为 `none`, 将 `$error` 可以打印出来，提交给我们。 +- API 的使用 demo 可以参考 [examples](https://github.com/qiniu/php-sdk/tree/master/examples)。 ## 代码贡献 @@ -60,12 +61,12 @@ $ ./vendor/bin/phpunit tests/Qiniu/Tests/ ## 联系我们 - 如果需要帮助，请提交工单（在portal右侧点击咨询和建议提交工单，或者直接向 support@qiniu.com 发送邮件） -- 如果有什么问题，可以到问答社区提问，[问答社区](http://qiniu.segmentfault.com/) -- 更详细的文档，见[官方文档站](http://developer.qiniu.com/) -- 如果发现了bug， 欢迎提交 [issue](https://github.com/qiniu/php-sdk/issues) +- 如果有什么问题，可以到问答社区提问，[问答社区](https://qiniu.segmentfault.com/) +- 更详细的文档，见[官方文档站](https://developer.qiniu.com/) +- 如果发现了 bug， 欢迎提交 [issue](https://github.com/qiniu/php-sdk/issues) - 如果有功能需求，欢迎提交 [issue](https://github.com/qiniu/php-sdk/issues) - 如果要提交代码，欢迎提交 pull request -- 欢迎关注我们的[微信](http://www.qiniu.com/#weixin) [微博](http://weibo.com/qiniutek)，及时获取动态信息。 +- 欢迎关注我们的[微信](https://www.qiniu.com/#weixin) [微博](https://weibo.com/qiniutek)，及时获取动态信息。 ## 代码许可 diff --git a/vendor/qiniu/php-sdk/docs/rtc/README.md b/vendor/qiniu/php-sdk/docs/rtc/README.md deleted file mode 100644 index 7b98ca0f9..000000000 --- a/vendor/qiniu/php-sdk/docs/rtc/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# Rtc Streaming Cloud Server-Side Library For PHP - -## Features - -- Appclient - - [x] 创建房间: client->createApp() - - [x] 查看房间: client->getApp() - - [x] 删除房间: client->deleteApp() - - [x] 生成房间token: client->appToken() - - - -## Contents - -- [Installation](#installation) -- [Usage](#usage) - - [Configuration](#configuration) - - [App](#app) - - [Create a app](#create-a-app) - - [Get a app](#get-a-app) - - [Delete a app](#delete-a-app) - - [Generate a app token](#generate-a-app-token) - - -## Usage - -### App - -#### Create a app - -```php -$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5"; -$sk = "xxxx"; -$auth = new Auth($ak, $sk); -$client = new Qiniu\Rtc\AppClient($auth); -$resp=$client->createApp("901","testApp"); -print_r($resp); -``` - -#### Get an app - -```php -$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5"; -$sk = "xxxx"; -$auth = new Auth($ak, $sk); -$client = new Qiniu\Rtc\AppClient($auth); -$resp=$client->getApp("deq02uhb6"); -print_r($resp); -``` - -#### Delete an app - -```php -$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5"; -$sk = "xxxx"; -$auth = new Auth($ak, $sk); -$client = new Qiniu\Rtc\AppClient($auth); -$resp=$client->deleteApp("deq02uhb6"); -print_r($resp); -``` - -#### Generate an app token - -```php -$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5"; -$sk = "xxxx"; -$auth = new Auth($ak, $sk); -$client = new Qiniu\Rtc\AppClient($auth); -$resp=$client->appToken("deq02uhb6", "lfx", '1111', (time()+3600), 'user'); -print_r($resp); -``` \ No newline at end of file diff --git a/vendor/qiniu/php-sdk/docs/rtc/example.php b/vendor/qiniu/php-sdk/docs/rtc/example.php deleted file mode 100644 index f30b9b415..000000000 --- a/vendor/qiniu/php-sdk/docs/rtc/example.php +++ /dev/null @@ -1,42 +0,0 @@ -createApp($hub, $title, $maxUsers); - print_r($resp); - // 获取app状态 - $resp = $client->getApp('dgdl5ge8y'); - print_r($resp); - //修改app状态 - $mergePublishRtmp = null; - $mergePublishRtmp['enable'] = true; - $resp = $client->updateApp('dgdl5ge8y', $hub, $title, $maxUsers, $mergePublishRtmp); - print_r($resp); - //删除app - $resp = $client->deleteApp('dgdl5ge8y'); - print_r($resp); - //获取房间连麦的成员 - $resp=$client->listUser("dgbfvvzid", 'lfxl'); - print_r($resp); - //剔除房间的连麦成员 - $resp=$client->kickUser("dgbfvvzid", 'lfx', "qiniu-f6e07b78-4dc8-45fb-a701-a9e158abb8e6"); - print_r($resp); - // 列举房间 - $resp=$client->listActiveRooms("dgbfvvzid", 'lfx', null, null); - print_r($resp); - //鉴权的有效时间: 1个小时. - $resp = $client->appToken("dgd4vecde", "lfxl", '1111', (time()+3600), 'user'); - print_r($resp); -} catch (\Exception $e) { - echo "Error:", $e, "\n"; -} diff --git a/vendor/qiniu/php-sdk/docs/sms/example.php b/vendor/qiniu/php-sdk/docs/sms/example.php deleted file mode 100644 index 541c0d6c2..000000000 --- a/vendor/qiniu/php-sdk/docs/sms/example.php +++ /dev/null @@ -1,70 +0,0 @@ - 'code' ); -try { - //发送短信 - $resp = $client->sendMessage($template_id, $mobiles, $code); - print_r($resp); -} catch (\Exception $e) { - echo "Error:", $e, "\n"; -}exit; -//模板模块 -$name="tstest001"; -$template="tesy001 ${code}"; -$type="notification"; -$description="tstest001"; -$signature_id="1131464448834277376"; -$id="1131810682442883072"; - -try { - //创建模板 - $resp = $client->createTemplate($name, $template, $type, $description, $signature_id); - print_r($resp); - //查询模板 - $resp = $client->queryTemplate(); - print_r($resp); - //修改模板 - $resp = $client->updateTemplate($id, $name, $template, $description, $signature_id); - print_r($resp); - //删除模板 - $resp = $client->deleteTemplate($id); - print_r($resp); -} catch (\Exception $e) { - echo "Error:", $e, "\n"; -} -//签名模块 -$signature = 'lfxlive2'; -$source = 'enterprises_and_institutions'; -$pic="/Users/Desktop/sss.jpg"; -$audit_status="passed"; -$page=1; -$page_size=1; -$id="1131464448834277376"; - -try { - //创建签名 - $resp = $client->createSignature($signature, $source, $pic); - print_r($resp); - //查询签名 - $resp = $client->checkSignature($audit_status); - //修改签名 - $resp = $client->updateSignature($id, $signature, $source, $pic); - print_r($resp); - //删除ID - $resp = $client->deleteSignature($id); - print_r($resp); -} catch (\Exception $e) { - echo "Error:", $e, "\n"; -} diff --git a/vendor/qiniu/php-sdk/examples/README.md b/vendor/qiniu/php-sdk/examples/README.md index 6cf8e30af..b7b4f98ee 100644 --- a/vendor/qiniu/php-sdk/examples/README.md +++ b/vendor/qiniu/php-sdk/examples/README.md @@ -1,10 +1,10 @@ # examples -这些 examples 旨在帮助你快速了解使用七牛的sdk。这些demo都是可以直接运行的， 但是在运行之前需要填上您自己的参数。 +这些 examples 旨在帮助你快速了解使用七牛的 SDK。这些 demo 都是可以直接运行的， 但是在运行之前需要填上您自己的参数。 比如： -* `$bucket` 需要填上您想操作的 [bucket名字](http://developer.qiniu.com/docs/v6/api/overview/concepts.html#bucket)。 -* `$accessKey` 和 `$secretKey` 可以在我们的[管理后台](https://portal.qiniu.com/setting/key)找到。 -* 在进行`视频转码`， `压缩文件`等异步操作时 需要使用到的队列名称也可以在我们[管理后台](https://portal.qiniu.com/mps/pipeline)新建。 +* `$bucket` 需要填上您想操作的 [bucket名字](https://portal.qiniu.com/kodo/bucket)。 +* `$accessKey` 和 `$secretKey` 可以在我们的[管理后台](https://portal.qiniu.com/user/key)找到。 +* 在进行`视频转码`， `压缩文件`等异步操作时 需要使用到的队列名称也可以在我们[管理后台](https://portal.qiniu.com/dora/media-gate/pipeline)新建。 diff --git a/vendor/qiniu/php-sdk/examples/bucket_lifecycleRule.php b/vendor/qiniu/php-sdk/examples/bucket_lifecycleRule.php index 3f7fefd5b..8827207a1 100644 --- a/vendor/qiniu/php-sdk/examples/bucket_lifecycleRule.php +++ b/vendor/qiniu/php-sdk/examples/bucket_lifecycleRule.php @@ -2,29 +2,35 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$name = 'demo'; -$prefix = 'test'; -$delete_after_days = 80; -$to_line_after_days =70; +// 存储空间 - 新增生命周期规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/3699/life-cycle-management -list($Info, $err) = $bucketManager->bucketLifecycleRule( +$bucket = 'xxxx'; // 存储空间名称 +$name = 'demo'; // 生命周期规则名称 +$prefix = 'test'; // 规则策略中的前缀 +$delete_after_days = 80; // 用户新创建的文件将在该设定时间之后自动删除 +$to_line_after_days = 70; // 用户新创建的文件将在该设定的时间之后自动转为低频存储 + +list($ret, $err) = $bucketManager->bucketLifecycleRule( $bucket, $name, $prefix, $delete_after_days, $to_line_after_days ); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/cdn_get_bandwidth.php b/vendor/qiniu/php-sdk/examples/cdn_get_bandwidth.php index 4d2ccf6f6..c9de0e69b 100644 --- a/vendor/qiniu/php-sdk/examples/cdn_get_bandwidth.php +++ b/vendor/qiniu/php-sdk/examples/cdn_get_bandwidth.php @@ -2,29 +2,30 @@ require_once __DIR__ . '/../autoload.php'; -use \Qiniu\Cdn\CdnManager; +use Qiniu\Auth; +use Qiniu\Cdn\CdnManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$auth = new Qiniu\Auth($accessKey, $secretKey); +$auth = new Auth($accessKey, $secretKey); $cdnManager = new CdnManager($auth); -//获取流量和带宽数据 -//参考文档：http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html +// 获取流量和带宽数据 +// 参考文档：https://developer.qiniu.com/fusion/api/1230/traffic-bandwidth $domains = array( "javasdk.qiniudn.com", "phpsdk.qiniudn.com" ); -$startDate = "2017-08-20"; -$endDate = "2017-08-21"; +$startDate = "2020-08-03"; +$endDate = "2020-08-05"; -//5min or hour or day +// 5min or hour or day $granularity = "day"; -//获取带宽数据 list($bandwidthData, $getBandwidthErr) = $cdnManager->getBandwidthData( $domains, $startDate, diff --git a/vendor/qiniu/php-sdk/examples/cdn_get_flux.php b/vendor/qiniu/php-sdk/examples/cdn_get_flux.php index 56da550a1..57df80855 100644 --- a/vendor/qiniu/php-sdk/examples/cdn_get_flux.php +++ b/vendor/qiniu/php-sdk/examples/cdn_get_flux.php @@ -2,29 +2,30 @@ require_once __DIR__ . '/../autoload.php'; +use Qiniu\Auth; use \Qiniu\Cdn\CdnManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$auth = new Qiniu\Auth($accessKey, $secretKey); +$auth = new Auth($accessKey, $secretKey); $cdnManager = new CdnManager($auth); -//获取流量和带宽数据 -//参考文档：http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html +// 获取流量和带宽数据 +// 参考文档：https://developer.qiniu.com/fusion/api/1230/traffic-bandwidth $domains = array( "javasdk.qiniudn.com", "phpsdk.qiniudn.com" ); -$startDate = "2017-08-20"; -$endDate = "2017-08-21"; +$startDate = "2020-08-03"; +$endDate = "2020-08-05"; //5min or hour or day $granularity = "day"; -//获取流量数据 list($fluxData, $getFluxErr) = $cdnManager->getFluxData($domains, $startDate, $endDate, $granularity); if ($getFluxErr != null) { var_dump($getFluxErr); diff --git a/vendor/qiniu/php-sdk/examples/cdn_get_log_list.php b/vendor/qiniu/php-sdk/examples/cdn_get_log_list.php index 4e5c9424f..2b3f7dd81 100644 --- a/vendor/qiniu/php-sdk/examples/cdn_get_log_list.php +++ b/vendor/qiniu/php-sdk/examples/cdn_get_log_list.php @@ -2,23 +2,25 @@ require_once __DIR__ . '/../autoload.php'; -use \Qiniu\Cdn\CdnManager; +use Qiniu\Auth; +use Qiniu\Cdn\CdnManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$auth = new Qiniu\Auth($accessKey, $secretKey); +$auth = new Auth($accessKey, $secretKey); $cdnManager = new CdnManager($auth); +// 获取日志下载链接 +// 参考文档：https://developer.qiniu.com/fusion/api/1226/download-the-log + $domains = array( "javasdk.qiniudn.com", "phpsdk.qiniudn.com" ); -$logDate = '2017-08-20'; - -//获取日志下载链接 -//参考文档：http://developer.qiniu.com/article/fusion/api/log.html +$logDate = '2020-08-05'; list($logListData, $getLogErr) = $cdnManager->getCdnLogList($domains, $logDate); if ($getLogErr != null) { diff --git a/vendor/qiniu/php-sdk/examples/cdn_get_prefetch_list.php b/vendor/qiniu/php-sdk/examples/cdn_get_prefetch_list.php new file mode 100644 index 000000000..958e5eb49 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/cdn_get_prefetch_list.php @@ -0,0 +1,46 @@ +getCdnPrefetchList( + $requestId, + $urls, + $state, + $pageNo, + $pageSize, + $startTime, + $endTime +); +echo "\n====> query prefetch list: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/cdn_get_refresh_list.php b/vendor/qiniu/php-sdk/examples/cdn_get_refresh_list.php new file mode 100644 index 000000000..ad4fca2fb --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/cdn_get_refresh_list.php @@ -0,0 +1,48 @@ +getCdnRefreshList( + $requestId, + $isDir, + $urls, + $state, + $pageNo, + $pageSize, + $startTime, + $endTime +); +echo "\n====> query refresh list: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/cdn_refresh_urls_dirs.php b/vendor/qiniu/php-sdk/examples/cdn_refresh_urls_dirs.php index c05e75f2f..214037861 100644 --- a/vendor/qiniu/php-sdk/examples/cdn_refresh_urls_dirs.php +++ b/vendor/qiniu/php-sdk/examples/cdn_refresh_urls_dirs.php @@ -2,29 +2,32 @@ require_once __DIR__ . '/../autoload.php'; -use \Qiniu\Cdn\CdnManager; +use Qiniu\Auth; +use Qiniu\Cdn\CdnManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$auth = new Qiniu\Auth($accessKey, $secretKey); +$auth = new Auth($accessKey, $secretKey); + +//---------------------------------------- demo1 ---------------------------------------- +// 刷新文件和目录 +// 文件列表一次最多提交 60 个，目录一次最多提交 10 个 +// 参考文档：https://developer.qiniu.com/fusion/api/1229/cache-refresh -//待刷新的文件列表和目录，文件列表最多一次100个，目录最多一次10个 -//参考文档：http://developer.qiniu.com/article/fusion/api/refresh.html $urls = array( "http://phpsdk.qiniudn.com/qiniu.jpg", "http://phpsdk.qiniudn.com/qiniu2.jpg", ); -//刷新目录需要联系七牛技术支持开通账户权限 $dirs = array( "http://phpsdk.qiniudn.com/test/" ); $cdnManager = new CdnManager($auth); -// 目前客户默认没有目录刷新权限，刷新会有400038报错，参考：https://developer.qiniu.com/fusion/api/1229/cache-refresh -// 需要刷新目录请工单联系技术支持 https://support.qiniu.com/tickets/category +// 如果刷新返回 400038 报错，则需要联系七牛技术支持开通刷新目录权限，参考：https://developer.qiniu.com/fusion/api/1229/cache-refresh， list($refreshResult, $refreshErr) = $cdnManager->refreshUrlsAndDirs($urls, $dirs); if ($refreshErr != null) { var_dump($refreshErr); @@ -33,20 +36,24 @@ if ($refreshErr != null) { print_r($refreshResult); } -//如果只有刷新链接或者目录的需求，可以分布使用 +//---------------------------------------- demo2 ---------------------------------------- +// 刷新文件 list($refreshResult, $refreshErr) = $cdnManager->refreshUrls($urls); if ($refreshErr != null) { var_dump($refreshErr); } else { - echo "refresh request sent\n"; + echo "refresh urls request sent\n"; print_r($refreshResult); } +//---------------------------------------- demo3 ---------------------------------------- +// 刷新目录 + list($refreshResult, $refreshErr) = $cdnManager->refreshDirs($dirs); if ($refreshErr != null) { var_dump($refreshErr); } else { - echo "refresh request sent\n"; + echo "refresh dirs request sent\n"; print_r($refreshResult); } diff --git a/vendor/qiniu/php-sdk/examples/cdn_timestamp_antileech.php b/vendor/qiniu/php-sdk/examples/cdn_timestamp_antileech.php index d9fd02346..f2d785581 100644 --- a/vendor/qiniu/php-sdk/examples/cdn_timestamp_antileech.php +++ b/vendor/qiniu/php-sdk/examples/cdn_timestamp_antileech.php @@ -2,17 +2,18 @@ require_once __DIR__ . '/../autoload.php'; -use \Qiniu\Cdn\CdnManager; +use Qiniu\Cdn\CdnManager; + +// 创建带时间戳防盗链的 URL +// 参考文档：https://developer.qiniu.com/fusion/manual/3841/timestamp-hotlinking-prevention-fusion -//创建时间戳防盗链 -//时间戳防盗链密钥，后台获取 $encryptKey = 'your_domain_timestamp_antileech_encryptkey'; -//带访问协议的域名 -$url1 = 'http://phpsdk.qiniuts.com/24.jpg?avinfo'; +// 一定要带访问协议，也就是 http:// 或者 https:// +$url1 = 'http://phpsdk.qiniuts.com/24.jpg?imageInfo'; $url2 = 'http://phpsdk.qiniuts.com/24.jpg'; -//有效期时间（单位秒） +// 有效期时间（单位秒） $durationInSeconds = 3600; $signedUrl = CdnManager::createTimestampAntiLeechUrl($url1, $encryptKey, $durationInSeconds); diff --git a/vendor/qiniu/php-sdk/examples/censor_image.php b/vendor/qiniu/php-sdk/examples/censor_image.php new file mode 100644 index 000000000..06e0522c9 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/censor_image.php @@ -0,0 +1,42 @@ +censorImage($body); +echo "\n====> Result is: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/censor_video.php b/vendor/qiniu/php-sdk/examples/censor_video.php new file mode 100644 index 000000000..7ac056fae --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/censor_video.php @@ -0,0 +1,52 @@ +censorVideo($body); +echo "\n====> Result is: \n"; +if ($err !== null) { + var_dump($err); +} else { + echo "job_id is: $jobid\n"; +} + +// 查询视频审核结果 +list($ret, $err) = $argusManager->censorStatus($jobid); +echo "\n====> job status: \n"; + +if ($err != null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/delete_bucket.php b/vendor/qiniu/php-sdk/examples/delete_bucket.php index dc2e30505..325a47a7e 100644 --- a/vendor/qiniu/php-sdk/examples/delete_bucket.php +++ b/vendor/qiniu/php-sdk/examples/delete_bucket.php @@ -2,19 +2,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$name = 'xxxx'; +// 删除指定的 Bucket +// 1、空间绑定了自定义域名，禁止删除，需要先解绑域名 +// 2、空间不为空，禁止删除，需要先把空间内的文件删除完毕 -list($Info, $err) = $bucketManager->deleteBucket($name); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->deleteBucket($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/delete_bucketEvent.php b/vendor/qiniu/php-sdk/examples/delete_bucketEvent.php index 00df6cae2..7eb744def 100644 --- a/vendor/qiniu/php-sdk/examples/delete_bucketEvent.php +++ b/vendor/qiniu/php-sdk/examples/delete_bucketEvent.php @@ -2,20 +2,27 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$name = 'demo'; +// 删除 bucket 事件通知规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/6095/event-notification -list($Info, $err) = $bucketManager->deleteBucketEvent($bucket, $name); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +$name = 'demo'; // 规则名称 bucket 内唯一，由 1 ~ 50 个字符组成，可包含：字母、数字和下划线 + +list($ret, $err) = $bucketManager->deleteBucketEvent($bucket, $name); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/delete_bucketLifecycleRule.php b/vendor/qiniu/php-sdk/examples/delete_bucketLifecycleRule.php index a53699267..2146b1b54 100644 --- a/vendor/qiniu/php-sdk/examples/delete_bucketLifecycleRule.php +++ b/vendor/qiniu/php-sdk/examples/delete_bucketLifecycleRule.php @@ -2,20 +2,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$name = 'demo'; +// 删除存储空间 - 生命周期规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/3699/life-cycle-management -list($Info, $err) = $bucketManager->deleteBucketLifecycleRule($bucket, $name); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 +$name = 'demo'; // 生命周期规则名称 + +list($ret, $err) = $bucketManager->deleteBucketLifecycleRule($bucket, $name); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketEvents.php b/vendor/qiniu/php-sdk/examples/get_bucketEvents.php index 53a5c88d2..23795847a 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketEvents.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketEvents.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; +// 获取存储空间 - 事件通知规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/6095/event-notification -list($Info, $err) = $bucketManager->getBucketEvents($bucket); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->getBucketEvents($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketLifecycleRules.php b/vendor/qiniu/php-sdk/examples/get_bucketLifecycleRules.php index 652bee8ce..a35feed4b 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketLifecycleRules.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketLifecycleRules.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; +// 获取存储空间 - 生命周期规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/3699/life-cycle-management -list($Info, $err) = $bucketManager->getBucketLifecycleRules($bucket); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->getBucketLifecycleRules($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketList.php b/vendor/qiniu/php-sdk/examples/get_bucketList.php index 74aaa65f3..6a2f7b088 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketList.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketList.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$region = 'z1'; +// 列举空间，返回 bucket 列表 +// 存储区域参考文档：https://developer.qiniu.com/kodo/manual/1671/region-endpoint -list($Info, $err) = $bucketManager->listbuckets($region); -if ($err) { - print_r($err); +$region = 'z1'; // 华东：z0，华北：z1，华南：z2，北美：na0，东南亚：as0 + +list($ret, $err) = $bucketManager->listbuckets($region); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketQuota.php b/vendor/qiniu/php-sdk/examples/get_bucketQuota.php index 563395d61..93474b53b 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketQuota.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketQuota.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; +// 获取用户 bucket 配额限制 +// size 表示空间存储量配额，count 表示空间文件数配额，新创建的空间默认没有限额 -list($Info, $err) = $bucketManager->getBucketQuota($bucket); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->getBucketQuota($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketinfo.php b/vendor/qiniu/php-sdk/examples/get_bucketinfo.php index ff052a436..98fd9f731 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketinfo.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketinfo.php @@ -2,19 +2,24 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; +// 获取指定空间的相关信息 -list($Info, $err) = $bucketManager->bucketInfo($bucket); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->bucketInfo($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_bucketinfos.php b/vendor/qiniu/php-sdk/examples/get_bucketinfos.php index 0ad650325..5eec1d8b6 100644 --- a/vendor/qiniu/php-sdk/examples/get_bucketinfos.php +++ b/vendor/qiniu/php-sdk/examples/get_bucketinfos.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$region = 'z1'; +// 获取指定 zone（存储区域）的空间信息列表 +// 存储区域，参考文档：https://developer.qiniu.com/kodo/manual/1671/region-endpoint -list($Info, $err) = $bucketManager->bucketInfos($region); -if ($err) { - print_r($err); +$region = 'z1'; // 华东：z0，华北：z1，华南：z2，北美：na0，东南亚：as0 + +list($ret, $err) = $bucketManager->bucketInfos($region); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/get_corsRules.php b/vendor/qiniu/php-sdk/examples/get_corsRules.php index fbfde2d21..58e28bedc 100644 --- a/vendor/qiniu/php-sdk/examples/get_corsRules.php +++ b/vendor/qiniu/php-sdk/examples/get_corsRules.php @@ -2,19 +2,25 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; +// 获取 bucket 设置的跨域信息 +// 参考文档：https://developer.qiniu.com/kodo/manual/6094/set-cors -list($Info, $err) = $bucketManager->getCorsRules($bucket); -if ($err) { - print_r($err); +$bucket = 'xxxx'; // 存储空间名称 + +list($ret, $err) = $bucketManager->getCorsRules($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/image_url_builder.php b/vendor/qiniu/php-sdk/examples/image_url_builder.php index e99a72868..20e2b00f0 100644 --- a/vendor/qiniu/php-sdk/examples/image_url_builder.php +++ b/vendor/qiniu/php-sdk/examples/image_url_builder.php @@ -6,7 +6,7 @@ use Qiniu\Processing\ImageUrlBuilder; $imageUrlBuilder = new ImageUrlBuilder(); -// 要处理图片 +// 要处理的图片 $url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg'; $url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?watermark/1/gravity/SouthEast/dx/0/dy/0/image/' . 'aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB'; @@ -38,12 +38,12 @@ var_dump($thumbLink, $thumbLink2); * * @param string $url 图片链接 * @param string $image 水印图片链接 - * @param numeric $dissolve 透明度 [可选] + * @param int $dissolve 透明度 [可选] * @param string $gravity 水印位置 [可选] - * @param numeric $dx 横轴边距 [可选] - * @param numeric $dy 纵轴边距 [可选] - * @param numeric $watermarkScale 自适应原图的短边比例 [可选] - * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html + * @param int $dx 横轴边距 [可选] + * @param int $dy 纵轴边距 [可选] + * @param int $watermarkScale 自适应原图的短边比例 [可选] + * @link https://developer.qiniu.com/dora/api/1316/image-watermarking-processing-watermark * @return string * @author Sherlock Ren */ @@ -60,10 +60,10 @@ var_dump($waterLink); * @param string $font 文字字体 * @param string $fontSize 文字字号 * @param string $fontColor 文字颜色 [可选] - * @param numeric $dissolve 透明度 [可选] + * @param int $dissolve 透明度 [可选] * @param string $gravity 水印位置 [可选] - * @param numeric $dx 横轴边距 [可选] - * @param numeric $dy 纵轴边距 [可选] + * @param int $dx 横轴边距 [可选] + * @param int $dy 纵轴边距 [可选] * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html#text-watermark * @return string * @author Sherlock Ren diff --git a/vendor/qiniu/php-sdk/examples/persistent_fop_init.php b/vendor/qiniu/php-sdk/examples/persistent_fop_init.php index 2df01e9fe..baca84642 100644 --- a/vendor/qiniu/php-sdk/examples/persistent_fop_init.php +++ b/vendor/qiniu/php-sdk/examples/persistent_fop_init.php @@ -3,17 +3,16 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; use Qiniu\Processing\PersistentFop; -$accessKey = 'Access_Key'; -$secretKey = 'Secret_Key'; +// 控制台获取密钥：https://portal.qiniu.com/user/key +$accessKey = getenv('QINIU_ACCESS_KEY'); +$secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -// 要转码的文件所在的空间。 -$bucket = 'Bucket_Name'; - -// 转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline -$pipeline = 'pipeline_name'; +$config = new Config(); +$config->useHTTPS=true; // 初始化 -$pfop = new PersistentFop($auth, $bucket, $pipeline); +$pfop = new PersistentFop($auth, $config); diff --git a/vendor/qiniu/php-sdk/examples/persistent_fop_status.php b/vendor/qiniu/php-sdk/examples/persistent_fop_status.php index 0c26f7a88..73e85a384 100644 --- a/vendor/qiniu/php-sdk/examples/persistent_fop_status.php +++ b/vendor/qiniu/php-sdk/examples/persistent_fop_status.php @@ -5,14 +5,15 @@ use Qiniu\Processing\PersistentFop; $pfop = new Qiniu\Processing\PersistentFop(null, null); -// 触发持久化处理后返回的 Id -$persistentId = 'z1.5b8a48e5856db843bc24cfc3'; +// 通过 persistentId 来主动查询持久化处理(prefop)的执行状态 +// 参考文档：https://developer.qiniu.com/dora/api/1294/persistent-processing-status-query-prefop + +// 触发持久化处理后返回的 persistentId +$persistentId = 'z2.01z201c4oyre6q1hgy00murnel0002nh'; -// 通过persistentId查询该 触发持久化处理的状态 list($ret, $err) = $pfop->status($persistentId); - -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/pfop_mkzip.php b/vendor/qiniu/php-sdk/examples/pfop_mkzip.php index 746b3568e..fb95cc22a 100644 --- a/vendor/qiniu/php-sdk/examples/pfop_mkzip.php +++ b/vendor/qiniu/php-sdk/examples/pfop_mkzip.php @@ -4,30 +4,39 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Processing\PersistentFop; -// 去我们的portal 后台来获取AK, SK +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); + +$auth = new Auth($accessKey, $secretKey); + +// 将七牛存储空间中的资源进行批量压缩 +// 参考文档：https://developer.qiniu.com/dora/api/1667/mkzip + +// 要压缩的文件所在的空间和文件名 $bucket = getenv('QINIU_TEST_BUCKET'); $key = 'qiniu.png'; -$auth = new Auth($accessKey, $secretKey); -// 异步任务的队列， 去后台新建： https://portal.qiniu.com/mps/pipeline +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; $pfop = new PersistentFop($auth, null); -// 进行zip压缩的url +// 进行 zip 压缩的 url $url1 = 'http://phpsdk.qiniudn.com/php-logo.png'; $url2 = 'http://phpsdk.qiniudn.com/1.png'; -//压缩后的key +// 压缩后的 key $zipKey = 'test.zip'; $fops = 'mkzip/2/url/' . \Qiniu\base64_urlSafeEncode($url1); $fops .= '/url/' . \Qiniu\base64_urlSafeEncode($url2); $fops .= '|saveas/' . \Qiniu\base64_urlSafeEncode("$bucket:$zipKey"); +// 处理完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） $notify_url = null; + +// 当转码后的文件名与源文件名相同时，是否覆盖源文件 $force = false; list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notify_url, $force); @@ -37,7 +46,13 @@ if ($err != null) { var_dump($err); } else { echo "PersistentFop Id: $id\n"; - - $res = "http://api.qiniu.com/status/get/prefop?id=$id"; - echo "Processing result: $res"; +} + +// 查询转码的进度和状态 +list($ret, $err) = $pfop->status($id); +echo "\n====> pfop mkzip status: \n"; +if ($err != null) { + var_dump($err); +} else { + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/pfop_vframe.php b/vendor/qiniu/php-sdk/examples/pfop_vframe.php index e1df2d54d..49fd36d8d 100644 --- a/vendor/qiniu/php-sdk/examples/pfop_vframe.php +++ b/vendor/qiniu/php-sdk/examples/pfop_vframe.php @@ -2,31 +2,40 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; use Qiniu\Processing\PersistentFop; -//对已经上传到七牛的视频发起异步转码操作 +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -//要转码的文件所在的空间和文件名。 +// 对已经上传到七牛的视频发起异步转码操作 +// 视频帧缩略图参考文档：https://developer.qiniu.com/dora/api/1313/video-frame-thumbnails-vframe + +// 要转码的文件所在的空间和文件名 +$bucket = getenv('QINIU_TEST_BUCKET'); $key = 'qiniu.mp4'; -//转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; -//转码完成后通知到你的业务服务器。 +// 转码完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） $notifyUrl = 'http://375dec79.ngrok.com/notify.php'; + +// 当转码后的文件名与源文件名相同时，是否覆盖源文件 $force = false; -$config = new \Qiniu\Config(); +$config = new Config(); $config->useHTTPS = true; $pfop = new PersistentFop($auth, $config); -//要进行视频截图操作 +// 视频处理完毕后保存到空间中的名称 +$saveasKey = 'qiniu_480x360.jpg'; + +// 进行视频截帧操作 $fops = "vframe/jpg/offset/1/w/480/h/360/rotate/90|saveas/" . - \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_480x360.jpg"); + \Qiniu\base64_urlSafeEncode("$bucket:$saveasKey"); list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force); echo "\n====> pfop avthumb result: \n"; @@ -36,7 +45,7 @@ if ($err != null) { echo "PersistentFop Id: $id\n"; } -//查询转码的进度和状态 +// 查询转码的进度和状态 list($ret, $err) = $pfop->status($id); echo "\n====> pfop avthumb status: \n"; if ($err != null) { diff --git a/vendor/qiniu/php-sdk/examples/pfop_video_avthumb.php b/vendor/qiniu/php-sdk/examples/pfop_video_avthumb.php index aebe81545..986aa8cc3 100644 --- a/vendor/qiniu/php-sdk/examples/pfop_video_avthumb.php +++ b/vendor/qiniu/php-sdk/examples/pfop_video_avthumb.php @@ -2,32 +2,40 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; use Qiniu\Processing\PersistentFop; -//对已经上传到七牛的视频发起异步转码操作 - +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -//要转码的文件所在的空间和文件名。 +// 对已经上传到七牛的视频发起异步转码操作 +// 普通音视频转码参考文档：https://developer.qiniu.com/dora/api/1248/audio-and-video-transcoding-avthumb + +// 要转码的文件所在的空间和文件名。 +$bucket = getenv('QINIU_TEST_BUCKET'); $key = 'qiniu.mp4'; -//转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; + +// 当转码后的文件名与源文件名相同时，是否覆盖源文件 $force = false; -//转码完成后通知到你的业务服务器。 +// 转码完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） $notifyUrl = 'http://375dec79.ngrok.com/notify.php'; -$config = new \Qiniu\Config(); -//$config->useHTTPS=true; +$config = new Config(); +$config->useHTTPS=true; + +// 视频处理完毕后保存到空间中的名称 +$saveasKey = 'qiniu_640x360.mp4'; $pfop = new PersistentFop($auth, $config); -//要进行转码的转码操作。 http://developer.qiniu.com/docs/v6/api/reference/fop/av/avthumb.html -$fops = "avthumb/mp4/s/640x360/vb/1.4m|saveas/" . \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_640x360.mp4"); +// 进行视频转码操作 +$fops = "avthumb/mp4/s/640x360/vb/1.4m|saveas/" . \Qiniu\base64_urlSafeEncode("$bucket:$saveasKey"); list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force); echo "\n====> pfop avthumb result: \n"; @@ -37,7 +45,7 @@ if ($err != null) { echo "PersistentFop Id: $id\n"; } -//查询转码的进度和状态 +// 查询转码的进度和状态 list($ret, $err) = $pfop->status($id); echo "\n====> pfop avthumb status: \n"; if ($err != null) { diff --git a/vendor/qiniu/php-sdk/examples/pfop_watermark.php b/vendor/qiniu/php-sdk/examples/pfop_watermark.php index 72aa6c443..ea3d6bc88 100644 --- a/vendor/qiniu/php-sdk/examples/pfop_watermark.php +++ b/vendor/qiniu/php-sdk/examples/pfop_watermark.php @@ -2,37 +2,44 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; use Qiniu\Processing\PersistentFop; -//对已经上传到七牛的视频发起异步转码操作 - +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -//要转码的文件所在的空间和文件名。 +// 对已经上传到七牛的视频发起异步转码操作 +// 视频水印参考文档：https://developer.qiniu.com/dora/api/1314/video-watermarking + +// 要转码的文件所在的空间和文件名 +$bucket = getenv('QINIU_TEST_BUCKET'); $key = 'qiniu.mp4'; -//转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; -//转码完成后通知到你的业务服务器。 +// 转码完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） $notifyUrl = 'http://375dec79.ngrok.com/notify.php'; + +// 当转码后的文件名与源文件名相同时，是否覆盖源文件 $force = false; -$config = new \Qiniu\Config(); -//$config->useHTTPS=true; +$config = new Config(); +$config->useHTTPS=true; $pfop = new PersistentFop($auth, $config); -//需要添加水印的图片UrlSafeBase64 -//可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html -$base64URL = Qiniu\base64_urlSafeEncode('http://devtools.qiniu.com/qiniu.png'); +// 图片水印的源路径，也就是给视频打图片水印的图片 +$base64URL = Qiniu\base64_urlSafeEncode('http://test-2.qiniudn.com/logo.png'); -//水印参数 -$fops = "avthumb/mp4/s/640x360/vb/1.4m/image/" . $base64URL . "|saveas/" - . \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_wm.mp4"); +// 视频处理完毕后保存到空间中的名称 +$saveasKey = 'qiniu_watermark.mp4'; + +// 进行视频打图片水印操作 +$fops = "avthumb/mp4/wmImage/" . $base64URL . "|saveas/" + . \Qiniu\base64_urlSafeEncode("$bucket:$saveasKey"); list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force); echo "\n====> pfop avthumb result: \n"; @@ -42,7 +49,7 @@ if ($err != null) { echo "PersistentFop Id: $id\n"; } -//查询转码的进度和状态 +// 查询转码的进度和状态 list($ret, $err) = $pfop->status($id); echo "\n====> pfop avthumb status: \n"; if ($err != null) { diff --git a/vendor/qiniu/php-sdk/examples/prefop.php b/vendor/qiniu/php-sdk/examples/prefop.php index ae61a5f7d..1b8950ae2 100644 --- a/vendor/qiniu/php-sdk/examples/prefop.php +++ b/vendor/qiniu/php-sdk/examples/prefop.php @@ -2,24 +2,22 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; use Qiniu\Processing\PersistentFop; -$accessKey = 'Access_Key'; -$secretKey = 'Secret_Key'; +// 控制台获取密钥：https://portal.qiniu.com/user/key +$accessKey = getenv('QINIU_ACCESS_KEY'); +$secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -//要持久化处理的文件所在的空间和文件名。 -$bucket = 'Bucket_Name'; +$config = new Config(); +$config->useHTTPS=true; -//持久化处理使用的队列名称。 https://portal.qiniu.com/mps/pipeline -$pipeline = 'pipeline_name'; +$pfop = new PersistentFop($auth, $config); -//持久化处理完成后通知到你的业务服务器。 -$notifyUrl = 'http://375dec79.ngrok.com/notify.php'; -$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl); +$id = "z2.01z201c4oyre6q1hgy00murnel0002nh"; -$id = "z2.5955c739e3d0041bf80c9baa"; -//查询持久化处理的进度和状态 +// 查询持久化处理的进度和状态 list($ret, $err) = $pfop->status($id); echo "\n====> pfop avthumb status: \n"; if ($err != null) { diff --git a/vendor/qiniu/php-sdk/examples/pulpvideo.php b/vendor/qiniu/php-sdk/examples/pulpvideo.php deleted file mode 100644 index bad8821c5..000000000 --- a/vendor/qiniu/php-sdk/examples/pulpvideo.php +++ /dev/null @@ -1,55 +0,0 @@ - 'pulp', - 'params' => array( - 'labels' => array( - array( - 'label' => "1", - 'select' => 1, - 'score' => 2, - ), - ) - ) - ), -); - -$params = array(); -$params = array( - 'async' => false, - 'vframe' => array( - 'mode' => 1, - 'interval' => 8, - ) -); - -$req = array(); -$req['data'] = $reqBody; -$req['ops'] = $ops; -$req['params'] = $params; -$body = json_encode($req); - -$vid = "xxxx"; -list($ret, $err) = $argusManager->pulpVideo($body, $vid); - -if ($err !== null) { - var_dump($err); -} else { - var_dump($ret); -} diff --git a/vendor/qiniu/php-sdk/examples/put_bucketAccessMode.php b/vendor/qiniu/php-sdk/examples/put_bucketAccessMode.php index b4539264a..638ae3c30 100644 --- a/vendor/qiniu/php-sdk/examples/put_bucketAccessMode.php +++ b/vendor/qiniu/php-sdk/examples/put_bucketAccessMode.php @@ -2,20 +2,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$private = 1; +$bucket = 'xxxx'; // 存储空间名称 +$private = 1; // 公开：0，私有：1 -list($Info, $err) = $bucketManager->putBucketAccessMode($bucket, $private); -if ($err) { - print_r($err); +// 设置 Bucket 访问权限 +// 参考文档：https://developer.qiniu.com/kodo/api/3946/set-bucket-private + +list($ret, $err) = $bucketManager->putBucketAccessMode($bucket, $private); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/put_bucketAccessStyleMode.php b/vendor/qiniu/php-sdk/examples/put_bucketAccessStyleMode.php index 2f7c27f2b..3cc2aec71 100644 --- a/vendor/qiniu/php-sdk/examples/put_bucketAccessStyleMode.php +++ b/vendor/qiniu/php-sdk/examples/put_bucketAccessStyleMode.php @@ -2,20 +2,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$mode = 1; +$bucket = 'xxxx'; // 存储空间名称 +$mode = 1; // 关闭：0 ，开启：1 -list($Info, $err) = $bucketManager->putBucketAccessStyleMode($bucket, $mode); -if ($err) { - print_r($err); +// 存储空间 - 原图保护开关 +// 原图保护：https://developer.qiniu.com/kodo/kb/1359/what-is-the-original-protection + +list($ret, $err) = $bucketManager->putBucketAccessStyleMode($bucket, $mode); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/put_bucketEvent.php b/vendor/qiniu/php-sdk/examples/put_bucketEvent.php index 33dbb44c0..f3c830d58 100644 --- a/vendor/qiniu/php-sdk/examples/put_bucketEvent.php +++ b/vendor/qiniu/php-sdk/examples/put_bucketEvent.php @@ -2,24 +2,31 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); -$bucket = 'xxxx'; -$name = 'testdemo'; +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 增加 bucket 事件通知规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/6095/event-notification + +$bucket = getenv('QINIU_TEST_BUCKET'); +$name = 'testnotification'; $prefix = 'test1'; $suffix = 'mp3'; $event = array("move","copy"); -$callbackURL = 'http://www.qiniu.com'; +$callbackURL = 'http://www.qiniu.com'; // 回调服务器地址，需要可以公网访问，并能够相应 200 OK -list($Info, $err) = $bucketManager->putBucketEvent($bucket, $name, $prefix, $suffix, $event, $callbackURL); -if ($err) { - print_r($err); +list($ret, $err) = $bucketManager->putBucketEvent($bucket, $name, $prefix, $suffix, $event, $callbackURL); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/put_bucketMaxAge.php b/vendor/qiniu/php-sdk/examples/put_bucketMaxAge.php index 77092e90a..489017467 100644 --- a/vendor/qiniu/php-sdk/examples/put_bucketMaxAge.php +++ b/vendor/qiniu/php-sdk/examples/put_bucketMaxAge.php @@ -2,20 +2,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -$bucket = 'xxxx'; -$maxAge = 15768000; +// 设置 Bucket 的 maxAge +// 参考文档：https://developer.qiniu.com/kodo/kb/1475/space-maxage-attribute-to-the-cache-control -list($Info, $err) = $bucketManager->putBucketMaxAge($bucket, $maxAge); -if ($err) { - print_r($err); +$bucket = getenv('QINIU_TEST_BUCKET'); +$maxAge = 31536000; + +list($ret, $err) = $bucketManager->putBucketMaxAge($bucket, $maxAge); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/put_bucketQuota.php b/vendor/qiniu/php-sdk/examples/put_bucketQuota.php index 18082b631..b00ec4892 100644 --- a/vendor/qiniu/php-sdk/examples/put_bucketQuota.php +++ b/vendor/qiniu/php-sdk/examples/put_bucketQuota.php @@ -2,21 +2,28 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); +$bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); -$bucket = 'xxxx'; +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 设置 bucket 配额 +// size 表示空间存储量配额，count 表示空间文件数配额，新创建的空间默认没有限额 + $size = 99999; $count = 99; -list($Info, $err) = $bucketManager->putBucketQuota($bucket, $size, $count); -if ($err) { - print_r($err); +list($ret, $err) = $bucketManager->putBucketQuota($bucket, $size, $count); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/put_referAntiLeech.php b/vendor/qiniu/php-sdk/examples/put_referAntiLeech.php index 6828bc9ac..7d56d1ed9 100644 --- a/vendor/qiniu/php-sdk/examples/put_referAntiLeech.php +++ b/vendor/qiniu/php-sdk/examples/put_referAntiLeech.php @@ -2,22 +2,29 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); -$bucket = 'xxxx'; -$mode = 1; -$norefer = "1"; -$pattern = "*.qiniu.com"; +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); -list($Info, $err) = $bucketManager->putReferAntiLeech($bucket, $mode, $norefer, $pattern); -if ($err) { - print_r($err); +// 存储空间 - 设置 referer 防盗链 +// 参考文档：https://developer.qiniu.com/kodo/manual/6093/set-the-hotlinking-prevention + +$bucket = getenv('QINIU_TEST_BUCKET'); +$mode = 1; // 关闭Referer(使用此选项将会忽略以下参数并将恢复默认值):0，设置Referer白名单：1，表示设置Referer黑名单：2 +$norefer = "1"; // 表示不允许空 Refer 访问：0，表示允许空 Refer 访问：1 +$pattern = "*.qiniu.com"; // 当前仅支持这三种格式：a.b.com，*.b.com，* + +list($ret, $err) = $bucketManager->putReferAntiLeech($bucket, $mode, $norefer, $pattern); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/qetag.php b/vendor/qiniu/php-sdk/examples/qetag.php index f6aff8a72..1fe90d16e 100644 --- a/vendor/qiniu/php-sdk/examples/qetag.php +++ b/vendor/qiniu/php-sdk/examples/qetag.php @@ -2,10 +2,13 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Etag; -$localFile = "/Users/jemy/Documents/qiniu.mp4"; -list($etag, $err) = Etag::sum($localFile); -if ($err == null) { - echo "Etag: $etag"; -} else { +// 计算文件的 ETag +// 参考文档：https://developer.qiniu.com/kodo/manual/1231/appendix#3 + +$localFile = "./php-logo.png"; +list($ret, $err) = Etag::sum($localFile); +if ($err != null) { var_dump($err); +} else { + echo "Etag: $ret"; } diff --git a/vendor/qiniu/php-sdk/examples/rs_asynch_fetch.php b/vendor/qiniu/php-sdk/examples/rs_asynch_fetch.php new file mode 100644 index 000000000..7bee00c77 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rs_asynch_fetch.php @@ -0,0 +1,71 @@ +useHTTPS = true; // 接口是否使用 HTTPS 协议 + +$bucketManager = new BucketManager($auth, $config); + +// 异步第三方资源抓取 +// 参考文档：https://developer.qiniu.com/kodo/api/4097/asynch-fetch + +// 需要抓取的文件 URL +$url = 'http://devtools.qiniu.com/qiniu.png'; + +//回调 URL（需要可以公网访问，并能够相应 200 OK） +$callbackurl = "http://your.domain.com/upload_verify_callback.php"; + +// 回调Body +$callbackbody = '{"key":"$(key)","hash":"$(etag)","w":"$(imageInfo.width)","h":"$(imageInfo.height)"}'; + + +//---------------------------------------- demo1 ---------------------------------------- +// 指定抓取的文件保存到七牛云空间中的名称 + +$key = time() . '.png'; +list($ret, $err) = $bucketManager->asynchFetch($url, $bucket, null, $key, null, null, $callbackurl, $callbackbody); +echo "=====> asynch fetch $url to bucket: $bucket key: $key\n"; +if ($err !== null) { + var_dump($err); +} else { + $id = $ret['id']; + echo "id is: $id\n"; +} + +//---------------------------------------- demo2 ---------------------------------------- +// 不指定 key 时，以文件内容的 hash 作为文件名 + +$key = null; +list($ret, $err) = $bucketManager->asynchFetch($url, $bucket, null, $key, null, null, $callbackurl, $callbackbody); +echo "=====> asynch fetch $url to bucket: $bucket key: $(etag)\n"; +if ($err !== null) { + var_dump($err); +} else { + $id = $ret['id']; + echo "id is: $id\n"; +} + +// 查询异步抓取的进度和状态 + +// 华东：z0，华北：z1，华南：z2，北美：na0，东南亚：as0 +$zone = 'z2'; + +sleep(10); // 由于异步抓取需要耗时，等待 10 秒后再查询状态 +list($ret, $err) = $bucketManager->asynchFetchStatus($zone, $id); +echo "\n====> asynch fetch status: \n"; +if ($err != null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_change_mime.php b/vendor/qiniu/php-sdk/examples/rs_batch_change_mime.php index d7d07cf77..c5bd6b458 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_change_mime.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_change_mime.php @@ -1,18 +1,22 @@ 'video/x-mp4', 'qiniu.png' => 'image/x-png', @@ -21,8 +25,8 @@ $keyMimePairs = array( $ops = $bucketManager->buildBatchChangeMime($bucket, $keyMimePairs); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_change_type.php b/vendor/qiniu/php-sdk/examples/rs_batch_change_type.php index 5f3f1cdb0..8a2248333 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_change_type.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_change_type.php @@ -1,18 +1,22 @@ buildBatchChangeType($bucket, $keyTypePairs); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_copy.php b/vendor/qiniu/php-sdk/examples/rs_batch_copy.php index 988c642fd..66c4d4d4a 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_copy.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_copy.php @@ -1,18 +1,22 @@ buildBatchCopy($srcBucket, $keyPairs, $destBucket, true); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_delete.php b/vendor/qiniu/php-sdk/examples/rs_batch_delete.php index 4f15586a2..ebcdbe663 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_delete.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_delete.php @@ -1,18 +1,22 @@ buildBatchDelete($bucket, $keys); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_delete_after_days.php b/vendor/qiniu/php-sdk/examples/rs_batch_delete_after_days.php index dabfe84e4..928dd149f 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_delete_after_days.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_delete_after_days.php @@ -1,18 +1,22 @@ buildBatchDeleteAfterDays($bucket, $keyDayPairs); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_move.php b/vendor/qiniu/php-sdk/examples/rs_batch_move.php index 89225221e..01d8c9198 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_move.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_move.php @@ -1,18 +1,22 @@ buildBatchMove($srcBucket, $keyPairs, $destBucket, true); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_batch_stat.php b/vendor/qiniu/php-sdk/examples/rs_batch_stat.php index a95fee7b2..88bc32e03 100644 --- a/vendor/qiniu/php-sdk/examples/rs_batch_stat.php +++ b/vendor/qiniu/php-sdk/examples/rs_batch_stat.php @@ -1,18 +1,22 @@ buildBatchStat($bucket, $keys); list($ret, $err) = $bucketManager->batch($ops); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_bucket_domains.php b/vendor/qiniu/php-sdk/examples/rs_bucket_domains.php index ea27cdc03..3cc9cb3e1 100644 --- a/vendor/qiniu/php-sdk/examples/rs_bucket_domains.php +++ b/vendor/qiniu/php-sdk/examples/rs_bucket_domains.php @@ -1,19 +1,26 @@ domains($bucket); -if ($err) { - print_r($err); + +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 获取指定空间绑定的所有的域名 +// 参考文档：https://developer.qiniu.com/kodo/api/3949/get-the-bucket-space-domain + +list($ret, $err) = $bucketManager->domains($bucket); +if ($err != null) { + var_dump($err); } else { - print_r($domains); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_buckets.php b/vendor/qiniu/php-sdk/examples/rs_buckets.php index 5fe1304d6..84263a90d 100644 --- a/vendor/qiniu/php-sdk/examples/rs_buckets.php +++ b/vendor/qiniu/php-sdk/examples/rs_buckets.php @@ -1,19 +1,25 @@ buckets(true); -if ($err) { - print_r($err); + +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 获取指定账号下所有的空间名 +// 参考文档：https://developer.qiniu.com/kodo/api/3926/get-service + +list($ret, $err) = $bucketManager->buckets(true); +if ($err != null) { + var_dump($err); } else { - print_r($buckets); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rs_change_mime.php b/vendor/qiniu/php-sdk/examples/rs_change_mime.php index 0d3f3ad09..399143de2 100644 --- a/vendor/qiniu/php-sdk/examples/rs_change_mime.php +++ b/vendor/qiniu/php-sdk/examples/rs_change_mime.php @@ -1,19 +1,26 @@ changeMime($bucket, $key, $newMime); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_change_status.php b/vendor/qiniu/php-sdk/examples/rs_change_status.php index cbcea5c28..40d243bf2 100644 --- a/vendor/qiniu/php-sdk/examples/rs_change_status.php +++ b/vendor/qiniu/php-sdk/examples/rs_change_status.php @@ -1,18 +1,25 @@ changeStatus($bucket, $key, $status); if ($err) { diff --git a/vendor/qiniu/php-sdk/examples/rs_change_type.php b/vendor/qiniu/php-sdk/examples/rs_change_type.php index acb896351..4b87c6fd7 100644 --- a/vendor/qiniu/php-sdk/examples/rs_change_type.php +++ b/vendor/qiniu/php-sdk/examples/rs_change_type.php @@ -1,18 +1,27 @@ changeType($bucket, $key, $fileType); if ($err) { diff --git a/vendor/qiniu/php-sdk/examples/rs_copy.php b/vendor/qiniu/php-sdk/examples/rs_copy.php index 10e7de8e4..2e5937417 100644 --- a/vendor/qiniu/php-sdk/examples/rs_copy.php +++ b/vendor/qiniu/php-sdk/examples/rs_copy.php @@ -1,21 +1,30 @@ copy($srcBucket, $srcKey, $destBucket, $destKey, true); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_delete.php b/vendor/qiniu/php-sdk/examples/rs_delete.php index 365d3bec1..a41cf22bb 100644 --- a/vendor/qiniu/php-sdk/examples/rs_delete.php +++ b/vendor/qiniu/php-sdk/examples/rs_delete.php @@ -1,16 +1,24 @@ delete($bucket, $key); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_delete_after_days.php b/vendor/qiniu/php-sdk/examples/rs_delete_after_days.php index ba0b58697..546d7ccb6 100644 --- a/vendor/qiniu/php-sdk/examples/rs_delete_after_days.php +++ b/vendor/qiniu/php-sdk/examples/rs_delete_after_days.php @@ -1,19 +1,23 @@ deleteAfterDays($bucket, $key, $days); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_download_urls.php b/vendor/qiniu/php-sdk/examples/rs_download_urls.php index 522b9f2ff..e803ddcb7 100644 --- a/vendor/qiniu/php-sdk/examples/rs_download_urls.php +++ b/vendor/qiniu/php-sdk/examples/rs_download_urls.php @@ -3,15 +3,17 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -// 构建Auth对象 +// 构建 Auth 对象 $auth = new Auth($accessKey, $secretKey); -// 私有空间中的外链 http:/// +// 私有空间中的外链 http(s):///，一定要带访问协议，也就是 http:// 或者 https:// $baseUrl = 'http://if-pri.qiniudn.com/qiniu.png?imageView2/1/h/500'; -// 对链接进行签名 + +// 对链接进行签名，参考文档：https://developer.qiniu.com/kodo/manual/1656/download-private $signedUrl = $auth->privateDownloadUrl($baseUrl); echo $signedUrl; diff --git a/vendor/qiniu/php-sdk/examples/rs_fetch.php b/vendor/qiniu/php-sdk/examples/rs_fetch.php index 6792410b1..5c1a5abbd 100644 --- a/vendor/qiniu/php-sdk/examples/rs_fetch.php +++ b/vendor/qiniu/php-sdk/examples/rs_fetch.php @@ -4,6 +4,7 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); @@ -11,10 +12,16 @@ $bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); $bucketManager = new BucketManager($auth); -$url = 'http://devtools.qiniu.com/qiniu.png'; -$key = time() . '.png'; +// 第三方资源抓取 +// 参考文档：https://developer.qiniu.com/kodo/api/1263/fetch -// 指定抓取的文件保存名称 +// 需要抓取的文件 URL +$url = 'http://devtools.qiniu.com/qiniu.png'; + +//---------------------------------------- demo1 ---------------------------------------- +// 指定抓取的文件保存到七牛云空间中的名称 + +$key = time() . '.png'; list($ret, $err) = $bucketManager->fetch($url, $bucket, $key); echo "=====> fetch $url to bucket: $bucket key: $key\n"; if ($err !== null) { @@ -23,7 +30,9 @@ if ($err !== null) { print_r($ret); } -// 不指定key时，以文件内容的hash作为文件名 +//---------------------------------------- demo2 ---------------------------------------- +// 不指定 key 时，以文件内容的 hash 作为文件名 + $key = null; list($ret, $err) = $bucketManager->fetch($url, $bucket, $key); echo "=====> fetch $url to bucket: $bucket key: $(etag)\n"; diff --git a/vendor/qiniu/php-sdk/examples/rs_move.php b/vendor/qiniu/php-sdk/examples/rs_move.php index 56105857b..bffbfb666 100644 --- a/vendor/qiniu/php-sdk/examples/rs_move.php +++ b/vendor/qiniu/php-sdk/examples/rs_move.php @@ -1,8 +1,9 @@ move($srcBucket, $srcKey, $destBucket, $destKey, true); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_prefetch.php b/vendor/qiniu/php-sdk/examples/rs_prefetch.php index de947a7e9..6ddc3603f 100644 --- a/vendor/qiniu/php-sdk/examples/rs_prefetch.php +++ b/vendor/qiniu/php-sdk/examples/rs_prefetch.php @@ -1,16 +1,22 @@ prefetch($bucket, $key); if ($err) { print_r($err); diff --git a/vendor/qiniu/php-sdk/examples/rs_pub_domain.php b/vendor/qiniu/php-sdk/examples/rs_pub_domain.php deleted file mode 100644 index 2e81922eb..000000000 --- a/vendor/qiniu/php-sdk/examples/rs_pub_domain.php +++ /dev/null @@ -1,19 +0,0 @@ -publishDomain($bucket, $domain); -if ($err) { - print_r($err); -} diff --git a/vendor/qiniu/php-sdk/examples/rs_stat.php b/vendor/qiniu/php-sdk/examples/rs_stat.php index 891e4e027..36e863eff 100644 --- a/vendor/qiniu/php-sdk/examples/rs_stat.php +++ b/vendor/qiniu/php-sdk/examples/rs_stat.php @@ -1,19 +1,28 @@ stat($bucket, $key); -if ($err) { - print_r($err); + +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 资源元信息查询 +// 参考文档：https://developer.qiniu.com/kodo/api/1308/stat + +$key = "qiniu.mp4"; + +list($ret, $err) = $bucketManager->stat($bucket, $key); +if ($err != null) { + var_dump($err); } else { - print_r($fileInfo); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rsf_list_bucket.php b/vendor/qiniu/php-sdk/examples/rsf_list_bucket.php index 5ce9a629c..97a5838a0 100644 --- a/vendor/qiniu/php-sdk/examples/rsf_list_bucket.php +++ b/vendor/qiniu/php-sdk/examples/rsf_list_bucket.php @@ -4,14 +4,16 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\BucketManager; -// http://developer.qiniu.com/docs/v6/api/reference/rs/list.html#list-description - +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); + $auth = new Auth($accessKey, $secretKey); $bucketManager = new BucketManager($auth); +// 资源列举 +// 参考文档：https://developer.qiniu.com/kodo/api/1284/list // 要列取文件的公共前缀 $prefix = ''; @@ -19,12 +21,11 @@ $prefix = ''; // 上次列举返回的位置标记，作为本次列举的起点信息。 $marker = ''; -// 本次列举的条目数 +// 本次列举的条目数，范围为 1-1000 $limit = 200; $delimiter = '/'; -// 列举文件 do { list($ret, $err) = $bucketManager->listFiles($bucket, $prefix, $marker, $limit, $delimiter); if ($err !== null) { diff --git a/vendor/qiniu/php-sdk/examples/rsf_list_files.php b/vendor/qiniu/php-sdk/examples/rsf_list_files.php index a3981c548..31c455b4e 100644 --- a/vendor/qiniu/php-sdk/examples/rsf_list_files.php +++ b/vendor/qiniu/php-sdk/examples/rsf_list_files.php @@ -4,14 +4,16 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\BucketManager; -// http://developer.qiniu.com/docs/v6/api/reference/rs/list.html#list-description - +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); + $auth = new Auth($accessKey, $secretKey); $bucketManager = new BucketManager($auth); +// 资源列举 +// https://developer.qiniu.com/kodo/api/1284/list // 要列取文件的公共前缀 $prefix = ''; @@ -19,7 +21,7 @@ $prefix = ''; // 上次列举返回的位置标记，作为本次列举的起点信息。 $marker = ''; -// 本次列举的条目数 +// 本次列举的条目数，，范围为 1-1000 $limit = 100; $delimiter = '/'; @@ -34,5 +36,4 @@ if ($err !== null) { echo "Marker:" . $ret["marker"] . "\n"; } echo "\nList Iterms====>\n"; - //var_dump($ret['items']); } diff --git a/vendor/qiniu/php-sdk/examples/rsf_v2list_bucket.php b/vendor/qiniu/php-sdk/examples/rsf_v2list_bucket.php index 4dcf27096..5f9d763ba 100644 --- a/vendor/qiniu/php-sdk/examples/rsf_v2list_bucket.php +++ b/vendor/qiniu/php-sdk/examples/rsf_v2list_bucket.php @@ -4,14 +4,16 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\BucketManager; -// http://developer.qiniu.com/docs/v6/api/reference/rs/list.html#list-description - +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); -$bucket = 'xxxx'; +$bucket = getenv('QINIU_TEST_BUCKET'); + $auth = new Auth($accessKey, $secretKey); $bucketManager = new BucketManager($auth); +// 资源列举 V2 +// https://developer.qiniu.com/kodo/api/4539/v2-list // 要列取文件的公共前缀 $prefix = ''; @@ -19,15 +21,14 @@ $prefix = ''; // 上次列举返回的位置标记，作为本次列举的起点信息。 $marker = ''; -// 本次列举的条目数 +// 本次列举的条目数，范围为 1-1000 $limit = 1000; $delimiter = ''; list($ret, $err) = $bucketManager->listFilesv2($bucket, $prefix, $marker, $limit, $delimiter, true); - -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($ret); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/rtc/README.md b/vendor/qiniu/php-sdk/examples/rtc/README.md new file mode 100644 index 000000000..c7fff4d8f --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/README.md @@ -0,0 +1,34 @@ +# Rtc Streaming Cloud Server-Side Library For PHP + +## Features + +- RoomToken 签发 + - [x] 生成 RoomToken: client->appToken() + +- App 管理 + - [x] 创建应用: client->createApp() + - [x] 获取应用配置信息: client->getApp() + - [x] 更新应用配置信息: client->updateApp() + - [x] 删除应用: client->deleteApp() + +- 房间管理 + - [x] 列举房间下的所有用户: client->listUser() + - [x] 指定一个用户踢出房间: client->kickUser() + - [x] 停止一个房间的合流转推: client->stopMerge() + - [x] 获取当前所有活跃的房间: client->listActiveRooms() + +## Demo +- RoomToken 签发 + - [生成 RoomToken](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_create_roomToken.php) + +- App 管理 + - [创建应用](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_createApp.php) + - [获取应用配置信息](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_getApp.php) + - [更新应用配置信息](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_updateApp.php) + - [删除应用](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_deleteApp.php) + +- 房间管理 + - [列举房间下的所有用户](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_rooms_listUser.php) + - [指定一个用户踢出房间](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_rooms_kickUser.php) + - [停止一个房间的合流转推](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_rooms_stopMerge.php) + - [获取当前所有活跃的房间](https://github.com/qiniu/php-sdk/tree/master/examples/rtc/rtc_rooms_listActiveRooms.php) \ No newline at end of file diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_createApp.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_createApp.php new file mode 100644 index 000000000..039eadd9d --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_createApp.php @@ -0,0 +1,32 @@ +createApp($hub, $title, $maxUsers); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Create Successfully： \n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_create_roomToken.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_create_roomToken.php new file mode 100644 index 000000000..6a62aa28b --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_create_roomToken.php @@ -0,0 +1,34 @@ +appToken($appId, $roomName, $userId, $expireAt, $permission); +echo "\n====> Create RoomToken Successfully： \n"; +var_dump($RoomToken); diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_deleteApp.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_deleteApp.php new file mode 100644 index 000000000..68bff3367 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_deleteApp.php @@ -0,0 +1,25 @@ +deleteApp($appId); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Delete $appId Successfully \n"; +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_getApp.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_getApp.php new file mode 100644 index 000000000..9f8e3748d --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_getApp.php @@ -0,0 +1,26 @@ +getApp($appId); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> $appId Conf: \n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_kickUser.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_kickUser.php new file mode 100644 index 000000000..019c3f21a --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_kickUser.php @@ -0,0 +1,31 @@ +kickUser($appId, $roomName, $userId); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Kick User $userId Successfully \n"; +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listActiveRooms.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listActiveRooms.php new file mode 100644 index 000000000..16e602751 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listActiveRooms.php @@ -0,0 +1,35 @@ +listActiveRooms($appId, $prefix, $offset, $limit); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Active Rooms:\n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listUser.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listUser.php new file mode 100644 index 000000000..a8397280e --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_listUser.php @@ -0,0 +1,29 @@ +listUser($appId, $roomName); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> User List: \n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_stopMerge.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_stopMerge.php new file mode 100644 index 000000000..e140907d4 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_rooms_stopMerge.php @@ -0,0 +1,28 @@ +stopMerge($appId, $roomName); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Stop Merge Successfully \n"; +} diff --git a/vendor/qiniu/php-sdk/examples/rtc/rtc_updateApp.php b/vendor/qiniu/php-sdk/examples/rtc/rtc_updateApp.php new file mode 100644 index 000000000..f7710754e --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/rtc/rtc_updateApp.php @@ -0,0 +1,40 @@ +updateApp($appId, $hub, $title, $maxUsers, false, $mergePublishRtmp); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Update $appId Conf Successfully： \n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/saveas.php b/vendor/qiniu/php-sdk/examples/saveas.php index d896f3bcd..5d51ef4be 100644 --- a/vendor/qiniu/php-sdk/examples/saveas.php +++ b/vendor/qiniu/php-sdk/examples/saveas.php @@ -4,23 +4,28 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Processing\PersistentFop; -// 后台来获取AK, SK -$accessKey = 'Access_Key'; -$secretKey = 'Secret_Key'; +// 控制台获取密钥：https://portal.qiniu.com/user/key +$accessKey = getenv('QINIU_ACCESS_KEY'); +$secretKey = getenv('QINIU_SECRET_KEY'); -//生成EncodedEntryURI的值 -$entry = ':';//为生成缩略图的文件名 -//生成的值 +// 处理结果另存为 +// 参考文档：https://developer.qiniu.com/dora/api/1305/processing-results-save-saveas + +// 生成EncodedEntryURI的值，为生成缩略图的文件名 +$entry = ':'; + +// 生成的值 $encodedEntryURI = \Qiniu\base64_urlSafeEncode($entry); -//使用SecretKey对新的下载URL进行HMAC1-SHA1签名 +// 使用 SecretKey 对新的下载 URL 进行 HMAC1-SHA1 签名 $newurl = "78re52.com1.z0.glb.clouddn.com/resource/Ship.jpg?imageView2/2/w/200/h/200|saveas/" . $encodedEntryURI; $sign = hash_hmac("sha1", $newurl, $secretKey, true); -//对签名进行URL安全的Base64编码 +// 对签名进行 URL 安全的 Base64 编码 $encodedSign = \Qiniu\base64_urlSafeEncode($sign); -//最终得到的完整下载URL + +// 最终得到的完整下载 URL $finalURL = "http://" . $newurl . "/sign/" . $accessKey . ":" . $encodedSign; $callbackBody = file_get_contents("$finalURL"); diff --git a/vendor/qiniu/php-sdk/examples/sms/README.md b/vendor/qiniu/php-sdk/examples/sms/README.md new file mode 100644 index 000000000..8c80a3894 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/README.md @@ -0,0 +1,45 @@ +# SMS Server-Side Library For PHP + +## Features + +- 签名管理 + - [x] 创建签名: client->createSignature() + - [x] 列出签名: client->checkSignature() + - [x] 查询单个签名: client->checkSingleSignature() + - [x] 编辑签名: client->updateSignature() + - [x] 删除签名: client->deleteSignature() + +- 模板管理 + - [x] 创建模板: client->createTemplate() + - [x] 列出模板: client->queryTemplate() + - [x] 查询单个模板: client->querySingleTemplate() + - [x] 编辑模板: client->updateTemplate() + - [x] 删除模板: client->deleteTemplate() + +- 发送短信 + - [x] 发送短信: client->sendMessage() + +- 查询发送记录 + - [x] 查询发送记录: client->querySendSms() + +## Demo + +- 签名管理 + - [创建签名](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_create_signature.php) + - [列出签名](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_query_signature.php) + - [查询单个签名](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_query_single_signature.php) + - [编辑签名](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_edit_signature.php) + - [删除签名](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_delete_signature.php) + +- 模板管理 + - [创建模板](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_create_template.php) + - [列出模板](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_query_template.php) + - [查询单个模板](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_query_single_template.php) + - [编辑模板](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_edit_template.php) + - [删除模板](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_delete_template.php) + +- 发送短信 + - [发送短信](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_send_message.php) + +- 查询发送记录 + - [查询发送记录](https://github.com/qiniu/php-sdk/tree/master/examples/sms/sms_query_send_sms.php) diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_create_signature.php b/vendor/qiniu/php-sdk/examples/sms/sms_create_signature.php new file mode 100644 index 000000000..ea1f158a8 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_create_signature.php @@ -0,0 +1,29 @@ +createSignature($signature, $source, $pics); + +echo "\n====> create signature result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_create_template.php b/vendor/qiniu/php-sdk/examples/sms/sms_create_template.php new file mode 100644 index 000000000..3cb3874df --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_create_template.php @@ -0,0 +1,33 @@ +createTemplate($name, $template, $type, $description, $signature_id); + +echo "\n====> create signature result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_delete_signature.php b/vendor/qiniu/php-sdk/examples/sms/sms_delete_signature.php new file mode 100644 index 000000000..fd873fa37 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_delete_signature.php @@ -0,0 +1,25 @@ +deleteSignature($signature_id); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Delete Signature $signature_id Successfully\n"; +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_delete_template.php b/vendor/qiniu/php-sdk/examples/sms/sms_delete_template.php new file mode 100644 index 000000000..45908351c --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_delete_template.php @@ -0,0 +1,25 @@ +deleteTemplate($template_id); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Delete Template $template_id Successfully\n"; +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_edit_signature.php b/vendor/qiniu/php-sdk/examples/sms/sms_edit_signature.php new file mode 100644 index 000000000..edf14e0c7 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_edit_signature.php @@ -0,0 +1,30 @@ +updateSignature($id, $signature, $source, $pics); + +echo "\n====> edit signature result: \n"; +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Update Signature Successfully\n"; +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_edit_template.php b/vendor/qiniu/php-sdk/examples/sms/sms_edit_template.php new file mode 100644 index 000000000..1be550988 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_edit_template.php @@ -0,0 +1,31 @@ +updateTemplate($template_id, $name, $template, $description, $signature_id); + +echo "\n====> edit template result: \n"; +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Update Template Successfully\n"; +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_query_send_sms.php b/vendor/qiniu/php-sdk/examples/sms/sms_query_send_sms.php new file mode 100644 index 000000000..cdbbe71d9 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_query_send_sms.php @@ -0,0 +1,50 @@ +querySendSms( + $job_id, + $message_id, + $mobile, + $status, + $template_id, + $type, + $start, + $end, + $page, + $page_size +); +echo "\n====> query send sms result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_query_signature.php b/vendor/qiniu/php-sdk/examples/sms/sms_query_signature.php new file mode 100644 index 000000000..224d09bdc --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_query_signature.php @@ -0,0 +1,28 @@ +querySignature($audit_status, $page, $page_size); +echo "\n====> query signature result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_query_single_signature.php b/vendor/qiniu/php-sdk/examples/sms/sms_query_single_signature.php new file mode 100644 index 000000000..8afb4d585 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_query_single_signature.php @@ -0,0 +1,26 @@ +checkSingleSignature($signature_id); +echo "\n====> query single signature result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_query_single_template.php b/vendor/qiniu/php-sdk/examples/sms/sms_query_single_template.php new file mode 100644 index 000000000..8e0b2798a --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_query_single_template.php @@ -0,0 +1,26 @@ +querySingleTemplate($template_id); +echo "\n====> query single template result： \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_query_template.php b/vendor/qiniu/php-sdk/examples/sms/sms_query_template.php new file mode 100644 index 000000000..6be260e09 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_query_template.php @@ -0,0 +1,28 @@ +queryTemplate($audit_status, $page, $page_size); +echo "\n====> query template result： \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/sms/sms_send_message.php b/vendor/qiniu/php-sdk/examples/sms/sms_send_message.php new file mode 100644 index 000000000..d943e5206 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/sms/sms_send_message.php @@ -0,0 +1,32 @@ + 'xxxx'); + +list($ret, $err) = $client->sendMessage($template_id, $mobiles, $code); +if ($err !== null) { + var_dump($err); +} else { + echo "\n====> Send Message Successfully： \n"; + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/update_bucketEvent.php b/vendor/qiniu/php-sdk/examples/update_bucketEvent.php index 26347ac41..7b0d1d05a 100644 --- a/vendor/qiniu/php-sdk/examples/update_bucketEvent.php +++ b/vendor/qiniu/php-sdk/examples/update_bucketEvent.php @@ -2,24 +2,30 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 更新 bucket 事件通知规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/6095/event-notification $bucket = 'xxxx'; $name = 'demo'; $prefix = 'test'; $suffix = 'mp4'; -$event = 'mkfile'; +$event = array("move","copy"); $callbackURL = 'https://www.qiniu.com'; -list($Info, $err) = $bucketManager->updateBucketEvent($bucket, $name, $prefix, $suffix, $event, $callbackURL); -if ($err) { - print_r($err); +list($ret, $err) = $bucketManager->updateBucketEvent($bucket, $name, $prefix, $suffix, $event, $callbackURL); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/update_bucketLifecycleRule.php b/vendor/qiniu/php-sdk/examples/update_bucketLifecycleRule.php index 85eb07a6b..73f0f5667 100644 --- a/vendor/qiniu/php-sdk/examples/update_bucketLifecycleRule.php +++ b/vendor/qiniu/php-sdk/examples/update_bucketLifecycleRule.php @@ -2,13 +2,19 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +use Qiniu\Config; +use Qiniu\Storage\BucketManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -$config = new \Qiniu\Config(); -$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config); +$config = new Config(); +$bucketManager = new BucketManager($auth, $config); + +// 存储空间 - 更新生命周期规则 +// 参考文档：https://developer.qiniu.com/kodo/manual/3699/life-cycle-management $bucket = 'xxxx'; $name = 'demo'; @@ -16,15 +22,15 @@ $prefix = 'test'; $delete_after_days = 90; $to_line_after_days =80; -list($Info, $err) = $bucketManager->updateBucketLifecycleRule( +list($ret, $err) = $bucketManager->updateBucketLifecycleRule( $bucket, $name, $prefix, $delete_after_days, $to_line_after_days ); -if ($err) { - print_r($err); +if ($err != null) { + var_dump($err); } else { - print_r($Info); + var_dump($ret); } diff --git a/vendor/qiniu/php-sdk/examples/upload_and_callback.php b/vendor/qiniu/php-sdk/examples/upload_and_callback.php index 1a7070557..a0c793a1d 100644 --- a/vendor/qiniu/php-sdk/examples/upload_and_callback.php +++ b/vendor/qiniu/php-sdk/examples/upload_and_callback.php @@ -3,27 +3,24 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\UploadManager; -// use Qiniu\Config; -// use Qiniu\Zone; - -// 指定zone上传 -// $zone = Zone::qvmZonez0(); //华东QVM内网上传指定host -// $config = new Config($zone); +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -// 上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器. -// 可参考文档: http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html + +// 上传完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） +// 上传策略参数：https://developer.qiniu.com/kodo/manual/1206/put-policy + $policy = array( 'callbackUrl' => 'http://your.domain.com/upload_verify_callback.php', 'callbackBody' => 'filename=$(fname)&filesize=$(fsize)' ); $uptoken = $auth->uploadToken($bucket, null, 3600, $policy); -//上传文件的本地路径 + +// 上传文件的本地路径 $filePath = './php-logo.png'; -//指定 config -// $uploadMgr = new UploadManager($config); + $uploadMgr = new UploadManager(); list($ret, $err) = $uploadMgr->putFile($uptoken, null, $filePath); echo "\n====> putFile result: \n"; diff --git a/vendor/qiniu/php-sdk/examples/upload_and_pfop.php b/vendor/qiniu/php-sdk/examples/upload_and_pfop.php index 898c09c63..32c1eb513 100644 --- a/vendor/qiniu/php-sdk/examples/upload_and_pfop.php +++ b/vendor/qiniu/php-sdk/examples/upload_and_pfop.php @@ -4,24 +4,35 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\UploadManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); +// 使用上传策略实现上传文件后，自动对该文件进行转码处理，并持久化生成一个新的文件存储到空间中 -// 在七牛保存的文件名 +// 上传到七牛后保存的文件名 $key = 'php-logo.png'; + +// 要上传文件的本地路径 +$filePath = './php-logo.png'; + $uploadMgr = new UploadManager(); -$pfop = "imageMogr2/rotate/90|saveas/" . \Qiniu\base64_urlSafeEncode($bucket . ":php-logo-rotate.png"); +// 视频处理完毕后保存到空间中的名称 +$saveasKey = 'php-logo-rotate.png'; -//转码完成后通知到你的业务服务器。（公网可以访问，并相应200 OK） +// 处理参数 +$pfop = "imageMogr2/rotate/90|saveas/" . \Qiniu\base64_urlSafeEncode("$bucket:$saveasKey"); + +// 转码完成后通知到你的业务服务器（需要可以公网访问，并能够相应 200 OK） $notifyUrl = 'http://notify.fake.com'; -//独立的转码队列：https://portal.qiniu.com/mps/pipeline +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; +// 上传策略参数：https://developer.qiniu.com/kodo/manual/1206/put-policy $policy = array( 'persistentOps' => $pfop, 'persistentNotifyUrl' => $notifyUrl, @@ -29,7 +40,7 @@ $policy = array( ); $token = $auth->uploadToken($bucket, null, 3600, $policy); -list($ret, $err) = $uploadMgr->putFile($token, null, $key); +list($ret, $err) = $uploadMgr->putFile($token, $key, $filePath); echo "\n====> putFile result: \n"; if ($err !== null) { var_dump($err); diff --git a/vendor/qiniu/php-sdk/examples/upload_mgr_init.php b/vendor/qiniu/php-sdk/examples/upload_mgr_init.php index 3459ef1d7..1164c905d 100644 --- a/vendor/qiniu/php-sdk/examples/upload_mgr_init.php +++ b/vendor/qiniu/php-sdk/examples/upload_mgr_init.php @@ -4,14 +4,15 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\UploadManager; -$accessKey = 'Access_Key'; -$secretKey = 'Secret_Key'; +// 控制台获取密钥：https://portal.qiniu.com/user/key +$accessKey = getenv('QINIU_ACCESS_KEY'); +$secretKey = getenv('QINIU_SECRET_KEY'); $auth = new Auth($accessKey, $secretKey); -// 空间名 http://developer.qiniu.com/docs/v6/api/overview/concepts.html#bucket +// 存储空间名称 $bucket = 'Bucket_Name'; -// 生成上传Token +// 生成上传 Token $token = $auth->uploadToken($bucket); // 构建 UploadManager 对象 diff --git a/vendor/qiniu/php-sdk/examples/upload_multi_demos.php b/vendor/qiniu/php-sdk/examples/upload_multi_demos.php index 3bbcd6030..0724d38df 100644 --- a/vendor/qiniu/php-sdk/examples/upload_multi_demos.php +++ b/vendor/qiniu/php-sdk/examples/upload_multi_demos.php @@ -4,17 +4,21 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; use Qiniu\Storage\UploadManager; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); + +// 用户默认没有私有队列，需要在这里创建然后填写 https://portal.qiniu.com/dora/media-gate/pipeline $pipeline = 'sdktest'; $auth = new Auth($accessKey, $secretKey); $token = $auth->uploadToken($bucket); $uploadMgr = new UploadManager(); -//----------------------------------------upload demo1 ---------------------------------------- +//---------------------------------------- upload demo1 ---------------------------------------- // 上传字符串到七牛 + list($ret, $err) = $uploadMgr->put($token, null, 'content string'); echo "\n====> put result: \n"; if ($err !== null) { @@ -24,8 +28,9 @@ if ($err !== null) { } -//----------------------------------------upload demo2 ---------------------------------------- +//---------------------------------------- upload demo2 ---------------------------------------- // 上传文件到七牛 + $filePath = './php-logo.png'; $key = 'php-logo.png'; list($ret, $err) = $uploadMgr->putFile($token, $key, $filePath); @@ -37,9 +42,10 @@ if ($err !== null) { } -//----------------------------------------upload demo3 ---------------------------------------- +//---------------------------------------- upload demo3 ---------------------------------------- // 上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器. -// 可参考文档: http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html +// 可参考文档: https://developer.qiniu.com/kodo/manual/1206/put-policy + $policy = array( 'callbackUrl' => 'http://172.30.251.210/upload_verify_callback.php', 'callbackBody' => 'filename=$(fname)&filesize=$(fsize)' @@ -58,17 +64,15 @@ if ($err !== null) { } -//----------------------------------------upload demo4 ---------------------------------------- -//上传视频，上传完成后进行m3u8的转码， 并给视频打水印 +//---------------------------------------- upload demo4 ---------------------------------------- +// 上传视频，上传完成后进行 m3u8 的转码， 并给视频打水印 + $wmImg = Qiniu\base64_urlSafeEncode('http://devtools.qiniudn.com/qiniu.png'); $pfop = "avthumb/m3u8/wmImage/$wmImg"; -//转码完成后回调到业务服务器。（公网可以访问，并相应200 OK） +// 转码完成后回调到业务服务器。（公网可以访问，并相应 200 OK） $notifyUrl = 'http://notify.fake.com'; -//独立的转码队列：https://portal.qiniu.com/mps/pipeline - - $policy = array( 'persistentOps' => $pfop, 'persistentNotifyUrl' => $notifyUrl, diff --git a/vendor/qiniu/php-sdk/examples/upload_simple_file.php b/vendor/qiniu/php-sdk/examples/upload_simple_file.php index 9d003f0fb..f495a0275 100644 --- a/vendor/qiniu/php-sdk/examples/upload_simple_file.php +++ b/vendor/qiniu/php-sdk/examples/upload_simple_file.php @@ -7,7 +7,7 @@ use Qiniu\Auth; // 引入上传类 use Qiniu\Storage\UploadManager; -// 需要填写你的 Access Key 和 Secret Key +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); @@ -21,13 +21,13 @@ $token = $auth->uploadToken($bucket); // 要上传文件的本地路径 $filePath = './php-logo.png'; -// 上传到七牛后保存的文件名 +// 上传到七牛存储后保存的文件名 $key = 'my-php-logo.png'; // 初始化 UploadManager 对象并进行文件的上传。 $uploadMgr = new UploadManager(); -// 调用 UploadManager 的 putFile 方法进行文件的上传。 +// 调用 UploadManager 的 putFile 方法进行文件的上传，该方法会判断文件大小，进而决定使用表单上传还是分片上传，无需手动配置。 list($ret, $err) = $uploadMgr->putFile($token, $key, $filePath); echo "\n====> putFile result: \n"; if ($err !== null) { diff --git a/vendor/qiniu/php-sdk/examples/upload_tokens.php b/vendor/qiniu/php-sdk/examples/upload_tokens.php index 90f24238b..d2cf02c13 100644 --- a/vendor/qiniu/php-sdk/examples/upload_tokens.php +++ b/vendor/qiniu/php-sdk/examples/upload_tokens.php @@ -1,34 +1,43 @@ uploadToken($bucket, null, $expires, $policy, true); print($upToken . "\n"); +//---------------------------------------- demo2 ---------------------------------------- // 自定义凭证有效期（示例2小时） + $expires = 7200; $upToken = $auth->uploadToken($bucket, null, $expires, $policy, true); print($upToken . "\n"); +//---------------------------------------- demo3 ---------------------------------------- // 覆盖上传凭证 + $expires = 3600; $keyToOverwrite = 'qiniu.mp4'; $upToken = $auth->uploadToken($bucket, $keyToOverwrite, $expires, $policy, true); print($upToken . "\n"); -//自定义上传回复（非callback模式）凭证 +//---------------------------------------- demo4 ---------------------------------------- +// 自定义上传回复（非callback模式）凭证 + $returnBody = '{"key":"$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}'; $policy = array( 'returnBody' => $returnBody @@ -36,7 +45,9 @@ $policy = array( $upToken = $auth->uploadToken($bucket, null, $expires, $policy, true); print($upToken . "\n"); -//带回调业务服务器的凭证（application/json） +//---------------------------------------- demo5 ---------------------------------------- +// 带回调业务服务器的凭证（application/json） + $policy = array( 'callbackUrl' => 'http://api.example.com/qiniu/upload/callback', 'callbackBody' => '{"key":"$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}', @@ -45,8 +56,9 @@ $policy = array( $upToken = $auth->uploadToken($bucket, null, $expires, $policy, true); print($upToken . "\n"); +//---------------------------------------- demo6 ---------------------------------------- +// 带回调业务服务器的凭证（application/x-www-form-urlencoded） -//带回调业务服务器的凭证（application/x-www-form-urlencoded） $policy = array( 'callbackUrl' => 'http://api.example.com/qiniu/upload/callback', 'callbackBody' => 'key=$(key)&hash=$(etag)&bucket=$(bucket)&fsize=$(fsize)&name=$(x:name)' @@ -54,7 +66,9 @@ $policy = array( $upToken = $auth->uploadToken($bucket, null, $expires, $policy, true); print($upToken . "\n"); -//带数据处理的凭证 +//---------------------------------------- demo7 ---------------------------------------- +// 带数据处理的凭证 + $saveMp4Entry = \Qiniu\base64_urlSafeEncode($bucket . ":avthumb_test_target.mp4"); $saveJpgEntry = \Qiniu\base64_urlSafeEncode($bucket . ":vframe_test_target.jpg"); $avthumbMp4Fop = "avthumb/mp4|saveas/" . $saveMp4Entry; diff --git a/vendor/qiniu/php-sdk/examples/upload_verify_callback.php b/vendor/qiniu/php-sdk/examples/upload_verify_callback.php index ffbbc8063..dcb64c957 100644 --- a/vendor/qiniu/php-sdk/examples/upload_verify_callback.php +++ b/vendor/qiniu/php-sdk/examples/upload_verify_callback.php @@ -3,24 +3,26 @@ require_once __DIR__ . '/../autoload.php'; use Qiniu\Auth; +// 控制台获取密钥：https://portal.qiniu.com/user/key $accessKey = getenv('QINIU_ACCESS_KEY'); $secretKey = getenv('QINIU_SECRET_KEY'); $bucket = getenv('QINIU_TEST_BUCKET'); $auth = new Auth($accessKey, $secretKey); -//获取回调的body信息 +// 获取回调的 body 信息 $callbackBody = file_get_contents('php://input'); -//回调的contentType +// 回调的 contentType $contentType = 'application/x-www-form-urlencoded'; -//回调的签名信息，可以验证该回调是否来自七牛 +// 回调的签名信息，可以验证该回调是否来自七牛 $authorization = $_SERVER['HTTP_AUTHORIZATION']; -//七牛回调的url，具体可以参考：http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html +// 七牛回调的 url，具体可以参考：https://developer.qiniu.com/kodo/manual/1206/put-policy $url = 'http://172.30.251.210/upload_verify_callback.php'; +//参考文档：https://developer.qiniu.com/kodo/manual/1653/callback $isQiniuCallback = $auth->verifyCallback($contentType, $authorization, $url, $callbackBody); if ($isQiniuCallback) { diff --git a/vendor/qiniu/php-sdk/examples/upload_with_qvmzone.php b/vendor/qiniu/php-sdk/examples/upload_with_qvmzone.php new file mode 100644 index 000000000..ce2b21fde --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/upload_with_qvmzone.php @@ -0,0 +1,40 @@ +uploadToken($bucket); + +// 上传文件的本地路径 +$filePath = './php-logo.png'; + +// 七牛云主机QVM和七牛对象存储KODO内网上传，目前支持华东1区域(杭州)和华北2区域(北京)的云主机可以访问同区域的对象存储服务 +// 参考文档：https://developer.qiniu.com/qvm/manual/4269/qvm-kodo + +$zone = Zone::qvmZonez0(); // 华东：z0，华北：z1 +$config = new Config($zone); +$config->useHTTPS = true; + +// 指定 config +$uploadMgr = new UploadManager($config); + +list($ret, $err) = $uploadMgr->putFile($uptoken, $key, $filePath); +echo "\n====> putFile result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/examples/upload_with_zone.php b/vendor/qiniu/php-sdk/examples/upload_with_zone.php new file mode 100644 index 000000000..619266609 --- /dev/null +++ b/vendor/qiniu/php-sdk/examples/upload_with_zone.php @@ -0,0 +1,39 @@ +uploadToken($bucket); + +// 上传文件的本地路径 +$filePath = './php-logo.png'; + +// 指定 zone 上传 +// 参考文档：https://developer.qiniu.com/kodo/manual/1671/region-endpoint +$zone = Zone::zonez0(); // 华东：z0，华北：z1，华南：z2，北美：na0，东南亚：as0 +$config = new Config($zone); +$config->useHTTPS = true; + +// 指定 config +$uploadMgr = new UploadManager($config); + +list($ret, $err) = $uploadMgr->putFile($uptoken, $key, $filePath); +echo "\n====> putFile result: \n"; +if ($err !== null) { + var_dump($err); +} else { + var_dump($ret); +} diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Auth.php b/vendor/qiniu/php-sdk/src/Qiniu/Auth.php index b5e4a6bcf..8452ac055 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Auth.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Auth.php @@ -103,6 +103,7 @@ final class Auth 'endUser', 'saveKey', + 'forceSaveKey', 'insertOnly', 'detectMime', diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php b/vendor/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php index 9b462f31a..a6efcedb3 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php @@ -63,6 +63,45 @@ final class CdnManager return $this->post($url, $body); } + /** + * 查询 CDN 刷新记录 + * + * @param string $requestId 指定要查询记录所在的刷新请求id + * @param string $isDir 指定是否查询目录，取值为 yes/no，默认不填则为两种类型记录都查询 + * @param array $urls 要查询的url列表，每个url可以是文件url，也可以是目录url + * @param string $state 指定要查询记录的状态，取值processing／success／failure + * @param int $pageNo 要求返回的页号，默认为0 + * @param int $pageSize 要求返回的页长度，默认为100 + * @param string $startTime 指定查询的开始日期，格式2006-01-01 + * @param string $endTime 指定查询的结束日期，格式2006-01-01 + * @return array + * @link https://developer.qiniu.com/fusion/api/1229/cache-refresh#4 + */ + public function getCdnRefreshList( + $requestId = null, + $isDir = null, + $urls = array(), + $state = null, + $pageNo = 0, + $pageSize = 100, + $startTime = null, + $endTime = null + ) { + $req = array(); + \Qiniu\setWithoutEmpty($req, 'requestId', $requestId); + \Qiniu\setWithoutEmpty($req, 'isDir', $isDir); + \Qiniu\setWithoutEmpty($req, 'urls', $urls); + \Qiniu\setWithoutEmpty($req, 'state', $state); + \Qiniu\setWithoutEmpty($req, 'pageNo', $pageNo); + \Qiniu\setWithoutEmpty($req, 'pageSize', $pageSize); + \Qiniu\setWithoutEmpty($req, 'startTime', $startTime); + \Qiniu\setWithoutEmpty($req, 'endTime', $endTime); + + $body = json_encode($req); + $url = $this->server . '/v2/tune/refresh/list'; + return $this->post($url, $body); + } + /** * @param array $urls 待预取的文件链接数组 * @@ -81,6 +120,42 @@ final class CdnManager return $this->post($url, $body); } + /** + * 查询 CDN 预取记录 + * + * @param string $requestId 指定要查询记录所在的刷新请求id + * @param array $urls 要查询的url列表，每个url可以是文件url，也可以是目录url + * @param string $state 指定要查询记录的状态，取值processing／success／failure + * @param int $pageNo 要求返回的页号，默认为0 + * @param int $pageSize 要求返回的页长度，默认为100 + * @param string $startTime 指定查询的开始日期，格式2006-01-01 + * @param string $endTime 指定查询的结束日期，格式2006-01-01 + * @return array + * @link https://developer.qiniu.com/fusion/api/1227/file-prefetching#4 + */ + public function getCdnPrefetchList( + $requestId = null, + $urls = array(), + $state = null, + $pageNo = 0, + $pageSize = 100, + $startTime = null, + $endTime = null + ) { + $req = array(); + \Qiniu\setWithoutEmpty($req, 'requestId', $requestId); + \Qiniu\setWithoutEmpty($req, 'urls', $urls); + \Qiniu\setWithoutEmpty($req, 'state', $state); + \Qiniu\setWithoutEmpty($req, 'pageNo', $pageNo); + \Qiniu\setWithoutEmpty($req, 'pageSize', $pageSize); + \Qiniu\setWithoutEmpty($req, 'startTime', $startTime); + \Qiniu\setWithoutEmpty($req, 'endTime', $endTime); + + $body = json_encode($req); + $url = $this->server . '/v2/tune/prefetch/list'; + return $this->post($url, $body); + } + /** * @param array $domains 待获取带宽数据的域名数组 * @param string $startDate 开始的日期，格式类似 2017-01-01 diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Config.php b/vendor/qiniu/php-sdk/src/Qiniu/Config.php index c80cd309f..659443eff 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Config.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Config.php @@ -3,7 +3,7 @@ namespace Qiniu; final class Config { - const SDK_VER = '7.2.10'; + const SDK_VER = '7.3.0'; const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改 @@ -12,7 +12,7 @@ final class Config const RS_HOST = 'rs.qiniu.com'; //RS Host const UC_HOST = 'uc.qbox.me'; //UC Host const RTCAPI_HOST = 'http://rtc.qiniuapi.com'; - const ARGUS_HOST = 'argus.atlab.ai'; + const ARGUS_HOST = 'ai.qiniuapi.com'; const CASTER_HOST = 'pili-caster.qiniuapi.com'; const SMS_HOST="https://sms.qiniuapi.com"; const RTCAPI_VERSION = 'v3'; diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Http/Response.php b/vendor/qiniu/php-sdk/src/Qiniu/Http/Response.php index f22ab371e..4f54663fe 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Http/Response.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Http/Response.php @@ -170,7 +170,7 @@ final class Response private static function isJson($headers) { - return array_key_exists('Content-Type', $headers) && + return array_key_exists('content-type', $headers) || array_key_exists('Content-Type', $headers) && strpos($headers['Content-Type'], 'application/json') === 0; } } diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php b/vendor/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php index 1ac5bf717..f5575ed91 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php @@ -1,4 +1,5 @@ @@ -105,15 +115,15 @@ final class ImageUrlBuilder /** * 图片水印 * - * @param string $url 图片链接 - * @param string $image 水印图片链接 - * @param numeric $dissolve 透明度 - * @param string $gravity 水印位置 - * @param numeric $dx 横轴边距 - * @param numeric $dy 纵轴边距 - * @param numeric $watermarkScale 自适应原图的短边比例 - * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html + * @param string $url 图片链接 + * @param string $image 水印图片链接 + * @param int $dissolve 透明度 + * @param string $gravity 水印位置 + * @param int $dx 横轴边距 + * @param int $dy 纵轴边距 + * @param int $watermarkScale 自适应原图的短边比例 * @return string + * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html * @author Sherlock Ren */ public function waterImg( @@ -174,17 +184,17 @@ final class ImageUrlBuilder /** * 文字水印 * - * @param string $url 图片链接 - * @param string $text 文字 - * @param string $font 文字字体 - * @param string $fontSize 文字字号 - * @param string $fontColor 文字颜色 - * @param numeric $dissolve 透明度 - * @param string $gravity 水印位置 - * @param numeric $dx 横轴边距 - * @param numeric $dy 纵轴边距 - * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html#text-watermark + * @param string $url 图片链接 + * @param string $text 文字 + * @param string $font 文字字体 + * @param string $fontSize 文字字号 + * @param string $fontColor 文字颜色 + * @param int $dissolve 透明度 + * @param string $gravity 水印位置 + * @param int $dx 横轴边距 + * @param int $dy 纵轴边距 * @return string + * @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html#text-watermark * @author Sherlock Ren */ public function waterText( @@ -252,7 +262,7 @@ final class ImageUrlBuilder /** * 效验url合法性 * - * @param string $url url链接 + * @param string $url url链接 * @return string * @author Sherlock Ren */ @@ -261,15 +271,15 @@ final class ImageUrlBuilder $urlArr = parse_url($url); return $urlArr['scheme'] - && in_array($urlArr['scheme'], array('http', 'https')) - && $urlArr['host'] - && $urlArr['path']; + && in_array($urlArr['scheme'], array('http', 'https')) + && $urlArr['host'] + && $urlArr['path']; } /** * 检测是否有query * - * @param string $url url链接 + * @param string $url url链接 * @return string * @author Sherlock Ren */ diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Processing/Operation.php b/vendor/qiniu/php-sdk/src/Qiniu/Processing/Operation.php index 919136fc5..7cdd352b6 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Processing/Operation.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Processing/Operation.php @@ -23,8 +23,8 @@ final class Operation /** * 对资源文件进行处理 * - * @param $key 待处理的资源文件名 - * @param $fops string|array fop操作，多次fop操作以array的形式传入。 + * @param string $key 待处理的资源文件名 + * @param string $fops string|array fop操作，多次fop操作以array的形式传入。 * eg. imageView2/1/w/200/h/200, imageMogr2/thumbnail/!75px * * @return array 文件处理后的结果及错误。 diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php b/vendor/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php index 24e7b734a..ac95d251e 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php @@ -1,10 +1,10 @@ baseURL = sprintf("%s/%s/apps", Config::RTCAPI_HOST, Config::RTCAPI_VERSION); } - /* + /** * 创建应用 - * hub: 直播空间名 - * title: app 的名称 注意，Title 不是唯一标识，重复 create 动作将生成多个 app - * maxUsers：人数限制 - * NoAutoKickUser: bool 类型，可选，禁止自动踢人（抢流）。默认为 false ， - 即同一个身份的 client (app/room/user) ，新的连麦请求可以成功，旧连接被关闭。 + * + * @param string $hub 绑定的直播 hub + * @param string $title app 的名称 注意，Title 不是唯一标识，重复 create 动作将生成多个 app + * @param int $maxUsers 连麦房间支持的最大在线人数 + * @param bool $noAutoKickUser 禁止自动踢人（抢流），默认为 false + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_1 */ public function createApp($hub, $title, $maxUsers = null, $noAutoKickUser = null) { + $params = array(); $params['hub'] = $hub; $params['title'] = $title; if (!empty($maxUsers)) { @@ -37,29 +41,25 @@ class AppClient $params['noAutoKickUser'] = $noAutoKickUser; } $body = json_encode($params); - $ret = $this->post($this->baseURL, $body); - return $ret; + return $this->post($this->baseURL, $body); } - /* - * 更新应用 - * appId: app 的唯一标识，创建的时候由系统生成。 - * Title: app 的名称， 可选。 - * Hub: 绑定的直播 hub，可选，用于合流后 rtmp 推流。 - * MaxUsers: int 类型，可选，连麦房间支持的最大在线人数。 - * NoAutoKickUser: bool 类型，可选，禁止自动踢人。 - * MergePublishRtmp: 连麦合流转推 RTMP 的配置，可选择。其详细配置包括如下 - Enable: 布尔类型，用于开启和关闭所有房间的合流功能。 - AudioOnly: 布尔类型，可选，指定是否只合成音频。 - Height, Width: int64，可选，指定合流输出的高和宽，默认为 640 x 480。 - OutputFps: int64，可选，指定合流输出的帧率，默认为 25 fps 。 - OutputKbps: int64，可选，指定合流输出的码率，默认为 1000 。 - URL: 合流后转推旁路直播的地址，可选，支持魔法变量配置按照连麦房间号生成不同的推流地址。如果是转推到七牛直播云，不建议使用该配置。 - StreamTitle: 转推七牛直播云的流名，可选，支持魔法变量配置按照连麦房间号生成不同的流名。例如，配置 Hub 为 qn-zhibo ，配置 StreamTitle 为 $(roomName) ，则房间 meeting-001 的合流将会被转推到 rtmp://pili-publish.qn-zhibo.***.com/qn-zhibo/meeting-001地址。详细配置细则，请咨询七牛技术支持。 + /** + * 更新一个应用的配置信息 + * + * @param string $appId app 的唯一标识，创建的时候由系统生成 + * @param string $hub app 的名称，可选 + * @param string $title 绑定的直播 hub，可选，用于合流后 rtmp 推流 + * @param int $maxUsers 连麦房间支持的最大在线人数，可选 + * @param bool $noAutoKickUser 禁止自动踢人，可选 + * @param null $mergePublishRtmp 连麦合流转推 RTMP 的配置，可选择。其详细配置可以参考文档 + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_1 */ - public function updateApp($appId, $hub, $title, $maxUsers = null, $mergePublishRtmp = null, $noAutoKickUser = null) + public function updateApp($appId, $hub, $title, $maxUsers = null, $noAutoKickUser = null, $mergePublishRtmp = null) { $url = $this->baseURL . '/' . $appId; + $params = array(); $params['hub'] = $hub; $params['title'] = $title; if (!empty($maxUsers)) { @@ -72,67 +72,91 @@ class AppClient $params['mergePublishRtmp'] = $mergePublishRtmp; } $body = json_encode($params); - $ret = $this->post($url, $body); - return $ret; + return $this->post($url, $body); } - /* + /** * 获取应用信息 - * appId: app 的唯一标识，创建的时候由系统生成。 + * + * @param string $appId + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_1 */ public function getApp($appId) { $url = $this->baseURL . '/' . $appId; - $ret = $this->get($url); - return $ret; + return $this->get($url); } - /* + /** * 删除应用 - * appId: app 的唯一标识，创建的时候由系统生成 + * + * @param string $appId app 的唯一标识，创建的时候由系统生成 + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_1 */ public function deleteApp($appId) { $url = $this->baseURL . '/' . $appId; - list(, $err) = $this->delete($url); - return $err; + return $this->delete($url); } - /* + /** * 获取房间内用户列表 - * appId: app 的唯一标识，创建的时候由系统生成。 - * roomName: 操作所查询的连麦房间。 + * + * @param string $appId app 的唯一标识，创建的时候由系统生成 + * @param string $roomName 操作所查询的连麦房间 + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_2 */ public function listUser($appId, $roomName) { $url = sprintf("%s/%s/rooms/%s/users", $this->baseURL, $appId, $roomName); - $ret = $this->get($url); - return $ret; + return $this->get($url); } - /* - * 踢出用户 - * appId: app 的唯一标识，创建的时候由系统生成。 - * roomName: 连麦房间 - * userId: 请求加入房间的用户ID - */ + /** + * 指定一个用户踢出房间 + * + * @param string $appId app 的唯一标识，创建的时候由系统生成 + * @param string $roomName 连麦房间 + * @param string $userId 操作所剔除的用户 + * @return mixed + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_2 + */ public function kickUser($appId, $roomName, $userId) { $url = sprintf("%s/%s/rooms/%s/users/%s", $this->baseURL, $appId, $roomName, $userId); - list(, $err) = $this->delete($url); - return $err; + return $this->delete($url); } - /* + /** + * 停止一个房间的合流转推 + * + * @param string $appId + * @param string $roomName + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_2 + */ + public function stopMerge($appId, $roomName) + { + $url = sprintf("%s/%s/rooms/%s/merge", $this->baseURL, $appId, $roomName); + return $this->delete($url); + } + + /** * 获取应用中活跃房间 - * appId: app 的唯一标识，创建的时候由系统生成。 - * prefix: 所查询房间名的前缀索引，可以为空。 - * offset: int 类型，分页查询的位移标记。 - * limit: int 类型，此次查询的最大长度。 - * GET /v3/apps//rooms?prefix=&offset=&limit= + * + * @param string $appId 连麦房间所属的 app + * @param null $prefix 所查询房间名的前缀索引，可以为空。 + * @param int $offset 分页查询的位移标记 + * @param int $limit 此次查询的最大长度 + * @return array + * @link https://doc.qnsdk.com/rtn/docs/server_overview#2_2 */ public function listActiveRooms($appId, $prefix = null, $offset = null, $limit = null) { + $query = array(); if (isset($prefix)) { $query['prefix'] = $prefix; } @@ -148,22 +172,23 @@ class AppClient } else { $url = sprintf("%s/%s/rooms", $this->baseURL, $appId); } - $ret = $this->get($url); - return $ret; + return $this->get($url); } - /* + /** * 生成加入房间的令牌 - * appId: app 的唯一标识，创建的时候由系统生成。 - * roomName: 房间名称，需满足规格 ^[a-zA-Z0-9_-]{3,64}$ - * userId: 请求加入房间的用户 ID，需满足规格 ^[a-zA-Z0-9_-]{3,50}$ - * expireAt: int64 类型，鉴权的有效时间，传入以秒为单位的64位Unix - 绝对时间，token 将在该时间后失效。 - * permission: 该用户的房间管理权限，"admin" 或 "user"，默认为 "user" 。 - 当权限角色为 "admin" 时，拥有将其他用户移除出房间等特权. + * + * @param string $appId app 的唯一标识，创建的时候由系统生成 + * @param string $roomName 房间名称，需满足规格 ^[a-zA-Z0-9_-]{3,64}$ + * @param string $userId 请求加入房间的用户 ID，需满足规格 ^[a-zA-Z0-9_-]{3,50}$ + * @param int $expireAt 鉴权的有效时间，传入以秒为单位的64位 Unix 绝对时间 + * @param string $permission 该用户的房间管理权限，"admin" 或 "user"，默认为 "user" + * @return string + * @link https://doc.qnsdk.com/rtn/docs/server_overview#1 */ public function appToken($appId, $roomName, $userId, $expireAt, $permission) { + $params = array(); $params['appId'] = $appId; $params['userId'] = $userId; $params['roomName'] = $roomName; diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Sms/Sms.php b/vendor/qiniu/php-sdk/src/Qiniu/Sms/Sms.php index f19a124fb..625ec3044 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Sms/Sms.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Sms/Sms.php @@ -1,10 +1,11 @@ baseURL = sprintf("%s/%s/", Config::SMS_HOST, Config::SMS_VERSION); } - /* + /** * 创建签名 - * signature: string 类型，必填，【长度限制8个字符内】超过长度会报错 - * source: string 类型，必填，申请签名时必须指定签名来源。取值范围为： - nterprises_and_institutions 企事业单位的全称或简称 - website 工信部备案网站的全称或简称 - app APP应用的全称或简称 - public_number_or_small_program 公众号或小程序的全称或简称 - store_name 电商平台店铺名的全称或简称 - trade_name 商标名的全称或简称， - * pics: 本地的图片路径 string 类型，可选 - *@return: 类型array { - "signature_id": - } + * + * @param string $signature 签名 + * @param string $source 签名来源，申请签名时必须指定签名来源 + * @param string $pics 签名对应的资质证明图片进行 base64 编码格式转换后的字符串，可选 + * @return array + * + * @link https://developer.qiniu.com/sms/api/5844/sms-api-create-signature */ public function createSignature($signature, $source, $pics = null) { + $params = array(); $params['signature'] = $signature; $params['source'] = $source; if (!empty($pics)) { - $params['pics'] = $this->imgToBase64($pics); + $params['pics'] = array($this->imgToBase64($pics)); } $body = json_encode($params); - $url =$this->baseURL.'signature'; - $ret = $this->post($url, $body); - return $ret; + $url = $this->baseURL . 'signature'; + return $this->post($url, $body); } - /* - * 编辑签名 - * id 签名id : string 类型，必填， - * signature: string 类型，必填， - * source: string 类型，必填，申请签名时必须指定签名来源。取值范围为： - enterprises_and_institutions 企事业单位的全称或简称 - website 工信部备案网站的全称或简称 - app APP应用的全称或简称 - public_number_or_small_program 公众号或小程序的全称或简称 - store_name 电商平台店铺名的全称或简称 - trade_name 商标名的全称或简称， - * pics: 本地的图片路径 string 类型，可选， - * @return: 类型array { - "signature": string - } - */ + /** + * 编辑签名 + * + * @param string $id 签名 ID + * @param string $signature 签名 + * @param string $source 签名来源 + * @param string $pics 签名对应的资质证明图片进行 base64 编码格式转换后的字符串，可选 + * @return array + * @link https://developer.qiniu.com/sms/api/5890/sms-api-edit-signature + */ public function updateSignature($id, $signature, $source, $pics = null) { + $params = array(); $params['signature'] = $signature; $params['source'] = $source; if (!empty($pics)) { - $params['pics'] = $this->imgToBase64($pics); + $params['pics'] = array($this->imgToBase64($pics)); } $body = json_encode($params); - $url =$this->baseURL.'signature/'.$id; - $ret = $this->PUT($url, $body); - return $ret; + $url = $this->baseURL . 'signature/' . $id; + return $this->PUT($url, $body); } - /* - * 查询签名 - * audit_status: 审核状态 string 类型，可选， - 取值范围为: "passed"(通过), "rejected"(未通过), "reviewing"(审核中) - * page:页码 int 类型， - * page_size: 分页大小 int 类型，可选， 默认为20 - *@return: 类型array { - "items": [{ - "id": string, - "signature": string, - "source": string, - "audit_status": string, - "reject_reason": string, - "created_at": int64, - "updated_at": int64 - }...], - "total": int, - "page": int, - "page_size": int, - } - */ - public function checkSignature($audit_status = null, $page = 1, $page_size = 20) + /** + * 列出签名 + * + * @param string $audit_status 审核状态："passed"(通过), "rejected"(未通过), "reviewing"(审核中) + * @param int $page 页码。默认为 1 + * @param int $page_size 分页大小。默认为 20 + * @return array + * @link https://developer.qiniu.com/sms/api/5889/sms-api-query-signature + */ + public function querySignature($audit_status = null, $page = 1, $page_size = 20) { $url = sprintf( "%s?audit_status=%s&page=%s&page_size=%s", - $this->baseURL.'signature', + $this->baseURL . 'signature', $audit_status, $page, $page_size ); - $ret = $this->get($url); - return $ret; + return $this->get($url); } - - /* - * 删除签名 - * id 签名id string 类型，必填， - * @retrun : 请求成功 HTTP 状态码为 200 - */ - public function deleteSignature($id) + /** + * 查询单个签名 + * + * @param string $signature_id + * @return array + * @link https://developer.qiniu.com/sms/api/5970/query-a-single-signature + */ + public function checkSingleSignature($signature_id) { - $url = $this->baseURL . 'signature/' . $id; - list(, $err) = $this->delete($url); - return $err; + + $url = sprintf( + "%s/%s", + $this->baseURL . 'signature', + $signature_id + ); + return $this->get($url); } + /** + * 删除签名 + * + * @param string $signature_id 签名 ID + * @return array + * @link https://developer.qiniu.com/sms/api/5891/sms-api-delete-signature + */ + public function deleteSignature($signature_id) + { + $url = $this->baseURL . 'signature/' . $signature_id; + return $this->delete($url); + } - - - /* - * 创建模板 - * name : 模板名称 string 类型 ，必填 - * template: 模板内容 string 类型，必填 - * type: 模板类型 string 类型，必填， - 取值范围为: notification (通知类短信), verification (验证码短信), marketing (营销类短信) - * description: 申请理由简述 string 类型，必填 - * signature_id: 已经审核通过的签名 string 类型，必填 - * @return: 类型 array { - "template_id": string - } - */ + /** + * 创建模板 + * + * @param string $name 模板名称 + * @param string $template 模板内容 可设置自定义变量，发送短信时候使用，参考:${code} + * @param string $type notification：通知类,verification：验证码,marketing：营销类,voice：语音类 + * @param string $description 申请理由简述 + * @param string $signature_id 已经审核通过的签名 + * @return array array + * @link https://developer.qiniu.com/sms/api/5893/sms-api-create-template + */ public function createTemplate( $name, $template, $type, $description, - $signture_id + $signature_id ) { + $params = array(); $params['name'] = $name; $params['template'] = $template; $params['type'] = $type; $params['description'] = $description; - $params['signature_id'] = $signture_id; + $params['signature_id'] = $signature_id; $body = json_encode($params); - $url =$this->baseURL.'template'; - $ret = $this->post($url, $body); - return $ret; + $url = $this->baseURL . 'template'; + return $this->post($url, $body); } - /* - * 查询模板 - * audit_status: 审核状态 string 类型 ，可选， - 取值范围为: passed (通过), rejected (未通过), reviewing (审核中) - * page: 页码 int 类型，可选，默认为 1 - * page_size: 分页大小 int 类型，可选，默认为 20 - * @return: 类型array{ - "items": [{ - "id": string, - "name": string, - "template": string, - "audit_status": string, - "reject_reason": string, - "type": string, - "signature_id": string, // 模版绑定的签名ID - "signature_text": string, // 模版绑定的签名内容 - "created_at": int64, - "updated_at": int64 - }...], - "total": int, - "page": int, - "page_size": int - } - */ + /** + * 列出模板 + * + * @param string $audit_status 审核状态：passed (通过), rejected (未通过), reviewing (审核中) + * @param int $page 页码。默认为 1 + * @param int $page_size 分页大小。默认为 20 + * @return array + * @link https://developer.qiniu.com/sms/api/5894/sms-api-query-template + */ public function queryTemplate($audit_status = null, $page = 1, $page_size = 20) { $url = sprintf( "%s?audit_status=%s&page=%s&page_size=%s", - $this->baseURL.'template', + $this->baseURL . 'template', $audit_status, $page, $page_size ); - $ret = $this->get($url); - return $ret; + return $this->get($url); } - /* - * 编辑模板 - * id :模板id - * name : 模板名称 string 类型 ，必填 - * template: 模板内容 string 类型，必填 - * description: 申请理由简述 string 类型，必填 - * signature_id: 已经审核通过的签名 string 类型，必填 - * @retrun : 请求成功 HTTP 状态码为 200 - */ + /** + * 查询单个模版 + * + * @param string $template_id 模版ID + * @return array + * @link https://developer.qiniu.com/sms/api/5969/query-a-single-template + */ + public function querySingleTemplate($template_id) + { + + $url = sprintf( + "%s/%s", + $this->baseURL . 'template', + $template_id + ); + return $this->get($url); + } + + /** + * 编辑模板 + * + * @param string $id 模板 ID + * @param string $name 模板名称 + * @param string $template 模板内容 + * @param string $description 申请理由简述 + * @param string $signature_id 已经审核通过的签名 ID + * @return array + * @link https://developer.qiniu.com/sms/api/5895/sms-api-edit-template + */ public function updateTemplate( $id, $name, @@ -211,51 +206,96 @@ class Sms $description, $signature_id ) { + $params = array(); $params['name'] = $name; $params['template'] = $template; $params['description'] = $description; $params['signature_id'] = $signature_id; $body = json_encode($params); - $url =$this->baseURL.'template/'.$id; - $ret = $this->PUT($url, $body); - return $ret; - } - - /* - * 删除模板 - * id :模板id string 类型，必填， - * @retrun : 请求成功 HTTP 状态码为 200 - */ - public function deleteTemplate($id) - { $url = $this->baseURL . 'template/' . $id; - list(, $err) = $this->delete($url); - return $err; + return $this->PUT($url, $body); } - /* - * 发送短信 - * 编辑模板 - * template_id :模板id string类型，必填 - * mobiles : 手机号数组 []string 类型 ，必填 - * parameters: 模板内容 map[string]string 类型，可选 - * @return: 类型json { - "job_id": string - } - */ + /** + * 删除模板 + * + * @param string $template_id 模板 ID + * @return array + * @link https://developer.qiniu.com/sms/api/5896/sms-api-delete-template + */ + public function deleteTemplate($template_id) + { + $url = $this->baseURL . 'template/' . $template_id; + return $this->delete($url); + } + + /** + * 发送短信 + * + * @param string $template_id 模板 ID + * @param array $mobiles 手机号 + * @param array $parameters 自定义模板变量，变量设置在创建模板时，参数template指定 + * @return array + * @link https://developer.qiniu.com/sms/api/5897/sms-api-send-message + */ public function sendMessage($template_id, $mobiles, $parameters = null) { + $params = array(); $params['template_id'] = $template_id; $params['mobiles'] = $mobiles; if (!empty($parameters)) { $params['parameters'] = $parameters; } $body = json_encode($params); - $url =$this->baseURL.'message'; - $ret = $this->post($url, $body); - return $ret; + $url = $this->baseURL . 'message'; + return $this->post($url, $body); } + /** + * 查询发送记录 + * + * @param string $job_id 发送任务返回的 id + * @param string $message_id 单条短信发送接口返回的 id + * @param string $mobile 接收短信的手机号码 + * @param string $status sending: 发送中，success: 发送成功，failed: 发送失败，waiting: 等待发送 + * @param string $template_id 模版 id + * @param string $type marketing:营销，notification:通知，verification:验证码，voice:语音 + * @param string $start 开始时间，timestamp，例如: 1563280448 + * @param int $end 结束时间，timestamp，例如: 1563280471 + * @param int $page 页码，默认为 1 + * @param int $page_size 每页返回的数据条数，默认20，最大200 + * @return array + * @link https://developer.qiniu.com/sms/api/5852/query-send-sms + */ + public function querySendSms( + $job_id = null, + $message_id = null, + $mobile = null, + $status = null, + $template_id = null, + $type = null, + $start = null, + $end = null, + $page = 1, + $page_size = 20 + ) { + $query = array(); + \Qiniu\setWithoutEmpty($query, 'job_id', $job_id); + \Qiniu\setWithoutEmpty($query, 'message_id', $message_id); + \Qiniu\setWithoutEmpty($query, 'mobile', $mobile); + \Qiniu\setWithoutEmpty($query, 'status', $status); + \Qiniu\setWithoutEmpty($query, 'template_id', $template_id); + \Qiniu\setWithoutEmpty($query, 'type', $type); + \Qiniu\setWithoutEmpty($query, 'start', $start); + \Qiniu\setWithoutEmpty($query, 'end', $end); + \Qiniu\setWithoutEmpty($query, 'page', $page); + \Qiniu\setWithoutEmpty($query, 'page_size', $page_size); + + $url = $this->baseURL . 'messages?' . http_build_query($query); + return $this->get($url); + } + + public function imgToBase64($img_file) { $img_base64 = ''; @@ -265,9 +305,10 @@ class Sms $fp = fopen($app_img_file, "r"); // 图片是否可读权限 if ($fp) { $filesize = filesize($app_img_file); - if ($filesize > 5*1024*1024) { + if ($filesize > 5 * 1024 * 1024) { die("pic size < 5M !"); } + $img_type = null; $content = fread($fp, $filesize); $file_content = chunk_split(base64_encode($content)); // base64编码 switch ($img_info[2]) { //判读图片类型 @@ -290,11 +331,11 @@ class Sms return $img_base64; } - private function get($url, $cType = null) + private function get($url, $contentType = 'application/x-www-form-urlencoded') { - $rtcToken = $this->auth->authorizationV2($url, "GET", null, $cType); - $rtcToken['Content-Type'] = $cType; - $ret = Client::get($url, $rtcToken); + $headers = $this->auth->authorizationV2($url, "GET", null, $contentType); + $headers['Content-Type'] = $contentType; + $ret = Client::get($url, $headers); if (!$ret->ok()) { return array(null, new Error($url, $ret)); } @@ -303,9 +344,9 @@ class Sms private function delete($url, $contentType = 'application/json') { - $rtcToken = $this->auth->authorizationV2($url, "DELETE", null, $contentType); - $rtcToken['Content-Type'] = $contentType; - $ret = Client::delete($url, $rtcToken); + $headers = $this->auth->authorizationV2($url, "DELETE", null, $contentType); + $headers['Content-Type'] = $contentType; + $ret = Client::delete($url, $headers); if (!$ret->ok()) { return array(null, new Error($url, $ret)); } @@ -314,20 +355,22 @@ class Sms private function post($url, $body, $contentType = 'application/json') { - $rtcToken = $this->auth->authorizationV2($url, "POST", $body, $contentType); - $rtcToken['Content-Type'] = $contentType; - $ret = Client::post($url, $body, $rtcToken); + $headers = $this->auth->authorizationV2($url, "POST", $body, $contentType); + + $headers['Content-Type'] = $contentType; + $ret = Client::post($url, $body, $headers); if (!$ret->ok()) { return array(null, new Error($url, $ret)); } $r = ($ret->body === null) ? array() : $ret->json(); return array($r, null); } + private function PUT($url, $body, $contentType = 'application/json') { - $rtcToken = $this->auth->authorizationV2($url, "PUT", $body, $contentType); - $rtcToken['Content-Type'] = $contentType; - $ret = Client::put($url, $body, $rtcToken); + $headers = $this->auth->authorizationV2($url, "PUT", $body, $contentType); + $headers['Content-Type'] = $contentType; + $ret = Client::put($url, $body, $headers); if (!$ret->ok()) { return array(null, new Error($url, $ret)); } diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Storage/ArgusManager.php b/vendor/qiniu/php-sdk/src/Qiniu/Storage/ArgusManager.php index 08893708c..0f2baee2c 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Storage/ArgusManager.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Storage/ArgusManager.php @@ -1,4 +1,5 @@ arPost($path, $body); } + + /** + * 图片审核 + * + * @param string $body + * + * @return array 成功返回NULL，失败返回对象Qiniu\Http\Error + * @link https://developer.qiniu.com/censor/api/5588/image-censor + */ + public function censorImage($body) + { + $path = '/v3/image/censor'; + + return $this->arPost($path, $body); + } + + /** + * 查询视频审核结果 + * + * @param string $jobid 任务ID + * @return array + * @link https://developer.qiniu.com/censor/api/5620/video-censor + */ + public function censorStatus($jobid) + { + $scheme = "http://"; + + if ($this->config->useHTTPS === true) { + $scheme = "https://"; + } + $url = $scheme . Config::ARGUS_HOST . "/v3/jobs/video/$jobid"; + $response = $this->get($url); + if (!$response->ok()) { + print("statusCode: " . $response->statusCode); + return array(null, new Error($url, $response)); + } + return array($response->json(), null); + } + private function getArHost() { $scheme = "http://"; - if ($this->config->useHTTPS == true) { + if ($this->config->useHTTPS === true) { $scheme = "https://"; } return $scheme . Config::ARGUS_HOST; @@ -58,16 +97,27 @@ final class ArgusManager return $this->post($url, $body); } + private function get($url) + { + $headers = $this->auth->authorizationV2($url, 'GET'); + + return Client::get($url, $headers); + } + private function post($url, $body) { $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json'); - $headers['Content-Type']='application/json'; + $headers['Content-Type'] = 'application/json'; $ret = Client::post($url, $body, $headers); if (!$ret->ok()) { - print($ret->statusCode); + print("statusCode: " . $ret->statusCode); return array(null, new Error($url, $ret)); } $r = ($ret->body === null) ? array() : $ret->json(); + if (strstr($url, "video")) { + $jobid = $r['job']; + return array($jobid, null); + } return array($r, null); } } diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php b/vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php index 0a2413dd4..600cb6c79 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php @@ -1,11 +1,11 @@ ucPost($path); - return $info; + return $this->ucPost($path); } /** * 创建空间 * - * @param $name 创建的空间名 - * @param $region 创建的区域，默认华东 + * @param string $name 创建的空间名 + * @param string $region 创建的区域，默认华东 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array + * @link https://developer.qiniu.com/kodo/api/1382/mkbucketv3 */ public function createBucket($name, $region = 'z0') { - $path = '/mkbucketv2/'.$name.'/region/' . $region; + $path = '/mkbucketv3/' . $name . '/region/' . $region; return $this->rsPost($path, null); } /** * 删除空间 * - * @param $name 删除的空间名 + * @param string $name 需要删除的目标空间名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array + * @link https://developer.qiniu.com/kodo/api/1601/drop-bucket */ public function deleteBucket($name) { - $path = '/drop/'.$name; + $path = '/drop/' . $name; return $this->rsPost($path, null); } /** * 获取指定空间绑定的所有的域名 * - * @return string[] 包含所有空间域名 + * @param string $bucket 空间名称 + * @return array */ public function domains($bucket) { @@ -104,55 +102,40 @@ final class BucketManager /** * 获取指定空间的相关信息 * - * @return string[] 包含空间信息 + * @param string $bucket 空间名称 + * @return array */ public function bucketInfo($bucket) { $path = '/v2/bucketInfo?bucket=' . $bucket; - $info = $this->ucPost($path); - return $info; + return $this->ucPost($path); } /** * 获取指定zone的空间信息列表 - * 在Region 未指定且Global 不为 true 时(包含未指定的情况,下同)，返回用户的所有空间。 - * 在指定了 region 参数且 global 不为 true 时，只列举非全局空间。 - * shared 不指定shared参数或指定shared为rw或false时，返回包含具有读写权限空间， - * 指定shared为rd或true时，返回包含具有读权限空间。 - * fs：如果为 true，会返回每个空间当前的文件数和存储量（实时数据）。 - * @return string[] 包含空间信息 + * + * @param string $region 区域 + * @param string $shared 指定共享空间，rw：读写权限空间，rd：读权限空间 + * @param string $fs 如果为 true，会返回每个空间当前的文件数和存储量（实时数据） + * @return array */ public function bucketInfos($region = null, $shared = 'false', $fs = 'false') { $path = '/v2/bucketInfos?region=' . $region . '&shared=' . $shared . '&fs=' . $fs; - $info = $this->ucPost($path); - return $info; + return $this->ucPost($path); } - /** - * 获取空间绑定的域名列表 - * @return string[] 包含空间绑定的所有域名 - */ - /** * 列取空间的文件列表 * - * @param $bucket 空间名 - * @param $prefix 列举前缀 - * @param $marker 列举标识符 - * @param $limit 单次列举个数限制 - * @param $delimiter 指定目录分隔符 + * @param string $bucket 空间名 + * @param string $prefix 列举前缀 + * @param string $marker 列举标识符 + * @param int $limit 单次列举个数限制 + * @param string $delimiter 指定目录分隔符 * - * @return array 包含文件信息的数组，类似：[ -* { -* "hash" => "", -* "key" => "", -* "fsize" => "", -* "putTime" => "" -* }, -* ... -* ] - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/list.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1284/list */ public function listFiles( $bucket, @@ -173,22 +156,14 @@ final class BucketManager /** * 列取空间的文件列表 * - * @param $bucket 空间名 - * @param $prefix 列举前缀 - * @param $marker 列举标识符 - * @param $limit 单次列举个数限制 - * @param $delimiter 指定目录分隔符 - * @param $skipconfirm 是否跳过已删除条目的确认机制 + * @param string $bucket 空间名 + * @param string $prefix 列举前缀 + * @param string $marker 列举标识符 + * @param int $limit 单次列举个数限制 + * @param string $delimiter 指定目录分隔符 + * @param bool $skipconfirm 是否跳过已删除条目的确认机制 * - * @return array 包含文件信息的数组，类似：[ -* { -* "hash" => "", -* "key" => "", -* "fsize" => "", -* "putTime" => "" -* }, -* ... -* ] + * @return array * @link http://developer.qiniu.com/docs/v6/api/reference/rs/list.html */ public function listFilesv2( @@ -213,40 +188,22 @@ final class BucketManager return array(null, new Error($url, $ret)); } $r = explode("\n", $ret->body); - $pop = array_pop($r); + array_pop($r); return array($r, null); } - /** - * 设置Referer防盗链 - * - * @param $bucket 空间名 - * @param $mode 0: 表示关闭Referer(使用此选项将会忽略以下参数并将恢复默认值); - * 1: 表示设置Referer白名单; 2:表示设置Referer黑名单 - * @param $norefer 0: 表示不允许空 Refer 访问; 1: 表示允许空 Refer 访问 - * @param $pattern 规则字符串, 当前允许格式分为三种: 一种为空主机头域名, - * 比如 foo.com; 一种是泛域名,比如 *.bar.com; 一种是完全通配符, - * 即一个 *; 多个规则之间用;隔开, 比如: foo.com;*.bar.com;sub.foo.com;*.sub.bar.com - * @param $source_enabled 源站是否支持，默认为0只给CDN配置, 设置为1表示开启源站防盗链 - * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - */ - // public function referAntiLeech(){ - - // } - /** * 增加bucket生命规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空，只能为 + * @param string $bucket 空间名 + * @param string $name 规则名称 bucket 内唯一，长度小于50，不能为空，只能为 * 字母、数字、下划线 - * @param $prefix 同一个 bucket 里面前缀不能重复 - * @param $delete_after_days 指定上传文件多少天后删除，指定为0表示不删除, + * @param string $prefix 同一个 bucket 里面前缀不能重复 + * @param int $delete_after_days 指定上传文件多少天后删除，指定为0表示不删除, * 大于0表示多少天后删除,需大于 to_line_after_days - * @param $to_line_after_days 指定文件上传多少天后转低频存储。指定为0表示 + * @param int $to_line_after_days 指定文件上传多少天后转低频存储。指定为0表示 * 不转低频存储，小于0表示上传的文件立即变低频存储 - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function bucketLifecycleRule( $bucket, @@ -256,6 +213,7 @@ final class BucketManager $to_line_after_days ) { $path = '/rules/add'; + $params = array(); if ($bucket) { $params['bucket'] = $bucket; } @@ -279,15 +237,15 @@ final class BucketManager /** * 更新bucket生命规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空，只能为字母、 + * @param string $bucket 空间名 + * @param string $name 规则名称 bucket 内唯一，长度小于50，不能为空，只能为字母、 * 数字、下划线 - * @param $prefix 同一个 bucket 里面前缀不能重复 - * @param $delete_after_days 指定上传文件多少天后删除，指定为0表示不删除， + * @param string $prefix 同一个 bucket 里面前缀不能重复 + * @param int $delete_after_days 指定上传文件多少天后删除，指定为0表示不删除， * 大于0表示多少天后删除，需大于 to_line_after_days - * @param $to_line_after_days 指定文件上传多少天后转低频存储。指定为0表示不 + * @param int $to_line_after_days 指定文件上传多少天后转低频存储。指定为0表示不 * 转低频存储，小于0表示上传的文件立即变低频存储 - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function updateBucketLifecycleRule( $bucket, @@ -297,6 +255,7 @@ final class BucketManager $to_line_after_days ) { $path = '/rules/update'; + $params = array(); if ($bucket) { $params['bucket'] = $bucket; } @@ -313,15 +272,14 @@ final class BucketManager $params['to_line_after_days'] = $to_line_after_days; } $data = http_build_query($params); - $info = $this->ucPost($path, $data); - return $info; + return $this->ucPost($path, $data); } /** * 获取bucket生命规则 * - * @param $bucket 空间名 - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @param string $bucket 空间名 + * @return array */ public function getBucketLifecycleRules($bucket) { @@ -333,14 +291,15 @@ final class BucketManager /** * 删除bucket生命规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空， + * @param string $bucket 空间名 + * @param string $name 规则名称 bucket 内唯一，长度小于50，不能为空， * 只能为字母、数字、下划线（） - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function deleteBucketLifecycleRule($bucket, $name) { $path = '/rules/delete'; + $params = array(); if ($bucket) { $params['bucket'] = $bucket; } @@ -355,18 +314,18 @@ final class BucketManager /** * 增加bucket事件通知规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空， + * @param string $bucket 空间名 + * @param string $name 规则名称 bucket 内唯一，长度小于50，不能为空， * 只能为字母、数字、下划线() - * @param $prefix 同一个 bucket 里面前缀不能重复 - * @param $suffix 可选，文件配置的后缀 - * @param $event 事件类型，可以指定多个，包括 put,mkfile,delete,copy,move,append, + * @param string $prefix 同一个 bucket 里面前缀不能重复 + * @param string $suffix 可选，文件配置的后缀 + * @param array $event 事件类型，可以指定多个，包括 put,mkfile,delete,copy,move,append, * disable,enable,deleteMarkerCreate - * @param $callbackURL 通知URL，可以指定多个，失败依次重试 - * @param $access_key 可选，设置的话会对通知请求用对应的ak、sk进行签名 - * @param $host 可选，通知请求的host + * @param string $callbackURL 通知URL，可以指定多个，失败依次重试 + * @param string $access_key 可选，设置的话会对通知请求用对应的ak、sk进行签名 + * @param string $host 可选，通知请求的host * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function putBucketEvent( $bucket, @@ -379,29 +338,30 @@ final class BucketManager $host = null ) { $path = '/events/add'; - if ($bucket) { + $params = array(); + if (!empty($bucket)) { $params['bucket'] = $bucket; } - if ($name) { + if (!empty($name)) { $params['name'] = $name; } - if ($prefix) { + if (!empty($prefix)) { $params['prefix'] = $prefix; } - if ($suffix) { + if (!empty($suffix)) { $params['suffix'] = $suffix; } - if ($callbackURL) { + if (!empty($callbackURL)) { $params['callbackURL'] = $callbackURL; } - if ($access_key) { + if (!empty($access_key)) { $params['access_key'] = $access_key; } - if ($host) { + if (!empty($host)) { $params['host'] = $host; } $data = http_build_query($params); - if ($event) { + if (!empty($event)) { $eventpath = ""; foreach ($event as $key => $value) { $eventpath .= "&event=$value"; @@ -415,18 +375,18 @@ final class BucketManager /** * 更新bucket事件通知规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空， + * @param string $bucket 空间名 + * @param string $name 规则名称 bucket 内唯一，长度小于50，不能为空， * 只能为字母、数字、下划线() - * @param $prefix 同一个 bucket 里面前缀不能重复 - * @param $suffix 可选，文件配置的后缀 - * @param $event 事件类型，可以指定多个，包括 put,mkfile,delete,copy,move,append,disable, + * @param string $prefix 同一个 bucket 里面前缀不能重复 + * @param string $suffix 可选，文件配置的后缀 + * @param array $event 事件类型，可以指定多个，包括 put,mkfile,delete,copy,move,append,disable, * enable,deleteMarkerCreate - * @param $callbackURL 通知URL，可以指定多个，失败依次重试 - * @param $access_key 可选，设置的话会对通知请求用对应的ak、sk进行签名 - * @param $host 可选，通知请求的host + * @param string $callbackURL 通知URL，可以指定多个，失败依次重试 + * @param string $access_key 可选，设置的话会对通知请求用对应的ak、sk进行签名 + * @param string $host 可选，通知请求的host * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function updateBucketEvent( $bucket, @@ -439,59 +399,65 @@ final class BucketManager $host = null ) { $path = '/events/update'; - if ($bucket) { + $params = array(); + if (!empty($bucket)) { $params['bucket'] = $bucket; } - if ($name) { + if (!empty($name)) { $params['name'] = $name; } - if ($prefix) { + if (!empty($prefix)) { $params['prefix'] = $prefix; } if ($suffix) { $params['suffix'] = $suffix; } - if ($event) { + if (!empty($event)) { $params['event'] = $event; } - if ($callbackURL) { + if (!empty($callbackURL)) { $params['callbackURL'] = $callbackURL; } - if ($access_key) { + if (!empty($access_key)) { $params['access_key'] = $access_key; } - if ($host) { + if (!empty($host)) { $params['host'] = $host; } $data = http_build_query($params); - $info = $this->ucPost($path, $data); - return $info; + if (!empty($event)) { + $eventpath = ""; + foreach ($event as $key => $value) { + $eventpath .= "&event=$value"; + } + $data .= $eventpath; + } + return $this->ucPost($path, $data); } /** * 获取bucket事件通知规则 * - * @param $bucket 空间名 - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @param string $bucket 空间名 + * @return array */ public function getBucketEvents($bucket) { $path = '/events/get?bucket=' . $bucket; - $info = $this->ucGet($path); - return $info; + return $this->ucGet($path); } /** * 删除bucket事件通知规则 * - * @param $bucket 空间名 - * @param $name 规则名称 bucket 内唯一，长度小于50，不能为空， - * 只能为字母、数字、下划线 - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @param string $bucket 空间名 + * @param string $name 规则名称bucket内唯一,长度小于50,不能为空,只能为字母、数字、下划线 + * @return array */ public function deleteBucketEvent($bucket, $name) { $path = '/events/delete'; + $params = array(); if ($bucket) { $params['bucket'] = $bucket; } @@ -499,180 +465,112 @@ final class BucketManager $params['name'] = $name; } $data = http_build_query($params); - $info = $this->ucPost($path, $data); - return $info; + return $this->ucPost($path, $data); } - /** - * 设置bucket的跨域信息，最多允许设置10条跨域规则。 - * 对于同一个域名如果设置了多条规则，那么按顺序使用第一条匹配的规则去生成返回值。 - * 对于简单跨域请求，只匹配 Origin； - * allowed_orgin: 允许的域名。必填；支持通配符*；*表示全部匹配；只有第一个*生效； - * 需要设置"Scheme"；大小写敏感。例如 - * 规则：http://*.abc.*.com 请求："http://test.abc.test.com" 结果：不通过 - * 规则："http://abc.com" 请求："https://abc.com"/"abc.com" 结果：不通过 - * 规则："abc.com" 请求："http://abc.com" 结果：不通过 - * allowed_method: 允许的方法。必填；不支持通配符；大小写不敏感； - * allowed_header: 允许的header。选填；支持通配符*， - * 但只能是单独的*，表示允许全部header，其他*不生效； - * 空则不允许任何header；大小写不敏感； - * exposed_header: 暴露的header。选填；不支持通配符； - * X-Log, X-Reqid是默认会暴露的两个header； - * 其他的header如果没有设置，则不会暴露；大小写不敏感； - * max_age: 结果可以缓存的时间。选填；空则不缓存； - * allowed_credentials：该配置不支持设置，默认为true。 - * 备注：如果没有设置任何corsRules，那么默认允许所有的跨域请求 - */ - // public function putCorsRules(string $bucket, array $params) - // { - // $path = '/corsRules/set/' . $bucket; - // $data = json_encode($params); - // $info = $this->ucPost($path, $data); - // return $info; - // } - /** * 获取bucket的跨域信息 - * $bucket 空间名 + * + * @param string $bucket 空间名 + * @return array */ public function getCorsRules($bucket) { $path = '/corsRules/get/' . $bucket; - $info = $this->ucGet($path); - return $info; - } - - /** - * 设置回源规则 - * 使用该API设置源站优先级高于/image设置的源站，即IO优先读取source接口设置的源站配置, - * 如果存在会忽略/image设置的源站 - * Bucket 空间名 - * Host(可选)回源Host - * RetryCodes(可选),镜像回源时源站返回Code可以重试，最多指定3个，当前只支持4xx错误码重试 - * SourceQiniuAK,SourceQiniuSK(可选)如果存在将在回源时对URL进行签名，客户源站可以验证 - * 以保证请求来自Qiniu服务器 - * Expires(可选) 签名过期时间，如果不设置默认为1小时 - * Addr 回源地址，不可重复。 - * Weight 权重,范围限制1-100,不填默认为1,回源时会根据所有源的权重值进行源站选择, - * 主备源会分开计算. - * Backup 是否备用回源,回源优先尝试主源 - */ - // public function putBucktSourceConfig(array $params) - // { - // $path = '/mirrorConfig/set'; - // $data = json_encode($params); - // $info = $this->ucPostV2($path, $data); - // return $info; - // } - - /** - * 获取空间回源配置 - */ - public function getBucktSourceConfig(array $params) - { - $path = '/mirrorConfig/get'; - $data = json_encode($params); - $info = $this->ucPostV2($path, $data); - return $info; + return $this->ucGet($path); } /** * 开关原图保护 - * mode 为1表示开启原图保护，0表示关闭 + * + * @param string $bucket 空间名称 + * @param int $mode mode 为1表示开启原图保护，0表示关闭 + * @return array */ public function putBucketAccessStyleMode($bucket, $mode) { $path = '/accessMode/' . $bucket . '/mode/' . $mode; - $info = $this->ucPost($path, null); - return $info; + return $this->ucPost($path, null); } /** * 设置私有属性 - * private为0表示公开，为1表示私有 + * + * @param string $bucket 空间名称 + * @param int $private private为0表示公开，为1表示私有 + * @return array */ public function putBucketAccessMode($bucket, $private) { - $path = '/bucket/' . $bucket . '/private/' . $private; - $info = $this->ucPost($path, null); - return $info; + $path = "/private?bucket=$bucket&private=$private"; + return $this->ucPost($path, null); } /** - * 设置referer防盗链 - * bucket=: bucket 名 - * mode=: - * 0: 表示关闭Referer(使用此选项将会忽略以下参数并将恢复默认值); - * 1: 表示设置Referer白名单; 2: 表示设置Referer黑名单 - * norefer=: 0: 表示不允许空 Refer 访问; - * 1: 表示允许空 Refer 访问 - * pattern=: 规则字符串, 当前允许格式分为三种: - * 一种为空主机头域名, 比如 foo.com; - * 一种是泛域名, 比如 *.bar.com; 一种是完全通配符, 即一个 *; - * 多个规则之间用;隔开, 比如: foo.com;*.bar.com;sub.foo.com;*.sub.bar.com - * 空主机头域名可以是多级域名，比如 foo.bar.com。 - * 多个域名之间不允许夹带空白字符。 - * source_enabled=:1 + * 设置 referer 防盗链 + * + * @param string $bucket 空间名称 + * @param int $mode 0:关闭Referer(使用此选项将会忽略以下参数并将恢复默认值); + * 1:设置Referer白名单; 2:设置Referer黑名单 + * @param string $norefer 0:不允许空 Refer 访问; 1:表示允许空Refer访问 + * @param string $pattern 规则字符串 + * @param int $enabled 源站是否支持，默认为0只给CDN配置, 设置为1表示开启源站防盗链 + * @return array + * @link https://developer.qiniu.com/kodo/manual/6093/set-the-hotlinking-prevention */ public function putReferAntiLeech($bucket, $mode, $norefer, $pattern, $enabled = 1) { $path = "/referAntiLeech?bucket=$bucket&mode=$mode&norefer=$norefer&pattern=$pattern&source_enabled=$enabled"; - $info = $this->ucPost($path, null); - return $info; + return $this->ucPost($path, null); } /** * 设置Bucket的maxAge - * maxAge为0或者负数表示为默认值（31536000） + * + * @param string $bucket 空间名称 + * @param int $maxAge maxAge为0或者负数表示为默认值（31536000） + * @return array */ public function putBucketMaxAge($bucket, $maxAge) { $path = '/maxAge?bucket=' . $bucket . '&maxAge=' . $maxAge; - $info = $this->ucPost($path, null); - return $info; + return $this->ucPost($path, null); } /** - * 设置配额 - * : 空间名称，不支持授权空间 - * : 空间存储量配额,参数传入0或不传表示不更改当前配置，传入-1表示取消限额， - * 新创建的空间默认没有限额。 - * : 空间文件数配额，参数含义同 + * 设置空间配额 + * + * @param string $bucket 空间名称，不支持授权空间 + * @param string $size 空间存储量配额,参数传入0或不传表示不更改当前配置，传入-1表示取消限额，新创建的空间默认没有限额 + * @param string $count 空间文件数配额，参数含义同 + * @return array */ public function putBucketQuota($bucket, $size, $count) { $path = '/setbucketquota/' . $bucket . '/size/' . $size . '/count/' . $count; - $info = $this->apiPost($path, null); - return $info; + return $this->apiPost($path, null); } /** - * 获取配额 - * bucket 空间名称 + * 获取空间配额 + * + * @param string $bucket 空间名称 + * @return array */ public function getBucketQuota($bucket) { $path = '/getbucketquota/' . $bucket; - $info = $this->apiPost($path, null); - return $info; + return $this->apiPost($path, null); } /** * 获取资源的元信息，但不返回文件内容 * - * @param $bucket 待获取信息资源所在的空间 - * @param $key 待获取资源的文件名 + * @param string $bucket 待获取信息资源所在的空间 + * @param string $key 待获取资源的文件名 * - * @return array 包含文件信息的数组，类似： -* [ -* "hash" => "", -* "key" => "", -* "fsize" => , -* "putTime" => "" -* "fileType" => -* ] - * - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/stat.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1308/stat */ public function stat($bucket, $key) { @@ -683,28 +581,26 @@ final class BucketManager /** * 删除指定资源 * - * @param $bucket 待删除资源所在的空间 - * @param $key 待删除资源的文件名 + * @param string $bucket 待删除资源所在的空间 + * @param string $key 待删除资源的文件名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/delete.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1257/delete */ public function delete($bucket, $key) { $path = '/delete/' . \Qiniu\entry($bucket, $key); - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } - /** * 给资源进行重命名，本质为move操作。 * - * @param $bucket 待操作资源所在空间 - * @param $oldname 待操作资源文件名 - * @param $newname 目标资源文件名 + * @param string $bucket 待操作资源所在空间 + * @param string $oldname 待操作资源文件名 + * @param string $newname 目标资源文件名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array */ public function rename($bucket, $oldname, $newname) { @@ -714,13 +610,13 @@ final class BucketManager /** * 对资源进行复制。 * - * @param $from_bucket 待操作资源所在空间 - * @param $from_key 待操作资源文件名 - * @param $to_bucket 目标资源空间名 - * @param $to_key 目标资源文件名 + * @param string $from_bucket 待操作资源所在空间 + * @param string $from_key 待操作资源文件名 + * @param string $to_bucket 目标资源空间名 + * @param string $to_key 目标资源文件名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/copy.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1254/copy */ public function copy($from_bucket, $from_key, $to_bucket, $to_key, $force = false) { @@ -730,20 +626,19 @@ final class BucketManager if ($force === true) { $path .= '/force/true'; } - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } /** * 将资源从一个空间到另一个空间 * - * @param $from_bucket 待操作资源所在空间 - * @param $from_key 待操作资源文件名 - * @param $to_bucket 目标资源空间名 - * @param $to_key 目标资源文件名 + * @param string $from_bucket 待操作资源所在空间 + * @param string $from_key 待操作资源文件名 + * @param string $to_bucket 目标资源空间名 + * @param string $to_key 目标资源文件名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/move.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1288/move */ public function move($from_bucket, $from_key, $to_bucket, $to_key, $force = false) { @@ -753,87 +648,71 @@ final class BucketManager if ($force) { $path .= '/force/true'; } - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } /** * 主动修改指定资源的文件元信息 * - * @param $bucket 待操作资源所在空间 - * @param $key 待操作资源文件名 - * @param $mime 待操作文件目标mimeType + * @param string $bucket 待操作资源所在空间 + * @param string $key 待操作资源文件名 + * @param string $mime 待操作文件目标mimeType * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/chgm.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1252/chgm */ public function changeMime($bucket, $key, $mime) { $resource = \Qiniu\entry($bucket, $key); $encode_mime = \Qiniu\base64_urlSafeEncode($mime); $path = '/chgm/' . $resource . '/mime/' . $encode_mime; - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } /** * 修改指定资源的存储类型 * - * @param $bucket 待操作资源所在空间 - * @param $key 待操作资源文件名 - * @param $fileType 待操作文件目标文件类型 + * @param string $bucket 待操作资源所在空间 + * @param string $key 待操作资源文件名 + * @param int $fileType 0 表示标准存储；1 表示低频存储；2 表示归档存储 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link https://developer.qiniu.com/kodo/api/3710/modify-the-file-type + * @return array + * @link https://developer.qiniu.com/kodo/api/3710/chtype */ public function changeType($bucket, $key, $fileType) { $resource = \Qiniu\entry($bucket, $key); $path = '/chtype/' . $resource . '/type/' . $fileType; - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } /** * 修改文件的存储状态，即禁用状态和启用状态间的的互相转换 * - * @param $bucket 待操作资源所在空间 - * @param $key 待操作资源文件名 - * @param $status 待操作文件目标文件类型 + * @param string $bucket 待操作资源所在空间 + * @param string $key 待操作资源文件名 + * @param int $status 0表示启用；1表示禁用 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error + * @return array * @link https://developer.qiniu.com/kodo/api/4173/modify-the-file-status */ public function changeStatus($bucket, $key, $status) { $resource = \Qiniu\entry($bucket, $key); $path = '/chstatus/' . $resource . '/status/' . $status; - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } /** * 从指定URL抓取资源，并将该资源存储到指定空间中 * - * @param $url 指定的URL - * @param $bucket 目标资源空间 - * @param $key 目标资源文件名 + * @param string $url 指定的URL + * @param string $bucket 目标资源空间 + * @param string $key 目标资源文件名 * - * @return array 包含已拉取的文件信息。 - * 成功时： [ - * [ - * "hash" => "", - * "key" => "" - * ], - * null - * ] - * - * 失败时： [ - * null, - * Qiniu/Http/Error - * ] - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/fetch.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1263/fetch */ public function fetch($url, $bucket, $key = null) { @@ -849,14 +728,97 @@ final class BucketManager return $this->post($url, null); } + /** + * 从指定URL异步抓取资源，并将该资源存储到指定空间中 + * + * @param string $url 需要抓取的url + * @param string $bucket 所在区域的bucket + * @param string $host 从指定url下载数据时使用的Host + * @param string $key 文件存储的key + * @param string $md5 文件md5 + * @param string $etag 文件etag + * @param string $callbackurl 回调URL + * @param string $callbackbody 回调Body + * @param string $callbackbodytype 回调Body内容类型,默认为"application/x-www-form-urlencoded" + * @param string $callbackhost 回调时使用的Host + * @param int $file_type 存储文件类型 0:标准存储(默认),1:低频存储,2:归档存储 + * @param bool $ignore_same_key 如果空间中已经存在同名文件则放弃本次抓取 + * @return array + * @link https://developer.qiniu.com/kodo/api/4097/asynch-fetch + */ + public function asynchFetch( + $url, + $bucket, + $host = null, + $key = null, + $md5 = null, + $etag = null, + $callbackurl = null, + $callbackbody = null, + $callbackbodytype = 'application/x-www-form-urlencoded', + $callbackhost = null, + $file_type = 0, + $ignore_same_key = false + ) { + $path = '/sisyphus/fetch'; + + $params = array('url' => $url, 'bucket' => $bucket); + \Qiniu\setWithoutEmpty($params, 'host', $host); + \Qiniu\setWithoutEmpty($params, 'key', $key); + \Qiniu\setWithoutEmpty($params, 'md5', $md5); + \Qiniu\setWithoutEmpty($params, 'etag', $etag); + \Qiniu\setWithoutEmpty($params, 'callbackurl', $callbackurl); + \Qiniu\setWithoutEmpty($params, 'callbackbody', $callbackbody); + \Qiniu\setWithoutEmpty($params, 'callbackbodytype', $callbackbodytype); + \Qiniu\setWithoutEmpty($params, 'callbackhost', $callbackhost); + \Qiniu\setWithoutEmpty($params, 'file_type', $file_type); + \Qiniu\setWithoutEmpty($params, 'ignore_same_key', $ignore_same_key); + $data = json_encode($params); + + $ak = $this->auth->getAccessKey(); + $apiHost = $this->config->getApiHost($ak, $bucket); + $url = $apiHost . $path; + + return $this->postV2($url, $data); + } + + + /** + * 查询异步第三方资源抓取任务状态 + * + * @param string $zone + * @param string $id + * @return array + * @link https://developer.qiniu.com/kodo/api/4097/asynch-fetch + */ + public function asynchFetchStatus($zone, $id) + { + $scheme = "http://"; + + if ($this->config->useHTTPS === true) { + $scheme = "https://"; + } + + $url = $scheme . "api-" . $zone . ".qiniu.com/sisyphus/fetch?id=" . $id; + + $response = $this->getV2($url); + + if (!$response->ok()) { + print("statusCode: " . $response->statusCode); + return array(null, new Error($url, $response)); + } + return array($response->json(), null); + } + + /** * 从镜像源站抓取资源到空间中，如果空间中已经存在，则覆盖该资源 * - * @param $bucket 待获取资源所在的空间 - * @param $key 代获取资源文件名 + * @param string $bucket 待获取资源所在的空间 + * @param string $key 代获取资源文件名 * - * @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error - * @link http://developer.qiniu.com/docs/v6/api/reference/rs/prefetch.html + * @return array + * @link https://developer.qiniu.com/kodo/api/1293/prefetch */ public function prefetch($bucket, $key) { @@ -867,14 +829,13 @@ final class BucketManager $ioHost = $this->config->getIovipHost($ak, $bucket); $url = $ioHost . $path; - list(, $error) = $this->post($url, null); - return $error; + return $this->post($url, null); } /** * 在单次请求中进行多个资源管理操作 * - * @param $operations 资源管理操作数组 + * @param array $operations 资源管理操作数组 * * @return array 每个资源的处理情况，结果类似： * [ @@ -896,25 +857,24 @@ final class BucketManager /** * 设置文件的生命周期 * - * @param $bucket 设置文件生命周期文件所在的空间 - * @param $key 设置文件生命周期文件的文件名 - * @param $days 设置该文件多少天后删除，当$days设置为0时表示取消该文件的生命周期 + * @param string $bucket 设置文件生命周期文件所在的空间 + * @param string $key 设置文件生命周期文件的文件名 + * @param int $days 设置该文件多少天后删除，当$days设置为0时表示取消该文件的生命周期 * - * @return Mixed + * @return array * @link https://developer.qiniu.com/kodo/api/update-file-lifecycle */ public function deleteAfterDays($bucket, $key, $days) { $entry = \Qiniu\entry($bucket, $key); $path = "/deleteAfterDays/$entry/$days"; - list(, $error) = $this->rsPost($path); - return $error; + return $this->rsPost($path); } private function getRsfHost() { $scheme = "http://"; - if ($this->config->useHTTPS == true) { + if ($this->config->useHTTPS === true) { $scheme = "https://"; } return $scheme . Config::RSF_HOST; @@ -923,7 +883,7 @@ final class BucketManager private function getRsHost() { $scheme = "http://"; - if ($this->config->useHTTPS == true) { + if ($this->config->useHTTPS === true) { $scheme = "https://"; } return $scheme . Config::RS_HOST; @@ -932,7 +892,7 @@ final class BucketManager private function getApiHost() { $scheme = "http://"; - if ($this->config->useHTTPS == true) { + if ($this->config->useHTTPS === true) { $scheme = "https://"; } return $scheme . Config::API_HOST; @@ -941,7 +901,7 @@ final class BucketManager private function getUcHost() { $scheme = "http://"; - if ($this->config->useHTTPS == true) { + if ($this->config->useHTTPS === true) { $scheme = "https://"; } return $scheme . Config::UC_HOST; @@ -993,6 +953,12 @@ final class BucketManager return array($ret->json(), null); } + private function getV2($url) + { + $headers = $this->auth->authorizationV2($url, 'GET'); + return Client::get($url, $headers); + } + private function post($url, $body) { $headers = $this->auth->authorization($url, $body, 'application/x-www-form-urlencoded'); @@ -1004,12 +970,6 @@ final class BucketManager return array($r, null); } - private function ucPostV2($path, $body) - { - $url = $this->getUcHost() . $path; - return $this->postV2($url, $body); - } - private function postV2($url, $body) { $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json'); diff --git a/vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php b/vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php index d87756a02..1267004e5 100644 --- a/vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php +++ b/vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php @@ -1,8 +1,9 @@ key = $key; $this->key2 = $key2; + global $customCallbackURL; + $this->customCallbackURL = $customCallbackURL; + global $testAuth; - $this->bucketManager = new BucketManager($testAuth); + $config = new Config(); + $this->bucketManager = new BucketManager($testAuth, $config); global $dummyAuth; $this->dummyBucketManager = new BucketManager($dummyAuth); @@ -38,6 +45,49 @@ class BucketTest extends \PHPUnit_Framework_TestCase $this->assertEquals(401, $error->code()); $this->assertNull($list2); $this->assertNotNull($error->message()); + $this->assertNotNull($error->getResponse()); + } + + public function testListbuckets() + { + list($ret, $error) = $this->bucketManager->listbuckets('z0'); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testCreateBucket() + { + list($ret, $error) = $this->bucketManager->createBucket('phpsdk-ci-test'); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testDeleteBucket() + { + list($ret, $error) = $this->bucketManager->deleteBucket('phpsdk-ci-test'); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testDomains() + { + list($ret, $error) = $this->bucketManager->domains($this->bucketName); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testBucketInfo() + { + list($ret, $error) = $this->bucketManager->bucketInfo($this->bucketName); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testBucketInfos() + { + list($ret, $error) = $this->bucketManager->bucketInfos('z0'); + $this->assertNotNull($ret); + $this->assertNull($error); } public function testList() @@ -45,6 +95,90 @@ class BucketTest extends \PHPUnit_Framework_TestCase list($ret, $error) = $this->bucketManager->listFiles($this->bucketName, null, null, 10); $this->assertNotNull($ret['items'][0]); $this->assertNotNull($ret['marker']); + $this->assertNull($error); + } + + public function testListFilesv2() + { + list($ret, $error) = $this->bucketManager->listFilesv2($this->bucketName, null, null, 10); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testBucketLifecycleRule() + { + list($ret, $error) = $this->bucketManager->bucketLifecycleRule($this->bucketName, 'demo', 'test', 80, 70); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testGetbucketLifecycleRule() + { + list($ret, $error) = $this->bucketManager->getBucketLifecycleRules($this->bucketName); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testUpdatebucketLifecycleRule() + { + list($ret, $error) = $this->bucketManager->updateBucketLifecycleRule( + $this->bucketName, + 'demo', + 'testupdate', + 80, + 70 + ); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testDeleteBucketLifecycleRule() + { + list($ret, $error) = $this->bucketManager->deleteBucketLifecycleRule($this->bucketName, 'demo'); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testPutBucketEvent() + { + list($ret, $error) = $this->bucketManager->putBucketEvent( + $this->bucketName, + 'bucketevent', + 'test', + 'img', + array('copy'), + $this->customCallbackURL + ); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testUpdateBucketEvent() + { + list($ret, $error) = $this->bucketManager->updateBucketEvent( + $this->bucketName, + 'bucketevent', + 'test', + 'video', + array('copy'), + $this->customCallbackURL + ); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testGetBucketEvent() + { + list($ret, $error) = $this->bucketManager->getBucketEvents($this->bucketName); + $this->assertNotNull($ret); + $this->assertNull($error); + } + + public function testDeleteBucketEvent() + { + list($ret, $error) = $this->bucketManager->deleteBucketEvent($this->bucketName, 'bucketevent'); + $this->assertNotNull($ret); + $this->assertNull($error); } public function testStat() @@ -67,8 +201,9 @@ class BucketTest extends \PHPUnit_Framework_TestCase public function testDelete() { - $error = $this->bucketManager->delete($this->bucketName, 'del'); - $this->assertEquals(612, $error->code()); + list($ret, $error) = $this->bucketManager->delete($this->bucketName, 'del'); + $this->assertNull($ret); + $this->assertNotNull($error); } @@ -77,9 +212,9 @@ class BucketTest extends \PHPUnit_Framework_TestCase $key = 'renamefrom' . rand(); $this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key); $key2 = 'renameto' . $key; - $error = $this->bucketManager->rename($this->bucketName, $key, $key2); + list($ret, $error) = $this->bucketManager->rename($this->bucketName, $key, $key2); $this->assertNull($error); - $error = $this->bucketManager->delete($this->bucketName, $key2); + list($ret, $error) = $this->bucketManager->delete($this->bucketName, $key2); $this->assertNull($error); } @@ -89,7 +224,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase $key = 'copyto' . rand(); $this->bucketManager->delete($this->bucketName, $key); - $error = $this->bucketManager->copy( + list($ret, $error) = $this->bucketManager->copy( $this->bucketName, $this->key, $this->bucketName, @@ -98,7 +233,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase $this->assertNull($error); //test force copy - $error = $this->bucketManager->copy( + list($ret, $error) = $this->bucketManager->copy( $this->bucketName, $this->key2, $this->bucketName, @@ -112,14 +247,14 @@ class BucketTest extends \PHPUnit_Framework_TestCase $this->assertEquals($key2Stat['hash'], $key2CopiedStat['hash']); - $error = $this->bucketManager->delete($this->bucketName, $key); + list($ret, $error) = $this->bucketManager->delete($this->bucketName, $key); $this->assertNull($error); } public function testChangeMime() { - $error = $this->bucketManager->changeMime( + list($ret, $error) = $this->bucketManager->changeMime( $this->bucketName, 'php-sdk.html', 'text/html' @@ -129,7 +264,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase public function testPrefetch() { - $error = $this->bucketManager->prefetch( + list($ret, $error) = $this->bucketManager->prefetch( $this->bucketName, 'php-sdk.html' ); @@ -162,6 +297,35 @@ class BucketTest extends \PHPUnit_Framework_TestCase $this->assertNull($error); } + public function testAsynchFetch() + { + list($ret, $error) = $this->bucketManager->asynchFetch( + 'http://devtools.qiniu.com/qiniu.png', + $this->bucketName, + null, + 'qiniu.png' + ); + $this->assertArrayHasKey('id', $ret); + $this->assertNull($error); + + list($ret, $error) = $this->bucketManager->asynchFetch( + 'http://devtools.qiniu.com/qiniu.png', + $this->bucketName, + null, + '' + ); + $this->assertArrayHasKey('id', $ret); + $this->assertNull($error); + + list($ret, $error) = $this->bucketManager->asynchFetch( + 'http://devtools.qiniu.com/qiniu.png', + $this->bucketName + ); + $this->assertArrayHasKey('id', $ret); + $this->assertNull($error); + } + + public function testBatchCopy() { $key = 'copyto' . rand(); @@ -191,7 +355,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase ); list($ret, $error) = $this->bucketManager->batch($ops); $this->assertEquals(200, $ret[0]['code']); - $error = $this->bucketManager->delete($this->bucketName, $key2); + list($ret, $error) = $this->bucketManager->delete($this->bucketName, $key2); $this->assertNull($error); } @@ -203,7 +367,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase $ops = BucketManager::buildBatchRename($this->bucketName, array($key => $key2), true); list($ret, $error) = $this->bucketManager->batch($ops); $this->assertEquals(200, $ret[0]['code']); - $error = $this->bucketManager->delete($this->bucketName, $key2); + list($ret, $error) = $this->bucketManager->delete($this->bucketName, $key2); $this->assertNull($error); } @@ -217,11 +381,71 @@ class BucketTest extends \PHPUnit_Framework_TestCase public function testDeleteAfterDays() { $key = rand(); - $err = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1); - $this->assertEquals(612, $err->code()); + list($ret, $error) = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1); + $this->assertNotNull($error); $this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key); - $err = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1); - $this->assertEquals(null, $err); + list($ret, $error) = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1); + $this->assertEquals(null, $ret); + } + + public function testGetCorsRules() + { + list($ret, $err) = $this->bucketManager->getCorsRules($this->bucketName); + $this->assertNull($err); + } + + public function testPutBucketAccessStyleMode() + { + list($ret, $err) = $this->bucketManager->putBucketAccessStyleMode($this->bucketName, 0); + $this->assertNull($err); + } + + public function testPutBucketAccessMode() + { + list($ret, $err) = $this->bucketManager->putBucketAccessMode($this->bucketName, 0); + $this->assertNull($err); + } + + public function testPutReferAntiLeech() + { + list($ret, $err) = $this->bucketManager->putReferAntiLeech($this->bucketName, 0, "1", "*"); + $this->assertNull($err); + } + + public function testPutBucketMaxAge() + { + list($ret, $err) = $this->bucketManager->putBucketMaxAge($this->bucketName, 31536000); + $this->assertNull($err); + } + + public function testPutBucketQuota() + { + list($ret, $err) = $this->bucketManager->putBucketQuota($this->bucketName, -1, -1); + $this->assertNull($err); + } + + public function testGetBucketQuota() + { + list($ret, $err) = $this->bucketManager->getBucketQuota($this->bucketName); + $this->assertNull($err); + } + + public function testChangeType() + { + list($ret, $err) = $this->bucketManager->changeType($this->bucketName, $this->key, 0); + $this->assertNull($err); + + list($ret, $err) = $this->bucketManager->changeType($this->bucketName, $this->key, 1); + $this->assertNull($err); + } + + public function testChangeStatus() + { + list($ret, $err) = $this->bucketManager->changeStatus($this->bucketName, $this->key, 1); + $this->assertNull($err); + + list($ret, $err) = $this->bucketManager->changeStatus($this->bucketName, $this->key, 0); + $this->assertNull($err); } } diff --git a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php index 892197da7..1a12704b6 100644 --- a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php +++ b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php @@ -15,26 +15,130 @@ class CdnManagerTest extends \PHPUnit_Framework_TestCase { protected $cdnManager; protected $encryptKey; - protected $imgUrl; + protected $testStartDate; + protected $testEndDate; + protected $testGranularity; + protected $testLogDate; + protected $refreshUrl; + protected $refreshDirs; + protected $customDomain; + protected $customDomain2; protected function setUp() { - global $timestampAntiLeechEncryptKey; - global $customDomain; global $testAuth; - $this->cdnManager = new CdnManager($testAuth); + + global $timestampAntiLeechEncryptKey; $this->encryptKey = $timestampAntiLeechEncryptKey; - $this->imgUrl = $customDomain . '/sdktest.png'; + + global $testStartDate; + $this->testStartDate = $testStartDate; + + global $testEndDate; + $this->testEndDate = $testEndDate; + + global $testGranularity; + $this->testGranularity = $testGranularity; + + global $testLogDate; + $this->testLogDate = $testLogDate; + + global $customDomain; + $this->refreshUrl = $customDomain . '/sdktest.png'; + $this->refreshDirs = $customDomain; + $this->customDomain = $customDomain; + + global $customDomain2; + $this->customDomain2 = $customDomain2; + } + + public function testRefreshUrls() + { + list($ret, $err) = $this->cdnManager->refreshUrls(array($this->refreshUrl)); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testRefreshDirs() + { + list($ret, $err) = $this->cdnManager->refreshDirs(array($this->refreshDirs)); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testRefreshUrlsAndDirs() + { + list($ret, $err) = $this->cdnManager->refreshUrlsAndDirs(array($this->refreshUrl), array($this->refreshDirs)); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testGetCdnRefreshList() + { + list($ret, $err) = $this->cdnManager->getCdnRefreshList(null, null, null, 'success'); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testPrefetchUrls() + { + list($ret, $err) = $this->cdnManager->prefetchUrls(array($this->refreshUrl)); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testGetCdnPrefetchList() + { + list($ret, $err) = $this->cdnManager->getCdnPrefetchList(null, null, 'success'); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testGetBandwidthData() + { + list($ret, $err) = $this->cdnManager->getBandwidthData( + array($this->customDomain2), + $this->testStartDate, + $this->testEndDate, + $this->testGranularity + ); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testGetFluxData() + { + list($ret, $err) = $this->cdnManager->getFluxData( + array($this->customDomain2), + $this->testStartDate, + $this->testEndDate, + $this->testGranularity + ); + $this->assertNotNull($ret); + $this->assertNull($err); + } + + public function testGetCdnLogList() + { + list($ret, $err) = $this->cdnManager->getCdnLogList(array('fake.qiniu.com'), $this->testLogDate); + $this->assertNull($ret); + $this->assertNotNull($err); } public function testCreateTimestampAntiLeechUrl() { - - $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->imgUrl, $this->encryptKey, 3600); - + $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->refreshUrl, $this->encryptKey, 3600); + $response = Client::get($signUrl); + $this->assertEquals($response->statusCode, 200); + $this->assertNull($response->error); + + $signUrl = $this->cdnManager->createTimestampAntiLeechUrl( + $this->refreshUrl . '?qiniu', + $this->encryptKey, + 3600 + ); $response = Client::get($signUrl); - $this->assertEquals($response->statusCode, 200); $this->assertNull($response->error); } diff --git a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php index e2ab5fc6d..558bc1f11 100644 --- a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php +++ b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php @@ -7,7 +7,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase { public function testGet() { - $response = Client::get('baidu.com'); + $response = Client::get('qiniu.com'); $this->assertEquals($response->statusCode, 200); $this->assertNotNull($response->body); $this->assertNull($response->error); @@ -15,7 +15,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase public function testGetQiniu() { - $response = Client::get('up.qiniu.com'); + $response = Client::get('upload.qiniu.com'); $this->assertEquals(405, $response->statusCode); $this->assertNotNull($response->body); $this->assertNotNull($response->xReqId()); @@ -23,9 +23,27 @@ class HttpTest extends \PHPUnit_Framework_TestCase $this->assertNotNull($response->error); } + public function testDelete() + { + $response = Client::delete('uc.qbox.me/bucketTagging', array()); + $this->assertEquals($response->statusCode, 401); + $this->assertNotNull($response->body); + $this->assertNotNull($response->error); + } + + public function testDeleteQiniu() + { + $response = Client::delete('uc.qbox.me/bucketTagging', array()); + $this->assertEquals(401, $response->statusCode); + $this->assertNotNull($response->body); + $this->assertNotNull($response->xReqId()); + $this->assertNotNull($response->xLog()); + $this->assertNotNull($response->error); + } + public function testPost() { - $response = Client::post('baidu.com', null); + $response = Client::post('qiniu.com', null); $this->assertEquals($response->statusCode, 200); $this->assertNotNull($response->body); $this->assertNull($response->error); @@ -33,11 +51,29 @@ class HttpTest extends \PHPUnit_Framework_TestCase public function testPostQiniu() { - $response = Client::post('up.qiniu.com', null); + $response = Client::post('upload.qiniu.com', null); $this->assertEquals($response->statusCode, 400); $this->assertNotNull($response->body); $this->assertNotNull($response->xReqId()); $this->assertNotNull($response->xLog()); $this->assertNotNull($response->error); } + + public function testPut() + { + $response = Client::PUT('uc.qbox.me/bucketTagging', null); + $this->assertEquals($response->statusCode, 401); + $this->assertNotNull($response->body); + $this->assertNotNull($response->error); + } + + public function testPutQiniu() + { + $response = Client::put('uc.qbox.me/bucketTagging', null); + $this->assertEquals(401, $response->statusCode); + $this->assertNotNull($response->body); + $this->assertNotNull($response->xReqId()); + $this->assertNotNull($response->xLog()); + $this->assertNotNull($response->error); + } } diff --git a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php index 41e6ea8ab..a648d88d3 100644 --- a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php +++ b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php @@ -35,7 +35,7 @@ class ResumeUpTest extends \PHPUnit_Framework_TestCase public function test4ML2() { $key = 'resumePutFile4ML'; - $zone = new Zone(array('up.fake.qiniu.com'), array('up.qiniup.com')); + $zone = new Zone(array('upload.fake.qiniu.com'), array('upload.qiniup.com')); $cfg = new Config($zone); $upManager = new UploadManager($cfg); $token = $this->auth->uploadToken($this->bucketName, $key); diff --git a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php index d32875bd2..cc5cce507 100644 --- a/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php +++ b/vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php @@ -13,6 +13,8 @@ class ZoneTest extends \PHPUnit_Framework_TestCase protected $bucketName; protected $bucketNameBC; protected $bucketNameNA; + protected $bucketNameFS; + protected $bucketNameAS; protected function setUp() @@ -26,6 +28,12 @@ class ZoneTest extends \PHPUnit_Framework_TestCase global $bucketNameNA; $this->bucketNameNA = $bucketNameNA; + global $bucketNameFS; + $this->bucketNameFS = $bucketNameFS; + + global $bucketNameAS; + $this->bucketNameAS = $bucketNameAS; + global $accessKey; $this->ak = $accessKey; @@ -35,14 +43,24 @@ class ZoneTest extends \PHPUnit_Framework_TestCase public function testUpHosts() { + list($ret, $err) = Zone::queryZone($this->ak, 'fakebucket'); + $this->assertNull($ret); + $this->assertNotNull($err); + $zone = Zone::queryZone($this->ak, $this->bucketName); $this->assertContains('upload.qiniup.com', $zone->cdnUpHosts); $zone = Zone::queryZone($this->ak, $this->bucketNameBC); $this->assertContains('upload-z1.qiniup.com', $zone->cdnUpHosts); + $zone = Zone::queryZone($this->ak, $this->bucketNameFS); + $this->assertContains('upload-z2.qiniup.com', $zone->cdnUpHosts); + $zone = Zone::queryZone($this->ak, $this->bucketNameNA); $this->assertContains('upload-na0.qiniup.com', $zone->cdnUpHosts); + + $zone = Zone::queryZone($this->ak, $this->bucketNameAS); + $this->assertContains('upload-as0.qiniup.com', $zone->cdnUpHosts); } public function testIoHosts() @@ -53,7 +71,55 @@ class ZoneTest extends \PHPUnit_Framework_TestCase $zone = Zone::queryZone($this->ak, $this->bucketNameBC); $this->assertEquals($zone->iovipHost, 'iovip-z1.qbox.me'); + $zone = Zone::queryZone($this->ak, $this->bucketNameFS); + $this->assertEquals($zone->iovipHost, 'iovip-z2.qbox.me'); + $zone = Zone::queryZone($this->ak, $this->bucketNameNA); $this->assertEquals($zone->iovipHost, 'iovip-na0.qbox.me'); + + $zone = Zone::queryZone($this->ak, $this->bucketNameAS); + $this->assertEquals($zone->iovipHost, 'iovip-as0.qbox.me'); + } + + public function testZonez0() + { + $zone = Zone::zonez0(); + $this->assertContains('upload.qiniup.com', $zone->cdnUpHosts); + } + + public function testZonez1() + { + $zone = Zone::zonez1(); + $this->assertContains('upload-z1.qiniup.com', $zone->cdnUpHosts); + } + + public function testZonez2() + { + $zone = Zone::zonez2(); + $this->assertContains('upload-z2.qiniup.com', $zone->cdnUpHosts); + } + + public function testZoneNa0() + { + $zone = Zone::zoneNa0(); + $this->assertContains('upload-na0.qiniup.com', $zone->cdnUpHosts); + } + + public function testZoneAs0() + { + $zone = Zone::zoneAs0(); + $this->assertContains('upload-as0.qiniup.com', $zone->cdnUpHosts); + } + + public function testQvmZonez0() + { + $zone = Zone::qvmZonez0(); + $this->assertContains('free-qvm-z0-xs.qiniup.com', $zone->srcUpHosts); + } + + public function testQvmZonez1() + { + $zone = Zone::qvmZonez1(); + $this->assertContains('free-qvm-z1-zz.qiniup.com', $zone->srcUpHosts); } } diff --git a/vendor/qiniu/php-sdk/tests/bootstrap.php b/vendor/qiniu/php-sdk/tests/bootstrap.php index 5cbce3570..aa3776a0b 100644 --- a/vendor/qiniu/php-sdk/tests/bootstrap.php +++ b/vendor/qiniu/php-sdk/tests/bootstrap.php @@ -12,8 +12,15 @@ $bucketName = 'phpsdk'; $key = 'php-logo.png'; $key2 = 'niu.jpg'; +$testStartDate = '2020-08-18'; +$testEndDate = '2020-08-19'; +$testGranularity = 'day'; +$testLogDate = '2020-08-18'; + $bucketNameBC = 'phpsdk-bc'; $bucketNameNA = 'phpsdk-na'; +$bucketNameFS = 'phpsdk-fs'; +$bucketNameAS = 'phpsdk-as'; $dummyAccessKey = 'abcdefghklmnopq'; $dummySecretKey = '1234567890'; @@ -22,6 +29,8 @@ $dummyAuth = new Auth($dummyAccessKey, $dummySecretKey); //cdn $timestampAntiLeechEncryptKey = getenv('QINIU_TIMESTAMP_ENCRPTKEY'); $customDomain = "http://sdk.peterpy.cn"; +$customDomain2 = "sdk.peterpy.cn"; +$customCallbackURL = "https://qiniu.timhbw.com/notify/callback"; $tid = getenv('TRAVIS_JOB_NUMBER'); if (!empty($tid)) { diff --git a/vendor/symfony/options-resolver/composer.json b/vendor/symfony/options-resolver/composer.json index 895847ea5..0f7e1fd38 100644 --- a/vendor/symfony/options-resolver/composer.json +++ b/vendor/symfony/options-resolver/composer.json @@ -24,10 +24,5 @@ "/Tests/" ] }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "minimum-stability": "dev" } diff --git a/vendor/topthink/think-installer/composer.json b/vendor/topthink/think-installer/composer.json index 4005de224..08bc72b9b 100644 --- a/vendor/topthink/think-installer/composer.json +++ b/vendor/topthink/think-installer/composer.json @@ -2,10 +2,10 @@ "name": "topthink/think-installer", "type": "composer-plugin", "require": { - "composer-plugin-api": "^1.0" + "composer-plugin-api": "^1.0||^2.0" }, "require-dev": { - "composer/composer": "1.0.*@dev" + "composer/composer": "^1.0||^2.0" }, "license": "Apache-2.0", "authors": [ diff --git a/vendor/topthink/think-installer/src/LibraryInstaller.php b/vendor/topthink/think-installer/src/LibraryInstaller.php new file mode 100644 index 000000000..45c05bcaa --- /dev/null +++ b/vendor/topthink/think-installer/src/LibraryInstaller.php @@ -0,0 +1,28 @@ +makePromise(parent::install($repo, $package)); + } + + public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) + { + return $this->makePromise(parent::update($repo, $initial, $target)); + } + + protected function makePromise($promise) + { + if ($promise instanceof PromiseInterface) { + return $promise; + } + return new Promise(); + } +} diff --git a/vendor/topthink/think-installer/src/Plugin.php b/vendor/topthink/think-installer/src/Plugin.php index 757c30fff..441523200 100644 --- a/vendor/topthink/think-installer/src/Plugin.php +++ b/vendor/topthink/think-installer/src/Plugin.php @@ -3,7 +3,6 @@ namespace think\composer; use Composer\Composer; -use Composer\Installer; use Composer\IO\IOInterface; use Composer\Plugin\PluginInterface; @@ -21,6 +20,15 @@ class Plugin implements PluginInterface //扩展 $manager->addInstaller(new ThinkExtend($io, $composer)); + } + + public function deactivate(Composer $composer, IOInterface $io) + { } -} \ No newline at end of file + + public function uninstall(Composer $composer, IOInterface $io) + { + + } +} diff --git a/vendor/topthink/think-installer/src/Promise.php b/vendor/topthink/think-installer/src/Promise.php new file mode 100644 index 000000000..6bfed5d3f --- /dev/null +++ b/vendor/topthink/think-installer/src/Promise.php @@ -0,0 +1,11 @@ +copyExtraFiles($package); + return parent::install($repo, $package) + ->then(function () use ($package) { + $this->copyExtraFiles($package); + }); } public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) { - parent::update($repo, $initial, $target); - $this->copyExtraFiles($target); - + return parent::update($repo, $initial, $target) + ->then(function () use ($target) { + $this->copyExtraFiles($target); + }); } protected function copyExtraFiles(PackageInterface $package) @@ -60,7 +61,6 @@ class ThinkExtend extends LibraryInstaller copy($source, $target); } - } } } @@ -69,4 +69,4 @@ class ThinkExtend extends LibraryInstaller { return 'think-extend' === $packageType; } -} \ No newline at end of file +} diff --git a/vendor/topthink/think-installer/src/ThinkFramework.php b/vendor/topthink/think-installer/src/ThinkFramework.php index cdb7d8434..2a7cc0380 100644 --- a/vendor/topthink/think-installer/src/ThinkFramework.php +++ b/vendor/topthink/think-installer/src/ThinkFramework.php @@ -2,20 +2,12 @@ namespace think\composer; -use Composer\Installer\LibraryInstaller; use Composer\Package\PackageInterface; use Composer\Repository\InstalledRepositoryInterface; +use InvalidArgumentException; class ThinkFramework extends LibraryInstaller { - public function install(InstalledRepositoryInterface $repo, PackageInterface $package) - { - parent::install($repo, $package); - if ($this->composer->getPackage()->getType() == 'project' && $package->getInstallationSource() != 'source') { - //remove tests dir - $this->filesystem->removeDirectory($this->getInstallPath($package) . DIRECTORY_SEPARATOR . 'tests'); - } - } /** * {@inheritDoc} @@ -23,7 +15,7 @@ class ThinkFramework extends LibraryInstaller public function getInstallPath(PackageInterface $package) { if ('topthink/framework' !== $package->getPrettyName()) { - throw new \InvalidArgumentException('Unable to install this library!'); + throw new InvalidArgumentException('Unable to install this library!'); } if ($this->composer->getPackage()->getType() !== 'project') { @@ -40,9 +32,24 @@ class ThinkFramework extends LibraryInstaller return 'thinkphp'; } + public function install(InstalledRepositoryInterface $repo, PackageInterface $package) + { + return parent::install($repo, $package) + ->then(function () use ($package) { + $this->removeTestDir($package); + }); + } + public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) { - parent::update($repo, $initial, $target); + return parent::update($repo, $initial, $target) + ->then(function () use ($target) { + $this->removeTestDir($target); + }); + } + + protected function removeTestDir(PackageInterface $target) + { if ($this->composer->getPackage()->getType() == 'project' && $target->getInstallationSource() != 'source') { //remove tests dir $this->filesystem->removeDirectory($this->getInstallPath($target) . DIRECTORY_SEPARATOR . 'tests'); @@ -56,4 +63,4 @@ class ThinkFramework extends LibraryInstaller { return 'think-framework' === $packageType; } -} \ No newline at end of file +} diff --git a/vendor/topthink/think-installer/src/ThinkTesting.php b/vendor/topthink/think-installer/src/ThinkTesting.php index bf27f7276..af74d20e7 100644 --- a/vendor/topthink/think-installer/src/ThinkTesting.php +++ b/vendor/topthink/think-installer/src/ThinkTesting.php @@ -11,10 +11,9 @@ namespace think\composer; - -use Composer\Installer\LibraryInstaller; use Composer\Package\PackageInterface; use Composer\Repository\InstalledRepositoryInterface; +use InvalidArgumentException; class ThinkTesting extends LibraryInstaller { @@ -24,7 +23,7 @@ class ThinkTesting extends LibraryInstaller public function getInstallPath(PackageInterface $package) { if ('topthink/think-testing' !== $package->getPrettyName()) { - throw new \InvalidArgumentException('Unable to install this library!'); + throw new InvalidArgumentException('Unable to install this library!'); } return parent::getInstallPath($package); @@ -32,19 +31,18 @@ class ThinkTesting extends LibraryInstaller public function install(InstalledRepositoryInterface $repo, PackageInterface $package) { - parent::install($repo, $package); - - $this->copyTestDir($package); - - + return parent::install($repo, $package) + ->then(function () use ($package) { + $this->copyTestDir($package); + }); } public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) { - parent::update($repo, $initial, $target); - - $this->copyTestDir($target); - + return parent::update($repo, $initial, $target) + ->then(function () use ($target) { + $this->copyTestDir($target); + }); } private function copyTestDir(PackageInterface $package) @@ -65,4 +63,4 @@ class ThinkTesting extends LibraryInstaller { return 'think-testing' === $packageType; } -} \ No newline at end of file +} diff --git a/vendor/zoujingli/ip2region/README.md b/vendor/zoujingli/ip2region/README.md index dba1aab3b..42ad7eca4 100644 --- a/vendor/zoujingli/ip2region/README.md +++ b/vendor/zoujingli/ip2region/README.md @@ -4,26 +4,50 @@ [![License](https://poser.pugx.org/zoujingli/ip2region/license)](https://packagist.org/packages/zoujingli/ip2region) -本库基于 [ip2region](https://github.com/lionsoul2014/ip2region) ，简单整合方便使用`composer`来管理。 --- +本库基于 [ip2region](https://github.com/lionsoul2014/ip2region) ，简单整合方便使用`Composer`来管理。 -[ip2region](https://github.com/lionsoul2014/ip2region) - 最自由的ip地址查询库，ip到地区的映射库，提供Binary,B树和纯内存三种查询算法，妈妈再也不用担心我的ip地址定位。 +## Ip2region 是什么？ -### 1. 99.9%准确率，定时更新： +[ip2region](https://github.com/lionsoul2014/ip2region) - 准确率 99.9% 的离线IP地址定位库，0.0x 毫秒级查询，ip2region.db 数据库只有数MB，提供了查询绑定和 Binary, B 树，内存三种查询算法。 -数据聚合了一些知名ip到地名查询提供商的数据，这些是他们官方的的准确率，经测试着实比纯真啥的准确多了。
-每次聚合一下数据需要1-2天，会不定时更新。 -### 2. 标准化的数据格式： +## Ip2region 特性 -每条ip数据段都固定了格式：_城市Id|国家|区域|省份|城市|ISP_ +### 99.9%准确率 -只有中国的数据精确到了城市，其他国家只能定位到国家，后前的选项全部是0，已经包含了全部你能查到的大大小小的国家。 -（请忽略前面的城市Id，个人项目需求） +数据聚合了一些知名ip到地名查询提供商的数据，这些是他们官方的的准确率，经测试着实比经典的纯真IP定位准确一些。
+ip2region的数据聚合自以下服务商的开放API或者数据(升级程序每秒请求次数2到4次):
+01, >80%, 淘宝IP地址库, [http://ip.taobao.com/](http://ip.taobao.com/)
+02, ≈10%, GeoIP, [https://geoip.com/](https://geoip.com/)
+03, ≈2%, 纯真IP库, [http://www.cz88.net/](http://www.cz88.net/)
+备注：如果上述开放API或者数据都不给开放数据时ip2region将停止数据的更新服务。 -### 3. 体积小： -数据库文件ip2region.db只有1.5M +### 标准化的数据格式 + +每条ip数据段都固定了格式： +``` +_城市Id|国家|区域|省份|城市|ISP_ +``` + +只有中国的数据精确到了城市，其他国家有部分数据只能定位到国家，后前的选项全部是0，已经包含了全部你能查到的大大小小的国家（请忽略前面的城市Id，个人项目需求）。 + + +### 体积小 + +包含了全部的 IP，生成的数据库文件 ip2region.db 只有几MB，最小的版本只有 1.5MB，随着数据的详细度增加数据库的大小也慢慢增大，目前还没超过8MB。 + + +### 查询速度快 + +全部的查询客户端单次查询都在 0.x 毫秒级别，内置了三种查询算法 + +1. memory 算法：整个数据库全部载入内存，单次查询都在 0.1x 毫秒内，C语言的客户端单次查询在 0.00x 毫秒级别。 +2. binary 算法：基于二分查找，基于 ip2region.db 文件，不需要载入内存，单次查询在 0.x 毫秒级别。 +3. b-tree 算法：基于 btree 算法，基于 ip2region.db 文件，不需要载入内存，单词查询在 0.x 毫秒级别，比 binary 算法更快。 + +任何客户端 b-tree 都比 binary 算法快，当然 memory 算法固然是最快的！ + ### Composer 安装 @@ -47,4 +71,4 @@ var_export($info, true); // 'region' => '中国|华南|广东省|深圳市|鹏博士', // ) -``` +``` \ No newline at end of file diff --git a/vendor/zoujingli/ip2region/ip2region.db b/vendor/zoujingli/ip2region/ip2region.db index d41b4a057..3b6a296ee 100644 Binary files a/vendor/zoujingli/ip2region/ip2region.db and b/vendor/zoujingli/ip2region/ip2region.db differ diff --git a/vendor/zoujingli/think-library/src/command/Sync.php b/vendor/zoujingli/think-library/src/command/Sync.php index c7d02e7f9..17cd61790 100644 --- a/vendor/zoujingli/think-library/src/command/Sync.php +++ b/vendor/zoujingli/think-library/src/command/Sync.php @@ -80,7 +80,8 @@ class Sync extends Command public function build() { return $this->tree([ - 'think', 'config/log.php', 'config/cookie.php', 'config/template.php', + 'think', + 'config/log.php', 'config/cookie.php', 'config/template.php', 'application/admin', 'application/wechat', 'application/service', 'public/static/plugs', 'public/static/theme', 'public/static/admin.js', 'public/static/login.js', ]); @@ -204,17 +205,13 @@ class Sync extends Command private function checkAllowDownload($name) { // 禁止目录级别上跳 - if (stripos($name, '../') !== false) { + if (stripos($name, '..') !== false) { return false; } // 禁止下载数据库配置文件 if (stripos($name, 'database.php') !== false) { return false; } - // 禁止非官方演示项目下载 - if (stripos($this->app->request->domain(), 'thinkadmin.top') === false) { - return false; - } // 检查允许下载的文件规则 foreach ($this->_getAllowDownloadRule() as $rule) { if (stripos($name, $rule) !== false) return true; diff --git a/vendor/zoujingli/wechat-developer/README.md b/vendor/zoujingli/wechat-developer/README.md index 21099e3d6..18a926c2d 100644 --- a/vendor/zoujingli/wechat-developer/README.md +++ b/vendor/zoujingli/wechat-developer/README.md @@ -1,19 +1,22 @@ -[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) -[![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) -[![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/zoujingli/wechat-developer) +[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) +[![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) +[![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/zoujingli/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/zoujingli/wechat-developer) WeChatDeveloper for PHP ---- + * WeChatDeveloper 是基于 [wechat-php-sdk](https://github.com/zoujingli/wechat-php-sdk) 重构，优化并完善； * 运行最底要求 PHP 版本 5.4 , 建议在 PHP7 上运行以获取最佳性能； * WeChatDeveloper 针对 access_token 失效增加了自动刷新机制； * 微信的部分接口需要缓存数据在本地，因此对目录需要有写权限； * 我们鼓励大家使用 composer 来管理您的第三方库，方便后期更新操作； * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。 +* 微信商户支持已经支持 v2 接口，组件开发版支持 v3 接口。 功能描述 ---- + * 微信小程序，服务端接口支持 * 微信认证服务号，服务端接口支持 * 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付等） @@ -23,20 +26,22 @@ WeChatDeveloper for PHP ---- PHP开发技术交流（QQ群 513350915） -[![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a) +[![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a) WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先阅读微信官方文档。 + * 微信官方文档：https://mp.weixin.qq.com/wiki * 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html 针对 WeChatDeveloper 也有一准备了帮助资料可供参考。 + * ThinkAdmin：https://github.com/zoujingli/ThinkAdmin * WeChatDeveloper：https://www.kancloud.cn/zoujingli/wechat-developer - 代码仓库 ---- WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。 + * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper @@ -81,10 +86,10 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何 | Template.php | WeMini\Template | 微信小程序模板消息支持 | 微信小程序 | \We::WeMiniTemplate() | | Total.php | WeMini\Total | 微信小程序数据接口 | 微信小程序 | \We::WeMiniTotal() | - 安装使用 ---- 1.1 通过 Composer 来管理安装 + ```shell # 首次安装 线上版本（稳定） composer require zoujingli/wechat-developer @@ -97,12 +102,14 @@ composer update zoujingli/wechat-developer ``` 1.2 如果不使用 Composer， 可以下载 WeChatDeveloper 并解压到项目中 + ```php # 在项目中加载初始化文件 include "您的目录/WeChatDeveloper/include.php"; ``` 2.1 接口实例所需参数 + ```php $config = [ 'token' => 'test', @@ -121,6 +128,7 @@ $config = [ ``` 3.1 实例指定接口 + ```php try { @@ -144,6 +152,7 @@ try { 微信支付 --- + ```php // 创建接口实例 $wechat = new \WeChat\Pay($config); @@ -176,28 +185,39 @@ try { } ``` + * 更多功能请阅读测试代码或SDK封装源码 支付宝支付 ---- + * 支付参数配置（可用沙箱模式） + ```php $config = [ // 沙箱模式 'debug' => true, + // 签名类型（RSA|RSA2） + 'sign_type' => "RSA2", // 应用ID 'appid' => '2016090900468879', - // 支付宝公钥(1行填写) - 'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB', - // 支付宝私钥(1行填写) - 'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3pbN7esinxgjE8uxXAsccgGNKIq+PR1LteNTFOy0fsete43ObQCrzd9DO0zaUeBUzpIOnxrKxez7QoZROZMYrinttFZ/V5rbObEM9E5AR5Tv/Fr4IBywoS8ZtN16Xb+fZmibfU91yq9O2RYSvscncU2qEYmmaTenM0QlUO80ZKqPsM5JkgCNdcYZTUeHclWeyER3dSImNtlSKiSBSSTHthb11fkudjzdiUXua0NKVWyYuAOoDMcpXbD6NJmYqEA/iZ/AxtQt08pv0Mow581GPB0Uop5+qA2hCV85DpagE94a067sKcRui0rtkJzHem9k7xVL+2RoFm1fv3RnUkMwhAgMBAAECggEAAetkddzxrfc+7jgPylUIGb8pyoOUTC4Vqs/BgZI9xYAJksNT2QKRsFvHPfItNt4Ocqy8h4tnIL3GCU43C564B4p6AcjhE85GiN/O0BudPOKlfuQQ9mqExqMMHuYeQfz0cmzPDTSGMwWiv9v4KBH2pyvkCCAzNF6uG+rvawb4/NNVuiI7C8Ku/wYsamtbgjMZVOFFdScYgIw1BgA99RUU/fWBLMnTQkoyowSRb9eSmEUHjt/WQt+/QgKAT2WmuX4RhaGy0qcQLbNaJNKXdJ+PVhQrSiasINNtqYMa8GsQuuKsk3X8TCg9K6/lowivt5ruhyWcP2sx93zY/LGzIHgHcQKBgQDoZlcs9RWxTdGDdtH8kk0J/r+QtMijNzWI0a+t+ZsWOyd3rw+uM/8O4JTNP4Y98TvvxhJXewITbfiuOIbW1mxh8bnO/fcz7+RXZKgPDeoTeNo717tZFZGBEyUdH9M9Inqvht7+hjVDIMCYBDomYebdk3Xqo4mDBjLRdVNGrhGmVQKBgQDKS/MgTMK8Ktfnu1KzwCbn/FfHTOrp1a1t1wWPv9AW0rJPYeaP6lOkgIoO/1odG9qDDhdB6njqM+mKY5Yr3N94PHamHbwJUCmbkqEunCWpGzgcQZ1Q254xk9D7UKq/XUqW2WDqDq80GQeNial+fBc46yelQzokwdA+JdIFKoyinQKBgQCBems9V/rTAtkk1nFdt6EGXZEbLS3PiXXhGXo4gqV+OEzf6H/i/YMwJb2hsK+5GQrcps0XQihA7PctEb9GOMa/tu5fva0ZmaDtc94SLR1p5d4okyQFGPgtIp594HpPSEN0Qb9BrUJFeRz0VP6U3dzDPGHo7V4yyqRLgIN6EIcy1QKBgAqdh6mHPaTAHspDMyjJiYEc5cJIj/8rPkmIQft0FkhMUB0IRyAALNlyAUyeK61hW8sKvz+vPR8VEEk5xpSQp41YpuU6pDZc5YILZLfca8F+8yfQbZ/jll6Foi694efezl4yE/rUQG9cbOAJfEJt4o4TEOaEK5XoMbRBKc8pl22lAoGARTq0qOr9SStihRAy9a+8wi2WEwL4QHcmOjH7iAuJxy5b5TRDSjlk6h+0dnTItiFlTXdfpO8KhWA8EoSJVBZ1kcACQDFgMIA+VM+yXydtzMotOn21W4stfZ4I6dHFiujMsnKpNYVpQh3oCrJf4SeXiQDdiSCodqb1HlKkEc6naHQ=', + // 支付宝公钥文字内容 (1行填写，特别注意：这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制) + 'public_key' => 'MIIBIjANBgkqhkiG9...', + // 支付宝私钥文字内容 (1行填写) + 'private_key' => 'MIIEvQIBADANBgkqh...', + // 应用公钥证书完整内容（新版资金类接口转 app_cert_sn） + 'app_cert' => '', + // 支付宝根证书完整内容（新版资金类接口转 alipay_root_cert_sn） + 'root_cert' => '', // 支付成功通知地址 - 'notify_url' => '', // 可以应用的时候配置哦 + 'notify_url' => '', // 网页支付回跳地址 - 'return_url' => '', // 可以应用的时候配置哦 + 'return_url' => '', ]; ``` + * 支付宝发起PC网站支付 + ```php // 参考公共参数 https://docs.open.alipay.com/203/107090/ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php'; @@ -225,7 +245,9 @@ try { } ``` + * 支付宝发起手机网站支付 + ```php // 参考公共参数 https://docs.open.alipay.com/203/107090/ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php'; @@ -253,15 +275,15 @@ try { } ``` + * 更多功能请阅读测试代码或SDK封装源码 开源协议 ---- + * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除 -赞助支持 ----- -![赞助](http://static.thinkadmin.top/pay.png) - +## 赞助打赏 +![赞助](https://thinkadmin.top/static/img/pay.png) diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php index 8439aedde..04b2525c8 100644 --- a/vendor/zoujingli/wechat-developer/We.php +++ b/vendor/zoujingli/wechat-developer/We.php @@ -28,6 +28,7 @@ use WeChat\Exceptions\InvalidInstanceException; * @method \AliPay\Bill AliPayBill($options) static 支付宝电子面单下载 * @method \AliPay\Pos AliPayPos($options) static 支付宝刷卡支付 * @method \AliPay\Scan AliPayScan($options) static 支付宝扫码支付 + * @method \AliPay\Trade AliPayTrade($options) static 支付宝标准接口 * @method \AliPay\Transfer AliPayTransfer($options) static 支付宝转账到账户 * @method \AliPay\Wap AliPayWap($options) static 支付宝手机网站支付 * @method \AliPay\Web AliPayWeb($options) static 支付宝网站支付 @@ -73,8 +74,9 @@ use WeChat\Exceptions\InvalidInstanceException; * * ----- WePay ----- * @method \WePay\Bill WePayBill($options = []) static 微信商户账单及评论 - * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券 * @method \WePay\Order WePayOrder($options = []) static 微信商户订单 + * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券 + * @method \WePay\Custom WePayCustom($options = []) static 微信商户海关 * @method \WePay\Refund WePayRefund($options = []) static 微信商户退款 * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持 * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱 @@ -86,7 +88,7 @@ class We * 定义当前版本 * @var string */ - const VERSION = '1.2.25'; + const VERSION = '1.2.31'; /** * 静态配置 diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php index 6a3b5df30..eec7c6a81 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php @@ -128,21 +128,21 @@ class BasicWeChat /** * 设置外部接口 AccessToken - * @param string $access_token + * @param string $accessToken * @throws \WeChat\Exceptions\LocalCacheException * @author 高一平 * - * 当用户使用自己的缓存驱动时，直接实例化对象后可直接设置 AccessToekn + * 当用户使用自己的缓存驱动时，直接实例化对象后可直接设置 AccessToken * - 多用于分布式项目时保持 AccessToken 统一 - * - 使用此方法后就由用户来保证传入的 AccessToekn 为有效 AccessToekn + * - 使用此方法后就由用户来保证传入的 AccessToken 为有效 AccessToken */ - public function setAccessToken($access_token) + public function setAccessToken($accessToken) { - if (!is_string($access_token)) { + if (!is_string($accessToken)) { throw new InvalidArgumentException("Invalid AccessToken type, need string."); } $cache = $this->config->get('appid') . '_access_token'; - Tools::setCache($cache, $this->access_token = $access_token); + Tools::setCache($cache, $this->access_token = $accessToken); } /** @@ -169,8 +169,7 @@ class BasicWeChat } catch (InvalidResponseException $exception) { if (isset($this->currentMethod['method']) && empty($this->isTry)) { if (in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) { - $this->delAccessToken(); - $this->isTry = true; + [$this->delAccessToken(), $this->isTry = true]; return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']); } } diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php index 46de39c8c..24a0e512b 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php @@ -170,7 +170,7 @@ class BasicWePay * @throws InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException */ - protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true) + protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true, $needNonceStr = true) { $option = []; if ($isCert) { @@ -192,7 +192,8 @@ class BasicWePay } } $params = $this->params->merge($data); - $needSignType && ($params['sign_type'] = strtoupper($signType)); + if (!$needNonceStr) unset($params['nonce_str']); + if ($needSignType) $params['sign_type'] = strtoupper($signType); $params['sign'] = $this->getPaySign($params, $signType); $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option)); if ($result['return_code'] !== 'SUCCESS') { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php index e81e3da46..d77ca885f 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php @@ -39,7 +39,7 @@ class MyCurlFile extends \stdClass } /** - * 获取文件信息 + * 获取文件上传信息 * @return \CURLFile|string * @throws \WeChat\Exceptions\LocalCacheException */ @@ -48,12 +48,14 @@ class MyCurlFile extends \stdClass $this->filename = Tools::pushFile($this->tempname, base64_decode($this->content)); if (class_exists('CURLFile')) { return new \CURLFile($this->filename, $this->mimetype, $this->postname); + } else { + return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}"; } - return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}"; } /** - * 类销毁处理 + * 通用销毁函数清理缓存文件 + * 提前删除过期因此放到了网络请求之后 */ public function __destruct() { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php index 0f96b7b27..90b4a4333 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php @@ -110,10 +110,11 @@ class Tools if (is_string($filename) && file_exists($filename)) { if (is_null($postname)) $postname = basename($filename); if (is_null($mimetype)) $mimetype = self::getExtMine(pathinfo($filename, 4)); - if (function_exists('curl_file_create')) { - return curl_file_create($filename, $mimetype, $postname); + if (class_exists('CURLFile')) { + return new \CURLFile($filename, $mimetype, $postname); + } else { + return "@{$filename};filename={$postname};type={$mimetype}"; } - return "@{$filename};filename={$postname};type={$mimetype}"; } return $filename; } @@ -182,7 +183,7 @@ class Tools */ public static function arr2json($data) { - $json = json_encode(self::buildEnEmojiData($data), JSON_UNESCAPED_UNICODE); + $json = json_encode($data, JSON_UNESCAPED_UNICODE); return $json === '[]' ? '{}' : $json; } @@ -425,7 +426,7 @@ class Tools return call_user_func_array(self::$cache_callable['get'], func_get_args()); } $file = self::_getCacheName($name); - if (file_exists($file) && ($content = file_get_contents($file))) { + if (file_exists($file) && is_file($file) && ($content = file_get_contents($file))) { $data = unserialize($content); if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) { return $data['value']; diff --git a/vendor/zoujingli/wechat-developer/WeChat/Oauth.php b/vendor/zoujingli/wechat-developer/WeChat/Oauth.php index 2cb79d07e..e9691f317 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Oauth.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Oauth.php @@ -40,15 +40,16 @@ class Oauth extends BasicWeChat /** * 通过 code 获取 AccessToken 和 openid + * @param string $code 授权Code值，不传则取GET参数 * @return bool|array * @throws Exceptions\InvalidResponseException * @throws Exceptions\LocalCacheException */ - public function getOauthAccessToken() + public function getOauthAccessToken($code = '') { $appid = $this->config->get('appid'); $appsecret = $this->config->get('appsecret'); - $code = isset($_GET['code']) ? $_GET['code'] : ''; + $code = $code ? $code : (isset($_GET['code']) ? $_GET['code'] : ''); $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={$appid}&secret={$appsecret}&code={$code}&grant_type=authorization_code"; return $this->httpGetForJson($url); } diff --git a/vendor/zoujingli/wechat-developer/WeChat/Script.php b/vendor/zoujingli/wechat-developer/WeChat/Script.php index 0a54b6b1f..c04be362e 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Script.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Script.php @@ -60,7 +60,7 @@ class Script extends BasicWeChat throw new InvalidResponseException('Invalid Resoponse Ticket.', '0'); } $ticket = $result['ticket']; - Tools::setCache($cache_name, $ticket, 5000); + Tools::setCache($cache_name, $ticket, 7000); } return $ticket; } diff --git a/vendor/zoujingli/wechat-developer/WePay/Custom.php b/vendor/zoujingli/wechat-developer/WePay/Custom.php new file mode 100644 index 000000000..21fdb3c52 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePay/Custom.php @@ -0,0 +1,67 @@ +callPostApi($url, $options, false, 'MD5', false, false); + } + + /** + * 订单附加信息查询接口 + * @param array $options + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function get(array $options = []) + { + $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery'; + return $this->callPostApi($url, $options, false, 'MD5', true, false); + } + + + /** + * 订单附加信息重推接口 + * @param array $options + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function reset(array $options = []) + { + $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/newcustoms/customdeclareredeclare'; + return $this->callPostApi($url, $options, false, 'MD5', true, false); + } + +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePay/Refund.php b/vendor/zoujingli/wechat-developer/WePay/Refund.php index e8abbad8f..39ac36a24 100644 --- a/vendor/zoujingli/wechat-developer/WePay/Refund.php +++ b/vendor/zoujingli/wechat-developer/WePay/Refund.php @@ -16,6 +16,7 @@ namespace WePay; use WeChat\Contracts\BasicWePay; use WeChat\Contracts\Tools; +use WeChat\Exceptions\InvalidDecryptException; use WeChat\Exceptions\InvalidResponseException; /** @@ -55,6 +56,7 @@ class Refund extends BasicWePay /** * 获取退款通知 * @return array + * @throws InvalidDecryptException * @throws InvalidResponseException */ public function getNotify() @@ -63,16 +65,14 @@ class Refund extends BasicWePay if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') { throw new InvalidResponseException('获取退款通知XML失败！'); } - if (!class_exists('Prpcrypt', false)) { - include dirname(__DIR__) . '/WeChat/Contracts/Prpcrypt.php'; + try { + $key = md5($this->config->get('mch_key')); + $decrypt = base64_decode($data['req_info']); + $response = openssl_decrypt($decrypt, 'aes-256-ecb', $key, OPENSSL_RAW_DATA); + $data['result'] = Tools::xml2arr($response); + return $data; + } catch (\Exception $exception) { + throw new InvalidDecryptException($exception->getMessage(), $exception->getCode()); } - $pc = new \Prpcrypt(md5($this->config->get('mch_key'))); - $array = $pc->decrypt(base64_decode($data['req_info'])); - if (intval($array[0]) > 0) { - throw new InvalidResponseException($array[1], $array[0]); - } - $data['decode'] = $array[1]; - return $data; } - } \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePayV3/Cert.php b/vendor/zoujingli/wechat-developer/WePayV3/Cert.php new file mode 100644 index 000000000..2c368aac2 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePayV3/Cert.php @@ -0,0 +1,49 @@ +config['mch_v3_key']); + $result = $this->doRequest('GET', '/v3/certificates'); + foreach ($result['data'] as $vo) { + $this->tmpFile($vo['serial_no'], $aes->decryptToString( + $vo['encrypt_certificate']['associated_data'], + $vo['encrypt_certificate']['nonce'], + $vo['encrypt_certificate']['ciphertext'] + )); + } + } catch (\Exception $exception) { + throw new InvalidResponseException($exception->getMessage(), $exception->getCode()); + } + } +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePayV3/Contracts/BasicWePay.php b/vendor/zoujingli/wechat-developer/WePayV3/Contracts/BasicWePay.php new file mode 100644 index 000000000..0394a869f --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePayV3/Contracts/BasicWePay.php @@ -0,0 +1,235 @@ + '', // 微信绑定APPID，需配置 + 'mch_id' => '', // 微信商户编号，需要配置 + 'mch_v3_key' => '', // 微信商户密钥，需要配置 + 'cert_serial' => '', // 商户证书序号，无需配置 + 'cert_public' => '', // 商户公钥内容，需要配置 + 'cert_private' => '', // 商户密钥内容，需要配置 + ]; + + /** + * BasicWePayV3 constructor. + * @param array $options [mch_id, mch_v3_key, cert_public, cert_private] + */ + public function __construct(array $options = []) + { + if (empty($options['mch_id'])) { + throw new InvalidArgumentException("Missing Config -- [mch_id]"); + } + if (empty($options['mch_v3_key'])) { + throw new InvalidArgumentException("Missing Config -- [mch_v3_key]"); + } + if (empty($options['cert_private'])) { + throw new InvalidArgumentException("Missing Config -- [cert_private]"); + } + if (empty($options['cert_public'])) { + throw new InvalidArgumentException("Missing Config -- [cert_public]"); + } + + if (stripos($options['cert_public'], '-----BEGIN CERTIFICATE-----') === false) { + if (file_exists($options['cert_public'])) { + $options['cert_public'] = file_get_contents($options['cert_public']); + } else { + throw new InvalidArgumentException("File Non-Existent -- [cert_public]"); + } + } + + if (stripos($options['cert_private'], '-----BEGIN PRIVATE KEY-----') === false) { + if (file_exists($options['cert_private'])) { + $options['cert_private'] = file_get_contents($options['cert_private']); + } else { + throw new InvalidArgumentException("File Non-Existent -- [cert_private]"); + } + } + + $this->config['appid'] = isset($options['appid']) ? $options['appid'] : ''; + $this->config['mch_id'] = $options['mch_id']; + $this->config['mch_v3_key'] = $options['mch_v3_key']; + $this->config['cert_public'] = $options['cert_public']; + $this->config['cert_private'] = $options['cert_private']; + $this->config['cert_serial'] = openssl_x509_parse($this->config['cert_public'])['serialNumberHex']; + + if (empty($this->config['cert_serial'])) { + throw new InvalidArgumentException("Failed to parse certificate public key"); + } + } + + /** + * 静态创建对象 + * @param array $config + * @return static + */ + public static function instance($config) + { + $key = md5(get_called_class() . serialize($config)); + if (isset(self::$cache[$key])) return self::$cache[$key]; + return self::$cache[$key] = new static($config); + } + + /** + * 模拟发起请求 + * @param string $method 请求访问 + * @param string $pathinfo 请求路由 + * @param string $jsondata 请求数据 + * @param bool $verify 是否验证 + * @return array + * @throws InvalidResponseException + */ + public function doRequest($method, $pathinfo, $jsondata = '', $verify = false) + { + list($time, $nonce) = [time(), uniqid() . rand(1000, 9999)]; + $signstr = join("\n", [$method, $pathinfo, $time, $nonce, $jsondata, '']); + // 生成数据签名TOKEN + $token = sprintf('mchid="%s",nonce_str="%s",timestamp="%d",serial_no="%s",signature="%s"', + $this->config['mch_id'], $nonce, $time, $this->config['cert_serial'], $this->signBuild($signstr) + ); + list($header, $content) = $this->_doRequestCurl($method, $this->base . $pathinfo, [ + 'data' => $jsondata, 'header' => [ + "Accept: application/json", "Content-Type: application/json", + 'User-Agent: https://thinkadmin.top', "Authorization: WECHATPAY2-SHA256-RSA2048 {$token}", + ], + ]); + if ($verify) { + $headers = []; + foreach (explode("\n", $header) as $line) { + if (stripos($line, 'Wechatpay') !== false) { + list($name, $value) = explode(':', $line); + list(, $keys) = explode('wechatpay-', strtolower($name)); + $headers[$keys] = trim($value); + } + } + try { + $string = join("\n", [$headers['timestamp'], $headers['nonce'], $content, '']); + if (!$this->signVerify($string, $headers['signature'], $headers['serial'])) { + throw new InvalidResponseException("验证响应签名失败"); + } + } catch (\Exception $exception) { + throw new InvalidResponseException($exception->getMessage(), $exception->getCode()); + } + } + return json_decode($content, true); + } + + /** + * 通过CURL模拟网络请求 + * @param string $method 请求方法 + * @param string $location 请求方法 + * @param array $options 请求参数 [data, header] + * @return array [header,content] + */ + private function _doRequestCurl($method, $location, $options = []) + { + $curl = curl_init(); + // POST数据设置 + if (strtolower($method) === 'post') { + curl_setopt($curl, CURLOPT_POST, true); + curl_setopt($curl, CURLOPT_POSTFIELDS, $options['data']); + } + // CURL头信息设置 + if (!empty($options['header'])) { + curl_setopt($curl, CURLOPT_HTTPHEADER, $options['header']); + } + curl_setopt($curl, CURLOPT_URL, $location); + curl_setopt($curl, CURLOPT_HEADER, true); + curl_setopt($curl, CURLOPT_TIMEOUT, 60); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); + $content = curl_exec($curl); + $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE); + curl_close($curl); + return [substr($content, 0, $headerSize), substr($content, $headerSize)]; + } + + /** + * 生成数据签名 + * @param string $data 签名内容 + * @return string + */ + protected function signBuild($data) + { + $pkeyid = openssl_pkey_get_private($this->config['cert_private']); + openssl_sign($data, $signature, $pkeyid, 'sha256WithRSAEncryption'); + return base64_encode($signature); + } + + /** + * 验证内容签名 + * @param string $data 签名内容 + * @param string $sign 原签名值 + * @param string $serial 证书序号 + * @return int + * @throws InvalidResponseException + * @throws LocalCacheException + */ + protected function signVerify($data, $sign, $serial = '') + { + $cert = $this->tmpFile($serial); + if (empty($cert)) { + Cert::instance($this->config)->download(); + $cert = $this->tmpFile($serial); + } + return @openssl_verify($data, base64_decode($sign), openssl_x509_read($cert), 'sha256WithRSAEncryption'); + } + + /** + * 写入或读取临时文件 + * @param string $name + * @param null|string $content + * @return string + * @throws LocalCacheException + */ + protected function tmpFile($name, $content = null) + { + if (is_null($content)) { + return base64_decode(Tools::getCache($name) ?: ''); + } else { + return Tools::setCache($name, base64_encode($content), 7200); + } + } +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePayV3/Contracts/DecryptAes.php b/vendor/zoujingli/wechat-developer/WePayV3/Contracts/DecryptAes.php new file mode 100644 index 000000000..7a5b59796 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePayV3/Contracts/DecryptAes.php @@ -0,0 +1,81 @@ +aesKey = $aesKey; + } + + /** + * Decrypt AEAD_AES_256_GCM ciphertext + * @param string $associatedData AES GCM additional authentication data + * @param string $nonceStr AES GCM nonce + * @param string $ciphertext AES GCM cipher text + * @return string|bool Decrypted string on success or FALSE on failure + * @throws InvalidDecryptException + */ + public function decryptToString($associatedData, $nonceStr, $ciphertext) + { + $ciphertext = \base64_decode($ciphertext); + if (strlen($ciphertext) <= self::AUTH_TAG_LENGTH_BYTE) { + return false; + } + try { + // ext-sodium (default installed on >= PHP 7.2) + if (function_exists('\sodium_crypto_aead_aes256gcm_is_available') && \sodium_crypto_aead_aes256gcm_is_available()) { + return \sodium_crypto_aead_aes256gcm_decrypt($ciphertext, $associatedData, $nonceStr, $this->aesKey); + } + // ext-libsodium (need install libsodium-php 1.x via pecl) + if (function_exists('\Sodium\crypto_aead_aes256gcm_is_available') && \Sodium\crypto_aead_aes256gcm_is_available()) { + return \Sodium\crypto_aead_aes256gcm_decrypt($ciphertext, $associatedData, $nonceStr, $this->aesKey); + } + // openssl (PHP >= 7.1 support AEAD) + if (PHP_VERSION_ID >= 70100 && in_array('aes-256-gcm', \openssl_get_cipher_methods())) { + $ctext = substr($ciphertext, 0, -self::AUTH_TAG_LENGTH_BYTE); + $authTag = substr($ciphertext, -self::AUTH_TAG_LENGTH_BYTE); + return \openssl_decrypt($ctext, 'aes-256-gcm', $this->aesKey, \OPENSSL_RAW_DATA, $nonceStr, $authTag, $associatedData); + } + } catch (\Exception $exception) { + throw new InvalidDecryptException($exception->getMessage(), $exception->getCode()); + } catch (\SodiumException $exception) { + throw new InvalidDecryptException($exception->getMessage(), $exception->getCode()); + } + throw new InvalidDecryptException('AEAD_AES_256_GCM 需要 PHP 7.1 以上或者安装 libsodium-php'); + } +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePayV3/Order.php b/vendor/zoujingli/wechat-developer/WePayV3/Order.php new file mode 100644 index 000000000..355e2a7d4 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePayV3/Order.php @@ -0,0 +1,106 @@ + '/v3/pay/transactions/h5', + 'app' => '/v3/pay/transactions/app', + 'jsapi' => '/v3/pay/transactions/jsapi', + 'native' => '/v3/pay/transactions/native', + ]; + if (empty($types[$type])) { + throw new InvalidArgumentException("Payment {$type} not defined."); + } else { + // 创建预支付码 + $result = $this->doRequest('POST', $types[$type], json_encode($data, JSON_UNESCAPED_UNICODE), true); + if (empty($result['prepay_id'])) return $result; + // 支付参数签名 + $time = (string)time(); + $appid = $this->config['appid']; + $prepayId = $result['prepay_id']; + $nonceStr = Tools::createNoncestr(); + if ($type === 'app') { + $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, $prepayId, ''])); + return ['partnerId' => $this->config['mch_id'], 'prepayId' => $prepayId, 'package' => 'Sign=WXPay', 'nonceStr' => $nonceStr, 'timeStamp' => $time, 'sign' => $sign]; + } elseif ($type === 'jsapi') { + $sign = $this->signBuild(join("\n", [$appid, $time, $nonceStr, "prepay_id={$prepayId}", ''])); + return ['appId' => $appid, 'timeStamp' => $time, 'nonceStr' => $nonceStr, 'package' => "prepay_id={$prepayId}", 'signType' => 'RSA', 'paySign' => $sign]; + } else { + return $result; + } + } + } + + /** + * 支付订单查询 + * @param string $orderNo 订单单号 + * @return array + * @throws InvalidResponseException + */ + public function query($orderNo) + { + $pathinfo = "/v3/pay/transactions/out-trade-no/{$orderNo}"; + return $this->doRequest('GET', "{$pathinfo}?mchid={$this->config['mch_id']}", '', true); + } + + /** + * 支付通知 + * @return array + * @throws InvalidDecryptException + */ + public function notify() + { + $body = file_get_contents('php://input'); + $data = json_decode($body, true); + if (isset($data['resource'])) { + $aes = new DecryptAes($this->config['mch_v3_key']); + $data['result'] = $aes->decryptToString( + $data['resource']['associated_data'], + $data['resource']['nonce'], + $data['resource']['ciphertext'] + ); + } + return $data; + } + +} diff --git a/vendor/zoujingli/wechat-developer/WePayV3/Refund.php b/vendor/zoujingli/wechat-developer/WePayV3/Refund.php new file mode 100644 index 000000000..809f6e296 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePayV3/Refund.php @@ -0,0 +1,75 @@ +doRequest('POST', '/v3/ecommerce/refunds/apply', json_encode($data, JSON_UNESCAPED_UNICODE), true); + } + + /** + * 退款订单查询 + * @param string $refundNo 退款单号 + * @return array + * @throws InvalidResponseException + */ + public function query($refundNo) + { + $pathinfo = "/v3/ecommerce/refunds/out-refund-no/{$refundNo}"; + return $this->doRequest('GET', "{$pathinfo}?sub_mchid={$this->config['mch_id']}", '', true); + } + + /** + * 获取退款通知 + * @return array + * @throws InvalidDecryptException + * @throws InvalidResponseException + */ + public function notify() + { + $data = Tools::xml2arr(file_get_contents("php://input")); + if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') { + throw new InvalidResponseException('获取退款通知XML失败！'); + } + try { + $key = md5($this->config['mch_v3_key']); + $decrypt = base64_decode($data['req_info']); + $response = openssl_decrypt($decrypt, 'aes-256-ecb', $key, OPENSSL_RAW_DATA); + $data['result'] = Tools::xml2arr($response); + return $data; + } catch (\Exception $exception) { + throw new InvalidDecryptException($exception->getMessage(), $exception->getCode()); + } + } + +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/_test/alipay.php b/vendor/zoujingli/wechat-developer/_test/alipay.php index b2f401d71..5949cc498 100644 --- a/vendor/zoujingli/wechat-developer/_test/alipay.php +++ b/vendor/zoujingli/wechat-developer/_test/alipay.php @@ -19,13 +19,13 @@ return [ 'sign_type' => "RSA2", // 应用ID 'appid' => '2016090900468879', - // 支付宝公钥 (1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制) + // 支付宝公钥内容 (1行填写，特别注意：这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制) 'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB', - // 支付宝私钥 (1行填写) + // 支付宝私钥内容 (1行填写) 'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3pbN7esinxgjE8uxXAsccgGNKIq+PR1LteNTFOy0fsete43ObQCrzd9DO0zaUeBUzpIOnxrKxez7QoZROZMYrinttFZ/V5rbObEM9E5AR5Tv/Fr4IBywoS8ZtN16Xb+fZmibfU91yq9O2RYSvscncU2qEYmmaTenM0QlUO80ZKqPsM5JkgCNdcYZTUeHclWeyER3dSImNtlSKiSBSSTHthb11fkudjzdiUXua0NKVWyYuAOoDMcpXbD6NJmYqEA/iZ/AxtQt08pv0Mow581GPB0Uop5+qA2hCV85DpagE94a067sKcRui0rtkJzHem9k7xVL+2RoFm1fv3RnUkMwhAgMBAAECggEAAetkddzxrfc+7jgPylUIGb8pyoOUTC4Vqs/BgZI9xYAJksNT2QKRsFvHPfItNt4Ocqy8h4tnIL3GCU43C564B4p6AcjhE85GiN/O0BudPOKlfuQQ9mqExqMMHuYeQfz0cmzPDTSGMwWiv9v4KBH2pyvkCCAzNF6uG+rvawb4/NNVuiI7C8Ku/wYsamtbgjMZVOFFdScYgIw1BgA99RUU/fWBLMnTQkoyowSRb9eSmEUHjt/WQt+/QgKAT2WmuX4RhaGy0qcQLbNaJNKXdJ+PVhQrSiasINNtqYMa8GsQuuKsk3X8TCg9K6/lowivt5ruhyWcP2sx93zY/LGzIHgHcQKBgQDoZlcs9RWxTdGDdtH8kk0J/r+QtMijNzWI0a+t+ZsWOyd3rw+uM/8O4JTNP4Y98TvvxhJXewITbfiuOIbW1mxh8bnO/fcz7+RXZKgPDeoTeNo717tZFZGBEyUdH9M9Inqvht7+hjVDIMCYBDomYebdk3Xqo4mDBjLRdVNGrhGmVQKBgQDKS/MgTMK8Ktfnu1KzwCbn/FfHTOrp1a1t1wWPv9AW0rJPYeaP6lOkgIoO/1odG9qDDhdB6njqM+mKY5Yr3N94PHamHbwJUCmbkqEunCWpGzgcQZ1Q254xk9D7UKq/XUqW2WDqDq80GQeNial+fBc46yelQzokwdA+JdIFKoyinQKBgQCBems9V/rTAtkk1nFdt6EGXZEbLS3PiXXhGXo4gqV+OEzf6H/i/YMwJb2hsK+5GQrcps0XQihA7PctEb9GOMa/tu5fva0ZmaDtc94SLR1p5d4okyQFGPgtIp594HpPSEN0Qb9BrUJFeRz0VP6U3dzDPGHo7V4yyqRLgIN6EIcy1QKBgAqdh6mHPaTAHspDMyjJiYEc5cJIj/8rPkmIQft0FkhMUB0IRyAALNlyAUyeK61hW8sKvz+vPR8VEEk5xpSQp41YpuU6pDZc5YILZLfca8F+8yfQbZ/jll6Foi694efezl4yE/rUQG9cbOAJfEJt4o4TEOaEK5XoMbRBKc8pl22lAoGARTq0qOr9SStihRAy9a+8wi2WEwL4QHcmOjH7iAuJxy5b5TRDSjlk6h+0dnTItiFlTXdfpO8KhWA8EoSJVBZ1kcACQDFgMIA+VM+yXydtzMotOn21W4stfZ4I6dHFiujMsnKpNYVpQh3oCrJf4SeXiQDdiSCodqb1HlKkEc6naHQ=', - // 应用公钥证书（新版资金类接口转 app_cert_sn） + // 应用公钥证书内容（新版资金类接口转 app_cert_sn） 'app_cert' => '', - // 支付宝根证书（新版资金类接口转 alipay_root_cert_sn） + // 支付宝根证书内容（新版资金类接口转 alipay_root_cert_sn） 'root_cert' => '', // 支付成功通知地址 'notify_url' => '', diff --git a/vendor/zoujingli/wechat-developer/_test/pay-v3-config-cert.php b/vendor/zoujingli/wechat-developer/_test/pay-v3-config-cert.php new file mode 100644 index 000000000..47883d133 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/_test/pay-v3-config-cert.php @@ -0,0 +1,16 @@ +download(); + +} catch (\Exception $exception) { + // 出错啦，处理下吧 + echo $exception->getMessage() . PHP_EOL; +} \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/_test/pay-v3-config.php b/vendor/zoujingli/wechat-developer/_test/pay-v3-config.php new file mode 100644 index 000000000..c844e3740 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/_test/pay-v3-config.php @@ -0,0 +1,26 @@ + '', + // 微信商户编号ID + 'mch_id' => '', + // 微信商户V3接口密钥 + 'mch_v3_key' => '', + // 微信商户证书公钥，支持证书内容或文件路径 + 'cert_public' => $certPublic, + // 微信商户证书私钥，支持证书内容或文件路径 + 'cert_private' => $certPrivate, +]; \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/_test/pay-v3-order-create.php b/vendor/zoujingli/wechat-developer/_test/pay-v3-order-create.php new file mode 100644 index 000000000..5448b6afd --- /dev/null +++ b/vendor/zoujingli/wechat-developer/_test/pay-v3-order-create.php @@ -0,0 +1,30 @@ +create('jsapi', [ + 'appid' => 'wx60a43dd8161666d4', + 'mchid' => $config['mch_id'], + 'description' => '商品描述', + 'out_trade_no' => (string)time(), + 'notify_url' => 'https://thinkadmin.top', + 'payer' => ['openid' => 'o38gps3vNdCqaggFfrBRCRikwlWY'], + 'amount' => ['total' => 2, 'currency' => 'CNY'], + ]); + + echo '
';
+    echo "\n--- 创建支付参数 ---\n";
+    var_export($result);
+
+} catch (\Exception $exception) {
+    // 出错啦，处理下吧
+    echo $exception->getMessage() . PHP_EOL;
+}
\ No newline at end of file
diff --git a/vendor/zoujingli/wechat-developer/composer.json b/vendor/zoujingli/wechat-developer/composer.json
index b0c41e380..1195ced09 100644
--- a/vendor/zoujingli/wechat-developer/composer.json
+++ b/vendor/zoujingli/wechat-developer/composer.json
@@ -1,7 +1,7 @@
 {
   "type": "library",
-  "name": "zoujingli/wechat-developer",
-  "homepage": "https://github.com/zoujingli/WeChatDeveloper",
+  "name": "zoujingli/wechat-developer-kentwangit",
+  "homepage": "https://github.com/kentwangit/WeChatDeveloper",
   "description": "WeChat platform and WeChat payment development tools",
   "license": "MIT",
   "authors": [
@@ -38,7 +38,8 @@
       "WePay\\": "WePay",
       "WeChat\\": "WeChat",
       "WeMini\\": "WeMini",
-      "AliPay\\": "AliPay"
+      "AliPay\\": "AliPay",
+      "WePayV3\\": "WePayV3"
     }
   }
-}
\ No newline at end of file
+}