Skip to content

Commit 813fe20

Browse files
ixreixre
committed
Merge pull request #21 from jsix/develop
Develop
2 parents ad22d17 + 89e54d6 commit 813fe20

File tree

333 files changed

+10958
-18434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+10958
-18434
lines changed

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ zhu***@126.com
6969

7070

7171

72+
pub-serve --- 14199
73+
partner-serve ---- 14192
74+
75+
76+
7277
## Deploy ##
7378
### 1. Import database ###
7479
> Create new mysql db instance named "go2o"

‎conf/query/Partner.ItemList.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ f.small_title,
1313
`cost`,
1414
`sale_price`,
1515
`apply_subs`,
16-
`note`,
1716
on_shelves,
1817
`state`,
19-
/*`description`,*/
2018
f.`create_time`,
2119
f.`update_time`
2220
FROM `gs_item` f INNER JOIN gs_category c ON f.category_id = c.id

‎conf/query/Partner.ItemsOfCategory.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ f.small_title,
1313
`cost`,
1414
`sale_price`,
1515
`apply_subs`,
16-
`note`,
16+
`remark`,
1717
on_shelves,
1818
`state`,
1919
/*`description`,*/

‎conf/query/Partner.PersonFinanceRiseAccount.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ExportItemConfig>
3+
<ColumnMappingString></ColumnMappingString>
4+
<Query>
5+
<![CDATA[
6+
7+
SELECT m.name,r.* FROM mm_member m INNER JOIN pf_riseinfo r ON r.person_id=m.id
8+
INNER JOIN mm_relation rl ON rl.member_id=m.id
9+
WHERE rl.reg_partner_id={partner_id} AND ('{keyword}' = '' OR (m.usr LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%' OR m.phone
10+
LIKE '%{keyword}%')) ORDER BY {order} LIMIT {page_start},{page_size}
11+
]]>
12+
</Query>
13+
<Import><![CDATA[]]></Import>
14+
<Total>
15+
<![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riseinfo r ON r.person_id=m.id
16+
INNER JOIN mm_relation rl ON rl.member_id=m.id
17+
WHERE rl.reg_partner_id={partner_id} AND ('{keyword}' = '' OR (m.usr LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%' OR m.phone
18+
LIKE '%{keyword}%'))
19+
]]>
20+
</Total>
21+
</ExportItemConfig>

‎conf/query/Partner.PersonFinanceRiseLog.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ExportItemConfig>
3+
<ColumnMappingString></ColumnMappingString>
4+
<Query>
5+
<![CDATA[
6+
SELECT r.* FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
7+
INNER JOIN mm_relation rl ON rl.member_id=m.id
8+
WHERE rl.reg_partner_id={partner_id} AND r.person_id={person_id}
9+
AND ({type}=-1 OR {type}=type) AND ('{keyword}' = ''
10+
OR (r.title LIKE '%{keyword}%')) ORDER BY log_time DESC LIMIT {page_start},{page_size}
11+
]]>
12+
</Query>
13+
<Import><![CDATA[]]></Import>
14+
<Total>
15+
<![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
16+
INNER JOIN mm_relation rl ON rl.member_id=m.id
17+
WHERE rl.reg_partner_id={partner_id} AND r.person_id={person_id}
18+
AND ({type}=-1 OR {type}=type) AND ('{keyword}' = ''
19+
OR (r.title LIKE '%{keyword}%'))
20+
]]>
21+
</Total>
22+
</ExportItemConfig>

‎conf/query/Partner.PersonFinanceRiseTransferLog.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ExportItemConfig>
3+
<ColumnMappingString></ColumnMappingString>
4+
<Query>
5+
<![CDATA[
6+
SELECT r.*,m.name,m.phone FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
7+
INNER JOIN mm_relation rl ON rl.member_id=m.id
8+
WHERE rl.reg_partner_id={partner_id} AND r.type IN({type})
9+
AND ({state}=-1 OR {state}=r.state) AND ('{keyword}' = ''
10+
OR (r.title LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%'
11+
OR m.phone LIKE '%{keyword}%' OR m.usr LIKE '%{keyword}%'))
12+
ORDER BY log_time DESC LIMIT {page_start},{page_size}
13+
]]>
14+
</Query>
15+
<Import><![CDATA[]]></Import>
16+
<Total>
17+
<![CDATA[ SELECT COUNT(0) FROM mm_member m INNER JOIN pf_riselog r ON r.person_id=m.id
18+
INNER JOIN mm_relation rl ON rl.member_id=m.id
19+
WHERE rl.reg_partner_id={partner_id} AND r.type IN({type})
20+
AND ({state}=-1 OR {state}=r.state) AND ('{keyword}' = ''
21+
OR (r.title LIKE '%{keyword}%' OR m.name LIKE '%{keyword}%'
22+
OR m.phone LIKE '%{keyword}%' OR m.usr LIKE '%{keyword}%'))
23+
]]>
24+
</Total>
25+
</ExportItemConfig>

‎docs/design/logo.png

-3.41 KB
Loading

‎go2o-server.go renamed to ‎go2o-serve.go

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ import (
2323
"go2o/src/core/service/dps"
2424
"log"
2525
"os"
26-
"os/signal"
2726
"runtime"
28-
"syscall"
27+
"go2o/src/fix"
2928
)
3029

