From 968b6161cd9da4ff548a3b7c7666e64c847f4fc6 Mon Sep 17 00:00:00 2001 From: Smallpath Date: Tue, 13 Nov 2018 21:55:51 +0800 Subject: [PATCH] release(Android): 0.9.5 --- CHANGELOG.md | 6 ++++ package.json | 2 +- psnine/component/BattleItem.tsx | 2 +- psnine/component/CircleItem.tsx | 2 +- psnine/component/CommunityItem.android.tsx | 2 +- psnine/component/CommunityItem.ios.tsx | 2 +- psnine/component/ComplexComment.tsx | 4 +-- psnine/component/DiscountItem.tsx | 4 +-- psnine/component/GameItem.tsx | 2 +- psnine/component/GeneItem.tsx | 2 +- psnine/component/HTMLView/htmlToElement.tsx | 2 +- psnine/component/HTMLView/inlineImage.tsx | 2 +- .../HTMLView/resizableImage.android.tsx | 2 +- .../component/HTMLView/resizableImage.ios.tsx | 2 +- psnine/component/LatestCommentItem.tsx | 2 +- psnine/component/MessageItem.tsx | 2 +- psnine/component/NewsItem.tsx | 2 +- psnine/component/QaItem.tsx | 2 +- psnine/component/RankItem.tsx | 2 +- psnine/component/SimpleComment.tsx | 2 +- psnine/component/TipItem.tsx | 2 +- psnine/component/TradeItem.tsx | 2 +- psnine/container/LeftDrawer.tsx | 16 +++++----- psnine/container/Toolbar.android.tsx | 4 +-- psnine/container/Toolbar.ios.tsx | 2 +- psnine/container/circle/Circle.tsx | 4 +-- psnine/container/game/GameBattle.tsx | 2 +- psnine/container/game/GamePoint.tsx | 2 +- psnine/container/game/GameQa.tsx | 2 +- psnine/container/game/GameRank.tsx | 2 +- psnine/container/game/Trophy.tsx | 2 +- psnine/container/new/NewBattle.tsx | 4 +-- psnine/container/new/NewGene.android.tsx | 4 +-- psnine/container/new/NewGene.ios.tsx | 4 +-- psnine/container/new/NewQa.tsx | 2 +- psnine/container/new/NewTopic.tsx | 2 +- psnine/container/new/NewTrade.tsx | 4 +-- psnine/container/new/Reply.android.tsx | 2 +- psnine/container/new/Reply.ios.tsx | 2 +- psnine/container/setting/PsnineAbout.tsx | 12 +++---- psnine/container/topic/BattleTopic.tsx | 2 +- psnine/container/topic/CommunityTopic.tsx | 6 ++-- psnine/container/topic/QaTopic.tsx | 4 +-- psnine/container/topic/TradeTopic.tsx | 2 +- psnine/container/user/Custom.tsx | 6 ++-- psnine/container/user/Detail.tsx | 6 ++-- psnine/container/user/UserDiary.tsx | 2 +- psnine/dao/index.ts | 6 ++-- psnine/dao/login.ts | 4 +-- psnine/dao/logout.ts | 2 +- psnine/dao/post.ts | 32 +++++++++---------- psnine/dao/signon.ts | 2 +- psnine/dao/sync.ts | 16 +++++----- psnine/parser/circle/circle.js | 4 +-- psnine/parser/circle/element.js | 2 +- psnine/parser/circle/index.js | 2 +- psnine/parser/circle/rank.js | 2 +- psnine/parser/discount/discount.js | 2 +- psnine/parser/discount/index.js | 2 +- psnine/parser/game/game.js | 2 +- psnine/parser/game/gameNewTopic.js | 2 +- psnine/parser/game/gameQa.js | 2 +- psnine/parser/game/gameRank.js | 2 +- psnine/parser/game/gameTopic.js | 2 +- psnine/parser/game/newGameDiscount.js | 2 +- psnine/parser/qa/qa.js | 2 +- psnine/parser/store/index.js | 2 +- psnine/parser/topic/topic.js | 2 +- psnine/parser/trade/index.js | 2 +- psnine/parser/user/circle.js | 2 +- psnine/parser/user/diary.js | 2 +- psnine/parser/user/favorite.js | 2 +- psnine/parser/user/gene.js | 2 +- psnine/parser/user/home.js | 4 +-- psnine/parser/user/issue.js | 4 +-- psnine/parser/user/myGame.js | 2 +- psnine/parser/user/photo.js | 2 +- psnine/parser/user/topic.js | 2 +- psnine/redux/reducer/Recommend.ts | 2 +- psnine/router/index.tsx | 12 +++---- psnine/utils/statistics.ts | 2 +- 81 files changed, 146 insertions(+), 140 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4cdb70..69a59f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.9.5 +- 启用 HTTPS + +## 0.9.4 +- 修复机因广告导致解析失败的问题 + ## 0.9.3 - 修复部分机型上折叠工具栏报错的问题 - 修复安卓5.0涟漪错位的问题 diff --git a/package.json b/package.json index a1af415..79b0502 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "psnine", - "version": "0.9.4", + "version": "0.9.5", "private": true, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", diff --git a/psnine/component/BattleItem.tsx b/psnine/component/BattleItem.tsx index 6baebc2..2d90a90 100644 --- a/psnine/component/BattleItem.tsx +++ b/psnine/component/BattleItem.tsx @@ -154,7 +154,7 @@ export default class BattleItem extends React.PureComponent{rowData.psnid} diff --git a/psnine/component/CircleItem.tsx b/psnine/component/CircleItem.tsx index c53a16b..3e46eb8 100644 --- a/psnine/component/CircleItem.tsx +++ b/psnine/component/CircleItem.tsx @@ -71,7 +71,7 @@ export default class CircleItem extends React.PureComponent { this.props.navigation.navigate('Home', { title: rowData.owner, id: rowData.owner, - URL: `http://psnine.com/psnid/${rowData.owner}` + URL: `https://psnine.com/psnid/${rowData.owner}` }) } }>机长：{rowData.owner} diff --git a/psnine/component/CommunityItem.android.tsx b/psnine/component/CommunityItem.android.tsx index f5e5148..1ff2743 100644 --- a/psnine/component/CommunityItem.android.tsx +++ b/psnine/component/CommunityItem.android.tsx @@ -154,7 +154,7 @@ export default class ComplexComment extends React.PureComponent{rowData.psnid} {rowData.psnid} { - fetch(`http://psnine.com/get/comson?id=${rowData.id.replace('comment-', '')}`).then(() => { + fetch(`https://psnine.com/get/comson?id=${rowData.id.replace('comment-', '')}`).then(() => { preFetch && preFetch() }) }, @@ -317,7 +317,7 @@ export default class ComplexComment extends React.PureComponent{rowData.psnid} diff --git a/psnine/component/DiscountItem.tsx b/psnine/component/DiscountItem.tsx index 86f4fa7..0a72c8b 100644 --- a/psnine/component/DiscountItem.tsx +++ b/psnine/component/DiscountItem.tsx @@ -22,8 +22,8 @@ export default class extends React.PureComponent { const { navigation } = this.props const URL = getGameUrl(rowData.id) navigation.navigate('GamePage', { - // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath', + // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath', URL, title: rowData.title, rowData, diff --git a/psnine/component/GeneItem.tsx b/psnine/component/GeneItem.tsx index cbc0137..99ef74e 100644 --- a/psnine/component/GeneItem.tsx +++ b/psnine/component/GeneItem.tsx @@ -148,7 +148,7 @@ export default class extends React.PureComponent{rowData.psnid} diff --git a/psnine/component/HTMLView/htmlToElement.tsx b/psnine/component/HTMLView/htmlToElement.tsx index 7b87b8c..6289346 100644 --- a/psnine/component/HTMLView/htmlToElement.tsx +++ b/psnine/component/HTMLView/htmlToElement.tsx @@ -213,7 +213,7 @@ export default function htmlToElement(rawHtml, opts, done) { if (ImageComponent === ResizableImgComponent) { let src = node.attribs.src if (/^(.*?):\/\//.exec(src)) {} else { - src = 'http://psnine.com' + src + src = 'https://psnine.com' + src } // console.log('pushing', src) opts.imageArr.push({ url: src }) diff --git a/psnine/component/HTMLView/inlineImage.tsx b/psnine/component/HTMLView/inlineImage.tsx index 16d38c9..b5b4a10 100644 --- a/psnine/component/HTMLView/inlineImage.tsx +++ b/psnine/component/HTMLView/inlineImage.tsx @@ -22,7 +22,7 @@ export default props => { } let src = props.attribs.src if (/^(.*?):\/\//.exec(src)) {} else { - src = 'http://psnine.com' + src + src = 'https://psnine.com' + src } const source = { uri: src, diff --git a/psnine/component/HTMLView/resizableImage.android.tsx b/psnine/component/HTMLView/resizableImage.android.tsx index 84d8623..a4ac31f 100644 --- a/psnine/component/HTMLView/resizableImage.android.tsx +++ b/psnine/component/HTMLView/resizableImage.android.tsx @@ -26,7 +26,7 @@ export default props => { } let src = props.attribs.src if (/^(.*?):\/\//.exec(src)) {} else { - src = 'http://psnine.com' + src + src = 'https://psnine.com' + src } const source = { diff --git a/psnine/component/HTMLView/resizableImage.ios.tsx b/psnine/component/HTMLView/resizableImage.ios.tsx index 0673dab..2acac2f 100644 --- a/psnine/component/HTMLView/resizableImage.ios.tsx +++ b/psnine/component/HTMLView/resizableImage.ios.tsx @@ -26,7 +26,7 @@ export default props => { } let src = props.attribs.src if (/^(.*?):\/\//.exec(src)) {} else { - src = 'http://psnine.com' + src + src = 'https://psnine.com' + src } const source = { diff --git a/psnine/component/LatestCommentItem.tsx b/psnine/component/LatestCommentItem.tsx index 80ea70a..4db9bde 100644 --- a/psnine/component/LatestCommentItem.tsx +++ b/psnine/component/LatestCommentItem.tsx @@ -54,7 +54,7 @@ export default class PhotoItem extends React.PureComponent { navigation.navigate('Home', { title: rowData.psnid, id: rowData.psnid, - URL: `http://psnine.com/psnid/${rowData.psnid}` + URL: `https://psnine.com/psnid/${rowData.psnid}` }) }}>{rowData.psnid} {rowData.psnid} diff --git a/psnine/component/NewsItem.tsx b/psnine/component/NewsItem.tsx index 52cfb88..c8518ad 100644 --- a/psnine/component/NewsItem.tsx +++ b/psnine/component/NewsItem.tsx @@ -91,7 +91,7 @@ export default class NewsItem extends React.PureComponent{rowData.psnid} {rowData.psnid} diff --git a/psnine/component/RankItem.tsx b/psnine/component/RankItem.tsx index 6af8888..540f6e3 100644 --- a/psnine/component/RankItem.tsx +++ b/psnine/component/RankItem.tsx @@ -35,7 +35,7 @@ export default class extends React.PureComponent{rowData.psnid} diff --git a/psnine/component/TipItem.tsx b/psnine/component/TipItem.tsx index 77ed890..f2ae922 100644 --- a/psnine/component/TipItem.tsx +++ b/psnine/component/TipItem.tsx @@ -56,7 +56,7 @@ export default class PhotoItem extends React.PureComponent { navigation.navigate('Home', { title: rowData.psnid, id: rowData.psnid, - URL: `http://psnine.com/psnid/${rowData.psnid}` + URL: `https://psnine.com/psnid/${rowData.psnid}` }) }}>{rowData.psnid} {rowData.psnid} diff --git a/psnine/container/LeftDrawer.tsx b/psnine/container/LeftDrawer.tsx index e1d01fe..1d81353 100644 --- a/psnine/container/LeftDrawer.tsx +++ b/psnine/container/LeftDrawer.tsx @@ -37,7 +37,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/fav?page=1' + let URL = 'https://psnine.com/my/fav?page=1' navigation.navigate('Favorite', { URL, @@ -52,7 +52,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/issue?page=1' + let URL = 'https://psnine.com/my/issue?page=1' navigation.navigate('Issue', { URL, @@ -67,7 +67,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/block' + let URL = 'https://psnine.com/my/block' navigation.navigate('UserBlock', { URL, @@ -82,7 +82,7 @@ const ListItems = [ // const { navigation, closeDrawer } = this.props // closeDrawer() - // let URL = 'http://psnine.com/my/element' + // let URL = 'https://psnine.com/my/element' // navigation.navigate('UserElement', { // URL, @@ -97,7 +97,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/photo?page=1' + let URL = 'https://psnine.com/my/photo?page=1' navigation.navigate('UserPhoto', { URL, @@ -112,7 +112,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/account' + let URL = 'https://psnine.com/my/account' navigation.navigate('UserDetail', { URL, @@ -127,7 +127,7 @@ const ListItems = [ const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/setting' + let URL = 'https://psnine.com/my/setting' navigation.navigate('UserCustom', { URL, @@ -341,7 +341,7 @@ export default class NavigationDrawer extends Component { const { navigation, closeDrawer } = this.props closeDrawer() - let URL = 'http://psnine.com/my/pass' + let URL = 'https://psnine.com/my/pass' navigation.navigate('Pass', { URL, diff --git a/psnine/container/Toolbar.android.tsx b/psnine/container/Toolbar.android.tsx index 398ba1c..b0df0ba 100644 --- a/psnine/container/Toolbar.android.tsx +++ b/psnine/container/Toolbar.android.tsx @@ -174,7 +174,7 @@ class Toolbar extends Component { index === 1 && this._onSearchClicked() const obj: any = {} if (communityType) { - obj.URL = `http://psnine.com/node/${communityType}/add` + obj.URL = `https://psnine.com/node/${communityType}/add` } index === 0 && this.props.navigation.navigate('NewTopic', obj) } @@ -457,7 +457,7 @@ class Toolbar extends Component { // this.props.navigation.navigate('Home', { // title: 'secondlife_xhm', // id: 'secondlife_xhm', - // URL: `http://psnine.com/psnid/${'secondlife_xhm'}` + // URL: `https://psnine.com/psnid/${'secondlife_xhm'}` // }) } diff --git a/psnine/container/Toolbar.ios.tsx b/psnine/container/Toolbar.ios.tsx index 3b1ac7e..495dc48 100644 --- a/psnine/container/Toolbar.ios.tsx +++ b/psnine/container/Toolbar.ios.tsx @@ -168,7 +168,7 @@ class Toolbar extends Component { index === 1 && this._onSearchClicked() const obj: any = {} if (communityType) { - obj.URL = `http://psnine.com/node/${communityType}/add` + obj.URL = `https://psnine.com/node/${communityType}/add` } index === 0 && this.props.navigation.navigate('NewTopic', obj) } diff --git a/psnine/container/circle/Circle.tsx b/psnine/container/circle/Circle.tsx index e925a63..62436f4 100644 --- a/psnine/container/circle/Circle.tsx +++ b/psnine/container/circle/Circle.tsx @@ -73,7 +73,7 @@ export default class extends Component { // alert(id) this.props.navigation.navigate('NewGene', { // shouldSeeBackground: true, - URL: `http://psnine.com/set/gene?ele=${id}` + URL: `https://psnine.com/set/gene?ele=${id}` }) break case 0: @@ -201,7 +201,7 @@ export default class extends Component { this.props.navigation.navigate('Home', { title: rowData.owner, id: rowData.owner, - URL: `http://psnine.com/psnid/${rowData.owner}` + URL: `https://psnine.com/psnid/${rowData.owner}` }) }}>元素发起者：{rowData.owner} diff --git a/psnine/container/game/GameBattle.tsx b/psnine/container/game/GameBattle.tsx index bc0bca2..4696fde 100644 --- a/psnine/container/game/GameBattle.tsx +++ b/psnine/container/game/GameBattle.tsx @@ -78,7 +78,7 @@ class GameTopic extends Component { const { params } = this.props.navigation.state const id = (params.URL.match(/\d+/) || [0])[0] this.props.navigation.navigate('NewBattle', { - URL: `http://psnine.com/set/battle?psngameid=${id}` + URL: `https://psnine.com/set/battle?psngameid=${id}` }) // console.log(id) return diff --git a/psnine/container/game/GamePoint.tsx b/psnine/container/game/GamePoint.tsx index 8e3ea19..46856a2 100644 --- a/psnine/container/game/GamePoint.tsx +++ b/psnine/container/game/GamePoint.tsx @@ -114,7 +114,7 @@ class CommunityTopic extends Component { onPress={() => { if (rowData.url) { this.props.navigation.navigate('GamePage', { - // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath', + // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath', URL: rowData.url, title: rowData.title, rowData, diff --git a/psnine/container/game/GameQa.tsx b/psnine/container/game/GameQa.tsx index e15fb30..ef137e2 100644 --- a/psnine/container/game/GameQa.tsx +++ b/psnine/container/game/GameQa.tsx @@ -118,7 +118,7 @@ class GameTopic extends Component { const { params } = this.props.navigation.state const id = (params.URL.match(/\d+/) || [0])[0] this.props.navigation.navigate('NewQa', { - URL: `http://psnine.com/set/qa?psngameid=${id}` + URL: `https://psnine.com/set/qa?psngameid=${id}` }) // console.log(id) return diff --git a/psnine/container/game/GameRank.tsx b/psnine/container/game/GameRank.tsx index 9504221..3fedc62 100644 --- a/psnine/container/game/GameRank.tsx +++ b/psnine/container/game/GameRank.tsx @@ -43,7 +43,7 @@ class TopicItem extends React.PureComponent { navigation.navigate('Home', { title: rowData.psnid, id: rowData.psnid, - URL: `http://psnine.com/psnid/${rowData.psnid}` + URL: `https://psnine.com/psnid/${rowData.psnid}` }) } diff --git a/psnine/container/game/Trophy.tsx b/psnine/container/game/Trophy.tsx index dff2b7a..b2828d8 100644 --- a/psnine/container/game/Trophy.tsx +++ b/psnine/container/game/Trophy.tsx @@ -110,7 +110,7 @@ class CommunityTopic extends Component { onPress={() => { if (rowData.url) { this.props.navigation.navigate('GamePage', { - // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath', + // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath', URL: rowData.url, title: rowData.title, rowData, diff --git a/psnine/container/new/NewBattle.tsx b/psnine/container/new/NewBattle.tsx index ca4ff29..dd1fb25 100644 --- a/psnine/container/new/NewBattle.tsx +++ b/psnine/container/new/NewBattle.tsx @@ -312,7 +312,7 @@ export default class NewTopic extends Component { ') - titleInfo.isLogined = !html.includes('登录') + titleInfo.isLogined = !html.includes('登录') const list = [] @@ -51,7 +51,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/circle/element.js b/psnine/parser/circle/element.js index 20f8ba4..29a5b0f 100644 --- a/psnine/parser/circle/element.js +++ b/psnine/parser/circle/element.js @@ -47,7 +47,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/circle/index.js b/psnine/parser/circle/index.js index 437161a..113550e 100644 --- a/psnine/parser/circle/index.js +++ b/psnine/parser/circle/index.js @@ -30,7 +30,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() || '1' page.push({ url, diff --git a/psnine/parser/circle/rank.js b/psnine/parser/circle/rank.js index e60373e..cff3ac6 100644 --- a/psnine/parser/circle/rank.js +++ b/psnine/parser/circle/rank.js @@ -45,7 +45,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/discount/discount.js b/psnine/parser/discount/discount.js index b5781e9..2aeff0e 100644 --- a/psnine/parser/discount/discount.js +++ b/psnine/parser/discount/discount.js @@ -20,7 +20,7 @@ export default function (html) { const prevContent = contentArr.join('
') const storeLink = prevContent.match(/store\(\'(.*?)\',\'(.*?)\'/) const isOK = storeLink && storeLink[1] && storeLink[2] - const onclick = isOK ? `http://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' + const onclick = isOK ? `https://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' const mock = { avatar: img, platform: arr[0], diff --git a/psnine/parser/discount/index.js b/psnine/parser/discount/index.js index 476ac9a..84fc1d8 100644 --- a/psnine/parser/discount/index.js +++ b/psnine/parser/discount/index.js @@ -20,7 +20,7 @@ export default function (html) { const prevContent = contentArr.join('
') const storeLink = prevContent.match(/store\(\'(.*?)\',\'(.*?)\'/) const isOK = storeLink && storeLink[1] && storeLink[2] - const onclick = isOK ? `http://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' + const onclick = isOK ? `https://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' const mock = { avatar: img, platform: arr[0], diff --git a/psnine/parser/game/game.js b/psnine/parser/game/game.js index 02cc2d3..25b70e4 100644 --- a/psnine/parser/game/game.js +++ b/psnine/parser/game/game.js @@ -112,7 +112,7 @@ export default function (html, hasPsnid = false) { if (toolbar) { toolbar.find('li').each(function (i, elem) { const $this = $(this) - const img = 'http://psnine.com' + $this.find('img').attr('src') + const img = 'https://psnine.com' + $this.find('img').attr('src') const text = $this.find('a').text() const url = $this.find('a').attr('href') toolbarInfo.push({ img, text, url }) diff --git a/psnine/parser/game/gameNewTopic.js b/psnine/parser/game/gameNewTopic.js index 98e368e..02d7c92 100644 --- a/psnine/parser/game/gameNewTopic.js +++ b/psnine/parser/game/gameNewTopic.js @@ -107,7 +107,7 @@ export default function parseThophy(html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/game/gameQa.js b/psnine/parser/game/gameQa.js index 51477cf..b909714 100644 --- a/psnine/parser/game/gameQa.js +++ b/psnine/parser/game/gameQa.js @@ -34,7 +34,7 @@ export default function (html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/game/gameRank.js b/psnine/parser/game/gameRank.js index 19f34f2..d89167d 100644 --- a/psnine/parser/game/gameRank.js +++ b/psnine/parser/game/gameRank.js @@ -29,7 +29,7 @@ export default function (html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/game/gameTopic.js b/psnine/parser/game/gameTopic.js index 0660119..1357e51 100644 --- a/psnine/parser/game/gameTopic.js +++ b/psnine/parser/game/gameTopic.js @@ -32,7 +32,7 @@ export default function parseThophy(html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/game/newGameDiscount.js b/psnine/parser/game/newGameDiscount.js index 723c048..a367c8b 100644 --- a/psnine/parser/game/newGameDiscount.js +++ b/psnine/parser/game/newGameDiscount.js @@ -19,7 +19,7 @@ export default function (html) { const prevContent = contentArr.join('
') const storeLink = prevContent.match(/store\(\'(.*?)\',\'(.*?)\'/) const isOK = storeLink && storeLink[1] && storeLink[2] - const onclick = isOK ? `http://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' + const onclick = isOK ? `https://psnine.com/store/${storeLink[1]}::${storeLink[2]}` : '' const mock = { avatar: img, platform: arr[0], diff --git a/psnine/parser/qa/qa.js b/psnine/parser/qa/qa.js index 38eb49f..d6a0a42 100644 --- a/psnine/parser/qa/qa.js +++ b/psnine/parser/qa/qa.js @@ -48,7 +48,7 @@ export default function (html) { all.find('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/store/index.js b/psnine/parser/store/index.js index 753a320..92ca6f4 100644 --- a/psnine/parser/store/index.js +++ b/psnine/parser/store/index.js @@ -33,7 +33,7 @@ export default function (html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() || '1' page.push({ url, diff --git a/psnine/parser/topic/topic.js b/psnine/parser/topic/topic.js index 8749062..f224b9b 100644 --- a/psnine/parser/topic/topic.js +++ b/psnine/parser/topic/topic.js @@ -81,7 +81,7 @@ export default function (html, type = 'gene') { all.find('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/trade/index.js b/psnine/parser/trade/index.js index 36aa4cc..65a0a32 100644 --- a/psnine/parser/trade/index.js +++ b/psnine/parser/trade/index.js @@ -39,7 +39,7 @@ export default function (html) { $('.page a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() || '1' page.push({ url, diff --git a/psnine/parser/user/circle.js b/psnine/parser/user/circle.js index af05beb..0af7f6c 100644 --- a/psnine/parser/user/circle.js +++ b/psnine/parser/user/circle.js @@ -31,7 +31,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/diary.js b/psnine/parser/user/diary.js index ba58c41..3cc6041 100644 --- a/psnine/parser/user/diary.js +++ b/psnine/parser/user/diary.js @@ -23,7 +23,7 @@ export default function (html, psnid) { if (!mock.content) { mock.content = $this.find('.title').html() } - mock.href = 'http://psnine.com/diary/' + mock.id + mock.href = 'https://psnine.com/diary/' + mock.id diary.push(mock) }) diff --git a/psnine/parser/user/favorite.js b/psnine/parser/user/favorite.js index 3099d39..03d4f97 100644 --- a/psnine/parser/user/favorite.js +++ b/psnine/parser/user/favorite.js @@ -114,7 +114,7 @@ export default function (html, type) { $('.page ul').last().find('a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/gene.js b/psnine/parser/user/gene.js index 89b224d..cf7c4c4 100644 --- a/psnine/parser/user/gene.js +++ b/psnine/parser/user/gene.js @@ -44,7 +44,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/home.js b/psnine/parser/user/home.js index 1ae4142..3e935cd 100644 --- a/psnine/parser/user/home.js +++ b/psnine/parser/user/home.js @@ -55,7 +55,7 @@ export default function (html, psnid) { // text: '同步' // }) // } - const base = `http://psnine.com/psnid/${psnid}` + const base = `https://psnine.com/psnid/${psnid}` const psnButtonInfo = [{ text: '屏蔽', psnid @@ -133,7 +133,7 @@ export default function (html, psnid) { if (!mock.content) { mock.content = $this.find('.title').html() } - mock.href = 'http://psnine.com/diary/' + mock.id + mock.href = 'https://psnine.com/diary/' + mock.id diaryTable.push(mock) }) diff --git a/psnine/parser/user/issue.js b/psnine/parser/user/issue.js index 53971bd..70e9bf7 100644 --- a/psnine/parser/user/issue.js +++ b/psnine/parser/user/issue.js @@ -90,7 +90,7 @@ export default function (html, type) { price: $this.find('.title .r').text(), count: nextArr[2] } - mock.edit = 'http://psnine.com/trade/' + mock.id + '/edit' + mock.edit = 'https://psnine.com/trade/' + mock.id + '/edit' list.push(mock) }) } else if (type === 'qa') { @@ -174,7 +174,7 @@ export default function (html, type) { $('.page ul').last().find('a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/myGame.js b/psnine/parser/user/myGame.js index 770d12f..84e2678 100644 --- a/psnine/parser/user/myGame.js +++ b/psnine/parser/user/myGame.js @@ -39,7 +39,7 @@ export default function parseThophy(html) { $('ul.dropmenu').next().find('a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/photo.js b/psnine/parser/user/photo.js index cb9567c..43a03cf 100644 --- a/psnine/parser/user/photo.js +++ b/psnine/parser/user/photo.js @@ -22,7 +22,7 @@ export default function (html, type) { $('.page ul').last().find('a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/parser/user/topic.js b/psnine/parser/user/topic.js index 854bdc0..2f03520 100644 --- a/psnine/parser/user/topic.js +++ b/psnine/parser/user/topic.js @@ -32,7 +32,7 @@ export default function (html) { $('.page li a').each(function (i, elem) { const $this = $(this) - const url = 'http://psnine.com' + $this.attr('href') + const url = 'https://psnine.com' + $this.attr('href') const text = $this.text() page.push({ url, diff --git a/psnine/redux/reducer/Recommend.ts b/psnine/redux/reducer/Recommend.ts index 3f53abc..6a25412 100644 --- a/psnine/redux/reducer/Recommend.ts +++ b/psnine/redux/reducer/Recommend.ts @@ -56,7 +56,7 @@ function callWarning (text) { if (matched) { let url = matched[1] if (url.startsWith('/')) { - url = 'http://psnine.com' + url + url = 'https://psnine.com' + url } button = { text: '点我查看', diff --git a/psnine/router/index.tsx b/psnine/router/index.tsx index 5a9ceb4..5af103e 100644 --- a/psnine/router/index.tsx +++ b/psnine/router/index.tsx @@ -324,7 +324,7 @@ Object.assign(Navigator.router, { switch (action.routeName) { case 'Home': action.params.title = `${id}` - action.params.URL = `http://psnine.com/${path}` + action.params.URL = `https://psnine.com/${path}` break case 'OlderCommunityTopic': case 'CommunityTopic': @@ -332,30 +332,30 @@ Object.assign(Navigator.router, { case 'QaTopic': case 'BattleTopic': case 'GamePage': - action.params.URL = `http://psnine.com/${path}` + action.params.URL = `https://psnine.com/${path}` action.params.type = replyTypeMapper[action.routeName] || 'gene' action.params.rowData = { id } break case 'StoreTopic': - action.params.URL = `http://psnine.com/${path}` + action.params.URL = `https://psnine.com/${path}` action.params.id = id.split('::')[0] action.params.server = id.split('::')[1] action.params.title = '数折' break case 'DiscountTopic': - action.params.URL = `http://psnine.com/${path}` + action.params.URL = `https://psnine.com/${path}` action.params.title = '数折' break case 'CommentList': case 'GeneCommentList': case 'GameTopic': case 'UserGame': - action.params.URL = `http://psnine.com/${path}?page=1` + action.params.URL = `https://psnine.com/${path}?page=1` break case 'Trophy': - action.params.URL = `http://psnine.com/${path}` + action.params.URL = `https://psnine.com/${path}` action.params.title = `No.${id}` break default: diff --git a/psnine/utils/statistics.ts b/psnine/utils/statistics.ts index ee38e40..dfe5191 100644 --- a/psnine/utils/statistics.ts +++ b/psnine/utils/statistics.ts @@ -12,7 +12,7 @@ import { getGameAPI } from '../dao' -const getGameURL = (psnid, page) => `http://psnine.com/psnid/${psnid}/psngame?page=${page}` +const getGameURL = (psnid, page) => `https://psnine.com/psnid/${psnid}/psngame?page=${page}` const getGameList = async (psnid, callback) => { const list: any = []