Răsfoiți Sursa

提交编辑器

wangkaiyue 5 ani în urmă
părinte
comite
a9320a6e6c

+ 12 - 15
core/src/main.go

@@ -29,20 +29,17 @@ import (
 	"qfw/util/fsw"
 	ip "qfw/util/ip17mon"
 	"qfw/util/mongodb"
-	mongodbutil "qfw/util/mongodbutil"
 	"qfw/util/redis"
 	"time"
 
+	"github.com/go-xweb/httpsession"
+	"github.com/go-xweb/xweb"
 	"qfw/jyelastic"
 	//_ "qfw/util/sq"
 	"qfw/coreutil"
 	"qfw/util/mysql"
 	_ "qfw/yellowpage"
 	"runtime"
-	ca "ucbsutil/cassandra"
-
-	"github.com/go-xweb/httpsession"
-	"github.com/go-xweb/xweb"
 )
 
 //初始化
@@ -57,21 +54,21 @@ func init() {
 		util.ReadConfig(configfile, &SysConfig)
 	}
 	//初始化cassandra
-	ca.ViewCacheLen = true
-	ca.InitCassandra("jianyu", SysConfig.Cassandrasize, SysConfig.Cassandra)
+	//ca.ViewCacheLen = true
+	//ca.InitCassandra("jianyu", SysConfig.Cassandrasize, SysConfig.Cassandra)
 
 	//mongodb初始化
 	//util.MongodbAddr = SysConfig.Mongodbservers
 	mongodb.InitMongodbPool(SysConfig.MongodbPoolSize, SysConfig.Mongodbservers, SysConfig.MongodbName)
 	//企业mongodb初始化
-	conf := *new(mongodbutil.PoolConfig)
-	conf.Addr = SysConfig.EntMongodbservers
-	conf.Alias = SysConfig.EntMongodbAlias
-	conf.DB = SysConfig.EntMongodbName
-	conf.Size = SysConfig.EntMongodbPoolSize
-	mongodbutil.Config = append(mongodbutil.Config, conf)
-
-	mongodbutil.InitMongodbPool()
+	//conf := *new(mongodbutil.PoolConfig)
+	//conf.Addr = SysConfig.EntMongodbservers
+	//conf.Alias = SysConfig.EntMongodbAlias
+	//conf.DB = SysConfig.EntMongodbName
+	//conf.Size = SysConfig.EntMongodbPoolSize
+	//mongodbutil.Config = append(mongodbutil.Config, conf)
+	//
+	//mongodbutil.InitMongodbPool()
 	//mysql 数据导出订单
 	coreutil.Mysql = &mysql.Mysql{
 		Address:  SysConfig.Mysql["address"],

+ 1 - 1
core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2020-01-08 22:45:48"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2020-01-08 22:45:48"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2020-01-16 16:17:23"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2020-01-16 16:17:23"}},"marketisstart":true,"marketrate":300}

+ 3 - 125
core/src/web/staticres/js/kindeditor/themes/course/iframe_course.css

@@ -1,127 +1,5 @@
 @charset "UTF-8";
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-size: 100%;
-  font-family: inherit;
-  vertical-align: baseline;
-  -webkit-tap-highlight-color: transparent;
-}
-
-:focus {
-  outline: 0;
-}
-
-body {
-  /*line-height: 1; */
-  /*color: black; 
-background: white; */
-  font-family: "Microsoft YaHei",sans-serif;
-  font-size: 16px;
-  -webkit-font-smoothing: antialiased;
-}
-
-input {
-  font-family: "Microsoft YaHei",sans-serif;
-  -webkit-appearance: none;
-}
-
-ol, ul {
-  list-style: none;
-}
-
-button {
-  outline: none;
-  border: none;
-}
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-}
-
-caption, th, td {
-  text-align: left;
-  font-weight: normal;
-}
-
-textarea {
-  resize: none;
-  -webkit-appearance: none;
-}
-
-img {
-  border: 0;
-}
-
-a {
-  text-decoration: none;
-  color: #000;
-  font-size: 14px;
-}
-
-/*selet 下拉三角改变*/
-/*select {border: none;border-radius: 0;appearance:none;-moz-appearance:none;-webkit-appearance:none;background:#ffffff url(../images/public-img/pub-Xsj.png) no-repeat 95% center;}*/
-/*清除ie的默认选择框样式清除,隐藏下拉箭头*/
-/*select::-ms-expand { display: none;}
-html{-webkit-text-size-adjust: none;}	*/
-/*a:link {color:#606060;} 
-a:visited {color:#606060;} 
-a:hover{color:#8cb91e;	text-decoration: underline;}
-a:active {color:#606060;}*/
-address, caption, cite, code, dfn, em, th, b, i {
-  font-weight: normal;
-  font-style: normal;
-}
-
-.clearfix:after {
-  visibility: hidden;
-  display: block;
-  font-size: 0;
-  content: " ";
-  clear: both;
-  height: 0;
-}
-
-.clearfix {
-  *zoom: 1;
-}
-
-.fl {
-  float: left;
-}
-
-.fr {
-  float: right;
-}
-
-.w {
-  width: 1200px;
-  margin: 0 auto;
-}
-
-.ellipsis {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-/*去除下拉框*/
-/*input[type="search"]::-webkit-search-cancel-button{
-  display: none;
-}*/
-h2 {
+.c-title {
   height: 48px;
   line-height: 48px;
   background-color: #F6F6F6;
@@ -132,11 +10,11 @@ h2 {
   position: relative;
 }
 
-h2:first-of-type {
+.c-title:first-of-type {
   margin-top: 0;
 }
 
-h2:after {
+.c-title:after {
   content: '';
   position: absolute;
   top: 50%;

+ 4 - 4
core/src/web/templates/manage/course/content.html

@@ -242,19 +242,19 @@
     var id = {{.T.id}};
     var Dotype ={{.T.doType}};
     var editor;
-    var defaultHtml = "<h2 id=\"a1\">课程介绍</h2>"
+    var defaultHtml = "<h2 class=\"c-title\" id=\"a1\">课程介绍</h2>"
         + "<p></p>"
         + "<p></p>"
 
-        + "<h2 id=\"a2\">课程大纲</h2>"
+        + "<h2 class=\"c-title\" id=\"a2\">课程大纲</h2>"
         + "<p></p>"
         + "<p></p>"
 
-        + "<h2 id=\"a3\">购买须知</h2>"
+        + "<h2 class=\"c-title\" id=\"a3\">购买须知</h2>"
         + "<p></p>"
         + "<p></p>"
 
-        + "<h2 id=\"a4\">客户服务</h2>"
+        + "<h2 class=\"c-title\" id=\"a4\">客户服务</h2>"
         + "<p></p>"
         + "<p></p>";