3130
func main() {
@@ -63,8 +62,8 @@ func main() {
6362
if !newApp.Init(debug, trace) {
6463
os.Exit(1)
6564
}
66-
67-
go handleSignal(ch)
65+
fix.CustomFix()
66+
go fix.SignalNotify(ch)
6867

6968
if v := newApp.Config().GetInt("server_port"); v != 0 {
7069
httpPort = v
@@ -95,18 +94,3 @@ func main() {
9594

9695
os.Exit(1) // 退出
9796
}
98-
99-
func handleSignal(srcCh chan bool) {
100-
ch := make(chan os.Signal)
101-
signal.Notify(ch, syscall.SIGHUP, syscall.SIGTERM)
102-
for {
103-
sig := <-ch
104-
switch sig {
105-
case syscall.SIGHUP:
106-
//log.Println("[ OS][ TERM] - go2o sighup ...")
107-
case syscall.SIGTERM: // 退出时
108-
log.Println("[ OS][ TERM] - go2o server has exit !")
109-
close(srcCh)
110-
}
111-
}
112-
}

‎go2o-tcpserve.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"os"
2121
"os/signal"
2222
"syscall"
23+
"go2o/src/fix"
2324
)
2425

2526
func main() {
@@ -41,6 +42,7 @@ func main() {
4142
gof.CurrentApp = core.NewMainApp(conf)
4243
dps.Init(gof.CurrentApp)
4344
cache.Initialize(gof.CurrentApp.Storage())
45+
fix.CustomFix()
4446

4547
ts := tcpserve.NewServe(logOutput)
4648
ts.RegisterJob(tcpserve.MemberSummaryNotifyJob) //注册会员信息通知

‎merchant-serve.go

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/**
2+
* Copyright 2014 @ z3q.net.
3+
* name :
4+
* author : jarryliu
5+
* date : 2013-12-16 21:45
6+
* description :
7+
* history :
8+
*/
9+
10+
package main
11+
12+
import (
13+
"flag"
14+
"fmt"
15+
"github.com/jsix/gof"
16+
"github.com/jsix/gof/storage"
17+
"go2o/src/app/cache"
18+
"go2o/src/core"
19+
"go2o/src/core/service/dps"
20+
"log"
21+
"os"
22+
"runtime"
23+
"go2o/src/fix"
24+
"go2o/src/app/front/partner"
25+
"github.com/jsix/gof/web/session"
26+
)
27+
28+
func main() {
29+
var (
30+
ch chan bool = make(chan bool)
31+
confFile string
32+
httpPort int
33+
debug bool
34+
trace bool
35+
help bool
36+
newApp *core.MainApp
37+
)
38+
39+
flag.IntVar(&httpPort, "port", 14281, "web server port")
40+
flag.BoolVar(&debug, "debug", false, "enable debug")
41+
flag.BoolVar(&trace, "trace", false, "enable trace")
42+
flag.BoolVar(&help, "help", false, "command usage")
43+
flag.StringVar(&confFile, "conf", "app.conf", "")
44+
flag.Parse()
45+
46+
if help {
47+
flag.Usage()
48+
return
49+
}
50+
51+
log.SetOutput(os.Stdout)
52+
log.SetFlags(log.LstdFlags | log.Ltime | log.Ldate | log.Lshortfile)
53+
54+
runtime.GOMAXPROCS(runtime.NumCPU())
55+
newApp = core.NewMainApp(confFile)
56+
if !newApp.Init(debug, trace) {
57+
os.Exit(1)
58+
}
59+
fix.CustomFix()
60+
go fix.SignalNotify(ch)
61+
62+
gof.CurrentApp = newApp
63+
dps.Init(newApp)
64+
core.RegisterTypes()
65+
cache.Initialize(storage.NewRedisStorage(newApp.Redis()))
66+
session.Set(newApp.Storage(),"")
67+
go partner.Listen(ch, newApp, fmt.Sprintf(":%d", httpPort))
68+
69+
<-ch
70+
}

‎pub-serve.go

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/**
2+
* Copyright 2014 @ z3q.net.
3+
* name :
4+
* author : jarryliu
5+
* date : 2013-12-16 21:45
6+
* description :
7+
* history :
8+
*/
9+
10+
package main
11+
12+
import (
13+
"flag"
14+
"fmt"
15+
"go2o/src/core"
16+
"log"
17+
"os"
18+
"runtime"
19+
"go2o/src/fix"
20+
"go2o/src/app/front/pub"
21+
)
22+
23+
func main() {
24+
var (
25+
ch chan bool = make(chan bool)
26+
confFile string
27+
httpPort int
28+
help bool
29+
newApp *core.MainApp
30+
)
31+
32+
flag.IntVar(&httpPort, "port", 14280, "web server port")
33+
flag.BoolVar(&help, "help", false, "command usage")
34+
flag.StringVar(&confFile, "conf", "app.conf", "")
35+
flag.Parse()
36+
37+
if help {
38+
flag.Usage()
39+
return
40+
}
41+
log.SetOutput(os.Stdout)
42+
log.SetFlags(log.LstdFlags | log.Ltime | log.Ldate | log.Lshortfile)
43+
runtime.GOMAXPROCS(runtime.NumCPU())
44+
newApp = core.NewMainApp(confFile)
45+
go fix.SignalNotify(ch)
46+
go pub.Listen(ch, newApp, fmt.Sprintf(":%d", httpPort))
47+
48+
<-ch
49+
}

‎public/static/assets/js/core.js

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/static/assets/js/core_full.js

Lines changed: 33 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/static/assets/js/global.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎public/static/assets/js/images/menu.gif

-834 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)