Merge branch 'projectmanage' of gitlab.gongsibao.com:jiangyong/zhichan into projectmanage

projectmanage/app/config/settings.js

@@ -29,7 +29,7 @@ var settings = {
     if(this.env=="dev"){
       return "http://p.apps.com:4001/";
     }else {
-      return "http://open.gongsibao.com/";
+      return "https://open.gongsibao.com/";
     }
   },
   reqEsAddr:function(){

projectmanage/app/front/entry/admin.ejs

@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
 	<title id="idtitle"><%=app.name%></title>
 	<link rel="stylesheet" href="/css/ele/index_2.5.4.css">
-	<link rel="stylesheet" href="http://open.gongsibao.com/css/pagecom.css">
+	<link rel="stylesheet" href="https://open.gongsibao.com/css/pagecom.css">
 	<link rel="stylesheet" href="/css/pagecom.css">
 	
 	<link rel="stylesheet" href="/css/fontawesome/css/font-awesome.min.css">

projectmanage/app/front/entry/index.ejs

@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
 	<title id="idtitle"><%=app?app.name:'应用未启用'%></title>
 	<link rel="stylesheet" href="/css/ele/index_2.5.4.css">
-	<link rel="stylesheet" href="http://open.gongsibao.com/css/pagecom.css">
+	<link rel="stylesheet" href="https://open.gongsibao.com/css/pagecom.css">
 	<link rel="stylesheet" href="/css/pagecom.css">
 	<link rel="stylesheet" href="/css/fontawesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="/css/fontawesome/css/toolicon-style.css">