Ana Sayfa Keşfet Yardım
Giriş Yap
qmx
/
jy
14
0
Çatalla 0
Dosyalar Sorunlar 2 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

修改为go mod

wangchuanjin 2 yıl önce
ebeveyn
cabfec8035
işleme
cbad611e3b
100 değiştirilmiş dosya ile 2867 ekleme ve 2532 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 46 0
      src/go.mod
  2. 1078 0
      src/go.sum
  3. 14 10
      src/jfw/active/21yearEndReport.go
  4. 5 4
      src/jfw/active/active.go
  5. 10 8
      src/jfw/active/active_future.go
  6. 17 12
      src/jfw/active/active_seal.go
  7. 1 1
      src/jfw/active/appext.go
  8. 1 1
      src/jfw/active/digitalexpo.go
  9. 4 3
      src/jfw/active/jyswitch.go
  10. 16 11
      src/jfw/active/live.go
  11. 4 3
      src/jfw/active/zqluckdraw.go
  12. 1 1
      src/jfw/config/active.go
  13. 2 2
      src/jfw/config/config.go
  14. 1 1
      src/jfw/config/zqluckdraw.go
  15. 3 3
      src/jfw/course/course.go
  16. 3 3
      src/jfw/course/course_wx.go
  17. 5 4
      src/jfw/filter/baseuserfilter.go
  18. 6 4
      src/jfw/filter/filter.go
  19. 4 3
      src/jfw/filter/logfilter.go
  20. 6 4
      src/jfw/filter/mergefilter.go
  21. 9 7
      src/jfw/filter/pcfilter.go
  22. 12 9
      src/jfw/filter/phonefilter.go
  23. 6 4
      src/jfw/filter/wxUserSalesFilter.go
  24. 9 7
      src/jfw/front/adv.go
  25. 12 8
      src/jfw/front/applysub.go
  26. 2 2
      src/jfw/front/areaPack.go
  27. 1 1
      src/jfw/front/bid-fileinter.go
  28. 37 35
      src/jfw/front/big-member.go
  29. 5 3
      src/jfw/front/commonPayPc.go
  30. 10 7
      src/jfw/front/commonPayWx.go
  31. 14 11
      src/jfw/front/conventionExhibition.go
  32. 24 18
      src/jfw/front/dataExport.go
  33. 1 1
      src/jfw/front/dataPackRouter.go
  34. 12 9
      src/jfw/front/distribution.go
  35. 13 9
      src/jfw/front/entsearch.go
  36. 92 84
      src/jfw/front/follow.go
  37. 37 31
      src/jfw/front/front.go
  38. 10 7
      src/jfw/front/frontRouter.go
  39. 6 6
      src/jfw/front/jyshare.go
  40. 4 3
      src/jfw/front/laboratory.go
  41. 13 8
      src/jfw/front/login.go
  42. 9 6
      src/jfw/front/message.go
  43. 18 15
      src/jfw/front/org_structure.go
  44. 6 4
      src/jfw/front/otherAct.go
  45. 21 15
      src/jfw/front/pcIndex.go
  46. 15 11
      src/jfw/front/pchelper.go
  47. 10 7
      src/jfw/front/search.go
  48. 36 30
      src/jfw/front/shorturl.go
  49. 11 8
      src/jfw/front/singleLogin.go
  50. 8 6
      src/jfw/front/structedData.go
  51. 19 12
      src/jfw/front/supsearch.go
  52. 30 24
      src/jfw/front/swordfish.go
  53. 17 12
      src/jfw/front/tags.go
  54. 7 5
      src/jfw/front/uploadfile.go
  55. 12 9
      src/jfw/front/vipsubscribe.go
  56. 9 6
      src/jfw/front/websocket.go
  57. 26 20
      src/jfw/front/ws_dataExport.go
  58. 1 1
      src/jfw/front/wxAccountPage.go
  59. 9 7
      src/jfw/front/wxMyOrder.go
  60. 10 6
      src/jfw/front/wx_dataExport.go
  61. 9 7
      src/jfw/front/wxkeyset.go
  62. 0 39
      src/jfw/jylabutil/authority.go
  63. 0 104
      src/jfw/jylabutil/entsearch.go
  64. 0 177
      src/jfw/jyutil/jyCms.go
  65. 0 227
      src/jfw/jyutil/jyutil.go
  66. 0 240
      src/jfw/jyutil/sessionEncryption.go
  67. 0 168
      src/jfw/jyutil/sessionkeep.go
  68. 0 27
      src/jfw/jyutil/sort.go
  69. 2 2
      src/jfw/modules/app/src/app/active/21yearEndReport.go
  70. 6 5
      src/jfw/modules/app/src/app/active/active.go
  71. 11 9
      src/jfw/modules/app/src/app/active/pullnew/pullnew.go
  72. 1 1
      src/jfw/modules/app/src/app/config/active.go
  73. 4 4
      src/jfw/modules/app/src/app/filter/baseuserfilter.go
  74. 4 3
      src/jfw/modules/app/src/app/filter/filter.go
  75. 2 2
      src/jfw/modules/app/src/app/filter/logfilter.go
  76. 5 4
      src/jfw/modules/app/src/app/filter/mergefilter.go
  77. 11 9
      src/jfw/modules/app/src/app/filter/phonefilter.go
  78. 15 13
      src/jfw/modules/app/src/app/followent/followent.go
  79. 7 6
      src/jfw/modules/app/src/app/followent/myfwent.go
  80. 1 1
      src/jfw/modules/app/src/app/front/accountPage.go
  81. 1 1
      src/jfw/modules/app/src/app/front/areaPack.go
  82. 3 3
      src/jfw/modules/app/src/app/front/bigMember.go
  83. 2 2
      src/jfw/modules/app/src/app/front/commonPay.go
  84. 16 13
      src/jfw/modules/app/src/app/front/conventionExhibition.go
  85. 2 2
      src/jfw/modules/app/src/app/front/course.go
  86. 7 5
      src/jfw/modules/app/src/app/front/dataExport.go
  87. 1 1
      src/jfw/modules/app/src/app/front/dataPackRouter.go
  88. 5 4
      src/jfw/modules/app/src/app/front/distrib.go
  89. 1 1
      src/jfw/modules/app/src/app/front/entniche.go
  90. 3 3
      src/jfw/modules/app/src/app/front/errLogsReceive.go
  91. 830 826
      src/jfw/modules/app/src/app/front/follow.go
  92. 24 21
      src/jfw/modules/app/src/app/front/front.go
  93. 1 1
      src/jfw/modules/app/src/app/front/frontRouter.go
  94. 1 1
      src/jfw/modules/app/src/app/front/laboratory.go
  95. 17 12
      src/jfw/modules/app/src/app/front/login.go
  96. 10 8
      src/jfw/modules/app/src/app/front/logoffuser.go
  97. 9 8
      src/jfw/modules/app/src/app/front/me.go
  98. 8 6
      src/jfw/modules/app/src/app/front/message.go
  99. 8 6
      src/jfw/modules/app/src/app/front/myorder.go
  100. 10 8
      src/jfw/modules/app/src/app/front/search.go

+ 46 - 0
src/go.mod
Dosyayı Görüntüle 

@@ -0,0 +1,46 @@
 
+module jy/src
 
+
 
+go 1.18
 
+
 
+require (
 
+	app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170
 
+	app.yhyue.com/moapp/jypkg v0.0.0-20221230014931-c9afd45ba90b
 
+	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 
+	github.com/dchest/captcha v1.0.0
 
+	github.com/fsnotify/fsnotify v1.6.0
 
+	github.com/robfig/cron v1.2.0
 
+	go.mongodb.org/mongo-driver v1.11.1
 
+)
 
+
 
+require (
 
+	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
 
+	app.yhyue.com/moapp/message v0.0.0-20221202072401-d825fc65512c // indirect
 
+	github.com/garyburd/redigo v1.6.2 // indirect
 
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
 
+	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
 
+	github.com/golang/snappy v0.0.4 // indirect
 
+	github.com/gomodule/redigo v1.8.9 // indirect
 
+	github.com/howeyc/fsnotify v0.9.0 // indirect
 
+	github.com/jinzhu/inflection v1.0.0 // indirect
 
+	github.com/jinzhu/now v1.1.1 // indirect
 
+	github.com/klauspost/compress v1.13.6 // indirect
 
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
 
+	github.com/nsqio/go-nsq v1.1.0 // indirect
 
+	github.com/olivere/elastic v6.2.37+incompatible // indirect
 
+	github.com/pkg/errors v0.9.1 // indirect
 
+	github.com/robfig/cron/v3 v3.0.1 // indirect
 
+	github.com/tealeg/xlsx v1.0.5 // indirect
 
+	github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed // indirect
 
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 
+	github.com/xdg-go/scram v1.1.1 // indirect
 
+	github.com/xdg-go/stringprep v1.0.3 // indirect
 
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 
+	github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb // indirect
 
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
 
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 
+	golang.org/x/sys v0.3.0 // indirect
 
+	golang.org/x/text v0.5.0 // indirect
 
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 
+	gorm.io/driver/mysql v1.0.5 // indirect
 
+	gorm.io/gorm v1.21.3 // indirect
 
+)

+ 1078 - 0
src/go.sum
Dosyayı Görüntüle 

@@ -0,0 +1,1078 @@
 
+app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+jPzpnsDe/OvcshDUUtOTZPYGSJ8=
 
+app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 
+app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 
+app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 
+app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170 h1:gjx6+x7P1Vp/++OyfuEdR3Bcjj4/HrgIaRnE1cMTP3k=
 
+app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170/go.mod h1:efAeRPDpJ13JuNODuqtfLlKQSQgCbnUcwGPzhFU5krY=
 
+app.yhyue.com/moapp/jypkg v0.0.0-20221230014931-c9afd45ba90b h1:RZ/8iz9U+jo1V97Wxm1lIRnp6UzUsM5A0k+pLUXIQug=
 
+app.yhyue.com/moapp/jypkg v0.0.0-20221230014931-c9afd45ba90b/go.mod h1:R19Q6Q1AOM47lY194ZQ6qdggbjkijDufoDnJndnRrRM=
 
+app.yhyue.com/moapp/message v0.0.0-20221202072401-d825fc65512c h1:CrcvbsXZ4aQkNikBi7FUUQZNnY8hKsNo2LLe/SqeXs8=
 
+app.yhyue.com/moapp/message v0.0.0-20221202072401-d825fc65512c/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
+cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 
+github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
 
+github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
 
+github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
 
+github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 
+github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 
+github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 
+github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 
+github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 
+github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 
+github.com/ClickHouse/clickhouse-go/v2 v2.2.0/go.mod h1:8f2XZUi7XoeU+uPIytSi1cvx8fmJxi7vIgqpvYTF1+o=
 
+github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 
+github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67 h1:x98/gnpyNAiuvg/gX3KgdfKxnZj3t9pIl3BCVJg3qwg=
 
+github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67/go.mod h1:g1VZ0nbzBvfsWw22gNVOxWxJxpBR+CBiFNK2n2ogeUo=
 
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 
+github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs=
 
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 
+github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0=
 
+github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 
+github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg=
 
+github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
 
+github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 
+github.com/antlr/antlr4 v0.0.0-20210105212045-464bcbc32de2/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y=
 
+github.com/antlr/antlr4 v0.0.0-20210319025552-3590d4d5e18c/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y=
 
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 
+github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 
+github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 
+github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 
+github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 
+github.com/coscms/tagfast v0.0.0-20150925144250-2b69b2496250/go.mod h1:zX8vynptAghuV/KG8BOZlDeo4DsTKWfBQ154RWlkay0=
 
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 
+github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
 
+github.com/dchest/captcha v1.0.0 h1:vw+bm/qMFvTgcjQlYVTuQBJkarm5R0YSsDKhm1HZI2o=
 
+github.com/dchest/captcha v1.0.0/go.mod h1:7zoElIawLp7GUMLcj54K9kbw+jEyvz2K0FDdRRYhvWo=
 
+github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 
+github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4/go.mod h1:L7S4x0R7vv3xoOhGuyAJyCO2MYzWOpccM4Isn8jIUgY=
 
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 
+github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 
+github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 
+github.com/emicklei/proto v1.9.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 
+github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 
+github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 
+github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 
+github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 
+github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 
+github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 
+github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 
+github.com/garyburd/redigo v1.6.2 h1:yE/pwKCrbLpLpQICzYTeZ7JsTA/C53wFTJHaEtRqniM=
 
+github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 
+github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 
+github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 
+github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
 
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 
+github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+github.com/go-redis/redis v6.15.7+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 
+github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w=
 
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 
+github.com/go-xorm/builder v0.3.4/go.mod h1:KxkQkNN1DpPKTedxXyTQcmH+rXfvk4LZ9SOOBoZBAxw=
 
+github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 
+github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
 
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
 
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
 
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
 
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
 
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
 
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
 
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
 
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
 
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
 
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
 
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
 
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
 
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
 
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
 
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
 
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
 
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
 
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 
+github.com/gogf/gf/v2 v2.0.6/go.mod h1:8uYzw7qNzuq8vrhVlWke1b1925FFqOJIgmyYW1sr/0M=
 
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 
+github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
 
+github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 
+github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
 
+github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
 
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
+github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 
+github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 
+github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
 
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 
+github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 
+github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78=
 
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 
+github.com/grpc-ecosystem/grpc-gateway v1.14.3/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0=
 
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 
+github.com/howeyc/fsnotify v0.9.0 h1:0gtV5JmOKH4A8SsFxG2BczSeXWWPvcMT0euZt5gDAxY=
 
+github.com/howeyc/fsnotify v0.9.0/go.mod h1:41HzSPxBGeFRQKEEwgh49TRw/nKBsYZ2cF1OzPjSJsA=
 
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 
+github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 
+github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 
+github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 
+github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 
+github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 
+github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
 
+github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
 
+github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
 
+github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
 
+github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 
+github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 
+github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 
+github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA=
 
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 
+github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 
+github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 
+github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 
+github.com/longbridgeapp/sqlparser v0.3.1/go.mod h1:GIHaUq8zvYyHLCLMJJykx1CdM6LHtkUih/QaJXySSx4=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 
+github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
 
+github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 
+github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
 
+github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
 
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 
+github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 
+github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 
+github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 
+github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 
+github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
 
+github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A=
 
+github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
 
+github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 
+github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
 
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 
+github.com/pierrec/lz4 v2.5.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 
+github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 
+github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 
+github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 
+github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM=
 
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 
+github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 
+github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 
+github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
 
+github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 
+github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 
+github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 
+github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 
+github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 
+github.com/tal-tech/go-zero v1.1.5/go.mod h1:LbN0C7/rbl2+LUWTSUYx5leXmgedeMWjt1jc3/8/zFA=
 
+github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
 
+github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM=
 
+github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed h1:1+oKuPuDQ4AbN1WRMFxl9WQClH80GuZ81X/4FsOshjI=
 
+github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed/go.mod h1:WE5pZgSp3RwicfhHQmOJOexA0n4AKTzBqmnSu7R8Nbk=
 
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 
+github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 
+github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 
+github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
 
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 
+github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
 
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 
+github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 
+github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
 
+github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 
+github.com/zeromicro/go-zero v1.3.5/go.mod h1:wh4o794b7Ul3W0k35Pw9nc3iB4O0OpaQTMQz/PJc1bc=
 
+github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb h1:uWiILQloLUVdtPYr1ZZo2zqtlpzo4G8vUpglo/Fs2H8=
 
+github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb/go.mod h1:J3xKssoVdrwZ2E29fIox/EKxOZWimS7AZ4fOTCFkOLo=
 
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 
+go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698/go.mod h1:YoUyTScD3Vcv2RBm3eGVOq7i1ULiz3OuXoQFWOirmAM=
 
+go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 
+go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 
+go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 
+go.mongodb.org/mongo-driver v1.5.0/go.mod h1:boiGPFqyBs5R0R5qf2ErokGRekMfwn+MqKaUyHs7wy0=
 
+go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
 
+go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8=
 
+go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 
+go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
 
+go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 
+go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
 
+go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
 
+go.opentelemetry.io/otel/exporters/jaeger v1.8.0/go.mod h1:GbWg+ng88rDtx+id26C34QLqw2erqJeAjsCx9AFeHfE=
 
+go.opentelemetry.io/otel/exporters/zipkin v1.8.0/go.mod h1:0uYAyCuGT67MFV9Z/Mmx93wGuugHw0FbxMc74fs3LNo=
 
+go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ2zCzeXwbM=
 
+go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
 
+go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c=
 
+go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs=
 
+go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
 
+go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
 
+go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
 
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 
+go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA=
 
+go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q=
 
+go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
 
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 
+go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 
+go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 
+golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 
+golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
 
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
+golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 
+golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2/go.mod h1:EFNZuWvGYxIRUEX+K8UmCFwYmZjqcrnq15ZuVldZkZ0=
 
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
 
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 
+golang.org/x/tools v0.0.0-20200410132612-ae9902aceb98/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
+google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 
+google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 
+google.golang.org/genproto v0.0.0-20220228195345-15d65a4533f7/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 
+google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
 
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
 
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 
+google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 
+gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
 
+gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
 
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
+gorm.io/driver/mysql v1.0.5 h1:WAAmvLK2rG0tCOqrf5XcLi2QUwugd4rcVJ/W3aoon9o=
 
+gorm.io/driver/mysql v1.0.5/go.mod h1:N1OIhHAIhx5SunkMGqWbGFVeh4yTNWKmMo1GOAsohLI=
 
+gorm.io/gorm v1.21.3 h1:qDFi55ZOsjZTwk5eN+uhAmHi8GysJ/qCTichM/yO7ME=
 
+gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 
+k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 
+k8s.io/apimachinery v0.22.9/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
 
+k8s.io/client-go v0.22.9/go.mod h1:IoH7exYnoH/zgvHOuVxh2c4yJepcCBt72FzCTisOc4k=
 
+k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 
+k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 
+k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 
+k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 
+k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 
+k8s.io/utils v0.0.0-20220706174534-f6158b442e7c/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 
+sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 
+xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
 
+xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=

+ 14 - 10
src/jfw/active/21yearEndReport.go
Dosyayı Görüntüle 

@@ -2,17 +2,21 @@ package active
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
-	"go.mongodb.org/mongo-driver/bson"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"net/url"
 
-	qutil "qfw/util"
 
-	"qfw/util/redis"
 
 	"time"
 
+
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"go.mongodb.org/mongo-driver/bson"
 
+	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
 
 const (
 
@@ -59,7 +63,7 @@ func (this *YearEndReport) YearEndReportPage() error {
 
 			return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "report"), 302)
 
 		}
 
 		//获取用户openid
 
-		openid = jyutil.Getopenid(this.GetString("code"))
 
+		openid = jyutil.Getopenid(this.GetString("code"), config.Wxoauthinfo)
 
 	}
 
 	//没有用户session 或  有session但是没有关注（刚刚取关 session信息存留）
 
 	//判断是否关注

+ 5 - 4
src/jfw/active/active.go
Dosyayı Görüntüle 

