合并SetoKaiba/Pxer的改动（217309b-b2bc225）

pea3nut · Apr 20, 2017 · 39fd34d · 39fd34d
1 parent e3fdc0c
commit 39fd34d
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 84 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -12,7 +12,7 @@
 
 ## Bug发生时的地址
 
-http://www.pixiv.net/member_illust.php?id=10009740
+https://www.pixiv.net/member_illust.php?id=10009740
 
 ## Bug发生时Pxer的状态
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 </p>
 
 
-纯客户端JavaScript编写的[pixiv.net](http://www.pixiv.net)爬虫，上线一周内被使用上万次！
+纯客户端JavaScript编写的[pixiv.net](https://www.pixiv.net)爬虫，上线一周内被使用上万次！
 
 不仅人人可用，且代码经过精心注释可供参考~
 
@@ -39,8 +39,8 @@ Pxer最大作用是将pixiv.net网站（类似于花瓣网）中的图片作品
 
 你可以通过下面流程快速体验Pxer的强大功能：
 
-1. 在[Pixiv网站](http://www.pixiv.net)登陆注册一个账号
-2. 打开“[机器猫 - 哆啦A梦](http://www.pixiv.net/search.php?s_mode=s_tag&word=%E3%83%89%E3%83%A9%E3%81%88%E3%82%82%E3%82%93%20000user)”的图片检索页面
+1. 在[Pixiv网站](https://www.pixiv.net)登陆注册一个账号
+2. 打开“[机器猫 - 哆啦A梦](https://www.pixiv.net/search.php?s_mode=s_tag&word=%E3%83%89%E3%83%A9%E3%81%88%E3%82%82%E3%82%93%20000user)”的图片检索页面
 3. 在浏览器运行[pxer.user.js](http://pxer-app.pea3nut.org/pxer-master.user.js)代码（将代码文件复制到控制台运行或存成书签点击运行）
 4. 操作页面中PxerUI界面
 

diff --git a/build/user.jstpl.ejs b/build/user.jstpl.ejs
@@ -6,7 +6,7 @@
 // @description   可能是目前最好用的P站收图工具
 // @grant         none
 // @noframes
-// @include       http://www.pixiv.net*<?=isDev?'\n// @include       http://127.0.0.1/*\n// @include       http://localhost/*':''?>
+// @include       https://www.pixiv.net*<?=isDev?'\n// @include       http://127.0.0.1/*\n// @include       http://localhost/*':''?>
 // ==/UserScript==
 javascript:void((function() {
     // 环境变量

diff --git a/dist/pxer-core.js b/dist/pxer-core.js
@@ -646,11 +646,11 @@ PxerHtmlParser.parseWorks = function (task) {
  * */
 PxerHtmlParser.getUrlList = function (task) {
     if (task.type === "ugoira" || task.type === "illust" && !task.isMultiple) {
-        return ["http://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id];
+        return ["https://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id];
     } else if (task.isMultiple) {
-        return ["http://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id, "http://www.pixiv.net/member_illust.php?mode=manga&illust_id=" + task.id, "http://www.pixiv.net/member_illust.php?mode=manga_big&page=0&illust_id=" + task.id];
+        return ["https://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id, "https://www.pixiv.net/member_illust.php?mode=manga&illust_id=" + task.id, "https://www.pixiv.net/member_illust.php?mode=manga_big&page=0&illust_id=" + task.id];
     } else if (task.type === "manga" && !task.isMultiple) {
-        return ["http://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id, "http://www.pixiv.net/member_illust.php?mode=big&illust_id=" + task.id];
+        return ["https://www.pixiv.net/member_illust.php?mode=medium&illust_id=" + task.id, "https://www.pixiv.net/member_illust.php?mode=big&illust_id=" + task.id];
     } else {
         console.warn('miss task ' + task.id);
         return [];

diff --git a/pxer-dev.user.js b/pxer-dev.user.js
@@ -1,4 +1,4 @@
-/**
+/**
  * Automatic generated by "user.build.js"
  * */
 // ==UserScript==
@@ -9,18 +9,18 @@
 // @description   可能是目前最好用的P站收图工具
 // @grant         none
 // @noframes
-// @include       http://www.pixiv.net*
+// @include       https://www.pixiv.net*
 // @include       http://127.0.0.1/*
 // @include       http://localhost/*
 // ==/UserScript==
 javascript:void((function() {
     // 环境变量
-    window['PXER_URL'] =/**/"http://pxer-app.pea3nut.org/";//*/'';
+    window['PXER_URL'] =/**/"https://rawgit.com/SetoKaiba/Pxer/dev/";//*/'';
     window['PXER_MODE'] ='dev';
 
     // 引入入口文件
     document.documentElement.appendChild(
         document.createElement('script')
     ).src=window['PXER_URL']+'jsonp.js?'+(+new Date);
 
-})());
+})());
diff --git a/pxer-master.user.js b/pxer-master.user.js
@@ -9,7 +9,7 @@
 // @description   可能是目前最好用的P站收图工具
 // @grant         none
 // @noframes
-// @include       http://www.pixiv.net*
+// @include       https://www.pixiv.net*
 // ==/UserScript==
 javascript:void((function() {
     // 环境变量

diff --git a/src/app/class/PxerHtmlParser.class.js b/src/app/class/PxerHtmlParser.class.js
@@ -132,17 +132,17 @@ PxerHtmlParser.getUrlList =function(task){
             && !task.isMultiple
         )
     ){
-        return ["http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id];
+        return ["https://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id];
     }else if(task.isMultiple){
         return [
-            "http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id,
-            "http://www.pixiv.net/member_illust.php?mode=manga&illust_id="+task.id,
-            "http://www.pixiv.net/member_illust.php?mode=manga_big&page=0&illust_id="+task.id
+            "https://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id,
+            "https://www.pixiv.net/member_illust.php?mode=manga&illust_id="+task.id,
+            "https://www.pixiv.net/member_illust.php?mode=manga_big&page=0&illust_id="+task.id
         ];
     }else if(task.type ==="manga" && !task.isMultiple){
         return [
-            "http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id,
-            "http://www.pixiv.net/member_illust.php?mode=big&illust_id="+task.id,
+            "https://www.pixiv.net/member_illust.php?mode=medium&illust_id="+task.id,
+            "https://www.pixiv.net/member_illust.php?mode=big&illust_id="+task.id,
         ];
     }else{
         console.warn('miss task '+task.id);

diff --git a/src/app/class/PxerPrinter.class.js b/src/app/class/PxerPrinter.class.js
@@ -1,4 +1,4 @@
-class PxerPrinter{
+class PxerPrinter{
     constructor(config){
 
         /**
@@ -183,8 +183,8 @@ PxerPrinter.defaultConfig =function(){
  * */
 PxerPrinter.getUgoira =function(works ,type='max'){
     const tpl ={
-        "max"   :"http://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira1920x1080.zip",
-        "600p"  :"http://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira600x600.zip",
+        "max"   :"https://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira1920x1080.zip",
+        "600p"  :"https://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira600x600.zip",
     };
 
     var address =tpl[type];
@@ -205,9 +205,9 @@ PxerPrinter.getUgoira =function(works ,type='max'){
  * */
 PxerPrinter.getMultiple =function(works ,type='max'){
     const tpl ={
-        "max"        :"http://#domain#/img-original/img/#date#/#id#_p#index#.#fileFormat#",
-        "1200p"      :"http://#domain#/c/1200x1200/img-master/img/#date#/#id#_p#index#_master1200.jpg",
-        "cover_600p" :"http://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg",
+        "max"        :"https://#domain#/img-original/img/#date#/#id#_p#index#.#fileFormat#",
+        "1200p"      :"https://#domain#/c/1200x1200/img-master/img/#date#/#id#_p#index#_master1200.jpg",
+        "cover_600p" :"https://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg",
     };
 
     var address =tpl[type];
@@ -234,8 +234,8 @@ PxerPrinter.getMultiple =function(works ,type='max'){
  * */
 PxerPrinter.getWorks =function (works ,type='max'){
     const tpl ={
-        "max"   :"http://#domain#/img-original/img/#date#/#id#_p0.#fileFormat#",
-        "600p"  :"http://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg",
+        "max"   :"https://#domain#/img-original/img/#date#/#id#_p0.#fileFormat#",
+        "600p"  :"https://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg",
     };
 
     var address =tpl[type];

diff --git a/src/test/old/test.html b/src/test/old/test.html
@@ -14,7 +14,7 @@ <h1>Hello Pxer6!</h1>
         <li>移除AD</li>
         <li>优化P站</li>
         <li>搜图快速搜索</li>
-        <li>http://www.pixiv.net/whitecube/user/6737048</li>
+        <li>https://www.pixiv.net/whitecube/user/6737048</li>
         <li>页面500会导致丢失图片</li>
         <li>关注画师也会启动Pxer</li>
     </ul>

diff --git a/src/test/tests.js b/src/test/tests.js