Merge pull request #21 from jsix/develop

Develop

README.md

@@ -69,6 +69,11 @@ zhu***@126.com
 
 
 
+pub-serve   ---  14199
+partner-serve  ---- 14192
+
+
+
 ## Deploy ##
 ### 1. Import database ###
 > Create new mysql db instance named "go2o"

conf/query/Partner.ItemList.xml

@@ -13,10 +13,8 @@ f.small_title,
 `cost`,
 `sale_price`,
 `apply_subs`,
-`note`,
 on_shelves,
 `state`,
-/*`description`,*/
 f.`create_time`,
 f.`update_time`
 FROM `gs_item` f INNER JOIN gs_category c ON f.category_id = c.id

conf/query/Partner.ItemsOfCategory.xml

@@ -13,7 +13,7 @@ f.small_title,
 `cost`,
 `sale_price`,
 `apply_subs`,
-`note`,
+`remark`,
 on_shelves,
 `state`,
 /*`description`,*/

conf/query/Partner.PersonFinanceRiseAccount.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ExportItemConfig>
+  <ColumnMappingString></ColumnMappingString>
+  <Query>
+    <![CDATA[
+
+    SELECT m.name,r.* FROM mm_member m INNER JOIN pf_riseinfo r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND ('{keyword}' = '' OR (m.usr LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%' OR m.phone
+LIKE '%{keyword}%')) ORDER BY {order} LIMIT {page_start},{page_size}
+     ]]>
+  </Query>
+  <Import><![CDATA[]]></Import>
+  <Total>
+    <![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riseinfo r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND ('{keyword}' = '' OR (m.usr LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%' OR m.phone
+LIKE '%{keyword}%'))
+ ]]>
+  </Total>
+</ExportItemConfig>

conf/query/Partner.PersonFinanceRiseLog.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ExportItemConfig>
+  <ColumnMappingString></ColumnMappingString>
+  <Query>
+    <![CDATA[
+    SELECT r.* FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND r.person_id={person_id}
+ AND ({type}=-1 OR {type}=type) AND ('{keyword}' = ''
+OR (r.title LIKE '%{keyword}%')) ORDER BY log_time DESC LIMIT {page_start},{page_size}
+     ]]>
+  </Query>
+  <Import><![CDATA[]]></Import>
+  <Total>
+    <![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND r.person_id={person_id}
+AND ({type}=-1 OR {type}=type) AND ('{keyword}' = ''
+OR (r.title LIKE '%{keyword}%'))
+ ]]>
+  </Total>
+</ExportItemConfig>

conf/query/Partner.PersonFinanceRiseTransferLog.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ExportItemConfig>
+  <ColumnMappingString></ColumnMappingString>
+  <Query>
+    <![CDATA[
+    SELECT r.*,m.name,m.phone FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND r.type IN({type})
+ AND ({state}=-1 OR {state}=r.state) AND ('{keyword}' = ''
+OR (r.title LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%'
+OR m.phone LIKE '%{keyword}%' OR m.usr LIKE '%{keyword}%'))
+ORDER BY log_time DESC LIMIT {page_start},{page_size}
+     ]]>
+  </Query>
+  <Import><![CDATA[]]></Import>
+  <Total>
+    <![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
+INNER JOIN mm_relation rl ON rl.member_id=m.id
+WHERE rl.reg_partner_id={partner_id} AND r.type IN({type})
+ AND ({state}=-1 OR {state}=r.state) AND ('{keyword}' = ''
+OR (r.title LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%'
+OR m.phone LIKE '%{keyword}%' OR m.usr LIKE '%{keyword}%'))
+ ]]>
+  </Total>
+</ExportItemConfig>

go2o-server.go → go2o-serve.go