@@ -1,10 +1,11 @@
 
 package active
 
 
 import (
 
-	"jfw/public"
 
-	"qfw/util"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Active struct {
 
@@ -47,7 +48,7 @@ type Active struct {
 
 }
 
 
 var mongodb = public.MQFW
 
-var se = util.SimpleEncrypt{Key: "topnet2015topnet2015"}
 
+var se = encrypt.SimpleEncrypt{Key: "topnet2015topnet2015"}
 
 
 func init() {
 
 	//添加模块解析

+ 10 - 8
src/jfw/active/active_future.go
Dosyayı Görüntüle 

@@ -4,19 +4,21 @@ import (
 
 	"net/http"
 
 	//	"encoding/json"
 
 	"fmt"
 
-	"jfw/config"
 
-	. "jfw/front"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	. "jy/src/jfw/front"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
 	//	"math/rand"
 
 	"net/url"
 
-	"qfw/util"
 
 	"sync"
 
 
-	//	"qfw/util/redis"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	//	"app.yhyue.com/moapp/jybase/redis"
 
 	"time"
 
 )
 
 
@@ -34,7 +36,7 @@ func (a *Active) FutureIndex(share_openid string) error {
 
 				//微信跳回来的
 
 				code := a.GetString("code")
 
 				if code != "" {
 
-					openid = jyutil.Getopenid(code)
 
+					openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 					if openid != "" {
 
 						FindUserAndCreateSess(openid, a.Session(), "wx", false)
 
 					}

+ 17 - 12
src/jfw/active/active_seal.go
Dosyayı Görüntüle 

@@ -4,26 +4,31 @@ import (
 
 	"encoding/json"
 
 	"fmt"
 
 	"io/ioutil"
 
-	"jfw/config"
 
-	. "jfw/front"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	. "jy/src/jfw/front"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
 	"net"
 
 	"net/http"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
-	rpc "qfw/util/rpc"
 
 	"strconv"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
+
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	rpc "app.yhyue.com/moapp/jybase/rpc"
 
 )
 
 
-var sese util.SimpleEncrypt = util.SimpleEncrypt{Key: "topnet"}
 
+var sese encrypt.SimpleEncrypt = encrypt.SimpleEncrypt{Key: "topnet"}
 
 var sealMap map[string]interface{}
 
 var sealArr []string
 
 
@@ -219,7 +224,7 @@ func (a *Active) ShareSeal(sharetype, openid string) error {
 
 		sealNum = len(util.ObjArrToMapArr((*userData)["a_seal"].([]interface{})))
 
 		sealCount = util.IntAll((*userData)["i_sealCount"])
 
 	}
 
-	a.T["userTime"] = util.FormatDateWithObj(&userTime, util.Date_Short_Layout)
 
+	a.T["userTime"] = FormatDateWithObj(&userTime, Date_Short_Layout)
 
 	a.T["openid"] = openid
 
 	a.T["signature"] = wx.SignJSSDK(a.Site() + a.Url())
 
 	count := mongodb.Count("person_seallink", `{"s_source_openid":"`+se.DecodeString(openid)+`","i_status":1}`)
 
@@ -247,7 +252,7 @@ func (a *Active) Index() error {
 
 				//微信跳回来的
 
 				code := a.GetString("code")
 
 				if code != "" {
 
-					openid := jyutil.Getopenid(code)
 
+					openid := jyutil.Getopenid(code, config.Wxoauthinfo)
 
 					if openid != "" {
 
 						FindUserAndCreateSess(openid, a.Session(), "wx", false)
 
 					}
 
@@ -276,7 +281,7 @@ func (a *Active) Index() error {
 
 	var userTime interface{}
 
 	if ok && len(*userData) > 0 {
 
 		userTime = (*userData)["l_timestamp"]
 
-		a.T["userTime"] = util.FormatDateWithObj(&userTime, util.Date_Short_Layout)
 
+		a.T["userTime"] = FormatDateWithObj(&userTime, Date_Short_Layout)
 
 		sealNum = len(util.ObjArrToMapArr((*userData)["a_seal"].([]interface{})))
 
 		sealCount = util.IntAll((*userData)["i_sealCount"])
 
 	}

+ 1 - 1
src/jfw/active/appext.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package active
 
 
 import (
 
-	"jfw/config"
 
+	"jy/src/jfw/config"
 
 )
 
 
 func (a *Active) AppExt(code string) error {

+ 1 - 1
src/jfw/active/digitalexpo.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package active
 
 
 import (
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 //数博会H5首页

+ 4 - 3
src/jfw/active/jyswitch.go
Dosyayı Görüntüle 

@@ -3,12 +3,13 @@ package active
 
 //剑鱼标讯开关页面，配置各种开关
 
 
 import (
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"sync"
 
 	"time"
 
-	//"github.com/go-xweb/xweb"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	//"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 func (a *Active) Jyswitch() error {

+ 16 - 11
src/jfw/active/live.go
Dosyayı Görüntüle 

@@ -3,14 +3,19 @@ package active
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	. "jfw/front"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	. "jy/src/jfw/front"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"time"
 
+
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 var LiveOrder = "liveorder" //预约表
 
@@ -30,8 +35,8 @@ func (this *Active) UpdateInfo() {
 
 		config.ActiveConfig.Live_Ing_End = liveEnd
 
 	}
 
 	this.ServeJson(map[string]interface{}{
 
-		"直播开始时间：": util.FormatDateByInt64(&liveStart, util.Date_Full_Layout),
 
-		"直播结束时间：": util.FormatDateByInt64(&liveEnd, util.Date_Full_Layout),
 
+		"直播开始时间：": FormatDateByInt64(&liveStart, Date_Full_Layout),
 
+		"直播结束时间：": FormatDateByInt64(&liveEnd, Date_Full_Layout),
 
 	})
 
 }
 
 
@@ -75,7 +80,7 @@ func (this *Active) SubStatus() error {
 
 	defer util.Catch()
 
 	userId, _ := this.Session().Get("userId").(string)
 
 	var res = map[string]interface{}{
 
-		"live_Active_Start":  util.FormatDateByInt64(&config.ActiveConfig.Live_Active_Start, "2006/01/02/15:04"), //直播活动开始时间
 
+		"live_Active_Start":  FormatDateByInt64(&config.ActiveConfig.Live_Active_Start, "2006/01/02/15:04"), //直播活动开始时间
 
 		"live_Active_End":    config.ActiveConfig.Live_Active_End,
 
 		"live_Preheat_Start": config.ActiveConfig.Live_Preheat_Start,
 
 		"live_Preheat_End":   config.ActiveConfig.Live_Preheat_End,
 
@@ -85,7 +90,7 @@ func (this *Active) SubStatus() error {
 
 		openId, _ := this.Session().Get("s_m_openid").(string)
 
 		if CheckUserIsSubscribe(openId) {
 
 			//是否是vip用户
 
-			res["userId"] = util.SE.EncodeString(userId)
 
+			res["userId"] = encrypt.SE.EncodeString(userId)
 
 			if this.GetString("pageName") == "A" {
 
 				data, ok := public.MQFW.FindById("user", userId, nil)
 
 				if ok && data != nil && *data != nil {
 
@@ -116,7 +121,7 @@ func (this *Active) LivePage() error {
 
 				//微信跳回来的
 
 				code := this.GetString("code")
 
 				if code != "" {
 
-					openid = jyutil.Getopenid(code)
 
+					openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 					if openid != "" {
 
 						//是否为关注用户
 
 						checkIsSubscribeFlag = CheckUserIsSubscribe(openid)

+ 4 - 3
src/jfw/active/zqluckdraw.go
Dosyayı Görüntüle 

@@ -2,13 +2,14 @@ package active
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
-	"qfw/util"
 
 	"time"
 
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )

+ 1 - 1
src/jfw/config/active.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package config
 
 
 import (
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 //系统配置

+ 2 - 2
src/jfw/config/config.go
Dosyayı Görüntüle 

@@ -1,8 +1,8 @@
 
 package config
 
 
 import (
 
-	"qfw/util"
 
-	"qfw/util/mail"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/mail"
 
 )
 
 
 //seo.josn 配置文件中的版本号，可以动态更新

+ 1 - 1
src/jfw/config/zqluckdraw.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package config
 
 
 import (
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 //系统配置

+ 3 - 3
src/jfw/course/course.go
Dosyayı Görüntüle 

@@ -1,10 +1,10 @@
 
 package course
 
 
 import (
 
-	"jfw/config"
 
-	"qfw/util"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //课程相关接口

+ 3 - 3
src/jfw/course/course_wx.go
Dosyayı Görüntüle 

@@ -1,10 +1,10 @@
 
 package course
 
 
 import (
 
-	"jfw/wx"
 
-	"qfw/util"
 
+	"jy/src/jfw/modules/app/src/jfw/wx"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //课程相关接口-weixin

+ 5 - 4
src/jfw/filter/baseuserfilter.go
Dosyayı Görüntüle 

@@ -1,13 +1,14 @@
 
 package filter
 
 
 import (
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"log"
 
 	"net/http"
 
-	"qfw/util"
 
 
-	"github.com/go-xweb/httpsession"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type baseUserFilter struct {

+ 6 - 4
src/jfw/filter/filter.go
Dosyayı Görüntüle 

@@ -1,14 +1,16 @@
 
 package filter
 
 
 import (
 
-	"jfw/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 	"net/http"
 
-	"qfw/util"
 
-	fs "qfw/util/fsnotify"
 
 	"regexp"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	fs "app.yhyue.com/moapp/jybase/fsnotify"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 var RouteConf struct {

+ 4 - 3
src/jfw/filter/logfilter.go
Dosyayı Görüntüle 

@@ -8,16 +8,17 @@ package filter
 
 
 import (
 
 	"encoding/json"
 
-	"jfw/public"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"log"
 
 	"net/http"
 
 	"net/url"
 
-	"qfw/util"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 var (

+ 6 - 4
src/jfw/filter/mergefilter.go
Dosyayı Görüntüle 

@@ -2,14 +2,16 @@ package filter
 
 
 import (
 
 	"fmt"
 
-	"jfw/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 	"log"
 
-	"mongodb"
 
 	"net/http"
 
-	"qfw/util/redis"
 
 	"strings"
 
 
-	"github.com/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/mongodb"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 //用户合并删除用户检测

+ 9 - 7
src/jfw/filter/pcfilter.go
Dosyayı Görüntüle 

@@ -2,17 +2,19 @@ package filter
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"net/http"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type pcFilter struct {

+ 12 - 9
src/jfw/filter/phonefilter.go
Dosyayı Görüntüle 

@@ -2,19 +2,22 @@ package filter
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 	"log"
 
-	"mongodb"
 
 	"net/http"
 
 	"net/url"
 
-	qu "qfw/util"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
+	qu "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/mongodb"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type phoneFilter struct {
 
@@ -80,7 +83,7 @@ func (l *phoneFilter) Do() bool {
 
 			reg := time.Unix(regtime, 0)
 
 			//新用户时间
 
 			accountMergeOnline, _ := config.Sysconfig["accountMergeOnline"].(string)
 
-			onLineTime, _ := time.ParseInLocation(qu.Date_Full_Layout, accountMergeOnline, time.Local)
 
+			onLineTime, _ := time.ParseInLocation(Date_Full_Layout, accountMergeOnline, time.Local)
 
 			if remind, _ := (*person)["b_merge_remind"].(bool); remind { //不再提醒
 
 				return true
 
 			}
 
@@ -117,8 +120,8 @@ func (l *phoneFilter) Do() bool {
 
 
 //获取当天结束时间 单位秒
 
 func GetExpire() int {
 
-	t, _ := time.ParseInLocation(qu.Date_Short_Layout, time.Now().AddDate(0, 0, 1).Format(qu.Date_Short_Layout), time.Local)
 
-	t2, _ := time.ParseInLocation(qu.Date_Full_Layout, time.Now().Format(qu.Date_Full_Layout), time.Local)
 
+	t, _ := time.ParseInLocation(Date_Short_Layout, time.Now().AddDate(0, 0, 1).Format(Date_Short_Layout), time.Local)
 
+	t2, _ := time.ParseInLocation(Date_Full_Layout, time.Now().Format(Date_Full_Layout), time.Local)
 
 	return int(t.Unix() - t2.Unix())
 
 }

+ 6 - 4
src/jfw/filter/wxUserSalesFilter.go
Dosyayı Görüntüle 

@@ -1,13 +1,15 @@
 
 package filter
 
 
 import (
 
-	"github.com/go-xweb/httpsession"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"net/http"
 
-	qu "qfw/util"
 
 	"strings"
 
 	"time"
 
+
 
+	qu "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type salesFilter struct {

+ 9 - 7
src/jfw/front/adv.go
Dosyayı Görüntüle 

@@ -1,16 +1,18 @@
 
 package front
 
 
 import (
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/rpc"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/rpc"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -111,8 +113,8 @@ func (a *Adv) DoInfo() error {
 
 					advMsg = "T" //保存成功
 
 					//
 
 					var nowData = time.Now()
 
-					var dslData = util.FormatDate(&nowData, util.Date_Short_Layout)
 
-					var dtlData = util.FormatDate(&nowData, util.Date_Time_Layout)
 
+					var dslData = FormatDate(&nowData, Date_Short_Layout)
 
+					var dtlData = FormatDate(&nowData, Date_Time_Layout)
 
 					dslData = strings.Split(dslData, "-")[0] + "年" + strings.Split(dslData, "-")[1] + "月" + strings.Split(dslData, "-")[2] + "日"
 
 					go func() {
 
 						for _, v := range advList {

+ 12 - 8
src/jfw/front/applysub.go
Dosyayı Görüntüle 

@@ -2,18 +2,22 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -198,7 +202,7 @@ func (a *Applysub) Index() error {
 
 			//微信跳回来的
 
 			code := a.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					FindUserAndCreateSess(openid, a.Session(), "wx", false)
 
 				}

+ 2 - 2
src/jfw/front/areaPack.go
Dosyayı Görüntüle 

@@ -1,9 +1,9 @@
 
 package front
 
 
 import (
 
-	"jfw/config"
 
+	"jy/src/jfw/config"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //省份订阅包

+ 1 - 1
src/jfw/front/bid-fileinter.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //招标文件解读

+ 37 - 35
src/jfw/front/big-member.go
Dosyayı Görüntüle 

@@ -1,55 +1,57 @@
 
 package front
 
 
 import (
 
-    "jfw/config"
 
-    "jfw/public"
 
-    "qfw/util/jy"
 
+	"jy/src/jfw/config"
 
 
-    "github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type BigMemberAction struct {
 
-    *xweb.Action
 
-    vIPViewPage   xweb.Mapper `xweb:"/big/page/(.*)"`    //大会员
 
-    pcVIPViewPage xweb.Mapper `xweb:"/big/pc/page/(.*)"` //大会员pc
 
-    wxVIPViewPage xweb.Mapper `xweb:"/big/wx/page/(.*)"` //大会员wx
 
+	*xweb.Action
 
+	vIPViewPage   xweb.Mapper `xweb:"/big/page/(.*)"`    //大会员
 
+	pcVIPViewPage xweb.Mapper `xweb:"/big/pc/page/(.*)"` //大会员pc
 
+	wxVIPViewPage xweb.Mapper `xweb:"/big/wx/page/(.*)"` //大会员wx
 
 }
 
 
 func init() {
 
-    xweb.AddAction(&BigMemberAction{})
 
+	xweb.AddAction(&BigMemberAction{})
 
 }
 
 
 func (s *BigMemberAction) VIPViewPage(htmlName string) {
 
-    s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
-    userid, _ := s.GetSession("userId").(string)
 
-    bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 
-    //大会员介绍页需要使用power字段
 
-    if bigBaseMsg.Status > 0 && htmlName == "index" {
 
-        power := []int{}
 
-        for key := range bigBaseMsg.PowerMap {
 
-            power = append(power, key)
 
-        }
 
-        s.T["power"] = power
 
-    }
 
-    s.T["member_status"] = bigBaseMsg.Status
 
-    s.T["member_trial"] = bigBaseMsg.HasTrial
 
-    s.Render("/big-member/pc/page_"+htmlName+".html", &s.T)
 
+	s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
+	userid, _ := s.GetSession("userId").(string)
 
+	bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 
+	//大会员介绍页需要使用power字段
 
+	if bigBaseMsg.Status > 0 && htmlName == "index" {
 
+		power := []int{}
 
+		for key := range bigBaseMsg.PowerMap {
 
+			power = append(power, key)
 
+		}
 
+		s.T["power"] = power
 
+	}
 
+	s.T["member_status"] = bigBaseMsg.Status
 
+	s.T["member_trial"] = bigBaseMsg.HasTrial
 
+	s.Render("/big-member/pc/page_"+htmlName+".html", &s.T)
 
 }
 
 
 func (s *BigMemberAction) PcVIPViewPage(htmlName string) {
 
-    s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
-    s.Render("/big-member/pc/page_"+htmlName+".html", &s.T)
 
+	s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
+	s.Render("/big-member/pc/page_"+htmlName+".html", &s.T)
 
 }
 
 
 func (s *BigMemberAction) WxVIPViewPage(htmlName string) error {
 
-    s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
-    userid, _ := s.GetSession("userId").(string)
 
-    bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 
-    if bigBaseMsg.Status > 0 && htmlName == "landingPage" {
 
-        return s.Redirect("/jy_mobile/tabbar/box")
 
-    }
 
-    if htmlName == "open_app_active" {
 
-        return s.Render("/big-member/wx/page_"+htmlName+".html", &s.T)
 
-    }
 
-    return s.Render("/big-member/wx/page_"+htmlName+".html", &s.T)
 
+	s.T["logid"] = config.Seoconfig["bigmember"].(string)
 
+	userid, _ := s.GetSession("userId").(string)
 
+	bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 
+	if bigBaseMsg.Status > 0 && htmlName == "landingPage" {
 
+		return s.Redirect("/jy_mobile/tabbar/box")
 
+	}
 
+	if htmlName == "open_app_active" {
 
+		return s.Render("/big-member/wx/page_"+htmlName+".html", &s.T)
 
+	}
 
+	return s.Render("/big-member/wx/page_"+htmlName+".html", &s.T)
 
 }

+ 5 - 3
src/jfw/front/commonPayPc.go
Dosyayı Görüntüle 

@@ -2,11 +2,13 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
-	"jfw/config"
 
-	qutil "qfw/util"
 
+	"jy/src/jfw/config"
 
 	"strings"
 
 	"time"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type JyOrder struct {

+ 10 - 7
src/jfw/front/commonPayWx.go
Dosyayı Görüntüle 

@@ -3,14 +3,17 @@ package front
 
 import (
 
 	"errors"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 /*
 
@@ -97,7 +100,7 @@ func (w *WxPayCommon) ToMyWxOrder() error {
 
 			//微信跳回来的
 
 			code := w.GetString("code")
 
 			if code != "" {
 
-				openid := jyutil.Getopenid(code)
 
+				openid := jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					if CheckUserIsSubscribe(openid) {
 
 						FindUserAndCreateSess(openid, w.Session(), "wx", false)

+ 14 - 11
src/jfw/front/conventionExhibition.go
Dosyayı Görüntüle 

@@ -2,14 +2,17 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
 	"html/template"
 
-	"jfw/config"
 
+	"jy/src/jfw/config"
 
 	"math"
 
-	qutil "qfw/util"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type ConventionExhibition struct {
 
@@ -34,7 +37,7 @@ func (m *ConventionExhibition) ExhibitionList(source string) error {
 
 	}
 
 
 	for _, v := range *list {
 
-		v["_id"] = qutil.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
 
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
 
 		//图片 log
 
 		v["picture"] = qutil.InterfaceToStr(v["picture"])
 
 		//对开始时间、结束时间处理
 
@@ -42,10 +45,10 @@ func (m *ConventionExhibition) ExhibitionList(source string) error {
 
 		et := qutil.Int64All(v["end_time"])
 
 		tm := time.Now()
 
 		startTime := time.Unix(st, 0)
 
-		//v["start_time"] = startTime.Format(qutil.Date_Short_Layout)
 
-		//v["end_time"] = time.Unix(et, 0).Format(qutil.Date_Short_Layout)
 
-		v["start_time"] = strings.Replace(startTime.Format(qutil.Date_Short_Layout), "-", ".", -1)
 
-		v["end_time"] = strings.Replace(time.Unix(et, 0).Format(qutil.Date_Short_Layout), "-", ".", -1)
 
+		//v["start_time"] = startTime.Format(qDate_Short_Layout)
 
+		//v["end_time"] = time.Unix(et, 0).Format(qDate_Short_Layout)
 
+		v["start_time"] = strings.Replace(startTime.Format(Date_Short_Layout), "-", ".", -1)
 
+		v["end_time"] = strings.Replace(time.Unix(et, 0).Format(Date_Short_Layout), "-", ".", -1)
 
 
 		v["picture"] = qutil.InterfaceToStr(config.Seoconfig["jyadd"]) + qutil.InterfaceToStr(v["picture"])
 
 		v["days"] = int(math.Ceil(startTime.Sub(tm).Hours() / 24))
 
@@ -67,7 +70,7 @@ func (m *ConventionExhibition) ExhibitionList(source string) error {
 
 }
 
 
 func (m *ConventionExhibition) ExhibitionDetails(source, ids string) error {
 
-	id := qutil.DecodeArticleId2ByCheck(ids)[0]
 
+	id := encrypt.DecodeArticleId2ByCheck(ids)[0]
 
 	data, ok := mongodb.FindById("exhibition_info", id, nil)
 
 	if data == nil || len(*data) == 0 || !ok {
 
 		return nil
 
@@ -107,8 +110,8 @@ func (m *ConventionExhibition) ExhibitionDetails(source, ids string) error {
 
 	et := qutil.Int64All((*data)["end_time"])
 
 	tm := time.Now()
 
 	startTime := time.Unix(st, 0)
 
-	(*data)["start_time"] = strings.Replace(startTime.Format(qutil.Date_Short_Layout), "-", ".", -1)
 
-	(*data)["end_time"] = strings.Replace(time.Unix(et, 0).Format(qutil.Date_Short_Layout), "-", ".", -1)
 
+	(*data)["start_time"] = strings.Replace(startTime.Format(Date_Short_Layout), "-", ".", -1)
 
+	(*data)["end_time"] = strings.Replace(time.Unix(et, 0).Format(Date_Short_Layout), "-", ".", -1)
 
 	(*data)["days"] = int(math.Ceil(startTime.Sub(tm).Hours() / 24))
 
 	if qutil.Int64All((*data)["status"]) != 3 {
 
 		if tm.Unix() < st {

+ 24 - 18
src/jfw/front/dataExport.go
Dosyayı Görüntüle 

@@ -4,19 +4,25 @@ import (
 
 	"encoding/json"
 
 	"errors"
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/dataexport"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"strconv"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
+
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type DataExport struct {
 
@@ -72,7 +78,7 @@ var (
 
 	orderStatus_deleted = "-1"               //订单状态-已删除
 
 	orderStatus_cancel  = "-2"               //订单状态-已取消
 
 	tableName_order     = "dataexport_order" //订单表
 
-	SE                  = util.SimpleEncrypt{Key: "topJYBX2019"}
 
+	SEX                 = encrypt.SimpleEncrypt{Key: "topJYBX2019"}
 
 	exportLock          = sync.Mutex{}
 
 	exportLockMap       = map[int]sync.Mutex{}
 
 )
 
@@ -229,7 +235,7 @@ func (d *DataExport) SieveData() {
 
 		}
 
 		_res["data"] = map[string]interface{}{
 
 			"list":  subUrl(list, dataType),
 
-			"_id":   util.SE.Encode2Hex(_id),
 
+			"_id":   encrypt.SE.Encode2Hex(_id),
 
 			"total": msgCount,
 
 		}
 
 		d.ServeJson(_res)
 
@@ -296,7 +302,7 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 
 
 	//卡卷id加密
 
 	if orderDetail["d_relation_id"] != "" {
 
-		orderDetail["userLotteryId"] = util.SE.Encode2Hex(util.ObjToString(orderDetail["d_relation_id"]))
 
+		orderDetail["userLotteryId"] = encrypt.SE.Encode2Hex(util.ObjToString(orderDetail["d_relation_id"]))
 
 	}
 
 	delete(orderDetail, "d_relation_id")
 
 	if orderDetail["filter"] != nil {
 
@@ -309,11 +315,11 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 
 					start, err := strconv.ParseInt(timeArr[0], 10, 64)
 
 					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
 
 					if err == nil && erro == nil {
 
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
 
+						filter.PublishTime = FormatDateByInt64(&start, layout_date) + "-" + FormatDateByInt64(&end, layout_date)
 
 					} else if err == nil && erro != nil {
 
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-"
 
+						filter.PublishTime = FormatDateByInt64(&start, layout_date) + "-"
 
 					} else if err != nil && erro == nil {
 
-						filter.PublishTime = "-" + util.FormatDateByInt64(&end, layout_date)
 
+						filter.PublishTime = "-" + FormatDateByInt64(&end, layout_date)
 
 					}
 
 				}
 
 			}
 
@@ -426,7 +432,7 @@ func (d *DataExport) SuperSearchExport() error {
 
 	d.SetSession("Echo_city", reqData.City)
 
 	d.SetSession("Echo_bid_field", reqData.BidField) // 领域类型 0101-医疗行业
 
 
-	saveData := reqData.PassBidSearchExport()
 
+	saveData := reqData.PassBidSearchExport(config.Sysconfig)
 
 	saveData["selectType"] = selectType
 
 	saveData["s_openid"] = openid
 
 	saveData["s_userid"] = userId
 
@@ -444,10 +450,10 @@ func (d *DataExport) SuperSearchExport() error {
 
 	//存入数据库
 
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 
 	log.Println(_id, "saveData:", saveData)
 
-	return d.Redirect("/front/dataExport/toCreateOrderPage/" + util.SE.Encode2Hex(_id))
 
+	return d.Redirect("/front/dataExport/toCreateOrderPage/" + encrypt.SE.Encode2Hex(_id))
 
 }
 
 func (d *DataExport) ToCreateOrderPage(_id string) error {
 
-	id := util.SE.Decode4Hex(_id)
 
+	id := encrypt.SE.Decode4Hex(_id)
 
 	openid := util.ObjToString(d.GetSession("s_m_openid"))
 
 	userId := util.ObjToString(d.GetSession("userId"))
 
 	if userId == "" {
 
@@ -545,7 +551,7 @@ func (d *DataExport) PreviewData(source, _id string) error {
 
 			redis.Incr("other", incurKey)
 
 		}
 
 	}
 
-	_id = util.SE.Decode4Hex(_id)
 
+	_id = encrypt.SE.Decode4Hex(_id)
 
 	dataType := d.GetString("dataType")
 
 	//从500条数据中筛选字段最全五条
 
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 
@@ -1110,7 +1116,7 @@ func (this *DataExport) GetPcEntAuth() {
 
 //		now := time.Now()
 
 //		public.Mysql.Insert("entniche_export_log", map[string]interface{}{
 
 //			"user_name":    name,
 
-//			"export_time":  util.FormatDate(&now, util.Date_Full_Layout),
 
+//			"export_time":  FormatDate(&now, util.Date_Full_Layout),
 
 //			"data_source":  "2",
 
 //			"export_num":   count,
 
 //			"deduct_num":   newCount,

+ 1 - 1
src/jfw/front/dataPackRouter.go
Dosyayı Görüntüle 

@@ -1,6 +1,6 @@
 
 package front
 
 
-import "github.com/go-xweb/xweb"
 
+import "app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 
 type DataPackRouter struct {
 
 	*xweb.Action

+ 12 - 9
src/jfw/front/distribution.go
Dosyayı Görüntüle 

@@ -2,15 +2,18 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
 	"net/url"
 
-	"qfw/util"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Distrib struct {
 
@@ -37,7 +40,7 @@ func (this *Distrib) LinkShare(discored string) error {
 
 			//微信跳回来的
 
 			code := this.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					//是否为关注用户
 
 					checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 
@@ -85,7 +88,7 @@ func (this *Distrib) LinkShareX(discored string) error {
 
 			//微信跳回来的
 
 			code := this.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					//是否为关注用户
 
 					checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 
@@ -132,7 +135,7 @@ func (this *Distrib) LinkShareG(discored string) error {
 
 			//微信跳回来的
 
 			code := this.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					//是否为关注用户
 
 					checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 
@@ -180,7 +183,7 @@ func (this *Distrib) LinkShareE(discored string) error {
 
 			//微信跳回来的
 
 			code := this.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					//是否为关注用户
 
 					checkIsSubscribeFlag = CheckUserIsSubscribe(openid)

+ 13 - 9
src/jfw/front/entsearch.go
Dosyayı Görüntüle 

@@ -2,14 +2,18 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jylabutil"
 
-	"jfw/public"
 
-	"qfw/util"
 
-	"qfw/util/bidsearch"
 
+	"jy/src/jfw/config"
 
 	"strconv"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jylabutil"
 
+
 
+	. "app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Entsearch struct {
 
@@ -151,12 +155,12 @@ func getSearchResult(searchvalue, area string, minprice, maxprice float64, curre
 
 		for _, j := range itemList {
 
 			z := j.(map[string]interface{})
 
 			if (z["subtype"] == "中标" || z["subtype"] == "成交") && z["winner"] == searchvalue {
 
-				subtypeid = util.EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
 
+				subtypeid = EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
 
 			} else if (z["bidstatus"] == "中标" || z["bidstatus"] == "成交") && z["winner"] == searchvalue {
 
-				bidstatusid = util.EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
 
+				bidstatusid = EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
 
 			}
 
 		}
 
-		v["linkid"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["sourceinfoid"]))
 
+		v["linkid"] = EncodeArticleId2ByCheck(util.ObjToString(v["sourceinfoid"]))
 
 		if subtypeid != "" {
 
 			v["linkid"] = subtypeid
 
 		} else if bidstatusid != "" {

+ 92 - 84
src/jfw/front/follow.go
Dosyayı Görüntüle 

@@ -4,26 +4,34 @@ import (
 
 	"encoding/base64"
 
 	"errors"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
-	. "mongodb"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
-	"qfw/util/rpc"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
-	"github.com/go-xweb/log"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	. "app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/rpc"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/log"
 
 
 	"github.com/SKatiyar/qr"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -72,7 +80,7 @@ func (m *Follow) DetaiToList() error {
 
 //
 
 func (m *Follow) CheckFPStatus() error {
 
 	defer util.Catch()
 
-	s_id := util.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
+	s_id := DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
 	follows, _ := mongodb.FindById("follow_project", s_id, `{"_id":1}`)
 
 	flag := "f"
 
 	if follows != nil && *follows != nil && len(*follows) > 0 {
 
@@ -89,7 +97,7 @@ func (m *Follow) CheckCStatus() error {
 
 	defer util.Catch()
 
 	//pname := m.GetString("pcname")
 
 	//pcode := m.GetString("pccode")
 
-	sid := util.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
+	sid := DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
 	userId, _ := m.GetSession("userId").(string)
 
 	//openId, _ := m.GetSession("s_m_openid").(string)
 
 	flag := false
 
@@ -108,7 +116,7 @@ func (m *Follow) CheckCStatus() error {
 
 func (m *Follow) Mylist() {
 
 	defer util.Catch()
 
 	id := m.GetString("id")
 
-	id = util.DecodeArticleId2ByCheck(id)[0]
 
+	id = DecodeArticleId2ByCheck(id)[0]
 
 	var flag = "F"
 
 	res := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"id": id}, "", "")
 
 	if res != nil && len(*res) > 0 {
 
@@ -125,7 +133,7 @@ func (m *Follow) Fwsave() {
 
 	userId := m.GetSession("userId").(string)
 
 	var status = "n"
 
 	var followId string
 
-	s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	s_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId}) >= util.Int64All(followLimit) {
 
 		status = "m"
 
 	} else if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}) > 0 {
 
@@ -178,8 +186,8 @@ func (m *Follow) Fwsave() {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status":   status,
 
-		"followId": util.EncodeArticleId2ByCheck(followId),
 
-		"infoId":   util.EncodeArticleId2ByCheck(s_id),
 
+		"followId": EncodeArticleId2ByCheck(followId),
 
+		"infoId":   EncodeArticleId2ByCheck(s_id),
 
 	})
 
 }
 
 
@@ -190,7 +198,7 @@ func (m *Follow) FwsaveBk() {
 
 	openid := m.GetSession("s_m_openid").(string)
 
 	var status = "n"
 
 	var followId string
 
-	s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	s_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	if mongodb.Count("follow_project", `{"s_userid":"`+userId+`"}`) >= followLimit {
 
 		status = "m"
 
 	} else if mongodb.Count("follow_project", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
 
@@ -242,7 +250,7 @@ func (m *Follow) FwsaveBk() {
 
 			mySelf["s_toptype"] = (*res)["toptype"]
 
 			mySelf["s_province"] = (*res)["area"]
 
 			mySelf["s_id"] = s_id
 
-			mySelf["s_eid"] = util.EncodeArticleId2ByCheck(s_id)
 
+			mySelf["s_eid"] = EncodeArticleId2ByCheck(s_id)
 
 			mySelf["l_publishtime"] = (*res)["publishtime"]
 
 			if (*res)["industry"] == nil && (*res)["s_subscopeclass"] != nil {
 
 				ind := strings.Split(util.ObjToString((*res)["s_subscopeclass"]), ",")[0]
 
@@ -267,8 +275,8 @@ func (m *Follow) FwsaveBk() {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status":   status,
 
-		"followId": util.EncodeArticleId2ByCheck(followId),
 
-		"infoId":   util.EncodeArticleId2ByCheck(s_id),
 
+		"followId": EncodeArticleId2ByCheck(followId),
 
+		"infoId":   EncodeArticleId2ByCheck(s_id),
 
 	})
 
 }
 
 
@@ -276,7 +284,7 @@ func (m *Follow) FwsaveBk() {
 
 func (m *Follow) ShareFW(tp string) error {
 
 	defer util.Catch()
 
 	tpm := strings.Split(tp, "__")
 
-	id := util.DecodeArticleId2ByCheck(tpm[0])[0]
 
+	id := DecodeArticleId2ByCheck(tpm[0])[0]
 
 	projectname := tpm[1]
 
 	openid := tpm[2]
 
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
 
@@ -296,15 +304,15 @@ func (m *Follow) ShareFW(tp string) error {
 
 	data := elastic.GetByIdField("bidding", "bidding", id, fields)
 
 	bidopentime := (*data)["bidopentime"]
 
 	if bidopentime != nil && util.Int64All(bidopentime) != 0 {
 
-		m.T["bidopentime"] = util.FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
+		m.T["bidopentime"] = FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
 		m.T["l_bidopentime"] = bidopentime
 
 	}
 
 	if remindtime := (*data)["remindtime"]; remindtime != nil && util.Int64All(remindtime) != 0 {
 
-		m.T["remindtime"] = util.FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
+		m.T["remindtime"] = FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
 		m.T["l_remindtime"] = remindtime
 
 	} else if bidopentime != nil && util.Int64All(bidopentime) != 0 {
 
 		date := time.Unix(util.Int64All(bidopentime), 0).AddDate(0, 0, -1)
 
-		m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+		m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 		m.T["l_remindtime"] = date.Unix()
 
 	}
 
 	mySelf := make(bson.M)
 
@@ -341,7 +349,7 @@ func (m *Follow) ShareFW(tp string) error {
 
 //
 
 func (m *Follow) PcAllNotice() error {
 
 	defer util.Catch()
 
-	id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	projectname := m.GetString("projectname")
 
 	projectcode := m.GetString("projectcode")
 
 	data := map[string]interface{}{}
 
@@ -356,7 +364,7 @@ func (m *Follow) PcAllNotice() error {
 
 		})
 
 		if len(res) > 0 {
 
 			for _, v := range res {
 
-				(*v)["s_eid"] = util.EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
+				(*v)["s_eid"] = EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
 			}
 
 			data["res"] = res
 
 		}
 
@@ -381,7 +389,7 @@ func (m *Follow) PcEntAllNotice() error {
 
 				res := elastic.GetPage("bidding", "bidding", `{"TERM_s_winner":"`+v+`"}`, `{"publishtime":-1}`, fields, 0, 100)
 
 				if len(*res) != 0 && res != nil && *res != nil {
 
 					for _, v := range *res {
 
-						v["_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
+						v["_id"] = EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
 					}
 
 					data[v] = res
 
 				}
 
@@ -408,7 +416,7 @@ func (m *Follow) Photo(tp string) error {
 
 	}
 
 	//已关注
 
 	if followid != "" {
 
-		id := util.DecodeArticleId2ByCheck(followid)[0]
 
+		id := DecodeArticleId2ByCheck(followid)[0]
 
 		fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
 		_id, _ := primitive.ObjectIDFromHex(id)
 
 		data, ok := mongodb.FindOneByField("follow_project", map[string]interface{}{
 
@@ -425,7 +433,7 @@ func (m *Follow) Photo(tp string) error {
 
 		}
 
 		sid, _ := (*data)["s_id"].(string)
 
 		m.T["_id"] = followid
 
-		m.T["sid"] = util.EncodeArticleId2ByCheck(sid)
 
+		m.T["sid"] = EncodeArticleId2ByCheck(sid)
 
 		m.T["source"] = (*data)["i_source"]
 
 		m.T["projectname"] = (*data)["s_projectname"]
 
 		m.T["projectcode"] = (*data)["s_projectcode"]
 
@@ -447,19 +455,19 @@ func (m *Follow) Photo(tp string) error {
 
 		m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
 		l_bidopentime := (*data)["l_bidopentime"]
 
 		if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-			m.T["bidopentime"] = util.FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
+			m.T["bidopentime"] = FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
 			m.T["l_bidopentime"] = l_bidopentime
 
 		}
 
 		if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
-			m.T["remindtime"] = util.FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
+			m.T["remindtime"] = FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
 			m.T["l_remindtime"] = l_remindtime
 
 		} else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
 			date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
-			m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+			m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 			m.T["l_remindtime"] = date.Unix()
 
 		}
 
 	} else { //未关注
 
-		id := util.DecodeArticleId2ByCheck(tpm[0])[0]
 
+		id := DecodeArticleId2ByCheck(tpm[0])[0]
 
 		m.T["projectname"] = projectname
 
 		m.T["projectcode"] = projectcode
 
 		fields := `"_id","title","comeintime","projectcode","projectname","bidopentime","projectcode","area","toptype","subtype","type","href","publishtime","area","industry","s_subscopeclass"`
 
@@ -475,7 +483,7 @@ func (m *Follow) Photo(tp string) error {
 
 			mySelf["s_projectcode"] = projectcode
 
 			mySelf["s_url"] = (*data)["href"]
 
 			mySelf["s_id"] = id
 
-			mySelf["s_eid"] = util.EncodeArticleId2ByCheck(id)
 
+			mySelf["s_eid"] = EncodeArticleId2ByCheck(id)
 
 			mySelf["l_publishtime"] = (*data)["publishtime"]
 
 			if (*data)["industry"] == nil && (*data)["s_subscopeclass"] != nil {
 
 				ind := strings.Split(util.ObjToString((*data)["s_subscopeclass"]), ",")[0]
 
@@ -485,15 +493,15 @@ func (m *Follow) Photo(tp string) error {
 
 			////////////////////////
 
 			bidopentime := (*data)["bidopentime"]
 
 			if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
-				m.T["bidopentime"] = util.FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
+				m.T["bidopentime"] = FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
 				m.T["l_bidopentime"] = bidopentime
 
 			}
 
 			if remindtime := (*data)["remindtime"]; remindtime != nil && remindtime != "" && util.Int64All(remindtime) != 0 {
 
-				m.T["remindtime"] = util.FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
+				m.T["remindtime"] = FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
 				m.T["l_remindtime"] = remindtime
 
 			} else if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
 				date := time.Unix(util.Int64All(bidopentime), 0).AddDate(0, 0, -1)
 
-				m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+				m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 				m.T["l_remindtime"] = date.Unix()
 
 			}
 
 			m.T["type"] = (*data)["type"]
 
@@ -512,12 +520,12 @@ func (m *Follow) Photo(tp string) error {
 
 			})
 
 			if len(res) > 0 || len(mySelf) > 0 {
 
 				for _, v := range res {
 
-					(*v)["s_eid"] = util.EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
+					(*v)["s_eid"] = EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
 				}
 
 				m.T["data"] = res
 
 			}
 
 		}
 
-		m.T["id"] = util.EncodeArticleId2ByCheck(id)
 
+		m.T["id"] = EncodeArticleId2ByCheck(id)
 
 		m.T["mySelf"] = mySelf
 
 		m.T["source"] = 1
 
 	}
 
@@ -539,7 +547,7 @@ func (m *Follow) AjaxReq() {
 
 	reqType := m.GetString("reqType")
 
 	var followId string
 
 	if reqType == "follow" { //快照页面关注
 
-		s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		s_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 		query := map[string]interface{}{
 
 			"s_userid": userId,
 
 		}
 
@@ -607,7 +615,7 @@ func (m *Follow) AjaxReq() {
 
 	} else if reqType == "cancel" { //取消关注
 
 		query := map[string]interface{}{
 
 			"s_userid": userId,
 
-			"id":       util.DecodeArticleId2ByCheck(m.GetString("_id"))[0],
 
+			"id":       DecodeArticleId2ByCheck(m.GetString("_id"))[0],
 
 		}
 
 		if data := public.BaseMysql.FindOne("follow_project_monitor", query, "", ""); data != nil {
 
 			(*data)["s_followid"] = BsonIdToSId((*data)["id"])
 
@@ -620,7 +628,7 @@ func (m *Follow) AjaxReq() {
 
 			}
 
 		}
 
 	} else if reqType == "followset" {
 
-		id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 		if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"id": id, "s_userid": userId}) == 1 {
 
 
 			data := make(map[string]interface{})
 
@@ -643,7 +651,7 @@ func (m *Follow) AjaxReq() {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status":   status,
 
-		"followId": util.EncodeArticleId2ByCheck(followId),
 
+		"followId": EncodeArticleId2ByCheck(followId),
 
 	})
 
 }
 
 
@@ -656,7 +664,7 @@ func (m *Follow) AjaxReqBk() {
 
 	reqType := m.GetString("reqType")
 
 	var followId string
 
 	if reqType == "follow" { //快照页面关注
 
-		s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		s_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 		if mongodb.Count("follow_project", `{"s_userid":"`+userId+`"}`) >= followLimit {
 
 			status = "m"
 
 		} else if mongodb.Count("follow_project", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
 
@@ -713,7 +721,7 @@ func (m *Follow) AjaxReqBk() {
 
 				mySelf["s_title"] = title
 
 				mySelf["s_url"] = url
 
 				mySelf["s_id"] = s_id
 
-				mySelf["s_eid"] = util.EncodeArticleId2ByCheck(s_id)
 
+				mySelf["s_eid"] = EncodeArticleId2ByCheck(s_id)
 
 				mySelf["l_publishtime"] = publishtime
 
 				mySelf["s_province"] = area
 
 				mySelf["s_subtype"] = subtype
 
@@ -735,18 +743,18 @@ func (m *Follow) AjaxReqBk() {
 
 			}
 
 		}
 
 	} else if reqType == "cancel" { //取消关注
 
-		if data, ok := mongodb.FindOne("follow_project", `{"s_userid":"`+userId+`","_id":"`+util.DecodeArticleId2ByCheck(m.GetString("id"))[0]+`"}`); ok && data != nil {
 
+		if data, ok := mongodb.FindOne("follow_project", `{"s_userid":"`+userId+`","_id":"`+DecodeArticleId2ByCheck(m.GetString("id"))[0]+`"}`); ok && data != nil {
 
 			(*data)["s_followid"] = BsonIdToSId((*data)["_id"])
 
 			delete(*data, "_id")
 
 			(*data)["i_status"] = 1
 
 			mongodb.Save("follow_project_back", data)
 
-			if mongodb.Del("follow_project", `{"s_userid":"`+(*data)["s_userid"].(string)+`","_id":"`+util.DecodeArticleId2ByCheck(m.GetString("id"))[0]+`"}`) {
 
+			if mongodb.Del("follow_project", `{"s_userid":"`+(*data)["s_userid"].(string)+`","_id":"`+DecodeArticleId2ByCheck(m.GetString("id"))[0]+`"}`) {
 
 				status = "y"
 
 				go delRelRedis((*data)["s_userid"], (*data)["a_relationinfo"])
 
 			}
 
 		}
 
 	} else if reqType == "followset" {
 
-		id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 		_id, _ := primitive.ObjectIDFromHex(id)
 
 		if mongodb.Count("follow_project", map[string]interface{}{"_id": _id, "s_userid": userId}) == 1 {
 
 			data := make(map[string]interface{})
 
@@ -769,7 +777,7 @@ func (m *Follow) AjaxReqBk() {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status":   status,
 
-		"followId": util.EncodeArticleId2ByCheck(followId),
 
+		"followId": EncodeArticleId2ByCheck(followId),
 
 	})
 
 }
 
 
@@ -859,7 +867,7 @@ func (m *Follow) List() error {
 
 
 		for _, v := range followData {
 
 			v["followid"] = BsonIdToSId(v["id"])
 
-			v["_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId(v["id"]))
 
+			v["_id"] = EncodeArticleId2ByCheck(BsonIdToSId(v["id"]))
 
 			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
 
 				v["l_lastpushtime"] = v["l_createtime"]
 
 			}
 
@@ -892,7 +900,7 @@ func (m *Follow) ListBk() error {
 
 	m.T["flag"] = false
 
 	if ok && datas != nil && len(*datas) > 0 {
 
 		for _, v := range *datas {
 
-			v["_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
+			v["_id"] = EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
 			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
 
 				v["l_lastpushtime"] = v["l_createtime"]
 
 			}
 
@@ -979,7 +987,7 @@ func (m *Follow) Addsave() error {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status": status,
 
-		"id":     util.EncodeArticleId2ByCheck(id),
 
+		"id":     EncodeArticleId2ByCheck(id),
 
 	})
 
 	return nil
 
 }
 
@@ -1042,7 +1050,7 @@ func (m *Follow) AddsaveBk() error {
 
 				mySelf["s_projectcode"] = projectcode
 
 				mySelf["s_url"] = url
 
 				mySelf["s_id"] = sid
 
-				mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
+				mySelf["s_eid"] = EncodeArticleId2ByCheck(sid)
 
 				mySelf["l_publishtime"] = publishtime
 
 				if d["industry"] == nil && d["s_subscopeclass"] != nil {
 
 					ind := strings.Split(util.ObjToString(d["s_subscopeclass"]), ",")[0]
 
@@ -1068,7 +1076,7 @@ func (m *Follow) AddsaveBk() error {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status": status,
 
-		"id":     util.EncodeArticleId2ByCheck(id),
 
+		"id":     EncodeArticleId2ByCheck(id),
 
 	})
 
 	return nil
 
 }
 
@@ -1077,7 +1085,7 @@ func (m *Follow) Set(tp, id string) error {
 
 	defer util.Catch()
 
 	//isDel := false
 
 	var isDel bool
 
-	id = util.DecodeArticleId2ByCheck(id)[0]
 
+	id = DecodeArticleId2ByCheck(id)[0]
 
 	//fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
 	//_id, _ := primitive.ObjectIDFromHex(id)
 
 	data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
@@ -1134,7 +1142,7 @@ func (m *Follow) Set(tp, id string) error {
 
 		mySelf["s_projectcode"] = projectcode
 
 		mySelf["s_url"] = d["href"].(string)
 
 		mySelf["s_id"] = ""
 
-		mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
+		mySelf["s_eid"] = EncodeArticleId2ByCheck(sid)
 
 		mySelf["l_publishtime"] = d["publishtime"]
 
 		if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
 			ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
@@ -1147,20 +1155,20 @@ func (m *Follow) Set(tp, id string) error {
 
 	jyutil.SortData(&thisList, "l_publishtime", true)
 
 	m.T["relationinfo"] = thisList
 
 
-	m.T["_id"] = util.EncodeArticleId2ByCheck(id)
 
-	m.T["sid"] = util.EncodeArticleId2ByCheck(sid)
 
+	m.T["_id"] = EncodeArticleId2ByCheck(id)
 
+	m.T["sid"] = EncodeArticleId2ByCheck(sid)
 
 	//m.T["a_lastpushids"] = (*data)["ids"]
 
 	l_bidopentime := (*data)["l_bidopentime"]
 
 	if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-		m.T["bidopentime"] = util.FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
+		m.T["bidopentime"] = FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
 		m.T["l_bidopentime"] = l_bidopentime
 
 	}
 
 	if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
-		m.T["remindtime"] = util.FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
+		m.T["remindtime"] = FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
 		m.T["l_remindtime"] = l_remindtime
 
 	} else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
 		date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
-		m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+		m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 		m.T["l_remindtime"] = date.Unix()
 
 	}
 
 	if !isDel {
 
@@ -1178,7 +1186,7 @@ func (m *Follow) Set(tp, id string) error {
 
 func (m *Follow) SetBk(tp, id string) error {
 
 	defer util.Catch()
 
 	isDel := false
 
-	id = util.DecodeArticleId2ByCheck(id)[0]
 
+	id = DecodeArticleId2ByCheck(id)[0]
 
 	userid := util.ObjToString(m.GetSession("userId"))
 
 	fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1,"s_userid":1}`
 
 	_id, _ := primitive.ObjectIDFromHex(id)
 
@@ -1196,7 +1204,7 @@ func (m *Follow) SetBk(tp, id string) error {
 
 	projectname, _ := (*data)["s_projectname"].(string)
 
 	projectcode, _ := (*data)["s_projectcode"].(string)
 
 	if util.ObjToString((*data)["s_userid"]) != userid {
 
-		return m.Redirect(fmt.Sprintf("/follow/photo/%s__%s__%s", util.EncodeArticleId2ByCheck(sid), projectname, projectcode))
 
+		return m.Redirect(fmt.Sprintf("/follow/photo/%s__%s__%s", EncodeArticleId2ByCheck(sid), projectname, projectcode))
 
 	}
 
 	if isDel {
 
 		fields := `"_id","title","comeintime","projectcode","projectname","bidopentime","projectcode","area","toptype","subtype","type","href","publishtime","area"`
 
@@ -1212,20 +1220,20 @@ func (m *Follow) SetBk(tp, id string) error {
 
 			mySelf["s_projectcode"] = projectcode
 
 			mySelf["s_url"] = (*data)["href"]
 
 			//mySelf["s_id"] = sid
 
-			mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
+			mySelf["s_eid"] = EncodeArticleId2ByCheck(sid)
 
 			mySelf["l_publishtime"] = (*data)["publishtime"]
 
 			////////////////////////
 
 			bidopentime := (*data)["bidopentime"]
 
 			if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
-				m.T["bidopentime"] = util.FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
+				m.T["bidopentime"] = FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
 				m.T["l_bidopentime"] = bidopentime
 
 			}
 
 			if remindtime := (*data)["remindtime"]; remindtime != nil && remindtime != "" && util.Int64All(remindtime) != 0 {
 
-				m.T["remindtime"] = util.FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
+				m.T["remindtime"] = FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
 				m.T["l_remindtime"] = remindtime
 
 			} else if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
 				date := time.Unix(util.Int64All(bidopentime), 0).AddDate(0, 0, -1)
 
-				m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+				m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 				m.T["l_remindtime"] = date.Unix()
 
 			}
 
 			m.T["type"] = (*data)["type"]
 
@@ -1244,17 +1252,17 @@ func (m *Follow) SetBk(tp, id string) error {
 
 			})
 
 			if len(res) > 0 || len(mySelf) > 0 {
 
 				for _, v := range res {
 
-					(*v)["s_eid"] = util.EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
+					(*v)["s_eid"] = EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
 					(*v)["s_id"] = ""
 
 				}
 
 				m.T["data"] = res
 
 			}
 
 		}
 
-		m.T["id"] = util.EncodeArticleId2ByCheck(sid)
 
+		m.T["id"] = EncodeArticleId2ByCheck(sid)
 
 		m.T["mySelf"] = mySelf
 
 	} else {
 
-		m.T["_id"] = util.EncodeArticleId2ByCheck(id)
 
-		m.T["sid"] = util.EncodeArticleId2ByCheck(sid)
 
+		m.T["_id"] = EncodeArticleId2ByCheck(id)
 
+		m.T["sid"] = EncodeArticleId2ByCheck(sid)
 
 		m.T["source"] = (*data)["i_source"]
 
 		m.T["url"] = (*data)["s_url"]
 
 		m.T["remind"] = (*data)["i_remind"]
 
@@ -1284,15 +1292,15 @@ func (m *Follow) SetBk(tp, id string) error {
 
 		m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
 		l_bidopentime := (*data)["l_bidopentime"]
 
 		if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-			m.T["bidopentime"] = util.FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
+			m.T["bidopentime"] = FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
 			m.T["l_bidopentime"] = l_bidopentime
 
 		}
 
 		if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
-			m.T["remindtime"] = util.FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
+			m.T["remindtime"] = FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
 			m.T["l_remindtime"] = l_remindtime
 
 		} else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
 			date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
-			m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+			m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
 			m.T["l_remindtime"] = date.Unix()
 
 		}
 
 	}
 
@@ -1310,7 +1318,7 @@ func (m *Follow) SetBk(tp, id string) error {
 
 
 func (m *Follow) AllNotice() error {
 
 	defer util.Catch()
 
-	id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	var relationinfo []interface{}
 
 	data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
 		"id":       id,
 
@@ -1338,7 +1346,7 @@ func (m *Follow) AllNotice() error {
 
 				mySelf["s_projectcode"] = util.ObjToString(d["projectcode"])
 
 				mySelf["s_url"] = d["href"].(string)
 
 				mySelf["s_id"] = ""
 
-				mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
+				mySelf["s_eid"] = EncodeArticleId2ByCheck(sid)
 
 				mySelf["l_publishtime"] = d["publishtime"]
 
 				if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
 					ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
@@ -1372,7 +1380,7 @@ func (m *Follow) AllNotice() error {
 
 }
 
 func (m *Follow) AllNoticeBk() error {
 
 	defer util.Catch()
 
-	id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	var relationinfo []interface{}
 
 	fields := `{"_id":-1,"s_title":1,"s_projectcode":1,"s_projectname":1,"s_url":1,"s_id":1,"l_publishtime":1,"a_relationinfo":1,"a_visited":1}`
 
 	data, ok := mongodb.FindById("follow_project", id, fields)
 
@@ -1405,7 +1413,7 @@ func (m *Follow) AllNoticeBk() error {
 
 
 func (m *Follow) Visited() error {
 
 	defer util.Catch()
 
-	d_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	d_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	if d_id == "" {
 
 		return nil
 
 	}
 
@@ -1434,7 +1442,7 @@ func (m *Follow) Notice(id, followId string) error {
 
 			relationinfo := a_relationinfo.([]interface{})
 
 			for x := range relationinfo {
 
 				s_id, _ := relationinfo[x].(map[string]interface{})["s_id"].(string)
 
-				relationinfo[x].(map[string]interface{})["s_id"] = util.EncodeArticleId2ByCheck(s_id)
 
+				relationinfo[x].(map[string]interface{})["s_id"] = EncodeArticleId2ByCheck(s_id)
 
 				for y := 0; y < len(relationinfo)-x-1; y++ {
 
 					dt1 := util.Int64All(relationinfo[y].(map[string]interface{})["l_publishtime"])
 
 					dt2 := util.Int64All(relationinfo[y+1].(map[string]interface{})["l_publishtime"])
 
@@ -1456,7 +1464,7 @@ func (m *Follow) Notice(id, followId string) error {
 
 		}
 
 		m.T["data"] = data
 
 	}
 
-	m.T["id"] = util.EncodeArticleId2ByCheck(id)
 
+	m.T["id"] = EncodeArticleId2ByCheck(id)
 
 	m.T["openid"] = se.EncodeString(util.ObjToString(m.GetSession("s_m_openid")))
 
 	mynickname, _ := m.Session().Get("s_nickname").(string)
 
 	myavatar, _ := m.Session().Get("s_avatar").(string)
 
@@ -1467,7 +1475,7 @@ func (m *Follow) Notice(id, followId string) error {
 
 }
 
 func (m *Follow) VisitedBk() error {
 
 	defer util.Catch()
 
-	d_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	d_id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
 	if d_id == "" {
 
 		return nil
 
 	}
 
@@ -1566,7 +1574,7 @@ func (this *Follow) FollowGift(shareid string) error {
 
 					//微信跳回来的
 
 					code := this.GetString("code")
 
 					if code != "" {
 
-						openid = jyutil.Getopenid(code)
 
+						openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 						if openid != "" {
 
 							if CheckUserIsSubscribe(openid) {
 
 								FindUserAndCreateSess(openid, this.Session(), "wx", false)

+ 37 - 31
src/jfw/front/front.go
Dosyayı Görüntüle 

@@ -2,29 +2,35 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/qrmanager"
 
-	"jfw/tag"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"jy/src/jfw/qrmanager"
 
+	"jy/src/jfw/tag"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
-	mgdb "mongodb"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"strconv"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	mgdb "app.yhyue.com/moapp/jybase/mongodb"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"github.com/SKatiyar/qr"
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -143,15 +149,15 @@ type Front struct {
 
 	getAdByCode xweb.Mapper `xweb:"/front/getAdByCode"`
 
 }
 
 
-var sewx util.SimpleEncrypt //微信的加密方法
 
+var sewx encrypt.SimpleEncrypt //微信的加密方法
 
 var mongodb = public.MQFW
 
 var urlMap map[string]interface{}
 
 
-var se = util.SE //移到tools中
 
+var se = encrypt.SE //移到tools中
 
 var isIosReg = regexp.MustCompile("\\(i[^;]+;( U;)? CPU.+Mac OS X")
 
 
 func init() {
 
-	sewx = util.SimpleEncrypt{Key: "topnet"}
 
+	sewx = encrypt.SimpleEncrypt{Key: "topnet"}
 
 	xweb.AddAction(&Front{})
 
 	xweb.AddAction(&Short{})
 
 	xweb.AddAction(&OrgStructure{})
 
@@ -211,7 +217,7 @@ func (p *Front) PayIndex() error {
 
 	defer util.Catch()
 
 	param := p.GetString("param")
 
 	params := strings.Split(param, "_")
 
-	id := util.DecodeArticleId2ByCheck(params[1])[0]
 
+	id := encrypt.DecodeArticleId2ByCheck(params[1])[0]
 
 	title := ""
 
 	if id != "" {
 
 		data, ok := public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection, id, `{"title":1}`)
 
@@ -235,9 +241,9 @@ func (f *Front) RecInof() error {
 
 	var msg = ""
 
 	var flag = true
 
 	var tyflag = false
 
-	id := util.DecodeArticleId2ByCheck(f.GetString("id"))[0] //文章id
 
-	fieldName := f.GetString("fieldName")                    //纠错字段
 
-	fwtScode := f.GetString("fwtscode")                      //纠错前权重最低字段
 
+	id := encrypt.DecodeArticleId2ByCheck(f.GetString("id"))[0] //文章id
 
+	fieldName := f.GetString("fieldName")                       //纠错字段
 
+	fwtScode := f.GetString("fwtscode")                         //纠错前权重最低字段
 
 	if strings.Contains(fieldName, "price") || strings.Contains(fieldName, "bidamount") || strings.Contains(fieldName, "budget") {
 
 		//tyflag = true
 
 	}
 
@@ -688,7 +694,7 @@ func (f *Front) GetLoginNum(prestr string) error {
 
 //一键报告
 
 func (m *Front) Onekey() error {
 
 	defer util.Catch()
 
-	fkid := util.DecodeArticleId2ByCheck(m.GetString("fkid"))[0]
 
+	fkid := encrypt.DecodeArticleId2ByCheck(m.GetString("fkid"))[0]
 
 	flag := "N"
 
 	data := make(map[string]interface{})
 
 	if fkid != "" {
 
@@ -760,8 +766,8 @@ func (m *Front) Encrypt() error {
 
 	var sid_openid string
 
 	util.Try(func() {
 
 		if id != "" && s_openid != nil {
 
-			id = util.DecodeArticleId2ByCheck(id)[0]
 
-			sid_openid = util.EncodeArticleId2ByCheck(id, s_openid.(string))
 
+			id = encrypt.DecodeArticleId2ByCheck(id)[0]
 
+			sid_openid = encrypt.EncodeArticleId2ByCheck(id, s_openid.(string))
 
 			flag = "T"
 
 		}
 
 	}, func(e interface{}) {
 
@@ -961,7 +967,7 @@ func (m *Front) Feedback() error {
 
 	m.T["list"] = list
 
 	fkid := m.GetString("fkid")
 
 	if fkid != "" {
 
-		fkid = util.DecodeArticleId2ByCheck(fkid)[0]
 
+		fkid = encrypt.DecodeArticleId2ByCheck(fkid)[0]
 
 	}
 
 	fromName := m.GetString("fromName")
 
 	if fromName != "" {
 
@@ -1092,7 +1098,7 @@ func (f *Front) TSGuide() error {
 
 			rlt := elastic.GetByNgram(INDEX, TYPE, strings.Split(f.GetString("key"), " "), "", FINDF, `{"publishtime":-1}`, `"_id","title","publishtime","toptype","subtype","type","area","href","areaval"`, 0, 10)
 
 			if *rlt != nil && len(*rlt) > 0 {
 
 				for _, v := range *rlt {
 
-					v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 
+					v["_id"] = encrypt.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 
 				}
 
 			}
 
 			result["data"] = rlt
 
@@ -1308,7 +1314,7 @@ func (f *Front) LimitSearchText() {
 
 	status := ""
 
 	if flag == -2 { //重置
 
 		status = "重置"
 
-		public.InitLimitSearchText(true)
 
+		public.InitLimitSearchText(true, config.Sysconfig)
 
 	} else if flag == -1 && public.Lst.Flag { //关闭
 
 		status = "关闭"
 
 		public.Lst.Flag = false
 
@@ -1380,7 +1386,7 @@ func ymResult(a, y, n string) ([]string, []int, map[int]map[string]int, map[int]
 
 			href := util.ObjToString(v["href"])
 
 			id := util.ObjToString(v["id"])
 
 			if id != "" {
 
-				href = util.ObjToString(config.Sysconfig["webdomain"]) + "/article/content/" + util.EncodeArticleId2ByCheck(util.ObjToString(v["id"])) + ".html"
 
+				href = util.ObjToString(config.Sysconfig["webdomain"]) + "/article/content/" + encrypt.EncodeArticleId2ByCheck(util.ObjToString(v["id"])) + ".html"
 
 			}
 
 			if titleHrefMap[year] == nil {
 
 				titleHrefMap[year] = map[string]map[string]string{}
 
@@ -1475,13 +1481,13 @@ func (f *Front) JylabShareTimeline() {
 
 	}
 
 	reqType := f.GetString("reqType")
 
 	if reqType == "update" {
 
-		public.UpdateShareStatus(userid, "wx", 3, 1, 0, false)
 
+		public.UpdateShareStatus(userid, "wx", 3, 1, 0, false, config.Sysconfig)
 
 		f.ServeJson(map[string]interface{}{
 
 			"status": true,
 
 		})
 
 	} else {
 
 		jylabsharetimeline := 1
 
-		if public.CheckUserNeedForceShare(userid, public.ShareType_lab) {
 
+		if public.CheckUserNeedForceShare(userid, public.ShareType_lab, config.Sysconfig) {
 
 			jylabsharetimeline = 0
 
 		}
 
 		f.ServeJson(map[string]interface{}{
 
@@ -1505,7 +1511,7 @@ func (s *Front) UpdateShareStatus() error {
 
 	if platform == "" {
 
 		platform = "wx"
 
 	}
 
-	public.UpdateShareStatus(userid, platform, shareType, shareProperty, ispcforceshare, s.GetString("isRepair") == "y")
 
+	public.UpdateShareStatus(userid, platform, shareType, shareProperty, ispcforceshare, s.GetString("isRepair") == "y", config.Sysconfig)
 
 	s.ServeJson(map[string]interface{}{})
 
 	return nil
 
 }
 
@@ -1553,7 +1559,7 @@ func NeedBind(uid string) bool {
 
 			reg := time.Unix(regtime, 0)
 
 			//新用户时间
 
 			accountMergeOnline, _ := config.Sysconfig["accountMergeOnline"].(string)
 
-			onLineTime, _ := time.ParseInLocation(util.Date_Full_Layout, accountMergeOnline, time.Local)
 
+			onLineTime, _ := time.ParseInLocation(Date_Full_Layout, accountMergeOnline, time.Local)
 
 			if remind, _ := (*person)["b_merge_remind"].(bool); remind { //不再提醒
 
 				return false
 
 			}

+ 10 - 7
src/jfw/front/frontRouter.go
Dosyayı Görüntüle 

@@ -2,17 +2,20 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util/jy"
 
 	"regexp"
 
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
 	//"strings"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //前端通用路由
 
@@ -78,7 +81,7 @@ func (this *CommonRouter) WxCommonPage(folder, loginSign, htmlPage string) error
 
 			if stateKey == "" { //公众号回调
 
 				return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "wx"), 302)
 
 			}
 
-			openid = jyutil.Getopenid(this.GetString("code"))
 
+			openid = jyutil.Getopenid(this.GetString("code"), config.Wxoauthinfo)
 
 			if ok, _, _ := FindUserAndCreateSess(openid, this.Session(), "wx", false); !ok {
 
 				return this.Redirect("/swordfish/about")
 
 			}

+ 6 - 6
src/jfw/front/jyshare.go
Dosyayı Görüntüle 

@@ -1,14 +1,14 @@
 
 package front
 
 
 import (
 
-	jutil "jfw/jyutil"
 
-	"jfw/public"
 
-	//"log"
 
-	"qfw/util/redis"
 
-	//"strconv"
 
+	jutil "app.yhyue.com/moapp/jypkg/jyutil"
 
 	"strings"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Jyshare struct {

+ 4 - 3
src/jfw/front/laboratory.go
Dosyayı Görüntüle 

@@ -1,10 +1,11 @@
 
 package front
 
 
 import (
 
-	"jfw/wx"
 
-	"qfw/util"
 
+	"jy/src/jfw/wx"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Lab struct {

+ 13 - 8
src/jfw/front/login.go
Dosyayı Görüntüle 

@@ -1,20 +1,25 @@
 
 package front
 
 
 import (
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
-	. "mongodb"
 
-	qutil "qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/usercenter"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+
 
 	"github.com/dchest/captcha"
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )

+ 9 - 6
src/jfw/front/message.go
Dosyayı Görüntüle 

@@ -3,11 +3,14 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"html/template"
 
-	"jfw/public"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Message struct {
 
@@ -32,9 +35,9 @@ func (m *Message) MesContent(_id string) error {
 
 		r, _ := public.MQFW.FindById("content", id, `{"s_title":1,"s_content":1,"releasetime":1,"s_source":1,"l_createdate":1}`)
 
 		if r != nil && len(*r) > 0 {
 
 			tmpdate1 := util.Int64All((*r)["l_createdate"])
 
-			(*r)["l_createdate"] = util.FormatDateByInt64(&tmpdate1, util.Date_Short_Layout)
 
+			(*r)["l_createdate"] = FormatDateByInt64(&tmpdate1, Date_Short_Layout)
 
 			tmpdate2 := util.Int64All((*r)["releasetime"])
 
-			(*r)["releasetime"] = util.FormatDateByInt64(&tmpdate2, util.Date_Short_Layout)
 
+			(*r)["releasetime"] = FormatDateByInt64(&tmpdate2, Date_Short_Layout)
 
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
 
 		}
 
 		m.DisableHttpCache()

+ 18 - 15
src/jfw/front/org_structure.go
Dosyayı Görüntüle 

@@ -9,18 +9,21 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
 	"net/url"
 
 	"time"
 
 
-	"qfw/util"
 
-	"qfw/util/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"github.com/SKatiyar/qr"
 
-	"github.com/go-xweb/xweb"
 
 )
 
 
 type OrgStructure struct {
 
@@ -62,8 +65,8 @@ func (this *OrgStructure) InvitationPage() error {
 
 	depId := this.GetString("depId")         //加密后-部门id
 
 	entId := this.GetString("entId")         //加密后-企业id
 
 	depcname := this.GetString("depcname")
 
-	registered := "0"                                     //是否是剑鱼用户：0：未关注； 1：已关注
 
-	entUserId_str := util.SE.Decode4HexByCheck(entUserId) //解密
 
+	registered := "0"                                        //是否是剑鱼用户：0：未关注； 1：已关注
 
+	entUserId_str := encrypt.SE.Decode4HexByCheck(entUserId) //解密
 
 	entUserId_sess := this.GetSession("entUserId")
 
 	OrgUrl := util.ObjToString(config.Sysconfig["wxOrgUrl"]) + "?entUserId=" + entUserId + "&depId=" + depId + "&entId=" + entId + "&depcname=" + depcname
 
 	if !mobileReg.MatchString(client) {
 
@@ -78,7 +81,7 @@ func (this *OrgStructure) InvitationPage() error {
 
 				//微信跳回来的
 
 				code := this.GetString("code")
 
 				if code != "" {
 
-					openId = jyutil.Getopenid(code)
 
+					openId = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				}
 
 			} else if public.CheckWxBrowser(this.Request) {
 
 				//所有参数都不再使用,跳到微信验证用户
 
@@ -94,9 +97,9 @@ func (this *OrgStructure) InvitationPage() error {
 
 			}
 
 		}
 
 		if phone != "" {
 
-			phone = util.SE.EncodeString(phone)
 
+			phone = encrypt.SE.EncodeString(phone)
 
 		}
 
-		OrgUrl = OrgUrl + "&openId=" + util.SE.EncodeString(openId) + "&phone=" + phone + "&registered=" + registered
 
+		OrgUrl = OrgUrl + "&openId=" + encrypt.SE.EncodeString(openId) + "&phone=" + phone + "&registered=" + registered
 
 	}
 
 	return this.Redirect(OrgUrl)
 
 
@@ -111,7 +114,7 @@ func (this *OrgStructure) Authorize() error {
 
 		//微信授权
 
 		code := this.GetString("code")
 
 		if code != "" {
 
-			openId = jyutil.Getopenid(code)
 
+			openId = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 		}
 
 	}
 
 	if openId != "" {
 
@@ -123,8 +126,8 @@ func (this *OrgStructure) Authorize() error {
 
 		}
 
 	}
 
 	this.ServeJson(map[string]interface{}{
 
-		"openId":      util.SE.EncodeString(openId),
 
-		"unionId":     util.SE.EncodeString(unionId),
 
+		"openId":      encrypt.SE.EncodeString(openId),
 
+		"unionId":     encrypt.SE.EncodeString(unionId),
 
 		"isSubscribe": isSubscribe,
 
 		"phone":       util.If(this.GetSession("phone") != nil, this.GetSession("phone"), ""),
 
 	})
 
@@ -140,7 +143,7 @@ func (this *OrgStructure) AutoLogon() error {
 
 	rb := false
 
 	if openId != "" && phone != "" {
 
 		//解密
 
-		openId = util.SE.DecodeString(openId)
 
+		openId = encrypt.SE.DecodeString(openId)
 
 		//当前用户未成为剑鱼用户
 
 		if !isExistsByPO(phone, openId) {
 
 			unionId := public.GetUnionid(openId)

+ 6 - 4
src/jfw/front/otherAct.go
Dosyayı Görüntüle 

@@ -2,14 +2,16 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
+	"jy/src/jfw/config"
 
 	"regexp"
 
 	"time"
 
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
 	"github.com/dchest/captcha"
 
-	"github.com/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 var phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")

+ 21 - 15
src/jfw/front/pcIndex.go
Dosyayı Görüntüle 

@@ -3,23 +3,29 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jylabutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
-	"qfw/util"
 
-	"qfw/util/bidsearch"
 
-	"qfw/util/elastic"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jylabutil"
 
+
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type PcIndex struct {
 
@@ -140,8 +146,8 @@ func GetNewArticle(typ int, pageSize int) (list []map[string]interface{}) {
 
 		if lists != nil && len(*lists) > 5 {
 
 			*lists = (*lists)[0:6]
 
 			for _, v := range *lists {
 
-				// v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 
-				v["_id"] = util.CommonEncodeArticle("indexcontent", v["_id"].(string))
 
+				// v["_id"] = EncodeArticleId2ByCheck(v["_id"].(string))
 
+				v["_id"] = encrypt.CommonEncodeArticle("indexcontent", v["_id"].(string))
 
 				delete(v, "toptype")
 
 				delete(v, "s_subscopeclass")
 
 				tmpdate := v["publishtime"]
 
@@ -407,7 +413,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 
 			}
 
 			if datas != nil && len(*datas) > 0 {
 
 				for _, v := range *datas {
 
-					v["_id"] = util.CommonEncodeArticle("indexcontent", util.ObjToString(v["_id"]))
 
+					v["_id"] = encrypt.CommonEncodeArticle("indexcontent", util.ObjToString(v["_id"]))
 
 				}
 
 			}
 
 			timeout := util.IntAllDef(config.Sysconfig["pcIndexHotCacheTime"], 7200)
 
@@ -580,7 +586,7 @@ func NumberFormat(i int) string {
 
 */
 
 func InSeoContent(arr *[]map[string]interface{}) {
 
 	for _, v := range *arr {
 
-		bid := util.CommonDecodeArticle("indexcontent", util.ObjToString(v["_id"]))[0]
 
+		bid := encrypt.CommonDecodeArticle("indexcontent", util.ObjToString(v["_id"]))[0]
 
 		if data, ok := mongodb.FindOne("seobidding", map[string]interface{}{"bid": bid}); ok && len(*data) > 0 {
 
 			continue
 
 		}
 
@@ -625,7 +631,7 @@ func SeoDateCount(area, stype, industry, city, keywords, key_industry string) in
 
 		}
 
 	}
 
 	//time
 
-	st, _ := time.ParseInLocation(util.Date_Short_Layout, util.NowFormat(util.Date_Short_Layout), time.Local)
 
+	st, _ := time.ParseInLocation(Date_Short_Layout, util.NowFormat(Date_Short_Layout), time.Local)
 
 	st_unix := st.Unix()
 
 	et := time.Now()
 
 	et_unix := time.Date(et.Year(), et.Month(), et.Day()+1, 0, 0, 0, 0, time.Local).Unix()

+ 15 - 11
src/jfw/front/pchelper.go
Dosyayı Görüntüle 

@@ -3,20 +3,24 @@ package front
 
 import (
 
 	"encoding/base64"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 	"log"
 
-	. "mongodb"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
-	"qfw/util/usercenter"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type PcHelper struct {
 
@@ -383,7 +387,7 @@ func getSToken(params ...string) string {
 
 		mac := params[0]
 
 		phone := params[1]
 
 		now := time.Now()
 
-		date := util.FormatDate(&now, util.Date_Full_Layout)
 
+		date := FormatDate(&now, Date_Full_Layout)
 
 		phone = base64.StdEncoding.EncodeToString([]byte(phone))
 
 		mxE := util.GetMd5String(mac + md5EncryptSep + phone + md5EncryptSep + date)
 
 		v := se.EncodeString(mac + othSep + phone + othSep + date + othSep + mxE)
 
@@ -433,7 +437,7 @@ func getUToken(params ...string) string {
 
 		mac := params[0]
 
 		phone := params[1]
 
 		now := time.Now()
 
-		date := util.FormatDate(&now, util.Date_Full_Layout)
 
+		date := FormatDate(&now, Date_Full_Layout)
 
 		phone = base64.StdEncoding.EncodeToString([]byte(phone))
 
 		mxE := util.GetMd5String(mac + md5EncryptSep + phone + md5EncryptSep + date)
 
 		v, err := jyutil.AC.Encrypt(mac + othSep + phone + othSep + date + othSep + mxE)

+ 10 - 7
src/jfw/front/search.go
Dosyayı Görüntüle 

@@ -2,14 +2,17 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
+
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Search struct {
 
@@ -68,7 +71,7 @@ func (this *Search) MainSearchStat() error {
 
 	if stateKey == "" { //公众号回调
 
 		return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "flag"), 302)
 
 	}
 
-	openid := jyutil.Getopenid(this.GetString("code")) //获取用户openid
 
+	openid := jyutil.Getopenid(this.GetString("code"), config.Wxoauthinfo) //获取用户openid
 
 	if loginCreateSess(openid, this.Session()) {
 
 		return this.Redirect("/jylab/mainSearch")
 
 	}

+ 36 - 30
src/jfw/front/shorturl.go
Dosyayı Görüntüle 

@@ -4,27 +4,33 @@ import (
 
 	"database/sql"
 
 	"errors"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
-	. "mongodb"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/fsw"
 
-	"qfw/util/jy"
 
 	"strconv"
 
 
-	"qfw/util/redis"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jybase/fsw"
 
+
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
 	"github.com/SKatiyar/qr"
 
-	"github.com/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -63,7 +69,7 @@ func (s *Short) Article(stype, id string) error {
 
 	if source != "" {
 
 		aboutUrl += "?source=" + source
 
 		if strings.Contains(source, "wx_infocontentshare") {
 
-			decodeArr := util.DecodeArticleId2ByCheck(id)
 
+			decodeArr := encrypt.DecodeArticleId2ByCheck(id)
 
 			if len(decodeArr) > 1 {
 
 				from_userid = se.Encode2Hex(GetUserId(decodeArr[1])) //加密用户userid
 
 			}
 
@@ -84,7 +90,7 @@ func (s *Short) Article(stype, id string) error {
 
 			if s.GetString("state") == "wx" {
 
 				//微信跳回来的
 
 				if code := s.GetString("code"); code != "" {
 
-					if openid := jyutil.Getopenid(code); openid != "" {
 
+					if openid := jyutil.Getopenid(code, config.Wxoauthinfo); openid != "" {
 
 						if CheckUserIsSubscribe(openid) {
 
 							FindUserAndCreateSess(openid, s.Session(), "wx", false)
 
 						}
 
@@ -108,7 +114,7 @@ func (s *Short) Article(stype, id string) error {
 
 				if stype == "bdcontent" {
 
 					var retMap = make(map[string]interface{})
 
 					stype = "content"
 
-					_id := util.CommonDecodeArticle(stype, id)[0]
 
+					_id := encrypt.CommonDecodeArticle(stype, id)[0]
 
 					_, _, _, obj := pcVRT(_id, "", stype, true)
 
 					if obj != nil && len(obj) > 0 {
 
 						retMap["_id"] = id
 
@@ -133,7 +139,7 @@ func (s *Short) Article(stype, id string) error {
 
 		}
 
 	} else if stype == "entservice" { //大客户数据快照展示
 
 		//SE := util.SimpleEncrypt{"entservice"}
 
-		sid := util.SE3.DecodeString(id)
 
+		sid := encrypt.SE3.DecodeString(id)
 
 		if len(sid) == 0 || (len(sid) > 0 && sid == "") {
 
 			s.Redirect("/notin/page", 302)
 
 			return nil
 
@@ -164,7 +170,7 @@ func (s *Short) Article(stype, id string) error {
 
 				obj["urlpath"] = s.Uri()
 
 				obj["industry"] = industry
 
 				if ssOpenid != nil {
 
-					obj["ucbsId"] = util.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
+					obj["ucbsId"] = encrypt.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
 				}
 
 				//if false && isbid(obj["subtype"]) {
 
 				//	//bidding表有数据就有，没有不再查此中标企业得其他信息--需求来自数据和质量
 
@@ -190,7 +196,7 @@ func (s *Short) Article(stype, id string) error {
 
 						if v == "-" || !isInStringArr(util.ObjArrToStringArr(idObjs), v) {
 
 							continue
 
 						}
 
-						winnerIdArr = append(winnerIdArr, util.EncodeArticleId2ByCheck(v))
 
+						winnerIdArr = append(winnerIdArr, encrypt.EncodeArticleId2ByCheck(v))
 
 						obj["entIds"] = winnerIdArr
 
 					}
 
 				}
 
@@ -269,7 +275,7 @@ func (s *Short) Article(stype, id string) error {
 
 		kds := s.GetString("keywords")
 
 		industry := s.GetString("industry")
 
 		var shareopenid, sid string
 
-		sid_openid := util.CommonDecodeArticle(stype, id)
 
+		sid_openid := encrypt.CommonDecodeArticle(stype, id)
 
 		switch len(sid_openid) {
 
 		case 0:
 
 			s.Redirect(aboutUrl, 302)
 
@@ -361,7 +367,7 @@ func (s *Short) Article(stype, id string) error {
 
 						if v == "-" || !isInStringArr(util.ObjArrToStringArr(idObjs), v) {
 
 							continue
 
 						}
 
-						winnerIdArr = append(winnerIdArr, util.EncodeArticleId2ByCheck(v))
 
+						winnerIdArr = append(winnerIdArr, encrypt.EncodeArticleId2ByCheck(v))
 
 						obj["entIds"] = winnerIdArr
 
 					}
 
 				}
 
@@ -392,7 +398,7 @@ func (s *Short) Article(stype, id string) error {
 
 			return s.Redirect(surl)
 
 		}
 
 	} else {
 
-		sids := util.CommonDecodeArticle(stype, id)
 
+		sids := encrypt.CommonDecodeArticle(stype, id)
 
 		if len(sids) == 0 || (len(sids) > 0 && sids[0] == "") {
 
 			s.Redirect("/notin/page", 302)
 
 			return nil
 
@@ -401,7 +407,7 @@ func (s *Short) Article(stype, id string) error {
 
 		//免费用户浏览三级页判断留资与浏览次数
 
 		indust := s.GetString("industry")
 
 		if userId != "" && stype == "indexcontent" { //已登录用户直接跳转至正常三级页
 
-			return s.Redirect(fmt.Sprintf("/article/content/%s.html", util.CommonEncodeArticle("content", sid)))
 
+			return s.Redirect(fmt.Sprintf("/article/content/%s.html", encrypt.CommonEncodeArticle("content", sid)))
 
 		}
 
 		industry := s.GetString("industry")
 
 		var shareid = s.GetString("id")
 
@@ -502,7 +508,7 @@ func (s *Short) Article(stype, id string) error {
 
 						if v == "-" || !isInStringArr(util.ObjArrToStringArr(idObjs), v) {
 
 							continue
 
 						}
 
-						winnerIdArr = append(winnerIdArr, util.EncodeArticleId2ByCheck(v))
 
+						winnerIdArr = append(winnerIdArr, encrypt.EncodeArticleId2ByCheck(v))
 
 						obj["entIds"] = winnerIdArr
 
 					}
 
 				}
 
@@ -517,7 +523,7 @@ func (s *Short) Article(stype, id string) error {
 
 			obj["urlpath"] = s.Uri()
 
 			obj["industry"] = industry
 
 			if ssOpenid != nil {
 
-				obj["ucbsId"] = util.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
+				obj["ucbsId"] = encrypt.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
 			}
 
 			s.T["obj"] = obj
 
 			s.T["url"] = s.Uri()
 
@@ -656,7 +662,7 @@ func UserPermission(userId string, ssOpenid interface{}) (bool, bool, bool) {
 
 func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry, id, from_userid, userId, stype string, b bool) {
 
 	obj["industry"] = industry
 
 	if ssOpenid != nil {
 
-		obj["ucbsId"] = util.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
+		obj["ucbsId"] = encrypt.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 
 	}
 
 	//判断是否公开联系人信息
 
 	if util.Int64All(obj["buyerhint"]) == 2 {
 
@@ -686,8 +692,8 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 
 					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, v, v))
 
 					if rData != nil && len(*rData) == 1 {
 
 						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
 
-							entIdArr = append(entIdArr, util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
 
-							winnerMap[v] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
 
+							entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
 
+							winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
 
 						}
 
 					}
 
 				}
 
@@ -697,7 +703,7 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 
 					if vstr == "-" {
 
 						continue
 
 					}
 
-					winnerMap[swinnerArr[k]] = util.EncodeArticleId2ByCheck(vstr)
 
+					winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
 
 				}
 
 			}
 
 			obj["entId"] = entIdArr
 
@@ -706,7 +712,7 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 
 	}
 
 	//移动端需要处理--剑鱼币
 
 	if b && from_userid != "" && se.Decode4Hex(from_userid) != "" && se.Decode4Hex(from_userid) != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
 
-		article_id := util.CommonDecodeArticle(stype, id)[0]
 
+		article_id := encrypt.CommonDecodeArticle(stype, id)[0]
 
 		key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, from_userid, userId)
 
 		if redis.Incr("other", key) == 1 {
 
 			redis.SetExpire("other", key, 60*60*24)
 
@@ -913,7 +919,7 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 
 
 func (s *Short) NologinArticle(stype, id string) error {
 
 	userId := util.ObjToString(s.GetSession("userId"))
 
-	sids := util.CommonDecodeArticle(stype, id)
 
+	sids := encrypt.CommonDecodeArticle(stype, id)
 
 	if len(sids) == 0 || (len(sids) > 0 && sids[0] == "") {
 
 		s.Redirect("/notin/page", 302)
 
 		return nil
 
@@ -923,7 +929,7 @@ func (s *Short) NologinArticle(stype, id string) error {
 
 	tg := &Tags{}
 
 
 	if userId != "" { //已登录用户直接跳转至正常三级页
 
-		return s.Redirect(fmt.Sprintf("/article/content/%s.html", util.CommonEncodeArticle("content", sid)))
 
+		return s.Redirect(fmt.Sprintf("/article/content/%s.html", encrypt.CommonEncodeArticle("content", sid)))
 
 	}
 
 	catchKey := fmt.Sprintf("jypcdetail_nologin_%s_%s", stype, sid)
 
 	if res := redis.Get("newother", catchKey); res == nil || res == "" {

+ 11 - 8
src/jfw/front/singleLogin.go
Dosyayı Görüntüle 

@@ -2,18 +2,21 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
 	"net/url"
 
-	qutil "qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -77,7 +80,7 @@ func (this *SingleLogin) SingleLogin() error {
 
 			}
 
 		}
 
 		//获取用户openid
 
-		openid = jyutil.Getopenid(this.GetString("code"))
 
+		openid = jyutil.Getopenid(this.GetString("code"), config.Wxoauthinfo)
 
 	}
 
 	//判断是否关注
 
 	isSubscribe := CheckUserIsSubscribe(openid)

+ 8 - 6
src/jfw/front/structedData.go
Dosyayı Görüntüle 

@@ -2,15 +2,17 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -164,7 +166,7 @@ func (t *StructedData) FreeSamples() error {
 
 						t.DelSession("DataSMVerifyEmail")
 
 						msg = "保存成功"
 
 						status = true
 
-						go public.SendStructedDataByEmail(s_email, config.GmailAuth)
 
+						go public.SendStructedDataByEmail(s_email, config.GmailAuth, config.Sysconfig, config.Seoconfig)
 
 					}
 
 				}
 
 			} else {

+ 19 - 12
src/jfw/front/supsearch.go
Dosyayı Görüntüle 

@@ -2,23 +2,30 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jylabutil"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
 	"log"
 
 	"math/rand"
 
-	"qfw/util"
 
-	"qfw/util/bidsearch"
 
-	"qfw/util/elastic"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"strconv"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
+	"app.yhyue.com/moapp/jypkg/jylabutil"
 
+
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"github.com/SKatiyar/qr"
 
-	"github.com/go-xweb/xweb"
 
 )
 
 
 type Pcsearch struct {
 
@@ -164,7 +171,7 @@ func (p *Pcsearch) ProposedProject() error {
 
 	if status == 2 {
 
 		if list != nil {
 
 			for _, v := range *list {
 
-				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 
+				v["_id"] = encrypt.EncodeArticleId2ByCheck(v["_id"].(string))
 
 				stp, _ := v["subtype"].(string)
 
 				if stp == "" {
 
 					stp, _ = v["toptype"].(string)
 
@@ -416,7 +423,7 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 
 				}
 
 			}
 
 			if isLimit == 1 {
 
-				secondKWS, _, _, _, secondFlag, count, totalPage, list = bidsearch.SearchData("pc", p.Request, 1, util.ObjToString(p.GetSession("userId")), secondKWS, s_word, area, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, 0, true, queryItems, field, notkey, isPayedUser, searchTypeSwitch, bidField, pageSize)
 
+				secondKWS, _, _, _, secondFlag, count, totalPage, list = bidsearch.SearchData("pc", p.Request, 1, util.ObjToString(p.GetSession("userId")), secondKWS, s_word, area, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, 0, true, queryItems, field, notkey, isPayedUser, searchTypeSwitch, bidField, pageSize, config.Sysconfig)
 
 			}
 
 		} else {
 
 			p.DisableHttpCache()
 
@@ -592,7 +599,7 @@ func duplicateRemoval(ss []map[string]interface{}) []map[string]interface{} {
 
 		}
 
 		t := time.Unix(util.Int64All(v["publishtime"]), 0)
 
 		v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
 
-		v["_id"] = util.EncodeArticleId2ByCheck(id)
 
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(id)
 
 		v["time"] = util.TimeDiff(t)
 
 		var stp = ""
 
 		if v["subtype"] != nil {

+ 30 - 24
src/jfw/front/swordfish.go
Dosyayı Görüntüle 

@@ -5,28 +5,34 @@ import (
 
 	"encoding/json"
 
 	"fmt"
 
 	"html/template"
 
-	"jfw/config"
 
-	"qfw/util/bidsearch"
 
+	"jy/src/jfw/config"
 
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 
+
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"math/rand"
 
-	. "mongodb"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/redis"
 
 	"reflect"
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
 
-	"qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -185,7 +191,7 @@ func (m *Front) PcAjaxReq() {
 
 			}
 
 		}
 
 		if isLimit == 1 {
 
-			second, _, _, pcAjaxFlag, secondFlag, count, totalPage, list = bidsearch.SearchData("pc", m.Request, currentPage, util.ObjToString(m.GetSession("userId")), secondKWS, s_word, area, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, start, true, queryItems, field, notkey, isPayedUser, searchTypeSwitch, bidField, pageSize)
 
+			second, _, _, pcAjaxFlag, secondFlag, count, totalPage, list = bidsearch.SearchData("pc", m.Request, currentPage, util.ObjToString(m.GetSession("userId")), secondKWS, s_word, area, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, start, true, queryItems, field, notkey, isPayedUser, searchTypeSwitch, bidField, pageSize, config.Sysconfig)
 
 		}
 
 	}
 
 	_secondList, _totalPage, _ := bidsearch.LisetData(1, currentPage, list, secondFlag, config.Seoconfig, isPayedUser, pageSize, userId) //只有前20条
 
@@ -427,7 +433,7 @@ func (m *Front) WxsearchlistPaging() {
 
 			}
 
 			if isLimit == 1 {
 
 				searchTypeSwitch, _ := config.Sysconfig["searchTypeSwitch"].(bool)
 
-				secondKWS, b_word, a_word, _, secondFlag, _, _, list = bidsearch.SearchData("wx", m.Request, pageNum, util.ObjToString(m.GetSession("userId")), secondKWS, searchvalue, scope, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, pageNum, true, queryItems, filed, notkey, isPayedUser, searchTypeSwitch, "", pageSize)
 
+				secondKWS, b_word, a_word, _, secondFlag, _, _, list = bidsearch.SearchData("wx", m.Request, pageNum, util.ObjToString(m.GetSession("userId")), secondKWS, searchvalue, scope, city, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, fileExists, pageNum, true, queryItems, filed, notkey, isPayedUser, searchTypeSwitch, "", pageSize, config.Sysconfig)
 
 			}
 
 			//新增历史记录
 
 			arrs = bidsearch.AddHistory(history, searchvalue)
 
@@ -530,7 +536,7 @@ func wxvisitD(sid, userId, openId, content string, isPayUser bool) (objdata map[
 
 			// obj["url"] = obj["href"]
 
 			pt := obj["publishtime"]
 
 			obj["l_publishtime"] = pt
 
-			obj["publishtime"] = util.FormatDateWithObj(&pt, util.Date_Full_Layout)
 
+			obj["publishtime"] = FormatDateWithObj(&pt, Date_Full_Layout)
 
 			//查询是否关注
 
 			obj["followFlag"] = false
 
 			obj["hasSession"] = false
 
@@ -581,7 +587,7 @@ func ObjData(isPayUser bool, sid, content string, lent int) (t bool, obj map[str
 
 			}
 
 		}
 
 	env:
 
-		obj["_id"] = util.EncodeArticleId2ByCheck(sid)
 
+		obj["_id"] = encrypt.EncodeArticleId2ByCheck(sid)
 
 		infoformat := util.IntAllDef(obj["infoformat"], 1)
 
 		obj["infoformat"] = infoformat
 
 		//精准字段（竞争对手的地址） 或  拟建项目
 
@@ -730,7 +736,7 @@ func MFollow(userId, sid string) (bool, string) {
 
 	followFlag := false
 
 	follows := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": sid}, "id", "")
 
 	if follows != nil && len(*follows) > 0 {
 
-		followId = util.EncodeArticleId2ByCheck(util.InterfaceToStr((*follows)["id"]))
 
+		followId = encrypt.EncodeArticleId2ByCheck(util.InterfaceToStr((*follows)["id"]))
 
 		followFlag = true
 
 	}
 
 	return followFlag, followId
 
@@ -804,7 +810,7 @@ func bidDataConvert(id string, datas *[]map[string]interface{}) (array []map[str
 
 		if _id == id {
 
 			continue
 
 		}
 
-		v["_id"] = util.EncodeArticleId2ByCheck(_id)
 
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(_id)
 
 		area, _ := v["area"].(string)
 
 		if area == "A" {
 
 			v["area"] = ""
 
@@ -1081,7 +1087,7 @@ func (m *Front) About() error {
 
 			//微信跳回来的
 
 			code := m.GetString("code")
 
 			if code != "" {
 
-				myopenid = jyutil.Getopenid(code)
 
+				myopenid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 			}
 
 		} else {
 
 			if public.CheckWxBrowser(m.Request) {
 
@@ -1291,7 +1297,7 @@ func (m *Front) DelOL() error {
 
 	var arrid = strings.Split(m.GetString("arrid"), ",")
 
 	if len(arrid) > 0 {
 
 		for _, chid := range arrid {
 
-			_id, _ := primitive.ObjectIDFromHex(util.DecodeArticleId2ByCheck(chid)[0])
 
+			_id, _ := primitive.ObjectIDFromHex(encrypt.DecodeArticleId2ByCheck(chid)[0])
 
 			ids = append(ids, _id)
 
 		}
 
 	}
 
@@ -1404,7 +1410,7 @@ func (f *Front) Jyblog(param /*参数*/ string) error {
 
 	f.T["logid"] = config.Seoconfig["jybky"].(string)
 
 	f.DisableHttpCache()
 
 	shareid = se.EncodeString(shareid)
 
-	data, pagination := jyutil.JyCmsSearch(querymap)
 
+	data, pagination := jyutil.JyCmsSearch(querymap, config.Seoconfig)
 
 	f.Render("/pc/jyblog.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "shareid": shareid})
 
 	return nil
 
 }
 
@@ -1425,7 +1431,7 @@ func (f *Front) JyCms(cType, param string) error {
 
 		json.Unmarshal(bs, &querymap)
 
 	}
 
 	f.DisableHttpCache()
 
-	data, pagination := jyutil.JyCmsSearch(querymap)
 
+	data, pagination := jyutil.JyCmsSearch(querymap, config.Seoconfig)
 
 	return f.Render("/pc/jyblog.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 
 }
 
 
@@ -1743,7 +1749,7 @@ func (f *Front) HasPushHistory() {
 
 		"isPassCount": isPassCount,
 
 		"isExpire":    isExpire,
 
 		"isOnTail":    isOnTail,
 
-		"userId":      util.EncodeArticleId(userId),
 
+		"userId":      encrypt.EncodeArticleId(userId),
 
 		"keys":        keys,
 
 		"otherFlag":   otherFlag,
 
 		"industry":    industry_,
 
@@ -1774,7 +1780,7 @@ func (f *Front) Newhistorypush() error {
 
 			}
 
 		}
 
 	}
 
-	f.T["forceShareFlag"] = public.CheckUserNeedForceShare(myopenid, public.ShareType_push)
 
+	f.T["forceShareFlag"] = public.CheckUserNeedForceShare(myopenid, public.ShareType_push, config.Sysconfig)
 
 	mynickname, _ := f.Session().Get("s_nickname").(string)
 
 	myavatar, _ := f.Session().Get("s_avatar").(string)
 
 	f.T["nickname"] = mynickname

+ 17 - 12
src/jfw/front/tags.go
Dosyayı Görüntüle 

@@ -2,22 +2,27 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/paging"
 
-	"jfw/public"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/paging"
 
 	"log"
 
 	"math"
 
 	"math/rand"
 
-	qu "qfw/util"
 
-	"qfw/util/bidsearch"
 
-	"qfw/util/elastic"
 
-	"qfw/util/redis"
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	qu "app.yhyue.com/moapp/jybase/common"
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //剑鱼标签页
 
@@ -425,7 +430,7 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 
 		if lists != nil && len(*lists) > 10 {
 
 			*lists = (*lists)[0:10]
 
 			for _, v := range *lists {
 
-				v["_id"] = qu.CommonEncodeArticle("content", v["_id"].(string))
 
+				v["_id"] = encrypt.CommonEncodeArticle("content", v["_id"].(string))
 
 				delete(v, "toptype")
 
 				delete(v, "s_subscopeclass")
 
 				tmpdate := v["publishtime"]
 
@@ -498,7 +503,7 @@ func (this *Tags) GetConsult() (list []map[string]interface{}) {
 
 		rs, _ := jyutil.JyCmsSearch(map[string]string{
 
 			"contentType": "hyzc",
 
 			"perPage":     "10",
 
-		})
 
+		}, config.Seoconfig)
 
 		if rs != nil {
 
 			for _, v := range *rs {
 
 				delete(v, "praise")
 
@@ -656,7 +661,7 @@ func (this *Tags) GetBidding(industry, area, city, stype, keyword string) ([]map
 
 			}
 
 			if datas != nil && len(*datas) > 0 {
 
 				for _, v := range *datas {
 
-					v["_id"] = qu.CommonEncodeArticle("content", qu.ObjToString(v["_id"]))
 
+					v["_id"] = encrypt.CommonEncodeArticle("content", qu.ObjToString(v["_id"]))
 
 				}
 
 				if strings.Contains(industry, "_") {
 
 					industry = strings.Split(industry, "_")[0]

+ 7 - 5
src/jfw/front/uploadfile.go
Dosyayı Görüntüle 

@@ -2,16 +2,18 @@ package front
 
 
 import (
 
 	"encoding/json"
 
-	"jfw/config"
 
+	"jy/src/jfw/config"
 
 	"os"
 
-	"qfw/util"
 
-	"qfw/util/image"
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/log"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/image"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/log"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Files struct {

+ 12 - 9
src/jfw/front/vipsubscribe.go
Dosyayı Görüntüle 

@@ -3,18 +3,21 @@ package front
 
 import (
 
 	"encoding/hex"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Subscribepay struct {
 
@@ -202,7 +205,7 @@ func (s *Subscribepay) Introduce() error {
 
 			//微信跳回来的
 
 			code := s.GetString("code")
 
 			if code != "" {
 
-				openid := jyutil.Getopenid(code)
 
+				openid := jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					isSubscribe := CheckUserIsSubscribe(openid)
 
 					if isSubscribe {

+ 9 - 6
src/jfw/front/websocket.go
Dosyayı Görüntüle 

@@ -3,17 +3,20 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"fmt"
 
-	"jfw/public"
 
 	"log"
 
-	qutil "qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
-	"golang.org/x/net/websocket"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/golang.org/x/net/websocket"
 
 )
 
 
 //socket对象放在内存中，待rpc回调使用

+ 26 - 20
src/jfw/front/ws_dataExport.go
Dosyayı Görüntüle 

@@ -4,24 +4,30 @@ import (
 
 	"encoding/json"
 
 	"errors"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"qfw/util/dataexport"
 
-	"qfw/util/jy"
 
+	"jy/src/jfw/config"
 
 	"strconv"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
 
-	//	"jfw/pay"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 
+
 
+	//	"jy/src/jfw/modules/app/src/jfw/pay"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"time"
 
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -48,7 +54,7 @@ func (w *WsDataExport) WxToOrderDetail() error {
 
 			//微信跳回来的
 
 			code := w.GetString("code")
 
 			if code != "" {
 
-				openid := jyutil.Getopenid(code)
 
+				openid := jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					FindUserAndCreateSess(openid, w.Session(), "wx", false)
 
 				}
 
@@ -98,11 +104,11 @@ func (w *WsDataExport) WxToOrderDetail() error {
 
 					start, err := strconv.ParseInt(timeArr[0], 10, 64)
 
 					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
 
 					if err == nil && erro == nil {
 
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
 
+						filter.PublishTime = FormatDateByInt64(&start, layout_date) + "-" + FormatDateByInt64(&end, layout_date)
 
 					} else if err == nil && erro != nil {
 
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-"
 
+						filter.PublishTime = FormatDateByInt64(&start, layout_date) + "-"
 
 					} else if err != nil && erro == nil {
 
-						filter.PublishTime = "-" + util.FormatDateByInt64(&end, layout_date)
 
+						filter.PublishTime = "-" + FormatDateByInt64(&end, layout_date)
 
 					}
 
 				}
 
 			}
 
@@ -189,7 +195,7 @@ func (w *WsDataExport) GetPreview() error {
 
 	} else {
 
 		redis.Incr("other", incurKey)
 
 	}
 
-	_id := util.SE.Decode4Hex(w.GetString("_id"))
 
+	_id := encrypt.SE.Decode4Hex(w.GetString("_id"))
 
 	dataType := w.GetString("dataType")
 
 	//从500条数据中筛选字段最全五条
 
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 
@@ -224,7 +230,7 @@ func (w *WsDataExport) ToPreview(_id string) error {
 
 			//微信跳回来的
 
 			code := w.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					FindUserAndCreateSess(openid, w.Session(), "wx", false)
 
 				}
 
@@ -246,7 +252,7 @@ func (w *WsDataExport) ToPreview(_id string) error {
 
 // 创建订单页面
 
 func (w *WsDataExport) SubmitOrder() error {
 
 	defer util.Catch()
 
-	id := util.SE.Decode4Hex(w.GetString("id"))
 
+	id := encrypt.SE.Decode4Hex(w.GetString("id"))
 
 	openid := util.ObjToString(w.GetSession("s_m_openid"))
 
 	userId := util.ObjToString(w.GetSession("userId"))
 
 	if userId == "" {
 
@@ -254,7 +260,7 @@ func (w *WsDataExport) SubmitOrder() error {
 
 			//微信跳回来的
 
 			code := w.GetString("code")
 
 			if code != "" {
 
-				openid = jyutil.Getopenid(code)
 
+				openid = jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					FindUserAndCreateSess(openid, w.Session(), "wx", false)
 
 				}
 
@@ -368,7 +374,7 @@ func (wd *WsDataExport) SearchExport() error {
 
 		City:         wd.GetString("city"),                         //城市
 
 		FileExists:   wd.GetString("fileExists"),                   //有无附件
 
 	}
 
-	saveData := reqData.PassBidSearchExport()
 
+	saveData := reqData.PassBidSearchExport(config.Sysconfig)
 
 	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
 
 		GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 
 	saveData["s_openid"] = openid
 
@@ -386,6 +392,6 @@ func (wd *WsDataExport) SearchExport() error {
 
 	//存入数据库
 
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 
 
-	wd.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id)})
 
+	wd.ServeJson(bson.M{"_id": encrypt.SE.Encode2Hex(_id)})
 
 	return nil
 
 }

+ 1 - 1
src/jfw/front/wxAccountPage.go
Dosyayı Görüntüle 

@@ -2,7 +2,7 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //用户账户前端路由

+ 9 - 7
src/jfw/front/wxMyOrder.go
Dosyayı Görüntüle 

@@ -3,14 +3,16 @@ package front
 
 import (
 
 	"errors"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/jyutil"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type WxMyOrder struct {
 
@@ -56,7 +58,7 @@ func (w *WxMyOrder) MyMenu() error {
 
 			//微信跳回来的
 
 			code := w.GetString("code")
 
 			if code != "" {
 
-				openid := jyutil.Getopenid(code)
 
+				openid := jyutil.Getopenid(code, config.Wxoauthinfo)
 
 				if openid != "" {
 
 					FindUserAndCreateSess(openid, w.Session(), "wx", false)
 
 				}

+ 10 - 6
src/jfw/front/wx_dataExport.go
Dosyayı Görüntüle 

@@ -3,15 +3,19 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"errors"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/wx"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/dataexport"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -222,7 +226,7 @@ func (w *WxDataExport) SaveData() error {
 
 	if msgCount > 20000 {
 
 		msgCount = 20000
 
 	}
 
-	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id), "total": msgCount})
 
+	w.ServeJson(bson.M{"_id": encrypt.SE.Encode2Hex(_id), "total": msgCount})
 
 	return nil
 
 }

+ 9 - 7
src/jfw/front/wxkeyset.go
Dosyayı Görüntüle 

@@ -2,16 +2,18 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
-	"jfw/wx"
 
+	"jy/src/jfw/config"
 
+	"jy/src/jfw/wx"
 
 	"net/url"
 
-	"qfw/util"
 
-	"qfw/util/jy"
 
 	"regexp"
 
 	"strconv"
 
 	"strings"
 
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
 	//	"sync"
 
 	"time"
 
 )
 
@@ -236,7 +238,7 @@ func (m *Front) WxKeysetAjaxReq() {
 
 		if rd, ok := mongodb.FindById("user", userId, `{"o_jy":1,"l_registedate":1}`); rd != nil && ok && len(*rd) > 0 {
 
 			//获取活动上线时间
 
 			optimalTime, _ := config.Sysconfig["optimalTime"].(string)
 
-			optime, _ = time.ParseInLocation(util.Date_Full_Layout, optimalTime, time.Local)
 
+			optime, _ = time.ParseInLocation(Date_Full_Layout, optimalTime, time.Local)
 
 			regtime, _ = (*rd)["l_registedate"].(int64)
 
 			if ojy, _ := (*rd)["o_jy"].(map[string]interface{}); len(ojy) > 0 {
 
 				if ojy["i_new"] == nil {
 
@@ -361,7 +363,7 @@ func NewUserByVIP(mData *map[string]interface{}) int {
 
 			return util.IntAllDef(ojy["i_new"], 1)
 
 		}
 
 		optimalTime, _ := config.Sysconfig["optimalTime"].(string)
 
-		optime, _ := time.ParseInLocation(util.Date_Full_Layout, optimalTime, time.Local)
 
+		optime, _ := time.ParseInLocation(Date_Full_Layout, optimalTime, time.Local)
 
 		regtime, _ := (*mData)["l_registedate"].(int64)
 
 		//如果a_key 存在 即为老用户
 
 		if (ojy["a_key"] == nil && time.Unix(regtime, 0).Before(optime)) || (time.Unix(regtime, 0).After(optime)) {

+ 0 - 39
src/jfw/jylabutil/authority.go
Dosyayı Görüntüle 

@@ -1,39 +0,0 @@
 
-// Package jylabutil authority
 
-package jylabutil
 
-
 
-import (
 
-	"jfw/public"
 
-	qu "qfw/util"
 
-)
 
-
 
-/**设置用户权限
 
-userid 用户_id
 
-field  用户权限属性字段
 
-value  用户权限值
 
-*/
 
-func UpdateAuthory(userid, field string, value int) bool {
 
-	b := public.MQFW.UpdateById("user", userid,
 
-		map[string]interface{}{
 
-			"$set": map[string]interface{}{
 
-				field: value,
 
-			},
 
-		})
 
-	return b
 
-}
 
-
 
-/**获取当前模块是否有权限
 
-userid 用户_id
 
-field  用户权限属性字段
 
-*/
 
-func IsAuthorized(userid, field string) bool {
 
-	user, b := public.MQFW.FindById("user", userid, nil)
 
-	if len(*user) > 0 && b {
 
-		if qu.Int64All((*user)[field]) == 1 {
 
-			return true
 
-		} else {
 
-			return false
 
-		}
 
-	} else {
 
-		return false
 
-	}
 
-}

+ 0 - 104
src/jfw/jylabutil/entsearch.go
Dosyayı Görüntüle 

@@ -1,104 +0,0 @@
 
-// Package jylabutil search
 
-package jylabutil
 
-
 
-import (
 
-	"fmt"
 
-	"qfw/util/elastic"
 
-	"strings"
 
-)
 
-
 
-/**即时获取企业名称列表
 
-name  名称
 
-limit 取几条
 
-*/
 
-func GetEenNameImmediate(name string, limit int) []map[string]interface{} {
 
-	query := `{"query": {
 
-			    "bool": {
 
-			      "must_not":[{"term": {"winnersign": "1"}}],
 
-			      "should": [{
 
-			          "bool": {"must": [{"multi_match": {"query": "` + name + `", "type": "phrase","fields": ["name"], "analyzer": "my_ngram"}}]}
 
-			        }],
 
-				  "minimum_should_match": 1
 
-			    }
 
-			  },
 
-			  "_source": ["name","_id"],
 
-			  "from": 0,"size": ` + fmt.Sprint(limit) + `
 
-			}`
 
-	list := *elastic.Get("winner", "winner", query)
 
-	return list
 
-}
 
-
 
-/*根据企业名称、地区、中标价获取项目列表
 
-entname 企业名称
 
-area	区域多值","号隔开
 
-lower	下限单位万
 
-upper	上限单位万
 
-pagenum	页码
 
-pagesize每页数量
 
-*/
 
-func GetProjectByEntName(entname string, area string, lower, upper float64, fields string, pagenum, pagesize int, getCount bool) (int, []map[string]interface{}) {
 
-	if pagenum < 1 {
 
-		pagenum = 1
 
-	}
 
-	mastquery := getSearchQuery(entname, area, lower, upper)
 
-	var count int
 
-	if getCount && pagenum == 1 {
 
-		countQuery := `{"query":{"bool":{"must":[` + mastquery + `]}}}`
 
-		count = int(elastic.Count("projectset", "projectset", countQuery))
 
-	}
 
-	order := `CUSTOM_"sort": {
 
-	    "_script": {
 
-	      	"script": "doc['jgtime']?doc['jgtime'].value:doc['zbtime'].value",
 
-	      	"lang": "groovy",
 
-	      	"type": "number",
 
-	      	"order": "desc"
 
-	    }
 
-	}`
 
-	list := *elastic.GetByNgram(
 
-		"projectset", "projectset",
 
-		``, mastquery,
 
-		"",
 
-		order, fields, (pagenum-1)*pagesize, pagesize,
 
-	)
 
-	return count, list
 
-}
 
-
 
-func getSearchQuery(entname, area string, lower, upper float64) string {
 
-	query := ``
 
-	if entname != "" {
 
-		query = `{"term":{"s_winner":"` + entname + `"}}`
 
-	}
 
-	if area != "" {
 
-		if len(query) > 0 {
 
-			query += ","
 
-		}
 
-		query += `{"terms":{"area":[`
 
-		for k, v := range strings.Split(area, ",") {
 
-			if k > 0 {
 
-				query += `,`
 
-			}
 
-			query += `"` + v + `"`
 
-		}
 
-		query += `]}}`
 
-	}
 
-	if lower > 0 && upper > 0 {
 
-		if len(query) > 0 {
 
-			query += ","
 
-		}
 
-		query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `,"lte":` + fmt.Sprint(upper*10000) + `}}}`
 
-	} else {
 
-		if lower > 0 {
 
-			if len(query) > 0 {
 
-				query += ","
 
-			}
 
-			query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `}}}`
 
-		}
 
-		if upper > 0 {
 
-			if len(query) > 0 {
 
-				query += ","
 
-			}
 
-			query += `{"range":{"bidamount":{"lte":` + fmt.Sprint(upper*10000) + `}}}`
 
-		}
 
-	}
 
-	return query
 
-}

+ 0 - 177
src/jfw/jyutil/jyCms.go
Dosyayı Görüntüle 

@@ -1,177 +0,0 @@
 
-package jyutil
 
-
 
-import (
 
-	"encoding/base64"
 
-	"encoding/json"
 
-	"fmt"
 
-	"html/template"
 
-	"jfw/config"
 
-	"jfw/public"
 
-	. "mongodb"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/redis"
 
-	"regexp"
 
-	"strconv"
 
-	"time"
 
-)
 
-
 
-const (
 
-	jyMsgFirstCache     = "jyMsg_%s_%d"
 
-	jyMsgFirstCacheTime = 5 * 60
 
-)
 
-
 
-//GetFirstJyCms 获取首评信息
 
-func GetFirstJyCms(contentType string, size int) (r []map[string]interface{}) {
 
-	// 默认剑鱼博客栏目
 
-	contentType = util.If(contentType == "", "jybk", contentType).(string)
 
-	redisKey := fmt.Sprintf(jyMsgFirstCache, contentType, size)
 
-	if data, ok := redis.Get("other", redisKey).([]interface{}); ok && data != nil && len(data) > 0 {
 
-		r = util.ObjArrToMapArr(data)
 
-	} else {
 
-		rs, _ := JyCmsSearch(map[string]string{
 
-			"contentType": contentType,
 
-			"perPage":     fmt.Sprintf("%d", size),
 
-		})
 
-		if rs != nil {
 
-			for _, v := range *rs {
 
-				delete(v, "praise")
 
-				delete(v, "s_contenttype")
 
-				delete(v, "s_source")
 
-			}
 
-			r = *rs
 
-		}
 
-		redis.Put("other", redisKey, r, jyMsgFirstCacheTime)
 
-	}
 
-	return r
 
-}
 
-
 
-// JyCmsSearch 剑鱼文章检索
 
-func JyCmsSearch(query map[string]string) (*[]map[string]interface{}, *[]interface{}) {
 
-	perPage, _ := strconv.Atoi(query["perPage"])
 
-	currentPage, _ := strconv.Atoi(query["currentPage"])
 
-	//修复
 
-	if perPage == 0 {
 
-		perPage = 5
 
-	}
 
-	if currentPage < 1 {
 
-		currentPage = 1
 
-	}
 
-	contentType := query["contentType"]
 
-	queryStr := query["query"]
 
-
 
-	queryMap := map[string]interface{}{
 
-		"s_contenttype": contentType,
 
-	}
 
-
 
-	if queryStr != "" {
 
-		queryMap["$or"] = []interface{}{
 
-			map[string]interface{}{
 
-				"s_title": map[string]interface{}{"$regex": queryStr},
 
-			},
 
-			map[string]interface{}{
 
-				"s_content": map[string]interface{}{"$regex": queryStr},
 
-			},
 
-		}
 
-	}
 
-
 
-	total := public.MQFW.Count("content", queryMap)
 
-
 
-	//查询列表数据
 
-	client := elastic.GetEsConn()
 
-	defer elastic.DestoryEsConn(client)
 
-	if client == nil {
 
-		return nil, nil
 
-	}
 
-	searchResult, _ := public.MQFW.Find("content", queryMap, `{"releasetime":-1}`, `{"s_title":1,"s_contenttype":1,"s_content":1,"releasetime":1,"s_description":1,"praise":1,"s_source":1,"s_pic":1,"s_pic1":1,"l_createdate":1,"_id":1,"s_author":1}`, false, (currentPage-1)*perPage, perPage)
 
-
 
-	var res []map[string]interface{}
 
-	if searchResult != nil && len(*searchResult) > 0 {
 
-		for _, m := range *searchResult {
 
-			s_content, _ := m["s_content"].(string)
 
-			if len(s_content) > 500 {
 
-				m["s_content"] = ""
 
-			} else {
 
-				con, _ := regexp.Compile("^[^<]*?>")
 
-				content := con.ReplaceAllString(s_content, "")
 
-				con1, _ := regexp.Compile("<[^>]*$")
 
-				m["s_content"] = template.HTML(con1.ReplaceAllString(content, ""))
 
-			}
 
-
 
-			s_title, _ := m["s_title"].(string)
 
-			m["s_title"] = template.HTML(s_title)
 
-
 
-			tmpdate, _ := m["l_createdate"]
 
-			m["l_createdate"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate), 0))
 
-			tmpdate1, _ := m["releasetime"]
 
-			m["releasetime"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate1), 0))
 
-			reltime := time.Unix(util.Int64All(tmpdate1), 0)
 
-			m["time"] = reltime.Format(util.Date_Short_Layout) //首页展示
 
-			s_pic, _ := m["s_pic"].(string)
 
-			if s_pic != "" {
 
-				s_pic = config.Seoconfig["jyadd"].(string) + s_pic
 
-			}
 
-			m["s_pic"] = s_pic
 
-			s_pic1, _ := m["s_pic1"].(string)
 
-			if s_pic1 != "" {
 
-				s_pic1 = config.Seoconfig["jyadd"].(string) + s_pic1
 
-			}
 
-			m["s_pic1"] = s_pic1
 
-			m["_id"] = se.EncodeString(BsonIdToSId(m["_id"]))
 
-			res = append(res, m)
 
-		}
 
-	}
 
-	//生成分页
 
-	pagination := MakePagination(perPage, currentPage, int(total), query, "/jyblog/index_%s.html")
 
-	return &res, &pagination
 
-}
 
-
 
-//计算分页，分页显示规则
 
-func MakePagination(perPage, currentPage, total int, param map[string]string, urltpl string) []interface{} {
 
-	var totalPages int //总页数
 
-	if total == 0 {
 
-		totalPages = 1
 
-	} else {
 
-		totalPages = (total - 1 + perPage) / perPage //总页数
 
-	}
 
-
 
-	ret := make([]interface{}, 3)
 
-	index := 0
 
-	prePage, nextPage := currentPage-1, currentPage+1
 
-	if prePage < 1 {
 
-		prePage = 1
 
-	}
 
-	if nextPage > totalPages {
 
-		nextPage = totalPages
 
-	}
 
-	param["currentPage"] = strconv.Itoa(prePage)
 
-	bs, _ := json.Marshal(param)
 
-	paramstr := base64.StdEncoding.EncodeToString(bs)
 
-	url := fmt.Sprintf(urltpl, paramstr)
 
-	iscurrent := currentPage == 1
 
-	ret[index] = map[string]interface{}{"page": "< 上一页", "url": url, "iscurrent": iscurrent}
 
-	index = index + 1
 
-	param["currentPage"] = strconv.Itoa(currentPage)
 
-	bs, _ = json.Marshal(param)
 
-	paramstr = base64.StdEncoding.EncodeToString(bs)
 
-	url = fmt.Sprintf(urltpl, paramstr)
 
-	iscurrent = currentPage == currentPage
 
-	ret[index] = map[string]interface{}{"page": currentPage, "url": url, "iscurrent": iscurrent}
 
-	index = index + 1
 
-	param["currentPage"] = strconv.Itoa(nextPage)
 
-	bs, _ = json.Marshal(param)
 
-	paramstr = base64.StdEncoding.EncodeToString(bs)
 
-	url = fmt.Sprintf(urltpl, paramstr)
 
-	iscurrent = currentPage == totalPages
 
-	ret[index] = map[string]interface{}{"page": "下一页 >", "url": url, "iscurrent": iscurrent}
 
-
 
-	//
 
-	u := map[string]interface{}{
 
-		"currentPage": 1,
 
-		"query":       "招标",
 
-		"contentType": param["contentType"],
 
-	}
 
-	bs, _ = json.Marshal(u)
 
-	paramstr = base64.StdEncoding.EncodeToString(bs)
 
-	return ret
 
-}

+ 0 - 227
src/jfw/jyutil/jyutil.go
Dosyayı Görüntüle 

@@ -1,227 +0,0 @@
 
-package jyutil
 
-
 
-import (
 
-	"encoding/json"
 
-	"fmt"
 
-	"io/ioutil"
 
-	"jfw/config"
 
-	"jfw/public"
 
-	"log"
 
-	. "mongodb"
 
-	"net/http"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
-	"reflect"
 
-	"regexp"
 
-	"sort"
 
-
 
-	"strings"
 
-	"time"
 
-)
 
-
 
-var mongodb = public.MQFW
 
-var se = &util.SimpleEncrypt{Key: "topnet2015topnet2015"}
 
-
 
-var AC = &util.AES_CBC{
 
-	Key: "mGlAgnIBB8bx2nch",
 
-	Iv:  "1389461544135476",
 
-}
 
-
 
-//
 
-func FindMyShareId(activecode, openid string) string {
 
-	defer util.Catch()
 
-	ret, bres := mongodb.Find("person_share", "{'s_openid':'"+openid+"','s_businesscode':'"+activecode+"'}", `{"l_timestamp":-1}`, nil, true, -1, -1)
 
-	var shareid string
 
-	if bres {
 
-		var shareData = make(map[string]interface{})
 
-		var str = ""
 
-		for _, v := range *ret {
 
-			str = util.ObjToString(v["i_shareid"])
 
-		}
 
-		var tt = `^\d+$`
 
-		a, _ := regexp.Compile(tt)
 
-		if str == "" || a.MatchString(str) {
 
-			data := make(map[string]interface{})
 
-			data["s_openid"] = openid
 
-			data["s_businesscode"] = activecode
 
-			data["i_shareid"] = se.EncodeString(openid + "---" + activecode)
 
-			data["l_timestamp"] = time.Now().Unix()
 
-			mongodb.Save("person_share", data)
 
-			shareid = openid + "---" + activecode
 
-		} else {
 
-			shareid = se.DecodeString(str)
 
-		}
 
-		odata := redis.Get("sso", "p_shareData_"+shareid)
 
-		if odata == nil {
 
-			shareData["action"] = "32"
 
-			redis.Put("sso", "p_shareData_"+shareid, shareData, 24*60*60)
 
-		}
 
-	}
 
-	return shareid
 
-}
 
-
 
-//获取用户openid
 
-func Getopenid(code string) (openid string) {
 
-	defer util.Catch()
 
-	recturl := fmt.Sprintf(config.Wxoauthinfo, code)
 
-	resp, err := http.Get(recturl)
 
-	if err != nil {
 
-		log.Println(err.Error())
 
-		return
 
-	}
 
-	defer resp.Body.Close()
 
-	bs, _ := ioutil.ReadAll(resp.Body)
 
-	data := map[string]interface{}{}
 
-	json.Unmarshal(bs, &data)
 
-	openid, _ = data["openid"].(string)
 
-	return
 
-}
 
-
 
-//
 
-func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[string]interface{}) {
 
-	person, ok := public.MQFW.FindOneByField("user", q, `{"_id":1,"i_shareknow":1,"s_m_openid":1,"s_nickname":1,"s_headimage":1,"s_headimageurl":1,"s_phone":1,"s_m_phone":1,"l_registedate":1,"b_merge_remind":1,"i_ispush":1,"i_unlimited":1,"s_jyname":1,"base_user_id":1}`)
 
-	sessionVal := make(map[string]interface{})
 
-	if !ok || person == nil || len(*person) == 0 {
 
-		return nil, sessionVal
 
-	}
 
-	sessionVal["user"] = *person
 
-	if (*person)["i_shareknow"] != nil {
 
-		sessionVal["shareknow"] = (*person)["i_shareknow"]
 
-	}
 
-	sessionVal["userId"] = BsonIdToSId((*person)["_id"])
 
-	nickName, _ := (*person)["s_nickname"].(string)
 
-	phone := util.ObjToString((*person)["s_phone"])
 
-	if nickName == "" {
 
-		if phone != "" && len(phone) > 3 {
 
-			nickName = string(phone[0:3]) + "****" + string(phone[len(phone)-4:])
 
-		}
 
-	}
 
-	if util.ObjToString((*person)["s_jyname"]) != "" {
 
-		sessionVal["s_jyname"] = util.ObjToString((*person)["s_jyname"])
 
-	}
 
-	sessionVal["s_nickname"] = nickName
 
-	sessionVal["nickname"] = nickName
 
-	avatar, _ := (*person)["s_headimageurl"].(string)
 
-	if avatar == "" {
 
-		avatar, _ = (*person)["s_headimage"].(string)
 
-	}
 
-	sessionVal["s_avatar"] = strings.Replace(avatar, "http://", "https://", 1)
 
-	sessionVal["s_m_openid"], _ = (*person)["s_m_openid"].(string)
 
-	sessionVal["openid"] = sessionVal["s_m_openid"]
 
-	if phone == "" {
 
-		phone = util.ObjToString((*person)["s_m_phone"])
 
-	}
 
-	if phone != "" {
 
-		//企业信息存session
 
-		sql := `SELECT a.id,a.name,a.startdate,a.enddate,a.quota,c.id as dept_id,b.id as user_id from entniche_info a 
-			INNER JOIN entniche_user b on (b.phone=? and a.id=b.ent_id) 
-			INNER JOIN entniche_department c on (c.pid=0 and a.id=c.ent_id) 
-			LEFT JOIN entniche_user_role d on (d.role_id=? and b.id=d.user_id)  
-			order by a.status DESC,b.power desc,a.auth_status DESC,d.role_id desc,a.createtime desc`
 
-		list := public.Mysql.SelectBySql(sql, phone, 1)
 
-		if list != nil {
 
-			for _, v := range *list {
 
-				if util.IntAll(v["id"]) == 0 {
 
-					break
 
-				}
 
-				sessionVal["entId"] = util.IntAll(v["id"])
 
-				sessionVal["entName"] = util.ObjToString(v["name"])
 
-				sessionVal["entUserId"] = util.IntAll(v["user_id"])
 
-				sessionVal["frameworkEntId"] = util.IntAll(v["id"])
 
-				sessionVal["frameworkEntName"] = util.ObjToString(v["name"])
 
-				break
 
-			}
 
-		}
 
-	}
 
-	sessionVal["phone"] = phone
 
-	sessionVal["i_unlimited"] = util.IntAll((*person)["i_unlimited"])
 
-	base_uid := util.IntAllDef((*person)["base_user_id"], 0)
 
-	if base_uid != 0 {
 
-		sessionVal["base_user_id"] = base_uid //用户中台的uid
 
-	}
 
-	return person, sessionVal
 
-}
 
-
 
-//value 用户sessionid
 
-func LoginRedisKey(userid string) string {
 
-	return fmt.Sprintf("login_%s", userid)
 
-}
 
-
 
-// 排序 排序键必须为数字类型
 
-type SortBy struct {
 
-	Data    []map[string]interface{}
 
-	Sortkey string
 
-}
 
-
 
-func (a SortBy) Len() int { return len(a.Data) }
 
-
 
-func (a SortBy) Swap(i, j int) {
 
-	a.Data[i], a.Data[j] = a.Data[j], a.Data[i]
 
-}
 
-
 
-func (a SortBy) Less(i, j int) bool {
 
-	//return Float64(a.Data[i][a.Sortkey]) < Float64(a.Data[j][a.Sortkey])
 
-	m := a.Data[i][a.Sortkey]
 
-	n := a.Data[j][a.Sortkey]
 
-	w := reflect.ValueOf(m)
 
-	v := reflect.ValueOf(n)
 
-	switch v.Kind() {
 
-	case reflect.String:
 
-		return w.String() < v.String()
 
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 
-		return w.Int() < v.Int()
 
-	case reflect.Float64, reflect.Float32:
 
-		return w.Float() < v.Float()
 
-	default:
 
-		return fmt.Sprintf("%v", w) < fmt.Sprintf("%v", v)
 
-	}
 
-}
 
-
 
-// ture  倒序3, 2, 1
 
-//fmt.Println(m)
 
-func SortData(data interface{}, sortkey string, reverse bool) {
 
-	//func SortData(data interface{}, sortkey string, reverse bool) {
 
-	var db []map[string]interface{}
 
-	err := Bind(data, &db)
 
-	if err != nil {
 
-		fmt.Println(err)
 
-		return
 
-	}
 
-	stb := SortBy{db, sortkey}
 
-	if !reverse {
 
-		sort.Sort(stb)
 
-	} else {
 
-		sort.Sort(sort.Reverse(stb))
 
-	}
 
-	err = Bind(stb.Data, data)
 
-	if err != nil {
 
-		fmt.Println(err)
 
-	}
 
-
 
-}
 
-
 
-// data 转换成ret
 
-func Bind(data interface{}, ret interface{}) error {
 
-	v := reflect.ValueOf(ret)
 
-	if v.Kind() != reflect.Ptr {
 
-		return fmt.Errorf("ptr input ret needed as type as input type %s", v.Kind())
 
-	}
 
-	havdata := false
 
-	var bk interface{}
 
-	if v.Elem().Kind() == reflect.Slice {
 
-		t := reflect.Zero(reflect.TypeOf(v.Elem().Interface()))
 
-		bk = v.Elem().Interface()
 
-		v.Elem().Set(t)
 
-		havdata = true
 
-	}
 
-	_data, _ := json.MarshalIndent(data, "", "    ")
 
-	err := json.Unmarshal(_data, ret)
 
-	if err != nil {
 
-		fmt.Println(err)
 
-		if havdata {
 
-			v.Elem().Set(reflect.ValueOf(bk))
 
-		}
 
-		return err
 
-	}
 
-	return nil
 
-}

+ 0 - 240
src/jfw/jyutil/sessionEncryption.go
Dosyayı Görüntüle 

@@ -1,240 +0,0 @@
 
-package jyutil
 
-
 
-import (
 
-	"bytes"
 
-	"crypto/rand"
 
-	"crypto/rsa"
 
-	"crypto/x509"
 
-	"encoding/json"
 
-	"encoding/pem"
 
-	"jfw/config"
 
-	"jfw/nodemgr"
 
-	"log"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
-	"sync"
 
-	"time"
 
-
 
-	"github.com/cron"
 
-)
 
-
 
-//
 
-type RsaStruct struct {
 
-	Sign       string
 
-	PrivateKey *rsa.PrivateKey
 
-	PublicKey  *rsa.PublicKey
 
-	RsaConfig  *RsaConfig
 
-}
 
-
 
-type RsaConfig struct {
 
-	RsaSignflag   string
 
-	PrivateKeyStr string
 
-	PublicKeyStr  string
 
-}
 
-
 
-type MyWrite struct {
 
-	Byte *bytes.Buffer
 
-}
 
-
 
-func (m MyWrite) Write(p []byte) (n int, err error) {
 
-	n, err = m.Byte.Write(p)
 
-	return
 
-}
 
-
 
-func getNewRsaConfig() *RsaConfig {
 
-	//私钥-----
 
-	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
 
-	if err != nil {
 
-		log.Println(err)
 
-	}
 
-	X509PrivateKey := x509.MarshalPKCS1PrivateKey(privateKey)
 
-	privateBlock := pem.Block{Type: "RSA Private Key", Bytes: X509PrivateKey}
 
-	privateWrite := MyWrite{Byte: bytes.NewBuffer([]byte(""))}
 
-	pem.Encode(privateWrite, &privateBlock)
 
-	privateKeyByte := privateWrite.Byte.Bytes()
 
-
 
-	//公钥----
 
-	publicKey := privateKey.PublicKey
 
-	X509PublicKey, err := x509.MarshalPKIXPublicKey(&publicKey)
 
-	if err != nil {
 
-		log.Println(err)
 
-	}
 
-	publicBlock := pem.Block{Type: "RSA Public Key", Bytes: X509PublicKey}
 
-	publicWrite := MyWrite{Byte: bytes.NewBuffer([]byte(""))}
 
-	pem.Encode(publicWrite, &publicBlock)
 
-	publicKeyByte := publicWrite.Byte.Bytes()
 
-
 
-	return &RsaConfig{
 
-		RsaSignflag:   time.Now().Format(util.Date_Full_Layout),
 
-		PrivateKeyStr: string(privateKeyByte),
 
-		PublicKeyStr:  string(publicKeyByte),
 
-	}
 
-}
 
-
 
-func initRsa(config *RsaConfig) *RsaStruct {
 
-	//初始化私钥
 
-	private_block, _ := pem.Decode([]byte(config.PrivateKeyStr))
 
-	private, err := x509.ParsePKCS1PrivateKey(private_block.Bytes)
 
-	if err != nil {
 
-		log.Println(err)
 
-	}
 
-	//初始化公钥
 
-	public_block, _ := pem.Decode([]byte(config.PublicKeyStr))
 
-	publicKeyInterface, err := x509.ParsePKIXPublicKey(public_block.Bytes)
 
-	if err != nil {
 
-		log.Println(err)
 
-	}
 
-	public := publicKeyInterface.(*rsa.PublicKey)
 
-	return &RsaStruct{
 
-		Sign:       config.RsaSignflag,
 
-		RsaConfig:  config,
 
-		PrivateKey: private,
 
-		PublicKey:  public,
 
-	}
 
-}
 
-
 
-//加密
 
-func (r *RsaStruct) Encrypt(str string) string {
 
-	enStrByte, err := rsa.EncryptPKCS1v15(rand.Reader, r.PublicKey, []byte(str))
 
-	if err != nil {
 
-		log.Printf("%s加密失败%v", str, err)
 
-	}
 
-	return string(enStrByte)
 
-}
 
-
 
-//解密
 
-func (r *RsaStruct) Decrypt(enStr string) string {
 
-	deStrByte, err := rsa.DecryptPKCS1v15(rand.Reader, r.PrivateKey, []byte(enStr))
 
-	if err != nil {
 
-		log.Printf("%s解密失败%v", enStr, err)
 
-	}
 
-	return string(deStrByte)
 
-}
 
-
 
-type EncryptionStruct struct {
 
-	RsaStruct_Now  *RsaStruct
 
-	MapRsa         map[string]*RsaStruct
 
-	EncryptionConf *EncryptionConf
 
-	Lock           *sync.Mutex
 
-}
 
-
 
-type EncryptionConf struct {
 
-	Now        string
 
-	MapRsaConf map[string]*RsaConfig
 
-}
 
-
 
-//首次启动加载秘钥
 
-func InitEncryptionStruct() *EncryptionStruct {
 
-	encryStruct := EncryptionStruct{EncryptionConf: &EncryptionConf{}, Lock: &sync.Mutex{}}
 
-	//	log.Println("xxxxxx", redis.GetInt("other", "jynode_"+nodemgr.NodeName))
 
-	//	isMaster := util.If(redis.GetInt("other", "jynode_"+nodemgr.NodeName) == 1, true, false).(bool)
 
-	go func() {
 
-		cn := cron.New()
 
-		str := util.ObjToString(config.Sysconfig["sessionEnctryFlushCorn"])
 
-		cn.AddFunc(str, func() {
 
-			encryStruct.Flush()
 
-		})
 
-		cn.Start()
 
-	}()
 
-
 
-	//for {
 
-	redis_obj := util.ObjToString(redis.Get("session", "sessionEncryption"))
 
-	if redis_obj != "" {
 
-		encryconf := EncryptionConf{}
 
-		err := json.Unmarshal([]byte(redis_obj), &encryconf)
 
-		if err != nil {
 
-			log.Println("InitEncryptionStruct Unmarshal redis err", err)
 
-		} else {
 
-			encryStruct.EncryptionConf = &encryconf
 
-			encryStruct.initAllRsa()
 
-			log.Println("从redis中加载EncryptionStruct")
 
-			return &encryStruct
 
-		}
 
-	}
 
-
 
-	log.Println("主结点首次创建EncryptionStruct")
 
-	newRsaConf := getNewRsaConfig()
 
-	encryStruct.EncryptionConf.Now = newRsaConf.RsaSignflag
 
-	encryStruct.EncryptionConf.MapRsaConf = map[string]*RsaConfig{newRsaConf.RsaSignflag: newRsaConf}
 
-	encryStruct.initAllRsa()
 
-	go func() {
 
-		//存入redis
 
-		byteArr, err := json.Marshal(encryStruct.EncryptionConf)
 
-		log.Println(string(byteArr))
 
-		if err != nil {
 
-			log.Printf("InitEncryptionStruct save %s redis err %:v\n", byteArr, err)
 
-			return
 
-		}
 
-		redis.Put("session", "sessionEncryption", string(byteArr), -1)
 
-	}()
 
-	return &encryStruct
 
-}
 
-
 
-func (e *EncryptionStruct) initAllRsa() {
 
-	e.Lock.Lock()
 
-	defer e.Lock.Unlock()
 
-	e.MapRsa = map[string]*RsaStruct{}
 
-	for k, v := range e.EncryptionConf.MapRsaConf {
 
-		thisRsa := initRsa(v)
 
-		e.MapRsa[k] = thisRsa
 
-		if k == e.EncryptionConf.Now {
 
-			e.RsaStruct_Now = thisRsa
 
-		}
 
-	}
 
-}
 
-
 
-//定时更新秘钥
 
-func (e *EncryptionStruct) Flush() {
 
-	isMaster := util.If(redis.GetInt("other", "jynode_"+nodemgr.NodeName) == 1, true, false).(bool)
 
-	if !isMaster {
 
-		//从节点从redis中更新秘钥
 
-		for {
 
-			redis_obj := util.ObjToString(redis.Get("session", "sessionEncryption"))
 
-			if redis_obj != "" {
 
-				encryconf := EncryptionConf{}
 
-				err := json.Unmarshal([]byte(redis_obj), &encryconf)
 
-				if e.RsaStruct_Now.Sign == encryconf.Now {
 
-					log.Println("从节点定时更新EncryptionStruct失败，一分钟后重试", e.RsaStruct_Now.Sign)
 
-					time.Sleep(time.Minute)
 
-					if redis.GetInt("other", "jynode_"+nodemgr.NodeName) == 1 {
 
-						break
 
-					} else {
 
-						continue
 
-					}
 
-				}
 
-				if err != nil {
 
-					log.Println("InitEncryptionStruct Unmarshal redis err", err)
 
-				} else {
 
-					e.EncryptionConf = &encryconf
 
-					e.initAllRsa()
 
-					log.Println("从节点定时更新EncryptionStruct")
 
-					return
 
-				}
 
-			}
 
-		}
 
-	} else {
 
-		e.Lock.Lock()
 
-		//主结点生成秘钥 存入redis
 
-		log.Printf("主结点更新EncryptionStruct before  %+v", e.MapRsa)
 
-		last := e.RsaStruct_Now
 
-		newRsa := initRsa(getNewRsaConfig())
 
-		//更新map
 
-		e.MapRsa = map[string]*RsaStruct{newRsa.Sign: newRsa, last.Sign: last}
 
-		//更新默认加密
 
-		e.RsaStruct_Now = newRsa
 
-		log.Printf("after  %+v", e.MapRsa)
 
-		e.Lock.Unlock()
 
-		//更新redis
 
-		func() {
 
-			e.EncryptionConf.Now = e.RsaStruct_Now.Sign
 
-			e.EncryptionConf.MapRsaConf = map[string]*RsaConfig{newRsa.Sign: newRsa.RsaConfig, last.Sign: last.RsaConfig}
 
-			byteArr, err := json.Marshal(e.EncryptionConf)
 
-			log.Println("主结点更新sessionEncryption", string(byteArr))
 
-			if err != nil {
 
-				log.Printf("InitEncryptionStruct save %s redis err %:v\n", byteArr, err)
 
-				return
 
-			}
 
-			redis.Put("session", "sessionEncryption", string(byteArr), -1)
 
-		}()
 
-	}
 
-}

+ 0 - 168
src/jfw/jyutil/sessionkeep.go
Dosyayı Görüntüle 

@@ -1,168 +0,0 @@
 
-package jyutil
 
-
 
-import (
 
-	"encoding/base64"
 
-	"fmt"
 
-	. "mongodb"
 
-	"net/http"
 
-	"qfw/util/redis"
 
-	"regexp"
 
-	"strings"
 
-	"time"
 
-
 
-	"github.com/go-xweb/httpsession"
 
-)
 
-
 
-const (
 
-	SKCookieName = "userid_secure"
 
-)
 
-
 
-var (
 
-	Encryption = InitEncryptionStruct()
 
-	//过滤器
 
-	//爬虫百度、谷歌、雅虎、新浪、搜狗、搜搜、网易有道
 
-	//var reg = regexp.MustCompile(`(baidu|google|yahoo|iask|sogou|soso|youdao|Android|Mobile)`)
 
-	reg = regexp.MustCompile(`(Android|Mobile)`)
 
-)
 
-
 
-// SessionKeep session保持
 
-type SessionKeep struct {
 
-	W          http.ResponseWriter
 
-	R          *http.Request
 
-	Session    *httpsession.Session
 
-	GetSession map[string]interface{}
 
-	SetSession map[string]interface{}
 
-}
 
-
 
-func (sk *SessionKeep) Do() bool {
 
-	defer func() {
 
-		if len(sk.SetSession) > 0 {
 
-			sk.Session.SetMultiple(sk.SetSession)
 
-		}
 
-	}()
 
-	rqu := sk.R.URL.Path
 
-	if strings.HasSuffix(rqu, "/notin/page") || strings.HasSuffix(rqu, "/swordfish/about") || strings.HasSuffix(rqu, "/orgstructure/invpage") || strings.Contains(rqu, "/exhibition/") {
 
-		return true
 
-	} else {
 
-		rhd := sk.R.Header
 
-		rhdua := "" //UA
 
-		if len(rhd["User-Agent"]) > 0 {
 
-			rhdua = rhd["User-Agent"][0]
 
-		}
 
-		ck, err := sk.R.Cookie(SKCookieName)
 
-		userid := sk.GetSession["userId"]
 
-		enuserid := ""
 
-		rhost := sk.R.Host
 
-		RURL := "" //当前url
 
-		sk.SetSession["User-Agent"] = rhdua
 
-		//当前页 模块
 
-		if strings.HasSuffix(rqu, ".html") {
 
-			RURL = fmt.Sprintf("%s%s%s", "https://", rhost, sk.R.RequestURI)
 
-			sk.SetSession["RURL"] = RURL
 
-		}
 
-		deuserid := ""
 
-		flag := 0
 
-		if userid != nil && userid != "" { //只有有session，就更新cookie失效时间
 
-			deuserid, _ = userid.(string)
 
-			enuserid = sk.EncodeString(deuserid)
 
-			flag = 1
 
-		} else if err == nil {
 
-			enuserid = ck.Value //"解密的userid"
 
-			deuserid = sk.DecodeString(enuserid)
 
-			flag = 2
 
-		}
 
-		if deuserid != "" {
 
-			b, _ := redis.Exists("sso", "req_"+deuserid)
 
-			if b {
 
-				http.Redirect(sk.W, sk.R, "/not/not", 302)
 
-			} else {
 
-				if flag == 2 {
 
-					_, sessionVal := GetSessionVal(map[string]interface{}{"_id": StringTOBsonId(deuserid)})
 
-					//未登陆账号
 
-					if i_unlimited, ok := sessionVal["i_unlimited"].(int); i_unlimited > 0 && ok {
 
-						http.SetCookie(sk.W, sk.cookie("", SKCookieName))
 
-						http.Redirect(sk.W, sk.R, "/", 302)
 
-						return false
 
-					}
 
-					for k, v := range sessionVal {
 
-						sk.SetSession[k] = v
 
-					}
 
-				}
 
-				http.SetCookie(sk.W, sk.cookie(enuserid, SKCookieName))
 
-				http.SetCookie(sk.W, sk.cookie(se.EncodeString(deuserid), "ud_safe"))
 
-			}
 
-		} else {
 
-			if strings.HasPrefix(rqu, "/article/") {
 
-				if strings.HasPrefix(rqu, "/article/mailprivate") || strings.HasPrefix(rqu, "/article/bdprivate") || strings.HasPrefix(rqu, "/article/bdcontent") || reg.MatchString(rhdua) || strings.HasPrefix(rqu, "/article/indexcontent") {
 
-					return true
 
-				} else { //只处理pc
 
-					sk.SetSession["referer"] = sk.R.RequestURI
 
-					http.Redirect(sk.W, sk.R, "/notin/page", 302)
 
-					return false
 
-				}
 
-			} else if strings.HasPrefix(rqu, "/front/dataExport") || strings.HasPrefix(rqu, "/front/dataPack") {
 
-				//数据预览图片导出，需要去掉session拦截
 
-				sk.SetSession["referer"] = sk.R.RequestURI
 
-				http.Redirect(sk.W, sk.R, "/notin/page", 302)
 
-				return false
 
-			} else if strings.HasPrefix(rqu, "/front/dataReport") {
 
-				if rqu == "/front/dataReport/payCallback" {
 
-					return true
 
-				}
 
-				http.Redirect(sk.W, sk.R, "/", 302)
 
-				return false
 
-			} else if strings.HasPrefix(rqu, "/front/vipsubscribe/") {
 
-				http.Redirect(sk.W, sk.R, "/swordfish/about", 302)
 
-				//查找不到此用户信息,（用户合并微信登录防止跳转）
 
-				return true
 
-			}
 
-		}
 
-	}
 
-	return true
 
-}
 
-
 
-// 生成cookie
 
-func (sk *SessionKeep) cookie(userid, keyname string) *http.Cookie {
 
-	maxAge := int(time.Hour * 72 / time.Second) //3天，单位秒
 
-	expires := time.Now().Add(72 * time.Hour)
 
-	cookie := &http.Cookie{
 
-		Name:     keyname,
 
-		Value:    userid,
 
-		Path:     "/",
 
-		HttpOnly: false,
 
-		MaxAge:   maxAge,
 
-		Expires:  expires,
 
-		Domain:   httpsession.Domain,
 
-	}
 
-	return cookie
 
-}
 
-
 
-// DecodeString 解密
 
-func (sk *SessionKeep) DecodeString(encodeStr string) string {
 
-	byteArr, err := base64.StdEncoding.DecodeString(encodeStr)
 
-	if err != nil {
 
-		fmt.Println("base64解密出错", encodeStr)
 
-		return ""
 
-	}
 
-	//获取加密字段和加密标识
 
-	ctxArr := strings.Split(string(byteArr), "***")
 
-	if len(ctxArr) != 2 {
 
-		return ""
 
-	}
 
-
 
-	enuserid := ctxArr[0]
 
-	signFlsg := ctxArr[1]
 
-	rs := Encryption.MapRsa[signFlsg]
 
-	if rs == nil {
 
-		fmt.Printf("sign %s不存在\n", signFlsg)
 
-		return ""
 
-	}
 
-	str := Encryption.MapRsa[signFlsg].Decrypt(enuserid)
 
-	return str
 
-}
 
-
 
-// EncodeString 加密
 
-func (sk *SessionKeep) EncodeString(userid string) string {
 
-	str := Encryption.RsaStruct_Now.Encrypt(userid) + "***" + Encryption.RsaStruct_Now.Sign
 
-	return base64.StdEncoding.EncodeToString([]byte(str))
 
-}

+ 0 - 27
src/jfw/jyutil/sort.go
Dosyayı Görüntüle 

@@ -1,27 +0,0 @@
 
-// sort
 
-package jyutil
 
-
 
-type ObjectMap struct {
 
-	Key string `json:"key"` //
 
-	Num int    `json:"num"` //
 
-
 
-}
 
-type ObjSort []*ObjectMap
 
-
 
-func (list ObjSort) Len() int {
 
-	return len(list)
 
-}
 
-
 
-func (list ObjSort) Less(i, j int) bool {
 
-	if list[i].Num > list[j].Num {
 
-		return true
 
-	} else {
 
-		return false
 
-	}
 
-}
 
-
 
-func (list ObjSort) Swap(i, j int) {
 
-	var temp *ObjectMap = list[i]
 
-	list[i] = list[j]
 
-	list[j] = temp
 
-}

+ 2 - 2
src/jfw/modules/app/src/app/active/21yearEndReport.go
Dosyayı Görüntüle 

@@ -1,8 +1,8 @@
 
 package active
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
-	qutil "qfw/util"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
 	"time"
 
 )

+ 6 - 5
src/jfw/modules/app/src/app/active/active.go
Dosyayı Görüntüle 

@@ -1,13 +1,14 @@
 
 package active
 
 
 import (
 
-	"app/active/pullnew"
 
-	"app/config"
 
-	"jfw/public"
 
-	"qfw/util"
 
+	"jy/src/jfw/modules/app/src/app/active/pullnew"
 
+	"jy/src/jfw/modules/app/src/app/config"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type active struct {

+ 11 - 9
src/jfw/modules/app/src/app/active/pullnew/pullnew.go
Dosyayı Görüntüle 

@@ -1,17 +1,19 @@
 
 package pullnew
 
 
 import (
 
-	"app/config"
 
-	jconfig "jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/app/config"
 
+	jconfig "jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
-	"qfw/util"
 
 	"regexp"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 )
 
 
 type pullnew struct {
 
@@ -125,8 +127,8 @@ func (a *pullnew) Index() error {
 
 		}
 
 	}
 
 	a.T["hasHelp"] = hasHelp
 
-	a.T["shareNickName"] = util.SE.Encode2Hex(nickName)
 
-	a.T["shareInviteCode"] = util.SE.Encode2Hex(util.ObjToString(a.T["inviteCode"]))
 
+	a.T["shareNickName"] = encrypt.SE.Encode2Hex(nickName)
 
+	a.T["shareInviteCode"] = encrypt.SE.Encode2Hex(util.ObjToString(a.T["inviteCode"]))
 
 	return a.Render("/active/pullnew/index.html")
 
 }
 
 func (a *pullnew) HelpFriends() error {
 
@@ -204,8 +206,8 @@ func (a *pullnew) Share() {
 
 }
 
 
 func (a *pullnew) Invite() error {
 
-	a.T["nickName"] = util.SE.Decode4Hex(a.GetString("n"))
 
-	a.T["inviteCode"] = util.SE.Decode4Hex(a.GetString("i"))
 
+	a.T["nickName"] = encrypt.SE.Decode4Hex(a.GetString("n"))
 
+	a.T["inviteCode"] = encrypt.SE.Decode4Hex(a.GetString("i"))
 
 	a.T["source"] = a.GetString("t")
 
 	return a.Render("/active/pullnew/invite.html")
 
 }

+ 1 - 1
src/jfw/modules/app/src/app/config/active.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package config
 
 
 import (
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 var Active *active

+ 4 - 4
src/jfw/modules/app/src/app/filter/baseuserfilter.go
Dosyayı Görüntüle 

@@ -1,13 +1,13 @@
 
 package filter
 
 
 import (
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"log"
 
 	"net/http"
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 
-	"github.com/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type baseUserFilter struct {

+ 4 - 3
src/jfw/modules/app/src/app/filter/filter.go
Dosyayı Görüntüle 

@@ -2,12 +2,13 @@ package filter
 
 
 import (
 
 	"net/http"
 
-	"qfw/util"
 
-	fs "qfw/util/fsnotify"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 	"regexp"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	fs "app.yhyue.com/moapp/jybase/fsnotify"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 var RouteConf struct {

+ 2 - 2
src/jfw/modules/app/src/app/filter/logfilter.go
Dosyayı Görüntüle 

@@ -8,10 +8,10 @@ package filter
 
 
 import (
 
 	"encoding/json"
 
-	"jfw/public"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"log"
 
 	"net/http"
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 	"sync"
 
 	"time"
 
 )

+ 5 - 4
src/jfw/modules/app/src/app/filter/mergefilter.go
Dosyayı Görüntüle 

@@ -2,13 +2,14 @@ package filter
 
 
 import (
 
 	"fmt"
 
-	"jfw/public"
 
 	"log"
 
 	"net/http"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
 
-	"github.com/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 //用户合并删除用户检测

+ 11 - 9
src/jfw/modules/app/src/app/filter/phonefilter.go
Dosyayı Görüntüle 

@@ -2,18 +2,20 @@ package filter
 
 
 import (
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
-	"mongodb"
 
 	"net/http"
 
-	qu "qfw/util"
 
-	"qfw/util/redis"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/httpsession"
 
+	qu "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
 )
 
 
 type phoneFilter struct {
 
@@ -69,7 +71,7 @@ func (l *phoneFilter) Do() bool {
 
 			reg := time.Unix(regtime, 0)
 
 			//新用户时间
 
 			accountMergeOnline, _ := config.Sysconfig["accountMergeOnline"].(string)
 
-			onLineTime, _ := time.ParseInLocation(qu.Date_Full_Layout, accountMergeOnline, time.Local)
 
+			onLineTime, _ := time.ParseInLocation(Date_Full_Layout, accountMergeOnline, time.Local)
 
 			if remind, _ := (*person)["b_merge_remind"].(bool); remind { //不再提醒
 
 				return true
 
 			}
 
@@ -103,8 +105,8 @@ func (l *phoneFilter) Do() bool {
 
 
 //获取当天结束时间 单位秒
 
 func GetExpire() int {
 
-	t, _ := time.ParseInLocation(qu.Date_Short_Layout, time.Now().AddDate(0, 0, 1).Format(qu.Date_Short_Layout), time.Local)
 
-	t2, _ := time.ParseInLocation(qu.Date_Full_Layout, time.Now().Format(qu.Date_Full_Layout), time.Local)
 
+	t, _ := time.ParseInLocation(Date_Short_Layout, time.Now().AddDate(0, 0, 1).Format(Date_Short_Layout), time.Local)
 
+	t2, _ := time.ParseInLocation(Date_Full_Layout, time.Now().Format(Date_Full_Layout), time.Local)
 
 	return int(t.Unix() - t2.Unix())
 
 }

+ 15 - 13
src/jfw/modules/app/src/app/followent/followent.go
Dosyayı Görüntüle 

@@ -1,15 +1,17 @@
 
 package followent
 
 
 import (
 
-	"app/jylabutil"
 
-	"jfw/config"
 
-	"jfw/public"
 
-	. "mongodb"
 
-	"qfw/util"
 
+	"jy/src/jfw/modules/app/src/app/jylabutil"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"strconv"
 
 	"strings"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 var mongodb = public.MQFW
 
@@ -58,8 +60,8 @@ func (f *FollowEnt) GetEntList() {
 
 	flag := false
 
 	if ok && datas != nil && len(*datas) > 0 {
 
 		for _, v := range *datas {
 
-			v["_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
-			v["s_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId(v["s_id"]))
 
+			v["_id"] = encrypt.EncodeArticleId2ByCheck(BsonIdToSId(v["_id"]))
 
+			v["s_id"] = encrypt.EncodeArticleId2ByCheck(BsonIdToSId(v["s_id"]))
 
 			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
 
 				v["l_lastpushtime"] = v["l_createtime"]
 
 			}
 
@@ -83,7 +85,7 @@ func (f *FollowEnt) RecList() {
 
 	re := jylabutil.GetEenNameImmediate(entName, limit)
 
 	if re != nil && len(re) != 0 {
 
 		for _, v := range re {
 
-			v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 
+			v["_id"] = encrypt.EncodeArticleId2ByCheck(v["_id"].(string))
 
 		}
 
 		f.ServeJson(map[string]interface{}{
 
 			"recList": re,
 
@@ -97,7 +99,7 @@ func (f *FollowEnt) SaveEnt() {
 
 func (f *FollowEnt) Detail(followId string) error {
 
 	defer util.Catch()
 
 	userId := util.ObjToString(f.GetSession("userId"))
 
-	followId = util.DecodeArticleId2ByCheck(followId)[0]
 
+	followId = encrypt.DecodeArticleId2ByCheck(followId)[0]
 
 	winner := ""
 
 	var a_visited interface{}
 
 	oneQy := base.FindOne("follow_ent_monitor", map[string]interface{}{
 
@@ -120,7 +122,7 @@ func (f *FollowEnt) Detail(followId string) error {
 
 	winner = util.ObjToString((*oneQy)["s_entname"])
 
 	f.T["data"] = public.GetWinnerNewestDatas(winner)
 
 	f.T["winner"] = winner
 
-	f.T["_id"] = util.EncodeArticleId2ByCheck(followId)
 
+	f.T["_id"] = encrypt.EncodeArticleId2ByCheck(followId)
 
 	f.T["follow"] = follow
 
 	f.T["a_visited"] = a_visited
 
 	return f.Render("/followent/set.html", &f.T)
 
@@ -140,7 +142,7 @@ func (f *FollowEnt) NewInfo(param string) error {
 
 		if (*oneQy)["a_visited"] != nil {
 
 			a_visited = (*oneQy)["a_visited"]
 
 		}
 
-		f.T["_id"] = util.EncodeArticleId2ByCheck(BsonIdToSId((*oneQy)["_id"]))
 
+		f.T["_id"] = encrypt.EncodeArticleId2ByCheck(BsonIdToSId((*oneQy)["_id"]))
 
 	}
 
 	f.T["data"] = public.GetWinnerNewestDatas(winner)
 
 	f.T["winner"] = winner
 
@@ -172,7 +174,7 @@ func (f *FollowEnt) QgFollow() error {
 
 func (f *FollowEnt) Visited() error {
 
 	defer util.Catch()
 
 	id := f.GetString("id")
 
-	id = util.DecodeArticleId2ByCheck(id)[0]
 
+	id = encrypt.DecodeArticleId2ByCheck(id)[0]
 
 	mongodb.Update("jylab_followent", map[string]interface{}{"_id": id}, map[string]interface{}{
 
 		"$addToSet": map[string]interface{}{"a_visited": f.GetString("sid")},
 
 	}, false, false)

+ 7 - 6
src/jfw/modules/app/src/app/followent/myfwent.go
Dosyayı Görüntüle 

@@ -1,13 +1,14 @@
 
 package followent
 
 
 import (
 
-	"jfw/config"
 
-	"jfw/public"
 
-	"qfw/util"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -49,7 +50,7 @@ func (m *Myfwent) Addfwent() error {
 
 	}
 
 	m.ServeJson(map[string]interface{}{
 
 		"status":   status,
 
-		"followId": util.EncodeArticleId2ByCheck(followId),
 
+		"followId": encrypt.EncodeArticleId2ByCheck(followId),
 
 	})
 
 	return nil
 
 }
 
@@ -60,7 +61,7 @@ func (m *Myfwent) DelOvertimeCompany() error {
 
 	var ids []primitive.ObjectID
 
 	var flag = "F"
 
 	for _, chid := range strings.Split(m.GetString("arrid"), ",") {
 
-		_id, _ := primitive.ObjectIDFromHex(util.DecodeArticleId2ByCheck(chid)[0])
 
+		_id, _ := primitive.ObjectIDFromHex(encrypt.DecodeArticleId2ByCheck(chid)[0])
 
 		ids = append(ids, _id)
 
 	}
 
 	userId, _ := m.GetSession("userId").(string)

+ 1 - 1
src/jfw/modules/app/src/app/front/accountPage.go
Dosyayı Görüntüle 

@@ -2,7 +2,7 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //用户账户前端路由

+ 1 - 1
src/jfw/modules/app/src/app/front/areaPack.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type AreaPackAction struct {

+ 3 - 3
src/jfw/modules/app/src/app/front/bigMember.go
Dosyayı Görüntüle 

@@ -1,9 +1,9 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
-	"jfw/public"
 
-	"qfw/util/jy"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
 	"regexp"
 
 )

+ 2 - 2
src/jfw/modules/app/src/app/front/commonPay.go
Dosyayı Görüntüle 

@@ -3,9 +3,9 @@ package front
 
 import (
 
 	"errors"
 
 	"fmt"
 
-	"qfw/util"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 /*

+ 16 - 13
src/jfw/modules/app/src/app/front/conventionExhibition.go
Dosyayı Görüntüle 

@@ -2,14 +2,17 @@ package front
 
 
 import (
 
 	"fmt"
 
-	"github.com/go-xweb/xweb"
 
 	"html/template"
 
-	"jfw/config"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"math"
 
-	qutil "qfw/util"
 
 	"regexp"
 
 	"strings"
 
 	"time"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type ConventionExhibition struct {
 
@@ -35,7 +38,7 @@ func (m *ConventionExhibition) ExhibitionList() error {
 
 	}
 
 
 	for _, v := range *list {
 
-		v["_id"] = qutil.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
 
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
 
 		//图片 log
 
 		v["picture"] = qutil.InterfaceToStr(v["picture"])
 
 		//对开始时间、结束时间处理
 
@@ -43,10 +46,10 @@ func (m *ConventionExhibition) ExhibitionList() error {
 
 		et := qutil.Int64All(v["end_time"])
 
 		tm := time.Now()
 
 		startTime := time.Unix(st, 0)
 
-		//v["start_time"] = startTime.Format(qutil.Date_Short_Layout)
 
-		//v["end_time"] = time.Unix(et, 0).Format(qutil.Date_Short_Layout)
 
-		v["start_time"] = strings.Replace(startTime.Format(qutil.Date_Short_Layout), "-", ".", -1)
 
-		v["end_time"] = strings.Replace(time.Unix(et, 0).Format(qutil.Date_Short_Layout), "-", ".", -1)
 
+		//v["start_time"] = startTime.Format(Date_Short_Layout)
 
+		//v["end_time"] = time.Unix(et, 0).Format(Date_Short_Layout)
 
+		v["start_time"] = strings.Replace(startTime.Format(Date_Short_Layout), "-", ".", -1)
 
+		v["end_time"] = strings.Replace(time.Unix(et, 0).Format(Date_Short_Layout), "-", ".", -1)
 
 		v["picture"] = qutil.InterfaceToStr(config.Seoconfig["jyadd"]) + qutil.InterfaceToStr(v["picture"])
 
 		v["days"] = int(math.Ceil(startTime.Sub(tm).Hours() / 24))
 
 
@@ -69,7 +72,7 @@ func (m *ConventionExhibition) ExhibitionList() error {
 
 
 func (m *ConventionExhibition) ExhibitionDetails(ids string) error {
 
 	m.T["loginFlag"] = qutil.InterfaceToStr(m.GetSession("userId")) != ""
 
-	id := qutil.DecodeArticleId2ByCheck(ids)[0]
 
+	id := encrypt.DecodeArticleId2ByCheck(ids)[0]
 
 	data, ok := mongodb.FindById("exhibition_info", id, nil)
 
 	if data == nil || len(*data) == 0 || !ok {
 
 		return nil
 
@@ -109,10 +112,10 @@ func (m *ConventionExhibition) ExhibitionDetails(ids string) error {
 
 	et := qutil.Int64All((*data)["end_time"])
 
 	tm := time.Now()
 
 	startTime := time.Unix(st, 0)
 
-	//(*data)["start_time"] = startTime.Format(qutil.Date_Short_Layout)
 
-	//(*data)["end_time"] = time.Unix(et, 0).Format(qutil.Date_Short_Layout)
 
-	(*data)["start_time"] = strings.Replace(startTime.Format(qutil.Date_Short_Layout), "-", ".", -1)
 
-	(*data)["end_time"] = strings.Replace(time.Unix(et, 0).Format(qutil.Date_Short_Layout), "-", ".", -1)
 
+	//(*data)["start_time"] = startTime.Format(Date_Short_Layout)
 
+	//(*data)["end_time"] = time.Unix(et, 0).Format(Date_Short_Layout)
 
+	(*data)["start_time"] = strings.Replace(startTime.Format(Date_Short_Layout), "-", ".", -1)
 
+	(*data)["end_time"] = strings.Replace(time.Unix(et, 0).Format(Date_Short_Layout), "-", ".", -1)
 
 	(*data)["days"] = int(math.Ceil(startTime.Sub(tm).Hours() / 24))
 
 	if qutil.Int64All((*data)["status"]) != 3 {
 
 		if tm.Unix() < st {

+ 2 - 2
src/jfw/modules/app/src/app/front/course.go
Dosyayı Görüntüle 

@@ -1,8 +1,8 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
-	"qfw/util"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 // CourseInfo 课程相关接口-weixin

+ 7 - 5
src/jfw/modules/app/src/app/front/dataExport.go
Dosyayı Görüntüle 

@@ -3,14 +3,16 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"errors"
 
-	"jfw/public"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/dataexport"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -228,7 +230,7 @@ func (w *WxDataExport) SaveData() error {
 
 	if msgCount > 20000 {
 
 		msgCount = 20000
 
 	}
 
-	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id), "total": msgCount})
 
+	w.ServeJson(bson.M{"_id": encrypt.SE.Encode2Hex(_id), "total": msgCount})
 
 	return nil
 
 }

+ 1 - 1
src/jfw/modules/app/src/app/front/dataPackRouter.go
Dosyayı Görüntüle 

@@ -1,6 +1,6 @@
 
 package front
 
 
-import "github.com/go-xweb/xweb"
 
+import "app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 
 type DataPackRouter struct {
 
 	*xweb.Action

+ 5 - 4
src/jfw/modules/app/src/app/front/distrib.go
Dosyayı Görüntüle 

@@ -1,15 +1,16 @@
 
 package front
 
 
 import (
 
-	"app/jyutil"
 
 	"fmt"
 
+	"jy/src/jfw/modules/app/src/app/jyutil"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 // Distrib 分销系统 app跳转记录日志中转

+ 1 - 1
src/jfw/modules/app/src/app/front/entniche.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Entniche struct {

+ 3 - 3
src/jfw/modules/app/src/app/front/errLogsReceive.go
Dosyayı Görüntüle 

@@ -2,9 +2,9 @@ package front
 
 
 import (
 
 	"encoding/json"
 
-	"github.com/go-xweb/xweb"
 
-	"jfw/public"
 
-	qutil "qfw/util"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
 )
 
 
 type ErrLogServer struct {

+ 830 - 826
src/jfw/modules/app/src/app/front/follow.go
Dosyayı Görüntüle 

@@ -1,912 +1,916 @@
 
 package front
 
 
 import (
 
-    "app/jyutil"
 
-    "fmt"
 
-    "jfw/config"
 
-    "jfw/public"
 
-    "log"
 
-    . "mongodb"
 
-    "qfw/util"
 
-    "qfw/util/elastic"
 
-    "qfw/util/redis"
 
-    "qfw/util/rpc"
 
-    "strings"
 
-    "sync"
 
-    "time"
 
-
 
-    "github.com/pkg/errors"
 
-
 
-    "github.com/go-xweb/xweb"
 
-    "go.mongodb.org/mongo-driver/bson"
 
-    "go.mongodb.org/mongo-driver/bson/primitive"
 
+	"fmt"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
+	"log"
 
+	"strings"
 
+	"sync"
 
+	"time"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jypkg/jyutil"
 
+
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jybase/rpc"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"github.com/pkg/errors"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"go.mongodb.org/mongo-driver/bson"
 
+	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
 
 type Follow struct {
 
-    *xweb.Action
 
-    newList       xweb.Mapper `xweb:"/jyapp/follow/list"` //我关注的项目--项目关注表合并 临时调整
 
-    detail        xweb.Mapper `xweb:"/jyapp/follow/set/(\\w+)/([^.]*)"`
 
-    ajaxReq       xweb.Mapper `xweb:"/jyapp/follow/ajaxReq"` //关注项目ajax请求
 
-    getList       xweb.Mapper `xweb:"/jyapp/follow/getList"` //我关注的项目
 
-    add           xweb.Mapper `xweb:"/jyapp/follow/add"`     //添加关注项目
 
-    addsave       xweb.Mapper `xweb:"/jyapp/follow/addsave"`
 
-    notice        xweb.Mapper `xweb:"/jyapp/follow/notice/([^.]+)/([^.]*)"` //项目公告
 
-    allNotice     xweb.Mapper `xweb:"/jyapp/follow/allNotice"`              //项目公告/(.*)
 
-    visited       xweb.Mapper `xweb:"/jyapp/follow/notice/visited"`
 
-    photo         xweb.Mapper `xweb:"/jyapp/follow/photo/(.*)"`
 
-    fwsave        xweb.Mapper `xweb:"/jyapp/follow/fwsave"`
 
-    mylist        xweb.Mapper `xweb:"/jyapp/follow/mylist"`
 
-    checkFPStatus xweb.Mapper `xweb:"/jyapp/follow/checkFPStatus"`
 
-    checkCStatus  xweb.Mapper `xweb:"/jyapp/follow/checkCStatus"`
 
-    //list          xweb.Mapper `xweb:"/jyapp/follow/list"`    //我关注的项目
 
-    //set           xweb.Mapper `xweb:"/jyapp/follow/set/(\\w+)/([^.]*)"`
 
+	*xweb.Action
 
+	newList       xweb.Mapper `xweb:"/jyapp/follow/list"` //我关注的项目--项目关注表合并 临时调整
 
+	detail        xweb.Mapper `xweb:"/jyapp/follow/set/(\\w+)/([^.]*)"`
 
+	ajaxReq       xweb.Mapper `xweb:"/jyapp/follow/ajaxReq"` //关注项目ajax请求
 
+	getList       xweb.Mapper `xweb:"/jyapp/follow/getList"` //我关注的项目
 
+	add           xweb.Mapper `xweb:"/jyapp/follow/add"`     //添加关注项目
 
+	addsave       xweb.Mapper `xweb:"/jyapp/follow/addsave"`
 
+	notice        xweb.Mapper `xweb:"/jyapp/follow/notice/([^.]+)/([^.]*)"` //项目公告
 
+	allNotice     xweb.Mapper `xweb:"/jyapp/follow/allNotice"`              //项目公告/(.*)
 
+	visited       xweb.Mapper `xweb:"/jyapp/follow/notice/visited"`
 
+	photo         xweb.Mapper `xweb:"/jyapp/follow/photo/(.*)"`
 
+	fwsave        xweb.Mapper `xweb:"/jyapp/follow/fwsave"`
 
+	mylist        xweb.Mapper `xweb:"/jyapp/follow/mylist"`
 
+	checkFPStatus xweb.Mapper `xweb:"/jyapp/follow/checkFPStatus"`
 
+	checkCStatus  xweb.Mapper `xweb:"/jyapp/follow/checkCStatus"`
 
+	//list          xweb.Mapper `xweb:"/jyapp/follow/list"`    //我关注的项目
 
+	//set           xweb.Mapper `xweb:"/jyapp/follow/set/(\\w+)/([^.]*)"`
 
 }
 
 
 var followLimit int
 
 
 func init() {
 
-    xweb.AddAction(&Follow{})
 
-    followLimit = util.IntAllDef(config.Sysconfig["followProject"], 10)
 
+	xweb.AddAction(&Follow{})
 
+	followLimit = util.IntAllDef(config.Sysconfig["followProject"], 10)
 
 }
 
 
 //原关注项目详情页 到大会员项目关注列表页 此处涉及到项目推送
 
 func (m *Follow) Detail(tp, id string) error {
 
-    log.Println(tp, "--", id)
 
-    return m.Redirect("/jyapp/big/page/pro_follow_list")
 
+	log.Println(tp, "--", id)
 
+	return m.Redirect("/jyapp/big/page/pro_follow_list")
 
 }
 
 
 //非大会员用户访问关注项目-->访问大会员的项目管理路由
 
 func (m *Follow) NewList() error {
 
-    return m.Redirect("/jyapp/big/page/pro_follow_list")
 
+	return m.Redirect("/jyapp/big/page/pro_follow_list")
 
 }
 
 
 //
 
 func (m *Follow) CheckFPStatus() error {
 
-    defer util.Catch()
 
-    s_id := util.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
-    userId, _ := m.GetSession("userId").(string)
 
-    follows := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}, "_id", "")
 
-    flag := "f"
 
-    if follows != nil && *follows != nil && len(*follows) > 0 {
 
-        flag = "t"
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "flag": flag,
 
-    })
 
-    return nil
 
+	defer util.Catch()
 
+	s_id := encrypt.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
+	userId, _ := m.GetSession("userId").(string)
 
+	follows := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}, "_id", "")
 
+	flag := "f"
 
+	if follows != nil && *follows != nil && len(*follows) > 0 {
 
+		flag = "t"
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"flag": flag,
 
+	})
 
+	return nil
 
 }
 
 
 func (m *Follow) CheckCStatus() error {
 
-    defer util.Catch()
 
-    flag := false
 
-    followid := ""
 
-    if m.GetString("s_id") != "" {
 
-        sid := util.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
-
 
-        userId, _ := m.GetSession("userId").(string)
 
-        if userId != "" {
 
-            flag, followid = MFollow(userId, sid)
 
-        }
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "flag":     flag,
 
-        "followid": followid,
 
-    })
 
-    return nil
 
+	defer util.Catch()
 
+	flag := false
 
+	followid := ""
 
+	if m.GetString("s_id") != "" {
 
+		sid := encrypt.DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
 
+
 
+		userId, _ := m.GetSession("userId").(string)
 
+		if userId != "" {
 
+			flag, followid = MFollow(userId, sid)
 
+		}
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"flag":     flag,
 
+		"followid": followid,
 
+	})
 
+	return nil
 
 }
 
 
 //
 
 func (m *Follow) Mylist() {
 
-    defer util.Catch()
 
-    id := m.GetString("id")
 
-    id = util.DecodeArticleId2ByCheck(id)[0]
 
-    var flag = "F"
 
-    res := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"id": id}, "", "")
 
-    if res != nil && len(*res) > 0 {
 
-        flag = "T"
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "flag": flag,
 
-    })
 
+	defer util.Catch()
 
+	id := m.GetString("id")
 
+	id = encrypt.DecodeArticleId2ByCheck(id)[0]
 
+	var flag = "F"
 
+	res := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{"id": id}, "", "")
 
+	if res != nil && len(*res) > 0 {
 
+		flag = "T"
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"flag": flag,
 
+	})
 
 }
 
 
 //关注列表关注
 
 func (m *Follow) Fwsave() {
 
-    defer util.Catch()
 
-    userId := m.GetSession("userId").(string)
 
-    var status = "n"
 
-    var followId string
 
-    s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
-    if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId}) >= util.Int64All(followLimit) {
 
-        status = "m"
 
-    } else if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}) > 0 {
 
-        status = "e"
 
-    } else {
 
-        data := make(map[string]interface{})
 
-        if remind, _ := m.GetInteger("remind"); remind == 1 {
 
-            data["i_remind"] = 1
 
-        } else {
 
-            data["i_remind"] = 0
 
-        }
 
-        if bidopentime, err := m.GetInt("bidopentime"); err == nil {
 
-            data["l_bidopentime"] = bidopentime
 
-        }
 
-        if remindtime, err := m.GetInt("remindtime"); err == nil {
 
-            data["l_remindtime"] = remindtime
 
-        }
 
-        projectname := m.GetString("projectname")
 
-        //data["s_projectname"] = projectname
 
-        data["s_userid"] = userId
 
-        data["l_createtime"] = time.Now().Unix()
 
-        data["s_title"] = projectname
 
-        data["s_id"] = s_id
 
-        //data["i_source"] = 3
 
-        //data["toptype"] = "招标"
 
-        fields := `"title","comeintime","bidopentime","projectcode","type","href","publishtime","area","subtype","toptype","industry","s_subscopeclass"`
 
-        res := elastic.GetByIdField("bidding", "bidding", s_id, fields)
 
-        if res != nil {
 
-            //	projectUserKey = []string{"s_id", "s_userid", "i_remind", "l_createtime", "l_lastpushtime", "a_visited", "info_source", "s_title", "i_apppushunread", "l_bidopentime", "l_remindtime", "old_id"}
 
-            data["s_title"] = (*res)["title"]
 
-            //data["l_publishtime"] = (*res)["publishtime"]
 
-            data["l_comeintime"] = (*res)["comeintime"]
 
-            if data["l_bidopentime"] == "" {
 
-                data["l_bidopentime"] = (*res)["bidopentime"]
 
-            }
 
-
 
-            projectcode, _ := (*res)["projectcode"].(string)
 
-            if id := public.BaseMysql.Insert("follow_project_monitor", data); id > 0 {
 
-                followId = util.InterfaceToStr(id)
 
-                status = "y"
 
-                go public.FollowPush(&rpc.FollowPush{
 
-                    ProjectName: projectname,
 
-                    ProjectCode: projectcode,
 
-                    InfoId:      s_id,
 
-                    FollowId:    followId,
 
-                    UserId:      userId,
 
-                })
 
-            }
 
-        }
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "status":   status,
 
-        "followId": util.EncodeArticleId2ByCheck(followId),
 
-        "infoId":   util.EncodeArticleId2ByCheck(s_id),
 
-    })
 
+	defer util.Catch()
 
+	userId := m.GetSession("userId").(string)
 
+	var status = "n"
 
+	var followId string
 
+	s_id := encrypt.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId}) >= util.Int64All(followLimit) {
 
+		status = "m"
 
+	} else if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}) > 0 {
 
+		status = "e"
 
+	} else {
 
+		data := make(map[string]interface{})
 
+		if remind, _ := m.GetInteger("remind"); remind == 1 {
 
+			data["i_remind"] = 1
 
+		} else {
 
+			data["i_remind"] = 0
 
+		}
 
+		if bidopentime, err := m.GetInt("bidopentime"); err == nil {
 
+			data["l_bidopentime"] = bidopentime
 
+		}
 
+		if remindtime, err := m.GetInt("remindtime"); err == nil {
 
+			data["l_remindtime"] = remindtime
 
+		}
 
+		projectname := m.GetString("projectname")
 
+		//data["s_projectname"] = projectname
 
+		data["s_userid"] = userId
 
+		data["l_createtime"] = time.Now().Unix()
 
+		data["s_title"] = projectname
 
+		data["s_id"] = s_id
 
+		//data["i_source"] = 3
 
+		//data["toptype"] = "招标"
 
+		fields := `"title","comeintime","bidopentime","projectcode","type","href","publishtime","area","subtype","toptype","industry","s_subscopeclass"`
 
+		res := elastic.GetByIdField("bidding", "bidding", s_id, fields)
 
+		if res != nil {
 
+			//	projectUserKey = []string{"s_id", "s_userid", "i_remind", "l_createtime", "l_lastpushtime", "a_visited", "info_source", "s_title", "i_apppushunread", "l_bidopentime", "l_remindtime", "old_id"}
 
+			data["s_title"] = (*res)["title"]
 
+			//data["l_publishtime"] = (*res)["publishtime"]
 
+			data["l_comeintime"] = (*res)["comeintime"]
 
+			if data["l_bidopentime"] == "" {
 
+				data["l_bidopentime"] = (*res)["bidopentime"]
 
+			}
 
+
 
+			projectcode, _ := (*res)["projectcode"].(string)
 
+			if id := public.BaseMysql.Insert("follow_project_monitor", data); id > 0 {
 
+				followId = util.InterfaceToStr(id)
 
+				status = "y"
 
+				go public.FollowPush(&rpc.FollowPush{
 
+					ProjectName: projectname,
 
+					ProjectCode: projectcode,
 
+					InfoId:      s_id,
 
+					FollowId:    followId,
 
+					UserId:      userId,
 
+				})
 
+			}
 
+		}
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"status":   status,
 
+		"followId": encrypt.EncodeArticleId2ByCheck(followId),
 
+		"infoId":   encrypt.EncodeArticleId2ByCheck(s_id),
 
+	})
 
 }
 
 
 //未关注项目
 
 func (m *Follow) Photo(tp string) error {
 
-    defer util.Catch()
 
-    followid := ""
 
-    tpm := strings.Split(tp, "__")
 
-    projectname := tpm[1]
 
-    projectcode := tpm[2]
 
-    userId, _ := m.GetSession("userId").(string)
 
-    if userId != "" {
 
-        _, followid = MFollow(userId, tp)
 
-    }
 
-    //已关注
 
-    if followid != "" {
 
-        id := util.DecodeArticleId2ByCheck(followid)[0]
 
-        fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
-        _id, _ := primitive.ObjectIDFromHex(id)
 
-        data, ok := mongodb.FindOneByField("follow_project", map[string]interface{}{
 
-            "_id":      _id,
 
-            "s_userid": m.GetSession("userId").(string),
 
-        }, fields)
 
-        m.T["isDel"] = false
 
-        if ok && (data == nil || len(*data) == 0) {
 
-            data, ok = mongodb.FindOneByField("follow_project_back", `{"s_followid":"`+id+`"}`, fields)
 
-            m.T["isDel"] = true
 
-        }
 
-        if !ok || data == nil || len(*data) == 0 {
 
-            return m.Redirect("/jyapp/free/mob/err")
 
-        }
 
-        sid, _ := (*data)["s_id"].(string)
 
-        m.T["_id"] = followid
 
-        m.T["sid"] = util.EncodeArticleId2ByCheck(sid)
 
-        m.T["source"] = (*data)["i_source"]
 
-        m.T["projectname"] = (*data)["s_projectname"]
 
-        m.T["projectcode"] = (*data)["s_projectcode"]
 
-        m.T["url"] = (*data)["s_url"]
 
-        m.T["remind"] = (*data)["i_remind"]
 
-        m.T["type"] = (*data)["s_type"]
 
-        if sid != "" {
 
-            info := elastic.GetByIdField("bidding", "bidding", sid, `"type","subtype","toptype"`)
 
-            info_ok := info != nil && len(*info) != 0
 
-            if info_ok {
 
-                m.T["subtype"] = (*info)["subtype"]
 
-                m.T["toptype"] = (*info)["toptype"]
 
-                m.T["type"] = (*data)["type"]
 
-            }
 
-        }
 
-        res := util.ObjArrToMapArr((*data)["a_relationinfo"].([]interface{}))
 
-        if len(res) > 0 {
 
-            for _, v := range res {
 
-                v["s_id"] = ""
 
-            }
 
-            m.T["relationinfo"] = res
 
-        }
 
-        m.T["a_visited"] = (*data)["a_visited"]
 
-        m.T["l_lastpushtime"] = (*data)["l_lastpushtime"]
 
-        m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
-        l_bidopentime := (*data)["l_bidopentime"]
 
-        if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-            m.T["bidopentime"] = util.FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
-            m.T["l_bidopentime"] = l_bidopentime
 
-        }
 
-        if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
-            m.T["remindtime"] = util.FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
-            m.T["l_remindtime"] = l_remindtime
 
-        } else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-            date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
-            m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
-            m.T["l_remindtime"] = date.Unix()
 
-        }
 
-    } else { //未关注
 
-        id := util.DecodeArticleId2ByCheck(tpm[0])[0]
 
-        m.T["projectname"] = projectname
 
-        m.T["projectcode"] = projectcode
 
-        fields := `"_id","title","comeintime","projectcode","projectname","bidopentime","projectcode","area","toptype","subtype","type","href","publishtime","area","industry","s_subscopeclass"`
 
-        data := elastic.GetByIdField("bidding", "bidding", id, fields)
 
-        mySelf := make(bson.M)
 
-        if data != nil && len(*data) > 0 {
 
-            mySelf["s_projectname"] = projectname
 
-            mySelf["s_title"] = (*data)["title"]
 
-            mySelf["type"] = (*data)["type"]
 
-            mySelf["subtype"] = (*data)["subtype"]
 
-            mySelf["toptype"] = (*data)["toptype"]
 
-            mySelf["area"] = (*data)["area"]
 
-            mySelf["s_projectcode"] = projectcode
 
-            mySelf["s_url"] = (*data)["href"]
 
-            mySelf["s_id"] = "" //id
 
-            mySelf["s_eid"] = util.EncodeArticleId2ByCheck(id)
 
-            mySelf["l_publishtime"] = (*data)["publishtime"]
 
-            if (*data)["industry"] == nil && (*data)["s_subscopeclass"] != nil {
 
-                ind := strings.Split(util.ObjToString((*data)["s_subscopeclass"]), ",")[0]
 
-                (*data)["industry"] = strings.Split(ind, "_")[0]
 
-                mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
-            }
 
-            ////////////////////////
 
-            bidopentime := (*data)["bidopentime"]
 
-            if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
-                m.T["bidopentime"] = util.FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
-                m.T["l_bidopentime"] = bidopentime
 
-            }
 
-            if remindtime := (*data)["remindtime"]; remindtime != nil && remindtime != "" && util.Int64All(remindtime) != 0 {
 
-                m.T["remindtime"] = util.FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
-                m.T["l_remindtime"] = remindtime
 
-            } else if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
-                date := time.Unix(util.Int64All(bidopentime), 0).AddDate(0, 0, -1)
 
-                m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
-                m.T["l_remindtime"] = date.Unix()
 
-            }
 
-            m.T["type"] = (*data)["type"]
 
-            m.T["subtype"] = (*data)["subtype"]
 
-            m.T["toptype"] = (*data)["toptype"]
 
-            m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
-        }
 
-        if len(projectname) > 0 || len(projectcode) > 0 {
 
-            res, _ := public.FollowPush(&rpc.FollowPush{
 
-                ProjectName: projectname,
 
-                ProjectCode: projectcode,
 
-                InfoId:      id,
 
-                FollowId:    "",
 
-                UserId:      m.GetSession("userId").(string),
 
-                Flag:        1,
 
-            })
 
-            if len(res) > 0 {
 
-                for _, v := range res {
 
-                    (*v)["s_eid"] = util.EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
-                    (*v)["s_id"] = ""
 
-                }
 
-                m.T["data"] = res
 
-            }
 
-        }
 
-        m.T["id"] = util.EncodeArticleId2ByCheck(id)
 
-        m.T["mySelf"] = mySelf
 
-        m.T["source"] = 1
 
-    }
 
-    return m.Render("/weixin/follow/set.html", &m.T)
 
+	defer util.Catch()
 
+	followid := ""
 
+	tpm := strings.Split(tp, "__")
 
+	projectname := tpm[1]
 
+	projectcode := tpm[2]
 
+	userId, _ := m.GetSession("userId").(string)
 
+	if userId != "" {
 
+		_, followid = MFollow(userId, tp)
 
+	}
 
+	//已关注
 
+	if followid != "" {
 
+		id := encrypt.DecodeArticleId2ByCheck(followid)[0]
 
+		fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
+		_id, _ := primitive.ObjectIDFromHex(id)
 
+		data, ok := mongodb.FindOneByField("follow_project", map[string]interface{}{
 
+			"_id":      _id,
 
+			"s_userid": m.GetSession("userId").(string),
 
+		}, fields)
 
+		m.T["isDel"] = false
 
+		if ok && (data == nil || len(*data) == 0) {
 
+			data, ok = mongodb.FindOneByField("follow_project_back", `{"s_followid":"`+id+`"}`, fields)
 
+			m.T["isDel"] = true
 
+		}
 
+		if !ok || data == nil || len(*data) == 0 {
 
+			return m.Redirect("/jyapp/free/mob/err")
 
+		}
 
+		sid, _ := (*data)["s_id"].(string)
 
+		m.T["_id"] = followid
 
+		m.T["sid"] = encrypt.EncodeArticleId2ByCheck(sid)
 
+		m.T["source"] = (*data)["i_source"]
 
+		m.T["projectname"] = (*data)["s_projectname"]
 
+		m.T["projectcode"] = (*data)["s_projectcode"]
 
+		m.T["url"] = (*data)["s_url"]
 
+		m.T["remind"] = (*data)["i_remind"]
 
+		m.T["type"] = (*data)["s_type"]
 
+		if sid != "" {
 
+			info := elastic.GetByIdField("bidding", "bidding", sid, `"type","subtype","toptype"`)
 
+			info_ok := info != nil && len(*info) != 0
 
+			if info_ok {
 
+				m.T["subtype"] = (*info)["subtype"]
 
+				m.T["toptype"] = (*info)["toptype"]
 
+				m.T["type"] = (*data)["type"]
 
+			}
 
+		}
 
+		res := util.ObjArrToMapArr((*data)["a_relationinfo"].([]interface{}))
 
+		if len(res) > 0 {
 
+			for _, v := range res {
 
+				v["s_id"] = ""
 
+			}
 
+			m.T["relationinfo"] = res
 
+		}
 
+		m.T["a_visited"] = (*data)["a_visited"]
 
+		m.T["l_lastpushtime"] = (*data)["l_lastpushtime"]
 
+		m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
+		l_bidopentime := (*data)["l_bidopentime"]
 
+		if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
+			m.T["bidopentime"] = FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
+			m.T["l_bidopentime"] = l_bidopentime
 
+		}
 
+		if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
+			m.T["remindtime"] = FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
+			m.T["l_remindtime"] = l_remindtime
 
+		} else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
+			date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
+			m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+			m.T["l_remindtime"] = date.Unix()
 
+		}
 
+	} else { //未关注
 
+		id := encrypt.DecodeArticleId2ByCheck(tpm[0])[0]
 
+		m.T["projectname"] = projectname
 
+		m.T["projectcode"] = projectcode
 
+		fields := `"_id","title","comeintime","projectcode","projectname","bidopentime","projectcode","area","toptype","subtype","type","href","publishtime","area","industry","s_subscopeclass"`
 
+		data := elastic.GetByIdField("bidding", "bidding", id, fields)
 
+		mySelf := make(bson.M)
 
+		if data != nil && len(*data) > 0 {
 
+			mySelf["s_projectname"] = projectname
 
+			mySelf["s_title"] = (*data)["title"]
 
+			mySelf["type"] = (*data)["type"]
 
+			mySelf["subtype"] = (*data)["subtype"]
 
+			mySelf["toptype"] = (*data)["toptype"]
 
+			mySelf["area"] = (*data)["area"]
 
+			mySelf["s_projectcode"] = projectcode
 
+			mySelf["s_url"] = (*data)["href"]
 
+			mySelf["s_id"] = "" //id
 
+			mySelf["s_eid"] = encrypt.EncodeArticleId2ByCheck(id)
 
+			mySelf["l_publishtime"] = (*data)["publishtime"]
 
+			if (*data)["industry"] == nil && (*data)["s_subscopeclass"] != nil {
 
+				ind := strings.Split(util.ObjToString((*data)["s_subscopeclass"]), ",")[0]
 
+				(*data)["industry"] = strings.Split(ind, "_")[0]
 
+				mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
+			}
 
+			////////////////////////
 
+			bidopentime := (*data)["bidopentime"]
 
+			if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
+				m.T["bidopentime"] = FormatDateWithObj(&bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(bidopentime), 0).Weekday().String())
 
+				m.T["l_bidopentime"] = bidopentime
 
+			}
 
+			if remindtime := (*data)["remindtime"]; remindtime != nil && remindtime != "" && util.Int64All(remindtime) != 0 {
 
+				m.T["remindtime"] = FormatDateWithObj(&remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(remindtime), 0).Weekday().String())
 
+				m.T["l_remindtime"] = remindtime
 
+			} else if bidopentime != nil && bidopentime != "" && util.Int64All(bidopentime) != 0 {
 
+				date := time.Unix(util.Int64All(bidopentime), 0).AddDate(0, 0, -1)
 
+				m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+				m.T["l_remindtime"] = date.Unix()
 
+			}
 
+			m.T["type"] = (*data)["type"]
 
+			m.T["subtype"] = (*data)["subtype"]
 
+			m.T["toptype"] = (*data)["toptype"]
 
+			m.T["a_lastpushids"] = (*data)["a_lastpushids"]
 
+		}
 
+		if len(projectname) > 0 || len(projectcode) > 0 {
 
+			res, _ := public.FollowPush(&rpc.FollowPush{
 
+				ProjectName: projectname,
 
+				ProjectCode: projectcode,
 
+				InfoId:      id,
 
+				FollowId:    "",
 
+				UserId:      m.GetSession("userId").(string),
 
+				Flag:        1,
 
+			})
 
+			if len(res) > 0 {
 
+				for _, v := range res {
 
+					(*v)["s_eid"] = encrypt.EncodeArticleId2ByCheck((*v)["s_id"].(string))
 
+					(*v)["s_id"] = ""
 
+				}
 
+				m.T["data"] = res
 
+			}
 
+		}
 
+		m.T["id"] = encrypt.EncodeArticleId2ByCheck(id)
 
+		m.T["mySelf"] = mySelf
 
+		m.T["source"] = 1
 
+	}
 
+	return m.Render("/weixin/follow/set.html", &m.T)
 
 }
 
 
 //关注项目相关的ajax请求
 
 func (m *Follow) AjaxReq() {
 
-    defer util.Catch()
 
-    userId := m.GetSession("userId").(string)
 
-    var status = "n"
 
-    reqType := m.GetString("reqType")
 
-    var followId string
 
-    if reqType == "follow" { //快照页面关注
 
-        s_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
-        query := map[string]interface{}{
 
-            "s_userid": userId,
 
-        }
 
-        if public.BaseMysql.Count("follow_project_monitor", query) >= util.Int64All(followLimit) {
 
-            status = "m"
 
-        } else if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}) > 0 {
 
-            status = "e"
 
-        } else {
 
-            //publishtime, _ := m.GetInt("publishtime")
 
-            projectname := m.GetString("projectname")
 
-            projectcode := m.GetString("projectcode")
 
-            //url := m.GetString("url")
 
-            title := m.GetString("title")
 
-            //area := m.GetString("area")
 
-            //subtype := m.GetString("subtype")
 
-            //toptype := m.GetString("toptype")
 
-            //s_type := m.GetString("type")
 
-            //s_industry := m.GetString("industry")
 
-            if projectname != "" || projectcode != "" {
 
-                data := map[string]interface{}{
 
-                    "s_userid": userId,
 
-                    "s_id":     s_id,
 
-                    //"s_url":         url,
 
-                    "s_title":      title,
 
-                    "l_createtime": time.Now().Unix(),
 
-                    "i_remind":     0,
 
-                    //"l_publishtime": publishtime,
 
-                    //"i_source":      1,
 
-                    //"s_province":    area,
 
-                    //"s_area":        area,
 
-                    //"s_type":        s_type,
 
-                    //"s_industry":    s_industry,
 
-                    //"toptype":       "招标",
 
-                }
 
-                /*if comeintime, err := m.GetInt("comeintime"); err == nil {
 
-                  	data["l_comeintime"] = comeintime
 
-                  }
 
-                  if s_type := m.GetString("type"); s_type != "" {
 
-                  	data["s_type"] = s_type
 
-                  }
 
-                  if projectname != "" {
 
-                  	data["s_projectname"] = projectname
 
-                  } else {
 
-                  	data["s_projectname"] = title
 
-                  }
 
-                  if projectcode != "" {
 
-                  	data["s_projectcode"] = projectcode
 
-                  }*/
 
-                if bidopentime, err := m.GetInt("bidopentime"); err == nil && bidopentime > 0 {
 
-                    data["l_bidopentime"] = bidopentime
 
-                }
 
-
 
-                if followId = util.InterfaceToStr(public.BaseMysql.Insert("follow_project_monitor", data)); len(followId) > 0 {
 
-                    status = "y"
 
-                    go public.FollowPush(&rpc.FollowPush{
 
-                        ProjectName: projectname,
 
-                        ProjectCode: projectcode,
 
-                        InfoId:      s_id,
 
-                        FollowId:    followId,
 
-                        UserId:      userId,
 
-                    })
 
-                }
 
-            }
 
-        }
 
-    } else if reqType == "cancel" { //取消关注
 
-        query := map[string]interface{}{
 
-            "s_userid": userId,
 
-            "id":       util.DecodeArticleId2ByCheck(m.GetString("_id"))[0],
 
-        }
 
-        if data := public.BaseMysql.FindOne("follow_project_monitor", query, "", ""); data != nil {
 
-            (*data)["s_followid"] = util.InterfaceToStr((*data)["id"])
 
-            delete(*data, "id")
 
-            (*data)["i_status"] = 1
 
-            mongodb.Save("follow_project_monitor_back", data)
 
-            if public.BaseMysql.Delete("follow_project_monitor", query) {
 
-                status = "y"
 
-                go delRelRedis((*data)["s_userid"], []interface{}{(*data)["s_id"]})
 
-            }
 
-        }
 
-    } else if reqType == "followset" {
 
-        id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
-        if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"id": id, "s_userid": userId}) == 1 {
 
-
 
-            data := make(map[string]interface{})
 
-            data["l_updatetime"] = time.Now().Unix()
 
-            if remind, _ := m.GetInteger("remind"); remind == 1 {
 
-                data["i_remind"] = 1
 
-            } else {
 
-                data["i_remind"] = 0
 
-            }
 
-            if bidopentime, err := m.GetInt("bidopentime"); err == nil {
 
-                data["l_bidopentime"] = bidopentime
 
-            }
 
-            if remindtime, err := m.GetInt("remindtime"); err == nil {
 
-                data["l_remindtime"] = remindtime
 
-            }
 
-            if public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"id": id}, data) {
 
-                status = "y"
 
-            }
 
-        }
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "status":   status,
 
-        "followId": util.EncodeArticleId2ByCheck(followId),
 
-    })
 
+	defer util.Catch()
 
+	userId := m.GetSession("userId").(string)
 
+	var status = "n"
 
+	reqType := m.GetString("reqType")
 
+	var followId string
 
+	if reqType == "follow" { //快照页面关注
 
+		s_id := encrypt.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		query := map[string]interface{}{
 
+			"s_userid": userId,
 
+		}
 
+		if public.BaseMysql.Count("follow_project_monitor", query) >= util.Int64All(followLimit) {
 
+			status = "m"
 
+		} else if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"s_userid": userId, "s_id": s_id}) > 0 {
 
+			status = "e"
 
+		} else {
 
+			//publishtime, _ := m.GetInt("publishtime")
 
+			projectname := m.GetString("projectname")
 
+			projectcode := m.GetString("projectcode")
 
+			//url := m.GetString("url")
 
+			title := m.GetString("title")
 
+			//area := m.GetString("area")
 
+			//subtype := m.GetString("subtype")
 
+			//toptype := m.GetString("toptype")
 
+			//s_type := m.GetString("type")
 
+			//s_industry := m.GetString("industry")
 
+			if projectname != "" || projectcode != "" {
 
+				data := map[string]interface{}{
 
+					"s_userid": userId,
 
+					"s_id":     s_id,
 
+					//"s_url":         url,
 
+					"s_title":      title,
 
+					"l_createtime": time.Now().Unix(),
 
+					"i_remind":     0,
 
+					//"l_publishtime": publishtime,
 
+					//"i_source":      1,
 
+					//"s_province":    area,
 
+					//"s_area":        area,
 
+					//"s_type":        s_type,
 
+					//"s_industry":    s_industry,
 
+					//"toptype":       "招标",
 
+				}
 
+				/*if comeintime, err := m.GetInt("comeintime"); err == nil {
 
+				  	data["l_comeintime"] = comeintime
 
+				  }
 
+				  if s_type := m.GetString("type"); s_type != "" {
 
+				  	data["s_type"] = s_type
 
+				  }
 
+				  if projectname != "" {
 
+				  	data["s_projectname"] = projectname
 
+				  } else {
 
+				  	data["s_projectname"] = title
 
+				  }
 
+				  if projectcode != "" {
 
+				  	data["s_projectcode"] = projectcode
 
+				  }*/
 
+				if bidopentime, err := m.GetInt("bidopentime"); err == nil && bidopentime > 0 {
 
+					data["l_bidopentime"] = bidopentime
 
+				}
 
+
 
+				if followId = util.InterfaceToStr(public.BaseMysql.Insert("follow_project_monitor", data)); len(followId) > 0 {
 
+					status = "y"
 
+					go public.FollowPush(&rpc.FollowPush{
 
+						ProjectName: projectname,
 
+						ProjectCode: projectcode,
 
+						InfoId:      s_id,
 
+						FollowId:    followId,
 
+						UserId:      userId,
 
+					})
 
+				}
 
+			}
 
+		}
 
+	} else if reqType == "cancel" { //取消关注
 
+		query := map[string]interface{}{
 
+			"s_userid": userId,
 
+			"id":       encrypt.DecodeArticleId2ByCheck(m.GetString("_id"))[0],
 
+		}
 
+		if data := public.BaseMysql.FindOne("follow_project_monitor", query, "", ""); data != nil {
 
+			(*data)["s_followid"] = util.InterfaceToStr((*data)["id"])
 
+			delete(*data, "id")
 
+			(*data)["i_status"] = 1
 
+			mongodb.Save("follow_project_monitor_back", data)
 
+			if public.BaseMysql.Delete("follow_project_monitor", query) {
 
+				status = "y"
 
+				go delRelRedis((*data)["s_userid"], []interface{}{(*data)["s_id"]})
 
+			}
 
+		}
 
+	} else if reqType == "followset" {
 
+		id := encrypt.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+		if public.BaseMysql.Count("follow_project_monitor", map[string]interface{}{"id": id, "s_userid": userId}) == 1 {
 
+
 
+			data := make(map[string]interface{})
 
+			data["l_updatetime"] = time.Now().Unix()
 
+			if remind, _ := m.GetInteger("remind"); remind == 1 {
 
+				data["i_remind"] = 1
 
+			} else {
 
+				data["i_remind"] = 0
 
+			}
 
+			if bidopentime, err := m.GetInt("bidopentime"); err == nil {
 
+				data["l_bidopentime"] = bidopentime
 
+			}
 
+			if remindtime, err := m.GetInt("remindtime"); err == nil {
 
+				data["l_remindtime"] = remindtime
 
+			}
 
+			if public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"id": id}, data) {
 
+				status = "y"
 
+			}
 
+		}
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"status":   status,
 
+		"followId": encrypt.EncodeArticleId2ByCheck(followId),
 
+	})
 
 }
 
 
 //我关注的项目
 
 func (m *Follow) List() error {
 
-    m.T["followLimit"] = followLimit
 
-    return m.Render("/weixin/follow/list.html", &m.T)
 
+	m.T["followLimit"] = followLimit
 
+	return m.Render("/weixin/follow/list.html", &m.T)
 
 }
 
 func (m *Follow) GetList() {
 
-    userId := util.ObjToString(m.Session().Get("userId"))
 
-    if userId == "" {
 
-        log.Println("查询我关注的项目出错，userid为空")
 
-    }
 
-    log.Println(userId, "---", util.IntAll(config.Sysconfig["followProject"]))
 
-    datas := public.BaseMysql.SelectBySql(`SELECT * FROM follow_project_monitor WHERE s_userid =? ORDER BY l_lastpushtime,l_createtime DESC LIMIT 0,?`, userId, util.IntAll(config.Sysconfig["followProject"]))
 
-    log.Println("datas:", datas)
 
-    //datas, ok := mongodb.Find("follow_project", `{"s_userid":"`+userId+`"}`, `{"l_lastpushtime":-1,"l_createtime":-1}`, `{"s_projectname":1,"s_projectcode":1,"i_remind":1,"l_lastpushtime":1,"l_createtime":1,"s_industry":1,"s_area":1,i_apppushunread":1}`, false, -1, -1)
 
-    flag := false
 
-    var followData []map[string]interface{}
 
-    if datas != nil && len(*datas) > 0 {
 
-        sidArr := []string{}
 
-        followSetting := map[string]map[string]interface{}{}
 
-        for _, followOne := range *datas {
 
-            sid := util.ObjToString(followOne["s_id"])
 
-            if followOne["l_lastpushtime"] != nil && util.ObjToString(followOne["l_lastpushtime"]) != "" {
 
-                followOne["l_createtime"] = followOne["l_lastpushtime"]
 
-            } else if followOne["l_lastpushtime"] == nil {
 
-                followOne["l_lastpushtime"] = followOne["l_createtime"]
 
-            }
 
-            sidArr = append(sidArr, sid)
 
-            followSetting[sid] = followOne
 
-        }
 
-
 
-        projectInfos := []map[string]interface{}{}
 
-        pool := make(chan bool, 10)
 
-        wait := &sync.WaitGroup{}
 
-        var lock sync.Mutex
 
-        for _, v := range SplitArray(sidArr, 50) {
 
-            pool <- true
 
-            wait.Add(1)
 
-            go func(arr []string) error {
 
-                defer func() {
 
-                    wait.Done()
 
-                    <-pool
 
-                }()
 
-                //es查询
 
-                projectInfos_, err := getProjectsBySid(arr)
 
-                lock.Lock()
 
-                projectInfos = append(projectInfos, projectInfos_...)
 
-                lock.Unlock()
 
-                if err != nil {
 
-                    err = errors.New("项目信息查询异常")
 
-                    return err
 
-                }
 
-                return nil
 
-            }(v)
 
-        }
 
-        wait.Wait()
 
-
 
-        for _, projectinfo := range projectInfos { //补充设置信息
 
-            for _, k := range util.ObjArrToStringArr(projectinfo["ids"].([]interface{})) {
 
-                if info, ok := followSetting[k]; ok {
 
-                    info["s_area"] = projectinfo["area"]
 
-                    info["s_buyerclass"] = projectinfo["buyerclass"]
 
-                    info["s_budget"] = util.Float64All(projectinfo["budget"])
 
-                    info["s_title"] = projectinfo["projectname"]
 
-                    info["s_projectname"] = projectinfo["projectname"]
 
-                    info["toptype"] = projectinfo["bidstatus"]
 
-                    info["s_projectcode"] = projectinfo["projectcode"]
 
-                    if projectinfo["topscopeclass"] != nil && len(projectinfo["topscopeclass"].([]interface{})) > 0 {
 
-                        topscopeclass, _ := projectinfo["topscopeclass"].([]interface{})
 
-                        info["s_industry"] = topscopeclass[0]
 
-                    }
 
-                    break
 
-                }
 
-            }
 
-        }
 
-
 
-        for _, sid := range sidArr {
 
-            thisRow := followSetting[sid]
 
-            fid := util.InterfaceToStr(thisRow["id"])
 
-            thisRow["id"] = fid
 
-            if thisRow["s_title"] == nil {
 
-                log.Println("异常数据：", sid, fid)
 
-                continue
 
-            }
 
-            delete(thisRow, "s_id")
 
-            followData = append(followData, thisRow)
 
-        }
 
-
 
-        for _, v := range followData {
 
-            v["followid"] = util.InterfaceToStr(v["id"])
 
-            v["_id"] = util.EncodeArticleId2ByCheck(util.InterfaceToStr(v["id"]))
 
-            if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
 
-                v["l_lastpushtime"] = v["l_createtime"]
 
-            }
 
-        }
 
-    }
 
-    m.T["datas"] = followData
 
-    if len(*datas) >= followLimit {
 
-        flag = true
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "flag": flag,
 
-        "list": followData,
 
-    })
 
+	userId := util.ObjToString(m.Session().Get("userId"))
 
+	if userId == "" {
 
+		log.Println("查询我关注的项目出错，userid为空")
 
+	}
 
+	log.Println(userId, "---", util.IntAll(config.Sysconfig["followProject"]))
 
+	datas := public.BaseMysql.SelectBySql(`SELECT * FROM follow_project_monitor WHERE s_userid =? ORDER BY l_lastpushtime,l_createtime DESC LIMIT 0,?`, userId, util.IntAll(config.Sysconfig["followProject"]))
 
+	log.Println("datas:", datas)
 
+	//datas, ok := mongodb.Find("follow_project", `{"s_userid":"`+userId+`"}`, `{"l_lastpushtime":-1,"l_createtime":-1}`, `{"s_projectname":1,"s_projectcode":1,"i_remind":1,"l_lastpushtime":1,"l_createtime":1,"s_industry":1,"s_area":1,i_apppushunread":1}`, false, -1, -1)
 
+	flag := false
 
+	var followData []map[string]interface{}
 
+	if datas != nil && len(*datas) > 0 {
 
+		sidArr := []string{}
 
+		followSetting := map[string]map[string]interface{}{}
 
+		for _, followOne := range *datas {
 
+			sid := util.ObjToString(followOne["s_id"])
 
+			if followOne["l_lastpushtime"] != nil && util.ObjToString(followOne["l_lastpushtime"]) != "" {
 
+				followOne["l_createtime"] = followOne["l_lastpushtime"]
 
+			} else if followOne["l_lastpushtime"] == nil {
 
+				followOne["l_lastpushtime"] = followOne["l_createtime"]
 
+			}
 
+			sidArr = append(sidArr, sid)
 
+			followSetting[sid] = followOne
 
+		}
 
+
 
+		projectInfos := []map[string]interface{}{}
 
+		pool := make(chan bool, 10)
 
+		wait := &sync.WaitGroup{}
 
+		var lock sync.Mutex
 
+		for _, v := range SplitArray(sidArr, 50) {
 
+			pool <- true
 
+			wait.Add(1)
 
+			go func(arr []string) error {
 
+				defer func() {
 
+					wait.Done()
 
+					<-pool
 
+				}()
 
+				//es查询
 
+				projectInfos_, err := getProjectsBySid(arr)
 
+				lock.Lock()
 
+				projectInfos = append(projectInfos, projectInfos_...)
 
+				lock.Unlock()
 
+				if err != nil {
 
+					err = errors.New("项目信息查询异常")
 
+					return err
 
+				}
 
+				return nil
 
+			}(v)
 
+		}
 
+		wait.Wait()
 
+
 
+		for _, projectinfo := range projectInfos { //补充设置信息
 
+			for _, k := range util.ObjArrToStringArr(projectinfo["ids"].([]interface{})) {
 
+				if info, ok := followSetting[k]; ok {
 
+					info["s_area"] = projectinfo["area"]
 
+					info["s_buyerclass"] = projectinfo["buyerclass"]
 
+					info["s_budget"] = util.Float64All(projectinfo["budget"])
 
+					info["s_title"] = projectinfo["projectname"]
 
+					info["s_projectname"] = projectinfo["projectname"]
 
+					info["toptype"] = projectinfo["bidstatus"]
 
+					info["s_projectcode"] = projectinfo["projectcode"]
 
+					if projectinfo["topscopeclass"] != nil && len(projectinfo["topscopeclass"].([]interface{})) > 0 {
 
+						topscopeclass, _ := projectinfo["topscopeclass"].([]interface{})
 
+						info["s_industry"] = topscopeclass[0]
 
+					}
 
+					break
 
+				}
 
+			}
 
+		}
 
+
 
+		for _, sid := range sidArr {
 
+			thisRow := followSetting[sid]
 
+			fid := util.InterfaceToStr(thisRow["id"])
 
+			thisRow["id"] = fid
 
+			if thisRow["s_title"] == nil {
 
+				log.Println("异常数据：", sid, fid)
 
+				continue
 
+			}
 
+			delete(thisRow, "s_id")
 
+			followData = append(followData, thisRow)
 
+		}
 
+
 
+		for _, v := range followData {
 
+			v["followid"] = util.InterfaceToStr(v["id"])
 
+			v["_id"] = encrypt.EncodeArticleId2ByCheck(util.InterfaceToStr(v["id"]))
 
+			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
 
+				v["l_lastpushtime"] = v["l_createtime"]
 
+			}
 
+		}
 
+	}
 
+	m.T["datas"] = followData
 
+	if len(*datas) >= followLimit {
 
+		flag = true
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"flag": flag,
 
+		"list": followData,
 
+	})
 
 }
 
 
 //添加关注项目
 
 func (m *Follow) Add() error {
 
-    return m.Render("/weixin/follow/add.html")
 
+	return m.Render("/weixin/follow/add.html")
 
 }
 
 
 //手动添加关注项目
 
 func (m *Follow) Addsave() error {
 
-    defer util.Catch()
 
-    var status = "n"
 
-    var id string
 
-    userId := m.GetSession("userId").(string)
 
-    query := map[string]interface{}{
 
-        "s_userid": userId,
 
-    }
 
-    if public.BaseMysql.Count("follow_project_monitor", query) >= util.Int64All(followLimit) {
 
-        status = "m"
 
-    } else {
 
-        //		"s_id":           sid,          //信息id
 
-        //		"s_userid":       this.UserId,  //用户id
 
-        //		"i_remind":       0,            //开标提醒
 
-        //		"l_createtime":   nowTimeStamp, //关注时间
 
-        //		"l_lastpushtime": nowTimeStamp, //关注时间
 
-        //		"a_visited":      "",           //浏览记录
 
-        if projectname := m.GetString("projectname"); projectname != "" {
 
-            data := map[string]interface{}{
 
-                "s_userid":     userId,
 
-                "l_createtime": time.Now().Unix(),
 
-                "i_remind":     0,
 
-                "s_title":      projectname,
 
-                "a_visited":    "",
 
-            }
 
-            //匹配
 
-            r := elastic.GetPage("bidding", "bidding", `{"TERM_projectname":"`+projectname+`"}`, `{"comeintime":-1}`, `"_id","title","comeintime","bidopentime","projectcode","type","href","publishtime","subtype","toptype","area","industry","s_subscopeclass"`, -1, -1)
 
-            var matchingFlag = r != nil && len(*r) != 0
 
-            var projectcode, sid string
 
-            if matchingFlag {
 
-                d := (*r)[0]
 
-                sid = d["_id"].(string) //(d["_id"].(bson.ObjectId)).Hex()
 
-                data["s_id"] = sid
 
-                publishtime := d["publishtime"]
 
-                data["l_lastpushtime"] = publishtime
 
-                data["s_title"] = d["title"]
 
-                if bidopentime := d["bidopentime"]; bidopentime != nil {
 
-                    data["l_bidopentime"] = bidopentime
 
-                }
 
-            }
 
-            if public.BaseMysql.Insert("follow_project_monitor", data) > 0 {
 
-                status = "y"
 
-                go public.FollowPush(&rpc.FollowPush{
 
-                    ProjectName: projectname,
 
-                    ProjectCode: projectcode,
 
-                    InfoId:      sid,
 
-                    FollowId:    id,
 
-                    UserId:      userId,
 
-                })
 
-            }
 
-        }
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "status": status,
 
-        "id":     util.EncodeArticleId2ByCheck(id),
 
-    })
 
-    return nil
 
+	defer util.Catch()
 
+	var status = "n"
 
+	var id string
 
+	userId := m.GetSession("userId").(string)
 
+	query := map[string]interface{}{
 
+		"s_userid": userId,
 
+	}
 
+	if public.BaseMysql.Count("follow_project_monitor", query) >= util.Int64All(followLimit) {
 
+		status = "m"
 
+	} else {
 
+		//		"s_id":           sid,          //信息id
 
+		//		"s_userid":       this.UserId,  //用户id
 
+		//		"i_remind":       0,            //开标提醒
 
+		//		"l_createtime":   nowTimeStamp, //关注时间
 
+		//		"l_lastpushtime": nowTimeStamp, //关注时间
 
+		//		"a_visited":      "",           //浏览记录
 
+		if projectname := m.GetString("projectname"); projectname != "" {
 
+			data := map[string]interface{}{
 
+				"s_userid":     userId,
 
+				"l_createtime": time.Now().Unix(),
 
+				"i_remind":     0,
 
+				"s_title":      projectname,
 
+				"a_visited":    "",
 
+			}
 
+			//匹配
 
+			r := elastic.GetPage("bidding", "bidding", `{"TERM_projectname":"`+projectname+`"}`, `{"comeintime":-1}`, `"_id","title","comeintime","bidopentime","projectcode","type","href","publishtime","subtype","toptype","area","industry","s_subscopeclass"`, -1, -1)
 
+			var matchingFlag = r != nil && len(*r) != 0
 
+			var projectcode, sid string
 
+			if matchingFlag {
 
+				d := (*r)[0]
 
+				sid = d["_id"].(string) //(d["_id"].(bson.ObjectId)).Hex()
 
+				data["s_id"] = sid
 
+				publishtime := d["publishtime"]
 
+				data["l_lastpushtime"] = publishtime
 
+				data["s_title"] = d["title"]
 
+				if bidopentime := d["bidopentime"]; bidopentime != nil {
 
+					data["l_bidopentime"] = bidopentime
 
+				}
 
+			}
 
+			if public.BaseMysql.Insert("follow_project_monitor", data) > 0 {
 
+				status = "y"
 
+				go public.FollowPush(&rpc.FollowPush{
 
+					ProjectName: projectname,
 
+					ProjectCode: projectcode,
 
+					InfoId:      sid,
 
+					FollowId:    id,
 
+					UserId:      userId,
 
+				})
 
+			}
 
+		}
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"status": status,
 
+		"id":     encrypt.EncodeArticleId2ByCheck(id),
 
+	})
 
+	return nil
 
 }
 
 
 //
 
 func (m *Front) NewFollowDetail() error {
 
-    return m.Render("/weixin/follow/detail.html")
 
+	return m.Render("/weixin/follow/detail.html")
 
 }
 
 
 //
 
 func (m *Follow) Set(tp, id string) error {
 
-    defer util.Catch()
 
-    //isDel := false
 
-    var isDel bool
 
-    id = util.DecodeArticleId2ByCheck(id)[0]
 
-    //fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
-    //_id, _ := primitive.ObjectIDFromHex(id)
 
-    data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
-        "id":       id,
 
-        "s_userid": m.GetSession("userId").(string),
 
-    }, "", "")
 
-    if data == nil || len(*data) == 0 {
 
-        data, _ = mongodb.FindOneByField("follow_project_monitor_back", `{"s_followid":"`+id+`"}`, "")
 
-        isDel = true
 
-    }
 
-    if data == nil || len(*data) == 0 {
 
-        return m.Redirect("/jyapp/free/mob/err")
 
-    }
 
-    m.T["isDel"] = isDel
 
-    sid, _ := (*data)["s_id"].(string)
 
-
 
-    list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus"],"from": 0,"size": 1}`)
 
-    if len(*list) == 0 {
 
-        return m.Redirect("/jyapp/free/mob/err")
 
-    }
 
-    projectInfo := (*list)[0]
 
-    projectIds, _ := projectInfo["list"].([]interface{})
 
-    //if !ok {
 
-    //	return m.Redirect("/jyapp/free/mob/err")
 
-    //}
 
-    thisList := []map[string]interface{}{}
 
-    projectname, _ := projectInfo["projectname"].(string)
 
-    projectcode, _ := projectInfo["projectcode"].(string)
 
-
 
-    if sid != "" {
 
-        r := elastic.GetPage("bidding", "bidding", `{"TERM_projectname":"`+projectname+`"}`, `{"comeintime":-1}`, `"_id","title","comeintime","bidopentime","projectcode","type","href","publishtime","subtype","toptype","area","industry","s_subscopeclass"`, -1, -1)
 
-        if r != nil && len(*r) != 0 {
 
-            d := (*r)[0]
 
-            m.T["url"] = d["href"].(string)
 
-            if s_type := d["type"]; s_type != nil {
 
-                m.T["type"] = d["type"]
 
-                m.T["subtype"] = d["subtype"]
 
-                m.T["toptype"] = d["toptype"]
 
-            }
 
-        }
 
-    }
 
-
 
-    for _, d := range util.ObjArrToMapArr(projectIds) {
 
-        if len(thisList) >= 50 {
 
-            break
 
-        }
 
-        mySelf := make(map[string]interface{})
 
-        mySelf["s_type"] = util.ObjToString(d["type"])
 
-        mySelf["s_toptype"] = util.ObjToString(d["toptype"])
 
-        mySelf["s_subtype"] = util.ObjToString(d["subtype"])
 
-        mySelf["s_province"] = util.ObjToString(d["area"])
 
-        mySelf["s_projectname"] = projectname
 
-        mySelf["s_title"] = d["title"]
 
-        mySelf["s_projectcode"] = projectcode
 
-        mySelf["s_url"] = d["href"].(string)
 
-        mySelf["s_id"] = ""
 
-        mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
-        mySelf["l_publishtime"] = d["publishtime"]
 
-        if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
-            ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
-            mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
-        } else {
 
-            mySelf["s_industry"] = projectInfo["industry"]
 
-        }
 
-        thisList = append(thisList, mySelf)
 
-    }
 
-    jyutil.SortData(&thisList, "l_publishtime", true)
 
-    m.T["relationinfo"] = thisList
 
-
 
-    m.T["_id"] = util.EncodeArticleId2ByCheck(id)
 
-    m.T["sid"] = util.EncodeArticleId2ByCheck(sid)
 
-    //m.T["a_lastpushids"] = (*data)["ids"]
 
-    l_bidopentime := (*data)["l_bidopentime"]
 
-    if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-        m.T["bidopentime"] = util.FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
-        m.T["l_bidopentime"] = l_bidopentime
 
-    }
 
-    if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
-        m.T["remindtime"] = util.FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
-        m.T["l_remindtime"] = l_remindtime
 
-    } else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
-        date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
-        m.T["remindtime"] = util.FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
-        m.T["l_remindtime"] = date.Unix()
 
-    }
 
-    if !isDel {
 
-        public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"id": id}, map[string]interface{}{
 
-            "i_apppushunread": 0,
 
-        })
 
-    }
 
-    m.T["a_visited"] = (*data)["a_visited"]
 
-    m.T["remind"] = (*data)["i_remind"]
 
-    m.T["l_lastpushtime"] = (*data)["l_lastpushtime"]
 
-    m.T["projectname"] = projectname
 
-    m.T["projectcode"] = projectcode
 
-    return m.Render("/weixin/follow/set.html", &m.T)
 
+	defer util.Catch()
 
+	//isDel := false
 
+	var isDel bool
 
+	id = encrypt.DecodeArticleId2ByCheck(id)[0]
 
+	//fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
 
+	//_id, _ := primitive.ObjectIDFromHex(id)
 
+	data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
+		"id":       id,
 
+		"s_userid": m.GetSession("userId").(string),
 
+	}, "", "")
 
+	if data == nil || len(*data) == 0 {
 
+		data, _ = mongodb.FindOneByField("follow_project_monitor_back", `{"s_followid":"`+id+`"}`, "")
 
+		isDel = true
 
+	}
 
+	if data == nil || len(*data) == 0 {
 
+		return m.Redirect("/jyapp/free/mob/err")
 
+	}
 
+	m.T["isDel"] = isDel
 
+	sid, _ := (*data)["s_id"].(string)
 
+
 
+	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus"],"from": 0,"size": 1}`)
 
+	if len(*list) == 0 {
 
+		return m.Redirect("/jyapp/free/mob/err")
 
+	}
 
+	projectInfo := (*list)[0]
 
+	projectIds, _ := projectInfo["list"].([]interface{})
 
+	//if !ok {
 
+	//	return m.Redirect("/jyapp/free/mob/err")
 
+	//}
 
+	thisList := []map[string]interface{}{}
 
+	projectname, _ := projectInfo["projectname"].(string)
 
+	projectcode, _ := projectInfo["projectcode"].(string)
 
+
 
+	if sid != "" {
 
+		r := elastic.GetPage("bidding", "bidding", `{"TERM_projectname":"`+projectname+`"}`, `{"comeintime":-1}`, `"_id","title","comeintime","bidopentime","projectcode","type","href","publishtime","subtype","toptype","area","industry","s_subscopeclass"`, -1, -1)
 
+		if r != nil && len(*r) != 0 {
 
+			d := (*r)[0]
 
+			m.T["url"] = d["href"].(string)
 
+			if s_type := d["type"]; s_type != nil {
 
+				m.T["type"] = d["type"]
 
+				m.T["subtype"] = d["subtype"]
 
+				m.T["toptype"] = d["toptype"]
 
+			}
 
+		}
 
+	}
 
+
 
+	for _, d := range util.ObjArrToMapArr(projectIds) {
 
+		if len(thisList) >= 50 {
 
+			break
 
+		}
 
+		mySelf := make(map[string]interface{})
 
+		mySelf["s_type"] = util.ObjToString(d["type"])
 
+		mySelf["s_toptype"] = util.ObjToString(d["toptype"])
 
+		mySelf["s_subtype"] = util.ObjToString(d["subtype"])
 
+		mySelf["s_province"] = util.ObjToString(d["area"])
 
+		mySelf["s_projectname"] = projectname
 
+		mySelf["s_title"] = d["title"]
 
+		mySelf["s_projectcode"] = projectcode
 
+		mySelf["s_url"] = d["href"].(string)
 
+		mySelf["s_id"] = ""
 
+		mySelf["s_eid"] = encrypt.EncodeArticleId2ByCheck(sid)
 
+		mySelf["l_publishtime"] = d["publishtime"]
 
+		if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
+			ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
+			mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
+		} else {
 
+			mySelf["s_industry"] = projectInfo["industry"]
 
+		}
 
+		thisList = append(thisList, mySelf)
 
+	}
 
+	jyutil.SortData(&thisList, "l_publishtime", true)
 
+	m.T["relationinfo"] = thisList
 
+
 
+	m.T["_id"] = encrypt.EncodeArticleId2ByCheck(id)
 
+	m.T["sid"] = encrypt.EncodeArticleId2ByCheck(sid)
 
+	//m.T["a_lastpushids"] = (*data)["ids"]
 
+	l_bidopentime := (*data)["l_bidopentime"]
 
+	if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
+		m.T["bidopentime"] = FormatDateWithObj(&l_bidopentime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_bidopentime), 0).Weekday().String())
 
+		m.T["l_bidopentime"] = l_bidopentime
 
+	}
 
+	if l_remindtime := (*data)["l_remindtime"]; l_remindtime != nil && l_remindtime != "" && util.Int64All(l_remindtime) != 0 {
 
+		m.T["remindtime"] = FormatDateWithObj(&l_remindtime, "2006年01月02日 15时") + " " + convertWeekday(time.Unix(util.Int64All(l_remindtime), 0).Weekday().String())
 
+		m.T["l_remindtime"] = l_remindtime
 
+	} else if l_bidopentime != nil && l_bidopentime != "" && util.Int64All(l_bidopentime) != 0 {
 
+		date := time.Unix(util.Int64All(l_bidopentime), 0).AddDate(0, 0, -1)
 
+		m.T["remindtime"] = FormatDate(&date, "2006年01月02日 15时") + " " + convertWeekday(date.Weekday().String())
 
+		m.T["l_remindtime"] = date.Unix()
 
+	}
 
+	if !isDel {
 
+		public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"id": id}, map[string]interface{}{
 
+			"i_apppushunread": 0,
 
+		})
 
+	}
 
+	m.T["a_visited"] = (*data)["a_visited"]
 
+	m.T["remind"] = (*data)["i_remind"]
 
+	m.T["l_lastpushtime"] = (*data)["l_lastpushtime"]
 
+	m.T["projectname"] = projectname
 
+	m.T["projectcode"] = projectcode
 
+	return m.Render("/weixin/follow/set.html", &m.T)
 
 }
 
 func (m *Follow) AllNotice() error {
 
-    defer util.Catch()
 
-    id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
-    var relationinfo []interface{}
 
-    data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
-        "id":       id,
 
-        "s_userid": m.GetSession("userId").(string),
 
-    }, "", "")
 
-    if data == nil || len(*data) == 0 {
 
-        data, _ = mongodb.FindOneByField("follow_project_monitor_back", `{"s_followid":"`+id+`"}`, "")
 
-    }
 
-    sid, _ := (*data)["s_id"].(string)
 
-    if data != nil && len(*data) > 0 {
 
-        thisList := []map[string]interface{}{}
 
-        list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus"],"from": 0,"size": 1}`)
 
-        projectInfo := (*list)[0]
 
-        relationinfo, _ = projectInfo["list"].([]interface{})
 
-        if relationinfo != nil {
 
-
 
-            for _, d := range util.ObjArrToMapArr(relationinfo) {
 
-                mySelf := make(map[string]interface{})
 
-                mySelf["s_type"] = util.ObjToString(d["type"])
 
-                mySelf["s_toptype"] = util.ObjToString(d["toptype"])
 
-                mySelf["s_subtype"] = util.ObjToString(d["subtype"])
 
-                mySelf["s_province"] = util.ObjToString(d["area"])
 
-                mySelf["s_projectname"] = util.ObjToString(d["projectname"])
 
-                mySelf["s_title"] = d["title"]
 
-                mySelf["s_projectcode"] = util.ObjToString(d["projectcode"])
 
-                mySelf["s_url"] = d["href"].(string)
 
-                mySelf["s_id"] = ""
 
-                mySelf["s_eid"] = util.EncodeArticleId2ByCheck(sid)
 
-                mySelf["l_publishtime"] = d["publishtime"]
 
-                if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
-                    ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
-                    mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
-                } else {
 
-                    mySelf["s_industry"] = projectInfo["industry"]
 
-                }
 
-                thisList = append(thisList, mySelf)
 
-            }
 
-            jyutil.SortData(&thisList, "l_publishtime", true)
 
-            //relationinfo = a_relationinfo.([]interface{})
 
-            //排序
 
-            //for x := range relationinfo {
 
-            //	for y := 0; y < len(relationinfo)-x-1; y++ {
 
-            //		dt1 := util.Int64All(relationinfo[y].(map[string]interface{})["l_publishtime"])
 
-            //		dt2 := util.Int64All(relationinfo[y+1].(map[string]interface{})["l_publishtime"])
 
-            //		if dt1 > 0 && dt2 > 0 && dt1 < dt2 {
 
-            //			temp := relationinfo[y]
 
-            //			relationinfo[y] = relationinfo[y+1]
 
-            //			relationinfo[y+1] = temp
 
-            //		}
 
-            //	}
 
-            //}
 
-        }
 
-        (*data)["a_relationinfo"] = thisList
 
-    }
 
-    m.ServeJson(map[string]interface{}{
 
-        "data": data,
 
-    })
 
-    return nil
 
+	defer util.Catch()
 
+	id := encrypt.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	var relationinfo []interface{}
 
+	data := public.BaseMysql.FindOne("follow_project_monitor", map[string]interface{}{
 
+		"id":       id,
 
+		"s_userid": m.GetSession("userId").(string),
 
+	}, "", "")
 
+	if data == nil || len(*data) == 0 {
 
+		data, _ = mongodb.FindOneByField("follow_project_monitor_back", `{"s_followid":"`+id+`"}`, "")
 
+	}
 
+	sid, _ := (*data)["s_id"].(string)
 
+	if data != nil && len(*data) > 0 {
 
+		thisList := []map[string]interface{}{}
 
+		list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus"],"from": 0,"size": 1}`)
 
+		projectInfo := (*list)[0]
 
+		relationinfo, _ = projectInfo["list"].([]interface{})
 
+		if relationinfo != nil {
 
+
 
+			for _, d := range util.ObjArrToMapArr(relationinfo) {
 
+				mySelf := make(map[string]interface{})
 
+				mySelf["s_type"] = util.ObjToString(d["type"])
 
+				mySelf["s_toptype"] = util.ObjToString(d["toptype"])
 
+				mySelf["s_subtype"] = util.ObjToString(d["subtype"])
 
+				mySelf["s_province"] = util.ObjToString(d["area"])
 
+				mySelf["s_projectname"] = util.ObjToString(d["projectname"])
 
+				mySelf["s_title"] = d["title"]
 
+				mySelf["s_projectcode"] = util.ObjToString(d["projectcode"])
 
+				mySelf["s_url"] = d["href"].(string)
 
+				mySelf["s_id"] = ""
 
+				mySelf["s_eid"] = encrypt.EncodeArticleId2ByCheck(sid)
 
+				mySelf["l_publishtime"] = d["publishtime"]
 
+				if projectInfo["industry"] == nil && projectInfo["s_subscopeclass"] != nil {
 
+					ind := strings.Split(util.ObjToString(projectInfo["s_subscopeclass"]), ",")[0]
 
+					mySelf["s_industry"] = strings.Split(ind, "_")[0]
 
+				} else {
 
+					mySelf["s_industry"] = projectInfo["industry"]
 
+				}
 
+				thisList = append(thisList, mySelf)
 
+			}
 
+			jyutil.SortData(&thisList, "l_publishtime", true)
 
+			//relationinfo = a_relationinfo.([]interface{})
 
+			//排序
 
+			//for x := range relationinfo {
 
+			//	for y := 0; y < len(relationinfo)-x-1; y++ {
 
+			//		dt1 := util.Int64All(relationinfo[y].(map[string]interface{})["l_publishtime"])
 
+			//		dt2 := util.Int64All(relationinfo[y+1].(map[string]interface{})["l_publishtime"])
 
+			//		if dt1 > 0 && dt2 > 0 && dt1 < dt2 {
 
+			//			temp := relationinfo[y]
 
+			//			relationinfo[y] = relationinfo[y+1]
 
+			//			relationinfo[y+1] = temp
 
+			//		}
 
+			//	}
 
+			//}
 
+		}
 
+		(*data)["a_relationinfo"] = thisList
 
+	}
 
+	m.ServeJson(map[string]interface{}{
 
+		"data": data,
 
+	})
 
+	return nil
 
 }
 
 func (m *Follow) Notice(id, followId string) error {
 
-    defer util.Catch()
 
-    go mongodb.UpdateById("follow_project", followId, map[string]interface{}{
 
-        "$set": map[string]interface{}{
 
-            "i_apppushunread": 0,
 
-        },
 
-    })
 
-    userid, _ := m.GetSession("userId").(string)
 
-    var query map[string]interface{}
 
-    if len(id) == 19 {
 
-        query = map[string]interface{}{
 
-            "l_date":     util.Int64All(id) / 1000000000,
 
-            "s_userid":   userid,
 
-            "s_followid": followId,
 
-        }
 
-    } else {
 
-        query = map[string]interface{}{
 
-            "_id":      StringTOBsonId(id),
 
-            "s_userid": userid,
 
-        }
 
-    }
 
-    data, ok := public.MQFW.FindOneByField("jy_pushproject", query, `{"s_followid":-1,"s_title":1,"s_projectcode":1,"s_projectname":1,"a_relationinfo":1,"a_visited":1}`)
 
-    if ok && data != nil && len(*data) > 0 {
 
-        if a_relationinfo := (*data)["a_relationinfo"]; a_relationinfo != nil {
 
-            relationinfo := a_relationinfo.([]interface{})
 
-            for x := range relationinfo {
 
-                s_id, _ := relationinfo[x].(map[string]interface{})["s_id"].(string)
 
-                relationinfo[x].(map[string]interface{})["s_id"] = util.EncodeArticleId2ByCheck(s_id)
 
-                for y := 0; y < len(relationinfo)-x-1; y++ {
 
-                    dt1 := util.Int64All(relationinfo[y].(map[string]interface{})["l_publishtime"])
 
-                    dt2 := util.Int64All(relationinfo[y+1].(map[string]interface{})["l_publishtime"])
 
-                    if dt1 > 0 && dt2 > 0 && dt1 < dt2 {
 
-                        temp := relationinfo[y]
 
-                        relationinfo[y] = relationinfo[y+1]
 
-                        relationinfo[y+1] = temp
 
-                    }
 
-                }
 
-            }
 
-            if len(relationinfo) == 1 {
 
-                firstMap, _ := relationinfo[0].(map[string]interface{})
 
-                go public.MQFW.UpdateById("jy_pushproject", id, map[string]interface{}{
 
-                    "$addToSet": map[string]interface{}{"a_visited": firstMap["s_id"]},
 
-                })
 
-                return m.Redirect("/jyapp/article/content/" + util.ObjToString(firstMap["s_id"]) + ".html")
 
-            }
 
-            (*data)["a_relationinfo"] = relationinfo
 
-        }
 
-        m.T["data"] = data
 
-    }
 
-    m.T["id"] = util.EncodeArticleId2ByCheck(id)
 
-    return m.Render("/weixin/follow/notice.html", &m.T)
 
+	defer util.Catch()
 
+	go mongodb.UpdateById("follow_project", followId, map[string]interface{}{
 
+		"$set": map[string]interface{}{
 
+			"i_apppushunread": 0,
 
+		},
 
+	})
 
+	userid, _ := m.GetSession("userId").(string)
 
+	var query map[string]interface{}
 
+	if len(id) == 19 {
 
+		query = map[string]interface{}{
 
+			"l_date":     util.Int64All(id) / 1000000000,
 
+			"s_userid":   userid,
 
+			"s_followid": followId,
 
+		}
 
+	} else {
 
+		query = map[string]interface{}{
 
+			"_id":      StringTOBsonId(id),
 
+			"s_userid": userid,
 
+		}
 
+	}
 
+	data, ok := public.MQFW.FindOneByField("jy_pushproject", query, `{"s_followid":-1,"s_title":1,"s_projectcode":1,"s_projectname":1,"a_relationinfo":1,"a_visited":1}`)
 
+	if ok && data != nil && len(*data) > 0 {
 
+		if a_relationinfo := (*data)["a_relationinfo"]; a_relationinfo != nil {
 
+			relationinfo := a_relationinfo.([]interface{})
 
+			for x := range relationinfo {
 
+				s_id, _ := relationinfo[x].(map[string]interface{})["s_id"].(string)
 
+				relationinfo[x].(map[string]interface{})["s_id"] = encrypt.EncodeArticleId2ByCheck(s_id)
 
+				for y := 0; y < len(relationinfo)-x-1; y++ {
 
+					dt1 := util.Int64All(relationinfo[y].(map[string]interface{})["l_publishtime"])
 
+					dt2 := util.Int64All(relationinfo[y+1].(map[string]interface{})["l_publishtime"])
 
+					if dt1 > 0 && dt2 > 0 && dt1 < dt2 {
 
+						temp := relationinfo[y]
 
+						relationinfo[y] = relationinfo[y+1]
 
+						relationinfo[y+1] = temp
 
+					}
 
+				}
 
+			}
 
+			if len(relationinfo) == 1 {
 
+				firstMap, _ := relationinfo[0].(map[string]interface{})
 
+				go public.MQFW.UpdateById("jy_pushproject", id, map[string]interface{}{
 
+					"$addToSet": map[string]interface{}{"a_visited": firstMap["s_id"]},
 
+				})
 
+				return m.Redirect("/jyapp/article/content/" + util.ObjToString(firstMap["s_id"]) + ".html")
 
+			}
 
+			(*data)["a_relationinfo"] = relationinfo
 
+		}
 
+		m.T["data"] = data
 
+	}
 
+	m.T["id"] = encrypt.EncodeArticleId2ByCheck(id)
 
+	return m.Render("/weixin/follow/notice.html", &m.T)
 
 }
 
 func (m *Follow) Visited() error {
 
-    defer util.Catch()
 
-    d_id := util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
-    if d_id == "" {
 
-        return nil
 
-    }
 
-    reqType, _ := m.GetInteger("type")
 
-    sid := m.GetString("sid")
 
-    if reqType == 1 {
 
-        public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"s_id": sid}, map[string]interface{}{
 
-            "$addToSet": map[string]interface{}{"a_visited": sid},
 
-        })
 
-    } else if reqType == 2 {
 
-        mongodb.UpdateById("jy_pushproject", d_id, map[string]interface{}{
 
-            "$addToSet": map[string]interface{}{"a_visited": sid},
 
-        })
 
-    }
 
-    return nil
 
+	defer util.Catch()
 
+	d_id := encrypt.DecodeArticleId2ByCheck(m.GetString("id"))[0]
 
+	if d_id == "" {
 
+		return nil
 
+	}
 
+	reqType, _ := m.GetInteger("type")
 
+	sid := m.GetString("sid")
 
+	if reqType == 1 {
 
+		public.BaseMysql.Update("follow_project_monitor", map[string]interface{}{"s_id": sid}, map[string]interface{}{
 
+			"$addToSet": map[string]interface{}{"a_visited": sid},
 
+		})
 
+	} else if reqType == 2 {
 
+		mongodb.UpdateById("jy_pushproject", d_id, map[string]interface{}{
 
+			"$addToSet": map[string]interface{}{"a_visited": sid},
 
+		})
 
+	}
 
+	return nil
 
 }
 
 func convertWeekday(weekday string) string {
 
-    if weekday == "Sunday" {
 
-        weekday = "日"
 
-    } else if weekday == "Monday" {
 
-        weekday = "一"
 
-    } else if weekday == "Tuesday" {
 
-        weekday = "二"
 
-    } else if weekday == "Wednesday" {
 
-        weekday = "三"
 
-    } else if weekday == "Thursday" {
 
-        weekday = "四"
 
-    } else if weekday == "Friday" {
 
-        weekday = "五"
 
-    } else if weekday == "Saturday" {
 
-        weekday = "六"
 
-    }
 
-    return "周" + weekday
 
+	if weekday == "Sunday" {
 
+		weekday = "日"
 
+	} else if weekday == "Monday" {
 
+		weekday = "一"
 
+	} else if weekday == "Tuesday" {
 
+		weekday = "二"
 
+	} else if weekday == "Wednesday" {
 
+		weekday = "三"
 
+	} else if weekday == "Thursday" {
 
+		weekday = "四"
 
+	} else if weekday == "Friday" {
 
+		weekday = "五"
 
+	} else if weekday == "Saturday" {
 
+		weekday = "六"
 
+	}
 
+	return "周" + weekday
 
 }
 
 
 //删除redis相关数据
 
 func delRelRedis(userid interface{}, relationinfo interface{}) {
 
-    defer util.Catch()
 
-    uid, _ := userid.(string)
 
-    if uid == "" || relationinfo == nil {
 
-        return
 
-    }
 
-    array, _ := relationinfo.([]interface{})
 
-    for _, v := range util.ObjArrToMapArr(array) {
 
-        sid, _ := v["s_id"].(string)
 
-        redis.Del("push", "push_"+uid+"_"+sid)
 
-    }
 
+	defer util.Catch()
 
+	uid, _ := userid.(string)
 
+	if uid == "" || relationinfo == nil {
 
+		return
 
+	}
 
+	array, _ := relationinfo.([]interface{})
 
+	for _, v := range util.ObjArrToMapArr(array) {
 
+		sid, _ := v["s_id"].(string)
 
+		redis.Del("push", "push_"+uid+"_"+sid)
 
+	}
 
 }
 
 
 // SplitArray 分割数组
 
 func SplitArray(arr []string, num int64) [][]string {
 
 
-    max := int64(len(arr))
 
-    //判断数组大小是否小于等于指定分割大小的值，是则把原数组放入二维数组返回
 
-    if max <= num {
 
-        return [][]string{arr}
 
-    }
 
-    //获取应该数组分割为多少份
 
-    var quantity int64
 
-    if max%num == 0 {
 
-        quantity = max / num
 
-    } else {
 
-        quantity = (max / num) + 1
 
-    }
 
-    //声明分割好的二维数组
 
-    var segments = make([][]string, 0)
 
-    //声明分割数组的截止下标
 
-    var start, end, i int64
 
-    for i = 1; i <= quantity; i++ {
 
-        end = i * num
 
-        if i != quantity {
 
-            segments = append(segments, arr[start:end])
 
-        } else {
 
-            segments = append(segments, arr[start:])
 
-        }
 
-        start = i * num
 
-    }
 
-    return segments
 
+	max := int64(len(arr))
 
+	//判断数组大小是否小于等于指定分割大小的值，是则把原数组放入二维数组返回
 
+	if max <= num {
 
+		return [][]string{arr}
 
+	}
 
+	//获取应该数组分割为多少份
 
+	var quantity int64
 
+	if max%num == 0 {
 
+		quantity = max / num
 
+	} else {
 
+		quantity = (max / num) + 1
 
+	}
 
+	//声明分割好的二维数组
 
+	var segments = make([][]string, 0)
 
+	//声明分割数组的截止下标
 
+	var start, end, i int64
 
+	for i = 1; i <= quantity; i++ {
 
+		end = i * num
 
+		if i != quantity {
 
+			segments = append(segments, arr[start:end])
 
+		} else {
 
+			segments = append(segments, arr[start:])
 
+		}
 
+		start = i * num
 
+	}
 
+	return segments
 
 }
 
 
 //根据多个信息id查询对应的项目信息
 
 func getProjectsBySid(sids []string) ([]map[string]interface{}, error) {
 
-    sidStr := strings.Join(sids, `","`)
 
-    list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"terms": {"list.infoid": ["`+sidStr+`"]}}]}},"_source":["projectname","topscopeclass","_id","area","buyerclass","budget","ids","bidstatus","projectcode"],"from": 0,"size": `+fmt.Sprint(len(sids))+`}`)
 
-    if len(*list) == 0 {
 
-        return nil, errors.New("获取项目信息查询出错")
 
-    }
 
-    return *list, nil
 
+	sidStr := strings.Join(sids, `","`)
 
+	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"terms": {"list.infoid": ["`+sidStr+`"]}}]}},"_source":["projectname","topscopeclass","_id","area","buyerclass","budget","ids","bidstatus","projectcode"],"from": 0,"size": `+fmt.Sprint(len(sids))+`}`)
 
+	if len(*list) == 0 {
 
+		return nil, errors.New("获取项目信息查询出错")
 
+	}
 
+	return *list, nil
 
 }

+ 24 - 21
src/jfw/modules/app/src/app/front/front.go
Dosyayı Görüntüle 

@@ -1,22 +1,25 @@
 
 package front
 
 
 import (
 
-	"app/jylabutil"
 
-	. "app/jyutil"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/app/jylabutil"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
-	"qfw/util"
 
-	"qfw/util/elastic"
 
-	"qfw/util/jy"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
+	. "jy/src/jfw/modules/app/src/app/jyutil"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	elastic "app.yhyue.com/moapp/jybase/esv1"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"github.com/SKatiyar/qr"
 
 	"github.com/dchest/captcha"
 
-	"github.com/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )
 
 
@@ -78,16 +81,16 @@ type Front struct {
 
 	shareDomain xweb.Mapper `xweb:"/jyapp/free/shareDomain"` //app分享 域名配置项
 
 }
 
 
-var sewx util.SimpleEncrypt //微信的加密方法
 
+var sewx encrypt.SimpleEncrypt //微信的加密方法
 
 var mongodb = public.MQFW
 
-var se = util.SE //移到tools中
 
+var se = encrypt.SE //移到tools中
 
 var industrylist map[string][]string
 
 var sortArray []string
 
 var mLock *sync.Mutex
 
 
 func init() {
 
 	mLock = new(sync.Mutex)
 
-	sewx = util.SimpleEncrypt{Key: "topnet"}
 
+	sewx = encrypt.SimpleEncrypt{Key: "topnet"}
 
 	xweb.AddAction(&Front{})
 
 	industrylist, sortArray = jy.Getindustrys(util.ObjToString(config.Sysconfig["industry"]), mongodb)
 
 }
 
@@ -266,7 +269,7 @@ func (m *Front) Feedback() error {
 
 	m.T["list"] = list
 
 	fkid := m.GetString("fkid")
 
 	if fkid != "" {
 
-		fkid = util.DecodeArticleId2ByCheck(fkid)[0]
 
+		fkid = encrypt.DecodeArticleId2ByCheck(fkid)[0]
 
 	}
 
 	fromName := m.GetString("fromName")
 
 	if fromName != "" {
 
@@ -352,7 +355,7 @@ func (f *Front) TSGuide() error {
 
 			rlt := elastic.GetByNgram(INDEX, TYPE, strings.Split(f.GetString("key"), " "), "", FINDF, `{"publishtime":-1}`, `"_id","title","publishtime","toptype","subtype","type","area","href","areaval"`, 0, 10)
 
 			if *rlt != nil && len(*rlt) > 0 {
 
 				for _, v := range *rlt {
 
-					v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 
+					v["_id"] = encrypt.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 
 				}
 
 			}
 
 			result["data"] = rlt
 
@@ -407,7 +410,7 @@ func (f *Front) LimitSearchText() {
 
 	status := ""
 
 	if flag == -2 { //重置
 
 		status = "重置"
 
-		public.InitLimitSearchText(true)
 
+		public.InitLimitSearchText(true, config.Sysconfig)
 
 	} else if flag == -1 && public.Lst.Flag { //关闭
 
 		status = "关闭"
 
 		public.Lst.Flag = false
 
@@ -484,13 +487,13 @@ func (f *Front) JylabShareTimeline() {
 
 	}
 
 	reqType := f.GetString("reqType")
 
 	if reqType == "update" {
 
-		public.UpdateShareStatus(userId, "app", 3, 1, 0, false)
 
+		public.UpdateShareStatus(userId, "app", 3, 1, 0, false, config.Sysconfig)
 
 		f.ServeJson(map[string]interface{}{
 
 			"status": true,
 
 		})
 
 	} else {
 
 		jylabsharetimeline := 1
 
-		if public.CheckUserNeedForceShare(userId, public.ShareType_lab) {
 
+		if public.CheckUserNeedForceShare(userId, public.ShareType_lab, config.Sysconfig) {
 
 			jylabsharetimeline = 0
 
 		}
 
 		f.ServeJson(map[string]interface{}{
 
@@ -510,7 +513,7 @@ func (s *Front) UpdateShareStatus() error {
 
 	userId, _ := s.GetSession("userId").(string)
 
 	shareType, _ := s.GetInt("shareType")
 
 	shareProperty, _ := s.GetInt("shareProperty")
 
-	public.UpdateShareStatus(userId, "app", shareType, shareProperty, 0, false)
 
+	public.UpdateShareStatus(userId, "app", shareType, shareProperty, 0, false, config.Sysconfig)
 
 	s.ServeJson(map[string]interface{}{})
 
 	return nil
 
 }
 
@@ -624,11 +627,11 @@ func (s *Front) EntnichePushList() error {
 
 	pi := s.GetString("pi")
 
 	pn := s.GetString("pn")
 
 	if pi != "" && pn != "" {
 
-		d_pn_s := strings.Split(util.SE.Decode4HexByCheck(pi), "_")
 
+		d_pn_s := strings.Split(encrypt.SE.Decode4HexByCheck(pi), "_")
 
 		if len(d_pn_s) == 3 && util.ObjToString(d_pn_s[0]) == "entniche" {
 
 			entId := util.IntAll(d_pn_s[1])
 
 			entUserId := util.IntAll(d_pn_s[2])
 
-			entName := util.SE.Decode4HexByCheck(pn)
 
+			entName := encrypt.SE.Decode4HexByCheck(pn)
 
 			s.SetSession("entId", entId)
 
 			s.SetSession("entName", entName)
 
 			s.SetSession("entUserId", entUserId)
 
@@ -642,11 +645,11 @@ func (s *Front) EntnichePush() error {
 
 	pi := s.GetString("pi")
 
 	pn := s.GetString("pn")
 
 	if pi != "" && pn != "" {
 
-		d_pn_s := strings.Split(util.SE.Decode4HexByCheck(pi), "_")
 
+		d_pn_s := strings.Split(encrypt.SE.Decode4HexByCheck(pi), "_")
 
 		if len(d_pn_s) == 3 && util.ObjToString(d_pn_s[0]) == "entniche" {
 
 			entId := util.IntAll(d_pn_s[1])
 
 			entUserId := util.IntAll(d_pn_s[2])
 
-			entName := util.SE.Decode4HexByCheck(pn)
 
+			entName := encrypt.SE.Decode4HexByCheck(pn)
 
 			s.SetSession("entId", entId)
 
 			s.SetSession("entName", entName)
 
 			s.SetSession("entUserId", entUserId)

+ 1 - 1
src/jfw/modules/app/src/app/front/frontRouter.go
Dosyayı Görüntüle 

@@ -4,7 +4,7 @@ import (
 
 	"fmt"
 
 	"log"
 
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 //前端通用路由

+ 1 - 1
src/jfw/modules/app/src/app/front/laboratory.go
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 package front
 
 
 import (
 
-	"github.com/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Lab struct {

+ 17 - 12
src/jfw/modules/app/src/app/front/login.go
Dosyayı Görüntüle 

@@ -1,27 +1,32 @@
 
 package front
 
 
 import (
 
-	"app/jyutil"
 
 	"encoding/json"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
-	. "mongodb"
 
 	"net/http"
 
-	qutil "qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
-	qrpc "qfw/util/rpc"
 
-	"qfw/util/usercenter"
 
 	"regexp"
 
 	"strings"
 
 	"sync"
 
 	"time"
 
 
+	"jy/src/jfw/modules/app/src/app/jyutil"
 
+
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+
 
+	. "app.yhyue.com/moapp/jybase/mongodb"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"github.com/dchest/captcha"
 
-	"github.com/go-xweb/httpsession"
 
-	"github.com/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -1044,7 +1049,7 @@ func createSession(s *httpsession.Session, person map[string]interface{}, loginI
 
 	//cookie
 
 	maxAge := int(time.Hour * 72 / time.Second) //3天，单位秒
 
 	expires := time.Now().Add(72 * time.Hour)
 
-	simpleuid := qutil.SE.EncodeString(BsonIdToSId(person["_id"]))
 
+	simpleuid := encrypt.SE.EncodeString(BsonIdToSId(person["_id"]))
 
 	c := &http.Cookie{
 
 		Name:     "ud_safe",
 
 		Value:    simpleuid,

+ 10 - 8
src/jfw/modules/app/src/app/front/logoffuser.go
Dosyayı Görüntüle 

@@ -1,16 +1,18 @@
 
 package front
 
 
 import (
 
-	. "api"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
 	"net/http"
 
-	qutil "qfw/util"
 
-	"qfw/util/usercenter"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	. "app.yhyue.com/moapp/jybase/api"
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 )
 
@@ -168,13 +170,13 @@ func IsUpdateEntGtMonth(phone []string) bool {
 
 	if res != nil {
 
 		for _, v := range *res {
 
 			create_time := qutil.ObjToString(v["createtime"])
 
-			createT, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time, time.Local)
 
+			createT, _ := time.ParseInLocation(Date_Full_Layout, create_time, time.Local)
 
 			if createT.After(month_time) {
 
 				return true
 
 			}
 
 			//是否新增过员工
 
 			newaddcount := public.Mysql.CountBySql(`select count(1) as count from entniche_user 
-									where ent_id = ? and  createtime between ? and ? `, v["id"], month_time.Format(qutil.Date_Full_Layout), time.Now().Format(qutil.Date_Full_Layout))
 
+									where ent_id = ? and  createtime between ? and ? `, v["id"], month_time.Format(Date_Full_Layout), time.Now().Format(Date_Full_Layout))
 
 			if newaddcount > 0 {
 
 				return true
 
 			}

+ 9 - 8
src/jfw/modules/app/src/app/front/me.go
Dosyayı Görüntüle 

@@ -1,19 +1,20 @@
 
 package front
 
 
 import (
 
-	. "app/jyutil"
 
 	"fmt"
 
-	"jfw/config"
 
-	"jfw/public"
 
+	. "jy/src/jfw/modules/app/src/app/jyutil"
 
+	"jy/src/jfw/modules/app/src/jfw/config"
 
 	"log"
 
-	qutil "qfw/util"
 
-	"qfw/util/jy"
 
-	"qfw/util/redis"
 
-	"qfw/util/usercenter"
 
 	"strings"
 
 	"time"
 
 
-	"github.com/go-xweb/xweb"
 
+	qutil "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jybase/usercenter"
 
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 	"go.mongodb.org/mongo-driver/bson"
 
 )

+ 8 - 6
src/jfw/modules/app/src/app/front/message.go
Dosyayı Görüntüle 

@@ -3,11 +3,13 @@ package front
 
 import (
 
 	"encoding/json"
 
 	"html/template"
 
-	"jfw/public"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
+
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 )
 
 
 type Message struct {
 
@@ -33,9 +35,9 @@ func (m *Message) MesContent(_id string) error {
 
 		r, _ := public.MQFW.FindById("content", id, `{"s_title":1,"s_content":1,"releasetime":1,"s_source":1,"l_createdate":1}`)
 
 		if r != nil && len(*r) > 0 {
 
 			tmpdate1 := util.Int64All((*r)["l_createdate"])
 
-			(*r)["l_createdate"] = util.FormatDateByInt64(&tmpdate1, util.Date_Short_Layout)
 
+			(*r)["l_createdate"] = FormatDateByInt64(&tmpdate1, Date_Short_Layout)
 
 			tmpdate2 := util.Int64All((*r)["releasetime"])
 
-			(*r)["releasetime"] = util.FormatDateByInt64(&tmpdate2, util.Date_Short_Layout)
 
+			(*r)["releasetime"] = FormatDateByInt64(&tmpdate2, Date_Short_Layout)
 
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
 
 		}
 
 		m.DisableHttpCache()

+ 8 - 6
src/jfw/modules/app/src/app/front/myorder.go
Dosyayı Görüntüle 

@@ -1,12 +1,14 @@
 
 package front
 
 
 import (
 
-	"jfw/public"
 
-	"qfw/util"
 
 	"strconv"
 
 	"strings"
 
 
-	"github.com/go-xweb/xweb"
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	. "app.yhyue.com/moapp/jybase/date"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jypkg/public"
 
 )
 
 
 type MyOrder struct {
 
@@ -80,11 +82,11 @@ func (m *MyOrder) GetOneMore() error {
 
 					start, err := strconv.ParseInt(timeArr[0], 10, 64)
 
 					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
 
 					if err == nil && erro == nil {
 
-						v["filter_publishtime"] = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
 
+						v["filter_publishtime"] = FormatDateByInt64(&start, layout_date) + "-" + FormatDateByInt64(&end, layout_date)
 
 					}
 
 				}
 
 			}
 
-			v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
 
+			v["filter_id"] = encrypt.SE.Encode2Hex(v["filter_id"].(string))
 
 			orderMoney := v["order_money"]
 
 			if orderMoney != nil {
 
 				v["order_money"] = float64(orderMoney.(int64)) / 100
 
@@ -213,7 +215,7 @@ func (m *MyOrder) DeleteOrder() error {
 
 						start, err := strconv.ParseInt(timeArr[0], 10, 64)
 
 						end, erro := strconv.ParseInt(timeArr[1], 10, 64)
 
 						if err == nil && erro == nil {
 
-							v["filter_publishtime"] = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
 
+							v["filter_publishtime"] = FormatDateByInt64(&start, layout_date) + "-" + FormatDateByInt64(&end, layout_date)
 
 						}
 
 					}
 
 				}

+ 10 - 8
src/jfw/modules/app/src/app/front/search.go
Dosyayı Görüntüle 

@@ -1,16 +1,18 @@
 
 package front
 
 
 import (
 
-	"app/jylabutil"
 
-	. "app/jyutil"
 
-	"app/tag"
 
 	"fmt"
 
-	. "jfw/config"
 
-	"qfw/util"
 
-	"qfw/util/redis"
 
+	"jy/src/jfw/modules/app/src/app/jylabutil"
 
+	"jy/src/jfw/modules/app/src/app/tag"
 
+	. "jy/src/jfw/modules/app/src/jfw/config"
 
 	"strings"
 
 
-	"github.com/go-xweb/xweb"
 
+	. "jy/src/jfw/modules/app/src/app/jyutil"
 
+
 
+	util "app.yhyue.com/moapp/jybase/common"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
+	"app.yhyue.com/moapp/jybase/redis"
 
 )
 
 
 type Search struct {
 
@@ -81,7 +83,7 @@ func (p *Search) SearchIndex() {
 
 		member = util.IntAll((*data)["i_member_status"])
 
 	}
 
 	m := map[string]interface{}{
 
-		"userId":         util.EncodeArticleId(util.ObjToString(p.GetSession("userId"))),
 
+		"userId":         encrypt.EncodeArticleId(util.ObjToString(p.GetSession("userId"))),
 
 		"isIosExam":      isIosExam,
 
 		"isIosExamPhone": isIosExamPhone,
 
 		"member":         member,

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor