fin-v0.1

APP/Dockerfile

@@ -0,0 +1,9 @@
+FROM python:3.6
+WORKDIR /code
+ENV FLASK_RUN_HOST 0.0.0.0
+ENV FLASK_APP server.py
+COPY . .
+RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+RUN bash ./get_ip.sh
+CMD ["flask", "run"]
+

APP/get_ip.sh

@@ -0,0 +1,5 @@
+#！/bin/bash
+echo var url=\"$IP:$PORT\"; > ./static/js/ip.js 
+
+
+

APP/server.py

@@ -21,5 +21,5 @@ app.register_blueprint(bp_auth)
 app.register_blueprint(bp_start)
 app.register_blueprint(bp_block)
 app.register_blueprint(bp_collection)
-init_db()
+#init_db()
 app.run(host="0.0.0.0",port="5000",debug=True)

APP/static/js/ip.js

@@ -1 +1 @@
-var url = '106.75.245.180';;
+var url="106.75.245.180:5000";;

APP/static/js/wsy.js

@@ -23,7 +23,6 @@ var cookie = {
 
 function sendRequest(url_suffix, data, func) {
     var url = url_prefix + url_suffix;
-    alert(url);
     $.ajax({
         type: "post",
         url: url,
@@ -323,8 +322,9 @@ var recommend = new Vue({
     },
     created: function () {
         var url;
-        url = "collection/recommend";
+        url = "collection/recommand";
         var data = new FormData();
+	data.append('phonenum', phonenum);
         sendRequest(url, data, function (data) {
             recommend.textList = data.collections;
             checkLike(this);

APP/templates/add.html

@@ -427,14 +427,14 @@
                         <ul class="vertical-nav-menu">
                             <li class="app-sidebar__heading">个人中心</li>
                             <li>
-                                <a href="personal.html" class="mm-active">
+                                <a href="/personal" class="mm-active">
                                     <i class="metismenu-icon pe-7s-browser">
                                     </i>我的集锦
                                 </a>
                             </li>
                             <li class="app-sidebar__heading">广场</li>
                             <li>
-                                <a href="square.html">
+                                <a href="/square">
                                     <i class="metismenu-icon pe-7s-display2">
                                     </i>用户集锦
                                 </a>
@@ -481,7 +481,7 @@
                                                     </div>
                                                 </li>
                                                 <li class="nav-item-divider nav-item"></li>
-                                                <li class="nav-item-header nav-item" v-if="item.type!='picture' ">修改名称
+                                                <li class="nav-item-header nav-item" v-if="item.type!='picture' ">修改
                                                 </li>
                                                 <li class="nav-item" v-if="item.type!='picture' ">
                                                     <textarea autocomplete="off" v-model="item.content"

APP/templates/forget.html

@@ -24,19 +24,17 @@
                 password1: password1
             },
             success: function(data){
-    			alert(data.msg);
                 if(data.code == 1){
-                    window.location = "login.html";
+                    window.location = "/login";
                 }
                 else{
-                    window.location = "forget.html";
+                    window.location = "/forget";
                 }
     		},
 			error: function(XMLHttpRequest, textStatus, errorThrown) {
-                alert(XMLHttpRequest.status);
-                alert(XMLHttpRequest.readyState);
+               
                 alert(textStatus);
-			    window.location = "forget.html";
+			    window.location = "/forget";
             }
         });
     } 

APP/templates/login.html

@@ -36,7 +36,6 @@
             var phonenum = $(obj).parent().prev().prev().children("#phonenum").val();
             var password = $(obj).parent().prev().children("#password").val();
             var url_ = "http://"+url+":5000/bp_auth/login";
-		alert(url_);
             $.ajax({
                 type: "POST",
                 url: url_,
@@ -46,7 +45,7 @@
                 },
                 success: function (data) {
                     cookie.setCookie('phonenum', phonenum, 30);
-                    alert(data.msg);
+                    
                     if(data.code != 1){
                         window.location = "%%url_for('start.login')%%";
                     }else{
@@ -54,8 +53,7 @@
                     }
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(XMLHttpRequest.status);
-                    alert(XMLHttpRequest.readyState);
+                    
                     alert(textStatus);
                     window.location = "%%url_for('start.login')%%";
                 }

APP/templates/register.html

@@ -33,7 +33,6 @@
             var password = $(obj).parent().prev().prev().children("#password").val();
             var password1 = $(obj).parent().prev().children("#password1").val();
             var suf_url = ":5000/bp_auth/register";
-		alert(url);
             var pre_url = "http://"
             $.ajax({
                 type: "POST",
@@ -45,7 +44,7 @@
                     password1: password1
                 },
                 success: function(data){
-                    alert(data.msg);
+                    
                     if(data.code == 1){
                         window.location = "/login";
                     }
@@ -55,8 +54,7 @@
     
                 },
                 error: function(XMLHttpRequest, textStatus, errorThrown) {
-                    alert(XMLHttpRequest.status);
-                    alert(XMLHttpRequest.readyState);
+                    
                     alert(textStatus);
                     window.location = "/register";
                 }

APP/templates/square.html

@@ -14,6 +14,7 @@
     <meta name="msapplication-tap-highlight" content="no">
     <link href="../static/css/charts.css" rel="stylesheet">
     <link href="../static/css/main.css" rel="stylesheet">
+    <script src="../static/js/ip.js"></script>     
     <script src="../static/js/jquery-3.5.1.min.js"></script>
     <script>
         // wsy
@@ -432,4 +433,4 @@
 <script src="../static/js/wsy.js"></script>
 
 </body>
-</html>
+</html>

APP/url crawler.py

@@ -1,9 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-
-url = "https://www.baidu.com"
-html = requests.get(url)
-html.encoding = 'utf-8'
-soup = BeautifulSoup(html.text, "html.parser")
-title = soup.find('title').text
-# print(title)

APP/view/block.py

@@ -175,10 +175,60 @@ def edit():
 def get_web_name():
     url = request.form.get('url')
     ret = {'msg': 'succuss'}
-    html = requests.get(url)
-    html.encoding = 'utf-8'
-    soup = BeautifulSoup(html.text, "html.parser")
-    title = soup.find('title').text
+    ori_url = url
+    title = None
+    if ori_url[0:4] != "http":
+        url = "https://" + ori_url
+    try:
+        html = requests.get(url)
+    except:
+        url = "http://" + ori_url
+        try:
+            html = requests.get(url)
+        except:
+            title = None
+        else:
+            soup = BeautifulSoup(html.text, "html.parser")
+            coding = soup.find('meta', attrs={'http-equiv': 'Content-Type'})
+            if coding != None:
+                coding = coding['content']
+                if 'charset' in coding:
+                    html.encoding = coding[coding.find('charset')+len('charset='):]
+                else:
+                    html.encoding = 'utf-8'
+            else:
+                coding = soup.find('meta', attrs={'http-equiv': 'content-type'})
+                if coding != None:
+                    coding = coding['content']
+                    if 'charset' in coding:
+                        html.encoding = coding[coding.find('charset')+len('charset='):]
+                    else:
+                        html.encoding = 'utf-8'
+                else:
+                    html.encoding = 'utf-8'
+            soup = BeautifulSoup(html.text, "html.parser")
+            title = soup.find('title').text
+    else:
+        soup = BeautifulSoup(html.text, "html.parser")
+        coding = soup.find('meta', attrs={'http-equiv': 'Content-Type'})
+        if coding != None:
+            coding = coding['content']
+            if 'charset' in coding:
+                html.encoding = coding[coding.find('charset')+len('charset='):]
+            else:
+                html.encoding = 'utf-8'
+        else:
+            coding = soup.find('meta', attrs={'http-equiv': 'content-type'})
+            if coding != None:
+                coding = coding['content']
+                if 'charset' in coding:
+                    html.encoding = coding[coding.find('charset')+len('charset='):]
+                else:
+                    html.encoding = 'utf-8'
+            else:
+                html.encoding = 'utf-8'
+        soup = BeautifulSoup(html.text, "html.parser")
+        title = soup.find('title').text
     """	    
     ret['name'] = url对应的网站的title，没有就返回url
     """