@@ -23,9 +23,8 @@ import (
 	"go2o/src/core/service/dps"
 	"log"
 	"os"
-	"os/signal"
 	"runtime"
-	"syscall"
+	"go2o/src/fix"
 )
 
 func main() {
@@ -63,8 +62,8 @@ func main() {
 	if !newApp.Init(debug, trace) {
 		os.Exit(1)
 	}
-
-	go handleSignal(ch)
+	fix.CustomFix()
+	go fix.SignalNotify(ch)
 
 	if v := newApp.Config().GetInt("server_port"); v != 0 {
 		httpPort = v
@@ -95,18 +94,3 @@ func main() {
 
 	os.Exit(1) // 退出
 }
-
-func handleSignal(srcCh chan bool) {
-	ch := make(chan os.Signal)
-	signal.Notify(ch, syscall.SIGHUP, syscall.SIGTERM)
-	for {
-		sig := <-ch
-		switch sig {
-		case syscall.SIGHUP:
-		//log.Println("[ OS][ TERM] - go2o sighup ...")
-		case syscall.SIGTERM: // 退出时
-			log.Println("[ OS][ TERM] - go2o server has exit !")
-			close(srcCh)
-		}
-	}
-}

go2o-tcpserve.go

@@ -20,6 +20,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"go2o/src/fix"
 )
 
 func main() {
@@ -41,6 +42,7 @@ func main() {
 	gof.CurrentApp = core.NewMainApp(conf)
 	dps.Init(gof.CurrentApp)
 	cache.Initialize(gof.CurrentApp.Storage())
+	fix.CustomFix()
 
 	ts := tcpserve.NewServe(logOutput)
 	ts.RegisterJob(tcpserve.MemberSummaryNotifyJob) //注册会员信息通知

merchant-serve.go

@@ -0,0 +1,70 @@
+/**
+ * Copyright 2014 @ z3q.net.
+ * name :
+ * author : jarryliu
+ * date : 2013-12-16 21:45
+ * description :
+ * history :
+ */
+
+package main
+
+import (
+    "flag"
+    "fmt"
+    "github.com/jsix/gof"
+    "github.com/jsix/gof/storage"
+    "go2o/src/app/cache"
+    "go2o/src/core"
+    "go2o/src/core/service/dps"
+    "log"
+    "os"
+    "runtime"
+    "go2o/src/fix"
+    "go2o/src/app/front/partner"
+    "github.com/jsix/gof/web/session"
+)
+
+func main() {
+    var (
+        ch        chan bool = make(chan bool)
+        confFile  string
+        httpPort  int
+        debug     bool
+        trace     bool
+        help      bool
+        newApp    *core.MainApp
+    )
+
+    flag.IntVar(&httpPort, "port", 14281, "web server port")
+    flag.BoolVar(&debug, "debug", false, "enable debug")
+    flag.BoolVar(&trace, "trace", false, "enable trace")
+    flag.BoolVar(&help, "help", false, "command usage")
+    flag.StringVar(&confFile, "conf", "app.conf", "")
+    flag.Parse()
+
+    if help {
+        flag.Usage()
+        return
+    }
+
+    log.SetOutput(os.Stdout)
+    log.SetFlags(log.LstdFlags | log.Ltime | log.Ldate | log.Lshortfile)
+
+    runtime.GOMAXPROCS(runtime.NumCPU())
+    newApp = core.NewMainApp(confFile)
+    if !newApp.Init(debug, trace) {
+        os.Exit(1)
+    }
+    fix.CustomFix()
+    go fix.SignalNotify(ch)
+
+    gof.CurrentApp = newApp
+    dps.Init(newApp)
+    core.RegisterTypes()
+    cache.Initialize(storage.NewRedisStorage(newApp.Redis()))
+    session.Set(newApp.Storage(),"")
+    go partner.Listen(ch, newApp, fmt.Sprintf(":%d", httpPort))
+
+    <-ch
+}

pub-serve.go

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2014 @ z3q.net.
+ * name :
+ * author : jarryliu
+ * date : 2013-12-16 21:45
+ * description :
+ * history :
+ */
+
+package main
+
+import (
+    "flag"
+    "fmt"
+    "go2o/src/core"
+    "log"
+    "os"
+    "runtime"
+    "go2o/src/fix"
+    "go2o/src/app/front/pub"
+)
+
+func main() {
+    var (
+        ch        chan bool = make(chan bool)
+        confFile  string
+        httpPort  int
+        help      bool
+        newApp    *core.MainApp
+    )
+
+    flag.IntVar(&httpPort, "port", 14280, "web server port")
+    flag.BoolVar(&help, "help", false, "command usage")
+    flag.StringVar(&confFile, "conf", "app.conf", "")
+    flag.Parse()
+
+    if help {
+        flag.Usage()
+        return
+    }
+    log.SetOutput(os.Stdout)
+    log.SetFlags(log.LstdFlags | log.Ltime | log.Ldate | log.Lshortfile)
+    runtime.GOMAXPROCS(runtime.NumCPU())
+    newApp = core.NewMainApp(confFile)
+    go fix.SignalNotify(ch)
+    go pub.Listen(ch, newApp, fmt.Sprintf(":%d", httpPort))
+
+    <-ch
+}