|
@@ -48,7 +48,7 @@ class Common(object):
|
|
|
|
|
|
self.referer = self.request.headers.get("Referer")
|
|
|
self.host = Demeter.host(self.data['site']['link'])
|
|
|
- uri = self.request.protocol + "://" + self.request.host + self.request.uri
|
|
|
+ uri = self.getHost() + self.request.uri
|
|
|
|
|
|
'''
|
|
|
if not self.referer:
|
|
@@ -147,7 +147,7 @@ class test_path(Load):
|
|
|
for row in datad:
|
|
|
writer.writerow(row)
|
|
|
|
|
|
- url = self.request.protocol + "://" + self.request.host
|
|
|
+ url = self.getHost();
|
|
|
|
|
|
file_path = url + file_path.replace(Demeter.path + 'runtime', '')
|
|
|
|
|
@@ -182,7 +182,7 @@ class convert_path(Load):
|
|
|
config = Demeter.config['redis']
|
|
|
redis.rpush(config['name'], file['id'])
|
|
|
|
|
|
- url = self.request.protocol + "://" + self.request.host
|
|
|
+ url = self.getHost();
|
|
|
|
|
|
self.data['file'] = {
|
|
|
'status' : file['status'],
|
|
@@ -203,7 +203,7 @@ class get_path(Load):
|
|
|
self.data = {}
|
|
|
file = Common.signature(self, 2)
|
|
|
|
|
|
- url = self.request.protocol + "://" + self.request.host
|
|
|
+ url = self.getHost();
|
|
|
|
|
|
self.data['file'] = {
|
|
|
#'id' : file['id'],
|
|
@@ -270,9 +270,12 @@ class view_path(Load):
|
|
|
num = page.replace('.page', '')
|
|
|
if limit > 0 and int(num) > limit:
|
|
|
self.out('您没有权限查看')
|
|
|
- url = self.request.protocol + "://" + self.request.host
|
|
|
+ url = self.getHost();
|
|
|
static = url + path
|
|
|
- page = Demeter.path + 'runtime' + path + page
|
|
|
+ if 'save' in Demeter.config['setting']:
|
|
|
+ page = path + page
|
|
|
+ else:
|
|
|
+ page = Demeter.path + 'runtime' + path + page
|
|
|
content = File.readContent(page)
|
|
|
content = content.replace('src="', 'src="' + str(static))
|
|
|
return content
|
|
@@ -280,10 +283,9 @@ class view_path(Load):
|
|
|
def getContent(self, file, limit, uid):
|
|
|
if limit < 0:
|
|
|
limit = int(file['page'])
|
|
|
- host = self.request.host.replace(':8088', '')
|
|
|
- url = self.request.protocol + "://" + host
|
|
|
+ url = self.getHost();
|
|
|
style = ['document.css']
|
|
|
- script = ['jquery.js']
|
|
|
+ script = ['jquery.js', 'layer.js']
|
|
|
content = ''
|
|
|
static = self.static(url)
|
|
|
assets = self.assets(url, file['path'])
|
|
@@ -292,16 +294,18 @@ class view_path(Load):
|
|
|
content = content + '<link rel="stylesheet" href="'+static+i+'"/>'
|
|
|
|
|
|
content = content + '<link rel="stylesheet" href="'+assets+file['key']+'.css"/>'
|
|
|
+ #content = content + '<style>' + File.readContent(file['path'], file['key']+'.css') + '</style>'
|
|
|
|
|
|
for i in script:
|
|
|
content = content + '<script src="'+static+i+'"></script>'
|
|
|
|
|
|
content = content + self.style()
|
|
|
- content = content + '<div id="page-container">'
|
|
|
+ content = content + '<div id="page-container" load-css="'+assets+file['key']+'.css">'
|
|
|
page_url = self.url(url, file['path'], file['key'], uid)
|
|
|
for i in range(limit):
|
|
|
n = str(i+1)
|
|
|
- content = content + '<div id="pf'+n+'" style="display:none;" class="demeter_document pf w0 h0" data-page-no="'+n+'" data-page-url="'+page_url+n+'.page"></div>'
|
|
|
+ #content = content + '<div id="pf'+n+'" style="display:none;" class="demeter_document pf w0 h0" data-page-no="'+n+'" data-page-url="'+page_url+n+'.page"></div>'
|
|
|
+ content = content + '<div id="demeter_document_'+n+'" style="display:none;" class="demeter_document" data-page-no="'+n+'" data-page-url="'+page_url+n+'.page"></div>'
|
|
|
|
|
|
content = content + '</div>'
|
|
|
#content = content + '<script>try{pdf2htmlEX.defaultViewer = new pdf2htmlEX.Viewer({});}catch(e){}</script>'
|
|
@@ -315,7 +319,7 @@ class view_path(Load):
|
|
|
File.write(view, content)
|
|
|
else:
|
|
|
content = File.readContent(file['html'])
|
|
|
- url = self.request.protocol + "://" + self.request.host
|
|
|
+ url = self.getHost();
|
|
|
|
|
|
static = self.static(url) + 'pdf/'
|
|
|
content = content.replace('src="', 'src="' + static)
|
|
@@ -331,11 +335,17 @@ class view_path(Load):
|
|
|
content = content.replace('</head>', self.style() + '<head>')
|
|
|
return content
|
|
|
|
|
|
+ def getHost(self):
|
|
|
+ host = self.request.host.replace(':8088', '')
|
|
|
+ host = self.request.protocol + "://" + host
|
|
|
+ return host
|
|
|
+
|
|
|
def static(self, url):
|
|
|
return url + '/static/'
|
|
|
|
|
|
def assets(self, url, path):
|
|
|
- path = path.replace(Demeter.path + 'runtime', '')
|
|
|
+ if 'save' not in Demeter.config['setting']:
|
|
|
+ path = path.replace(Demeter.path + 'runtime', '')
|
|
|
return url + path
|
|
|
|
|
|
def pattern(self, limit, content):
|
|
@@ -359,7 +369,8 @@ class view_path(Load):
|
|
|
signature = self.input('signature')
|
|
|
file_id = self.input('file_id')
|
|
|
|
|
|
- path = path.replace(Demeter.path + 'runtime', '')
|
|
|
+ if 'save' not in Demeter.config['setting']:
|
|
|
+ path = path.replace(Demeter.path + 'runtime', '')
|
|
|
|
|
|
url = url + '/main/view?path=' + str(path) + '&file=' + key + '&file_id=' + file_id + '×tamp=' + timestamp + '&nonce=' + nonce + '&appid=' + appid + '&signature=' + signature + '&uid=' + uid + '&page='
|
|
|
|