Kaynağa Gözat

feat:改造

wangchuanjin 10 ay önce
ebeveyn
işleme
dea1fad434
98 değiştirilmiş dosya ile 395 ekleme ve 3143 silme
  1. 8 7
      common/db/db.go
  2. 35 45
      common/gatecode/errcode.go
  3. 0 78
      common/gatecode/errcode_string.go
  4. 0 67
      common/gatecode/getError_test.go
  5. 0 37
      common/gatecode/global.go
  6. 0 10
      core/logs/internal/module.go
  7. 0 42
      core/logs/internal/savedb/saveDb.go
  8. 0 113
      core/node/NewReigster.go
  9. 0 51
      core/node/hellowrold/main.go
  10. 0 50
      core/node/node.go
  11. 0 38
      core/node/node_test.go
  12. 0 73
      core/node/register.go
  13. 0 25
      core/node/scheme.go
  14. 0 49
      core/node/watcher.go
  15. 0 133
      core/proxy/broker/broker.go
  16. 0 180
      core/proxy/broker/outServer/SussBi.go
  17. 0 7
      core/proxy/filterPoly/filterPoly.go
  18. 0 23
      core/proxy/filterPoly/reqRule.go
  19. 0 174
      core/proxy/filterPoly/wordsclick.go
  20. 0 33
      core/proxy/loadmodule/interface.go
  21. 0 62
      core/proxy/loadmodule/module_hash.go
  22. 0 62
      core/proxy/loadmodule/module_random.go
  23. 0 63
      core/proxy/loadmodule/module_round.go
  24. 39 6
      core/proxy/middleware/errorHandler.go
  25. 29 19
      core/proxy/middleware/filterFuncs.go
  26. 113 34
      core/proxy/proxyServer.go
  27. 0 5
      core/proxy/vars/vars.go
  28. 2 1
      core/router/ctx.go
  29. 17 14
      core/router/manager.go
  30. 11 6
      core/router/router.go
  31. 51 0
      core/util/reqLimit.go
  32. 2 6
      etc/config.yaml
  33. 0 86
      etc/config_local.yaml
  34. 4 19
      go.mod
  35. 3 36
      go.sum
  36. 81 0
      jylog/logfile.log
  37. 0 577
      resources/antiRes/control.html
  38. 0 506
      resources/antiRes/css/app.css
  39. 0 86
      resources/antiRes/css/default.css
  40. BIN
      resources/antiRes/images/flush.png
  41. BIN
      resources/antiRes/images/hoverclick.png
  42. BIN
      resources/antiRes/images/verify_logo.png
  43. 0 3
      resources/antiRes/js/jquery.js
  44. 0 111
      resources/antiRes/js/mainHook.js
  45. 0 19
      resources/antiRes/js/rem.js
  46. BIN
      resources/antiRes/lib/anti_v1.wasm
  47. 0 87
      resources/antiRes/page/app.html
  48. 0 100
      resources/antiRes/page/default.html
  49. BIN
      resources/verify/fontBg/100.jpg
  50. BIN
      resources/verify/fontBg/101.jpg
  51. BIN
      resources/verify/fontBg/102.jpg
  52. BIN
      resources/verify/fontBg/81.jpg
  53. BIN
      resources/verify/fontBg/82.jpg
  54. BIN
      resources/verify/fontBg/83.jpg
  55. BIN
      resources/verify/fontBg/84.jpg
  56. BIN
      resources/verify/fontBg/85.jpg
  57. BIN
      resources/verify/fontBg/86.jpg
  58. BIN
      resources/verify/fontBg/87.jpg
  59. BIN
      resources/verify/fontBg/88.jpg
  60. BIN
      resources/verify/fontBg/90.jpg
  61. BIN
      resources/verify/fontBg/91.jpg
  62. BIN
      resources/verify/fontBg/92.jpg
  63. BIN
      resources/verify/fontBg/93.jpg
  64. BIN
      resources/verify/fontBg/94.jpg
  65. BIN
      resources/verify/fontBg/95.jpg
  66. BIN
      resources/verify/fontBg/96.jpg
  67. BIN
      resources/verify/fontBg/97.jpg
  68. BIN
      resources/verify/fontBg/98.jpg
  69. BIN
      resources/verify/fontBg/99.jpg
  70. BIN
      resources/verify/fontType/STZHONGS.TTF
  71. BIN
      resources/verify/imageBg/10.jpg
  72. BIN
      resources/verify/imageBg/15.jpg
  73. BIN
      resources/verify/imageBg/17.jpg
  74. BIN
      resources/verify/imageBg/18.jpg
  75. BIN
      resources/verify/imageBg/2.jpg
  76. BIN
      resources/verify/imageBg/23.jpg
  77. BIN
      resources/verify/imageBg/24.jpg
  78. BIN
      resources/verify/imageBg/3.jpg
  79. BIN
      resources/verify/imageBg/32.jpg
  80. BIN
      resources/verify/imageBg/37.jpg
  81. BIN
      resources/verify/imageBg/39.jpg
  82. BIN
      resources/verify/imageBg/4.jpg
  83. BIN
      resources/verify/imageBg/65.jpg
  84. BIN
      resources/verify/imageBg/66.jpg
  85. BIN
      resources/verify/imageBg/67.jpg
  86. BIN
      resources/verify/imageBg/68.jpg
  87. BIN
      resources/verify/imageBg/69.jpg
  88. BIN
      resources/verify/imageBg/7.jpg
  89. BIN
      resources/verify/imageBg/70.jpg
  90. BIN
      resources/verify/imageBg/72.jpg
  91. BIN
      resources/verify/imageBg/73.jpg
  92. BIN
      resources/verify/imageBg/74.jpg
  93. BIN
      resources/verify/imageBg/75.jpg
  94. BIN
      resources/verify/imageBg/76.jpg
  95. BIN
      resources/verify/imageBg/77.jpg
  96. BIN
      resources/verify/imageBg/78.jpg
  97. BIN
      resources/verify/imageBg/8.jpg
  98. BIN
      tripartite_gateway.exe

+ 8 - 7
common/db/db.go

@@ -2,9 +2,12 @@ package db
 
 import (
 	"database/sql"
-	"github.com/gogf/gf/v2/util/gconv"
 	"log"
 
+	"app.yhyue.com/moapp/jybase/redis"
+
+	"github.com/gogf/gf/v2/util/gconv"
+
 	"app.yhyue.com/moapp/jybase/mysql"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -27,18 +30,17 @@ var Bjgjdsjjys map[string]interface{}
 // InitDatabases 初始化数据库
 func InitDatabases() {
 	initDbCtx := gctx.New()
+	redis.InitRedis(gcfg.Instance().MustGet(initDbCtx, "databases.redis").String())
 	// 初始化mysql数据库
 	var mysqlConf Mysql
 	err := gcfg.Instance().MustGet(initDbCtx, "databases.mysql").Scan(&mysqlConf)
 	AddressMap = gconv.Map(gcfg.Instance().MustGet(initDbCtx, "addressMap", ""))
 	if err != nil {
-		log.Printf("mysql配置异常 %v\n", err)
-		log.Fatal(err)
+		log.Fatalln("mysql配置异常", err)
 	}
 	err = gcfg.Instance().MustGet(initDbCtx, "bjgjdsjjys").Scan(&Bjgjdsjjys)
 	if err != nil {
-		log.Printf("bjgjdsjjys配置异常 %v\n", err)
-		log.Fatal(err)
+		log.Fatalln("bjgjdsjjys配置异常", err)
 	}
 	GateWatMySql = &mysql.Mysql{
 		Address:      mysqlConf.Address,
@@ -49,6 +51,5 @@ func InitDatabases() {
 		MaxIdleConns: mysqlConf.MaxIdleConns,
 	}
 	GateWatMySql.Init()
-	log.Printf("初始化Mysql完成 %+v\n", mysqlConf)
-	//初始化jymysql数据库
+	log.Println("初始化Mysql完成")
 }

+ 35 - 45
common/gatecode/errcode.go

@@ -1,5 +1,13 @@
 package gatecode
 
+import (
+	"errors"
+	"strings"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+)
+
 // ErrCode 表示错误码
 type ErrCode int
 
@@ -8,50 +16,32 @@ type ErrCode int
 // 定义错误码 *代码后错误注释,即返回用户的错误信息
 const (
 	// GLOBAL_ERR_NIL 常用全局异常定义
-	GLOBAL_ERR_NIL                          ErrCode = 1000 + iota // global OK
-	GLOBAL_ERR_NOTLOGIN                                           // 无用户身份
-	GLOBAL_ERR_NOENT_SELECT                                       // 无选择企业
-	GLOBAL_ERR_NOPOWER                                            // 没有权限
-	GLOBAL_ERR_UNFINISH                                           // 正在开发中
-	GLOBAL_ERR_ENTACCOUNT_STATUS                                  // 企业账户已被冻结
-	GLOBAL_ERR_ENTACCOUNT_AUTH_NOT                                // 企业未认证
-	GLOBAL_ERR_ENTACCOUNT_AUTH_AWAIT                              // 企业认证待审核
-	GLOBAL_ERR_ENTACCOUNT_AUTH_NOTPASS                            // 企业认证未通过
-	GLOBAL_ERR_ENTACCOUNT_AUTH_EXPIRED                            // 企业认证已过期
-	GLOBAL_ERR_RESOURCE_POWERCODE_ERR                             // 无效资源code
-	GLOBAL_ERR_RESOURCE_PORWE_FAIL                                // 权限校验失败
-	GLOBAL_ERR_RESOURCE_PORWE_EXPIRED                             // 权益已过期
-	GLOBAL_ERR_RESOURCE_PORWE_NOTENOUGH                           // 权益余额不足
-	GLOBAL_ERR_RESOURCE_PORWE_NOTHAS                              // 没有权限
-	GLOBAL_ERR_RESOURCE_PORWE_RECHARGE                            // 资源充值异常
-	GLOBAL_ERR_RESOURCE_PORWE_RECHARGE_FULL                       // 资源充值已达上限
-	GLOBAL_ERR_CONFIG_FAIL                                        // 配置异常
-)
-const (
-	// GATEWAY_ERR_NIL 代理网关错误定义
-	GATEWAY_ERR_NIL                ErrCode = 2000 + iota // gateway ok
-	GATEWAY_MODULE_UNDEFINED                             // 未知节点
-	GATEWAY_MODULE_SERVER_ERR                            // 节点无可用服务
-	GATEWAY_ROUTER_NOTFIND                               // 未注册路由地址
-	GATEWAY_ROUTER_UPHOLD                                // 接口维护中
-	GATEWAY_REGISTED_URL_ERR                             // 服务地址异常
-	GATEWAY_PROXY_ERR                                    // 服务异常
-	GATEWAY_RPC_USERCENTER_ERR                           // 用户中心服务异常
-	GATEWAY_RPC_RESOURCECENTER_ERR                       // 资源中心服务异常
-	GATEWAY_HTML_RENDER_ERR                              // 页面渲染异常
-)
-const (
-	// SERVER_ERR_NIL 服务接口错误定义
-	SERVER_ERR_NIL           ErrCode = 3000 + iota // server ok
-	SERVER_DETAIL_TIMEOUT                          // 接口超时
-	SERVER_DEDUCT_PARAM_LACK                       //扣减异常
-)
-const (
-	// OTHER_ERR_NIL 未捕获的异常
-	OTHER_ERR_NIL       ErrCode = 4000 + iota // server ok
-	OTHER_ERR_UNDEFINED                       // 未知异常
-	OTHER_ERR_OFTEN                           //请求频繁
+	GLOBAL_ERR_ERR          ErrCode = 1000 + iota //代理服务异常
+	GLOBAL_ERR_SIGN                               //无效的签名
+	GLOBAL_ERR_NOBALANCE                          //余额不足
+	GLOBAL_ERR_OFTEN                              //系统繁忙,请稍候再试
+	GLOBAL_ERR_NOTFIND                            //请求地址不存在
+	GLOBAL_ERR_MISSPARAM                          //缺少参数:%s
+	GLOBAL_ERR_INVALIDPARAM                       //无效参数:%s
+	GLOBAL_ERR_SERVICE                            //远端服务异常
 )
 
-//使用
-// NewErrorWithCode(GATEWAY_MODULE_UNDEFINED, "未找到可用服务")
+var globalErrMap = map[ErrCode]string{
+	GLOBAL_ERR_ERR:          "代理服务异常",
+	GLOBAL_ERR_SIGN:         "无效的签名",
+	GLOBAL_ERR_NOBALANCE:    "余额不足",
+	GLOBAL_ERR_OFTEN:        "系统繁忙,请稍候再试",
+	GLOBAL_ERR_NOTFIND:      "请求地址不存在",
+	GLOBAL_ERR_MISSPARAM:    "缺少参数:%s",
+	GLOBAL_ERR_INVALIDPARAM: "无效参数:%s",
+	GLOBAL_ERR_SERVICE:      "远端服务异常",
+}
+
+func (i ErrCode) String() string {
+	return globalErrMap[i]
+}
+
+// NewErrorWithCode 创建异常
+func NewErrorWithCode(err ErrCode, detail ...string) error {
+	return gerror.WrapCode(gcode.New(int(err), err.String(), strings.Join(detail, ",")), errors.New(err.String()))
+}

+ 0 - 78
common/gatecode/errcode_string.go

@@ -1,78 +0,0 @@
-// Code generated by "stringer -type ErrCode -linecomment"; DO NOT EDIT.
-
-package gatecode
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[GLOBAL_ERR_NIL-1000]
-	_ = x[GLOBAL_ERR_NOTLOGIN-1001]
-	_ = x[GLOBAL_ERR_NOENT_SELECT-1002]
-	_ = x[GLOBAL_ERR_NOPOWER-1003]
-	_ = x[GLOBAL_ERR_UNFINISH-1004]
-	_ = x[GLOBAL_ERR_ENTACCOUNT_STATUS-1005]
-	_ = x[GLOBAL_ERR_ENTACCOUNT_AUTH_NOT-1006]
-	_ = x[GLOBAL_ERR_ENTACCOUNT_AUTH_AWAIT-1007]
-	_ = x[GLOBAL_ERR_ENTACCOUNT_AUTH_NOTPASS-1008]
-	_ = x[GLOBAL_ERR_ENTACCOUNT_AUTH_EXPIRED-1009]
-	_ = x[GLOBAL_ERR_RESOURCE_POWERCODE_ERR-1010]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_FAIL-1011]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_EXPIRED-1012]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_NOTENOUGH-1013]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_NOTHAS-1014]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_RECHARGE-1015]
-	_ = x[GLOBAL_ERR_RESOURCE_PORWE_RECHARGE_FULL-1016]
-	_ = x[GLOBAL_ERR_CONFIG_FAIL-1017]
-	_ = x[GATEWAY_ERR_NIL-2000]
-	_ = x[GATEWAY_MODULE_UNDEFINED-2001]
-	_ = x[GATEWAY_MODULE_SERVER_ERR-2002]
-	_ = x[GATEWAY_ROUTER_NOTFIND-2003]
-	_ = x[GATEWAY_ROUTER_UPHOLD-2004]
-	_ = x[GATEWAY_REGISTED_URL_ERR-2005]
-	_ = x[GATEWAY_PROXY_ERR-2006]
-	_ = x[GATEWAY_RPC_USERCENTER_ERR-2007]
-	_ = x[GATEWAY_RPC_RESOURCECENTER_ERR-2008]
-	_ = x[GATEWAY_HTML_RENDER_ERR-2009]
-	_ = x[SERVER_ERR_NIL-3000]
-	_ = x[SERVER_DETAIL_TIMEOUT-3001]
-	_ = x[SERVER_DEDUCT_PARAM_LACK-3002]
-	_ = x[OTHER_ERR_NIL-4000]
-	_ = x[OTHER_ERR_UNDEFINED-4001]
-	_ = x[OTHER_ERR_OFTEN-4002]
-}
-
-const (
-	_ErrCode_name_0 = "global OK无用户身份无选择企业没有权限正在开发中企业账户已被冻结企业未认证企业认证待审核企业认证未通过企业认证已过期无效资源code权限校验失败权益已过期权益余额不足没有权限资源充值异常资源充值已达上限配置异常"
-	_ErrCode_name_1 = "gateway ok未知节点节点无可用服务未注册路由地址接口维护中服务地址异常服务异常用户中心服务异常资源中心服务异常页面渲染异常"
-	_ErrCode_name_2 = "server ok接口超时扣减异常"
-	_ErrCode_name_3 = "server ok未知异常请求频繁"
-)
-
-var (
-	_ErrCode_index_0 = [...]uint16{0, 9, 24, 39, 51, 66, 90, 105, 126, 147, 168, 184, 202, 217, 235, 247, 265, 289, 301}
-	_ErrCode_index_1 = [...]uint8{0, 10, 22, 43, 64, 79, 97, 109, 133, 157, 175}
-	_ErrCode_index_2 = [...]uint8{0, 9, 21, 33}
-	_ErrCode_index_3 = [...]uint8{0, 9, 21, 33}
-)
-
-func (i ErrCode) String() string {
-	switch {
-	case 1000 <= i && i <= 1017:
-		i -= 1000
-		return _ErrCode_name_0[_ErrCode_index_0[i]:_ErrCode_index_0[i+1]]
-	case 2000 <= i && i <= 2009:
-		i -= 2000
-		return _ErrCode_name_1[_ErrCode_index_1[i]:_ErrCode_index_1[i+1]]
-	case 3000 <= i && i <= 3002:
-		i -= 3000
-		return _ErrCode_name_2[_ErrCode_index_2[i]:_ErrCode_index_2[i+1]]
-	case 4000 <= i && i <= 4002:
-		i -= 4000
-		return _ErrCode_name_3[_ErrCode_index_3[i]:_ErrCode_index_3[i+1]]
-	default:
-		return "ErrCode(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-}

+ 0 - 67
common/gatecode/getError_test.go

@@ -1,67 +0,0 @@
-package gatecode
-
-import (
-	"errors"
-	"fmt"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestGError(t *testing.T) {
-	err := errors.New("1")
-	err = gerror.Wrap(err, "2")
-	err = gerror.Wrap(err, "3")
-	t.Log(err, nil)
-	t.Log(fmt.Sprintf("%s", err), "3: 2: 1")
-	t.Log(fmt.Sprintf("%v", err), "3: 2: 1")
-
-}
-
-func TestGCode(t *testing.T) {
-	err1 := errors.New("permission denied")
-	err2 := gerror.WrapCode(gcode.New(10000, "aaaa", nil), err1, "Custom Error")
-	fmt.Println(err2.Error())
-	fmt.Println(gerror.Code(err2))
-	err3 := gerror.Wrap(err2, "sss")
-	fmt.Println(err3)
-}
-
-func TestGErr(t *testing.T) {
-	err := errors.New("permission denied")
-	c := gerror.Code(err)
-	t.Log(c == gcode.CodeNil)
-	t.Log("www", c.Detail())
-
-	cc := gerror.Stack(err)
-	t.Log(cc)
-
-	ccc := gerror.Code(nil)
-	t.Log(ccc.Detail())
-}
-
-func TestErrorCodeIncrease(t *testing.T) {
-	c1 := getErrCode(1000)
-	c2 := getErrCode(2000)
-	for i := 0; i < 10; i++ {
-		fmt.Println(c1())
-	}
-	for i := 0; i < 10; i++ {
-		fmt.Println(c2())
-	}
-}
-
-func TestErrCode(t *testing.T) {
-	fmt.Println(runtime.Version())
-	fmt.Println("GLOBAL_ERR_NIL =>", GLOBAL_ERR_NIL, int(GLOBAL_ERR_NIL), GLOBAL_ERR_NIL.String())
-}
-
-func TestName(t *testing.T) {
-	t.Log(demo())
-}
-
-func demo(e ...string) string {
-	return strings.Join(e, ",")
-}

+ 0 - 37
common/gatecode/global.go

@@ -1,37 +0,0 @@
-package gatecode
-
-import (
-	"errors"
-	"strings"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-)
-
-var (
-	UndefinedRouter = errors.New("未知路由")
-	RouterUpholding = errors.New("接口维护中")
-)
-
-// gatewayCode 错误信息累加器
-func getErrCode(code int) func() int {
-	return func() int {
-		code++
-		return code
-	}
-}
-
-var (
-	//网关应用错误类型 1000-2000
-	gatewayErrCode            = getErrCode(1000)
-	GatewayUndefinedRouterErr = gerror.WrapCode(gcode.New(gatewayErrCode(), UndefinedRouter.Error(), "未知路由地址"), UndefinedRouter)
-
-	//服务接口错误类型 3000-4000
-	serverErrCode            = getErrCode(2000)
-	ServerRouterUpholdingErr = gerror.WrapCode(gcode.New(serverErrCode(), RouterUpholding.Error(), "接口维护中"), RouterUpholding)
-)
-
-// NewErrorWithCode 创建异常
-func NewErrorWithCode(err ErrCode, detail ...string) error {
-	return gerror.WrapCode(gcode.New(int(err), err.String(), strings.Join(detail, ",")), errors.New(err.String()))
-}

+ 0 - 10
core/logs/internal/module.go

@@ -1,10 +0,0 @@
-package internal
-
-type SaveLogsDb interface {
-	AddLogToTask(data map[string]interface{}) //添加日志
-	SaveLogTask()                             //日志堆栈
-}
-
-type LogsNotice interface {
-	SendWarnMsg(data map[string]interface{}) error
-}

+ 0 - 42
core/logs/internal/savedb/saveDb.go

@@ -1,42 +0,0 @@
-package savedb
-
-import (
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"log"
-	"sync"
-	"time"
-)
-
-type DbLogs struct {
-	Cache []map[string]interface{}
-	lock  sync.Mutex
-	Db    mongodb.MongodbSim
-}
-
-// SaveLogTask 定时保存日志
-func (s *DbLogs) SaveLogTask() {
-	s.lock.Lock()
-	if len(s.Cache) >= 1 {
-		tmp := s.Cache
-		s.Cache = make([]map[string]interface{}, 0)
-		go func() {
-			log.Println("timer..save..visit..log", len(tmp))
-		}()
-	}
-
-	s.lock.Unlock()
-	time.AfterFunc(5*time.Minute, s.SaveLogTask)
-}
-
-func (s *DbLogs) AddLogToTask(data map[string]interface{}) {
-	s.lock.Lock()
-	s.Cache = append(s.Cache, data)
-	if len(s.Cache) >= 5 {
-		tmp := s.Cache
-		s.Cache = make([]map[string]interface{}, 0)
-		go func() {
-			log.Println("save..visit..log", len(tmp), s.Db.SaveBulk("jy_gateway_logs", tmp...))
-		}()
-	}
-	s.lock.Unlock()
-}

+ 0 - 113
core/node/NewReigster.go

@@ -1,113 +0,0 @@
-package node
-
-import (
-	"app.yhyue.com/moapp/jybase/iputil"
-	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/threading"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"time"
-)
-
-type Publisher struct {
-	code      string           //服务code
-	serAddr   string           //服务地址
-	serPort   string           //服务端口
-	endpoints []string         //etcd集群地址
-	leaseId   clientv3.LeaseID //租约
-	client    *clientv3.Client //链接
-	stop      chan struct{}
-}
-
-func NewPublisher(serverCode, port string, endpoints ...string) *Publisher {
-	if len(endpoints) == 0 {
-		endpoints = defaultEndpoints
-	}
-	return &Publisher{
-		code:      serverCode,
-		serPort:   port,
-		endpoints: endpoints,
-		stop:      make(chan struct{}),
-	}
-}
-
-// Register 注册服务
-func (p *Publisher) Register() (chan struct{}, error) {
-	//创建链接
-	client, err := clientv3.New(clientv3.Config{
-		Endpoints:   p.endpoints,
-		DialTimeout: time.Duration(defaultDialTimeout) * time.Second,
-	})
-	if err != nil {
-		return p.stop, err
-	}
-
-	//注册节点
-	err = p.register(client)
-	if err != nil {
-		return p.stop, err
-	}
-
-	//续租约
-	return p.stop, p.keepAliveAsync(client)
-}
-
-// getRegisterKey 获取注册key
-func (p *Publisher) getRegisterKey() (key, val string) {
-	addr, port := p.serAddr, p.serPort
-	if addr == "" {
-		addr = fmt.Sprintf("http://%s", iputil.InternalIp())
-	}
-	if p.serPort == "" {
-		port = "80"
-	}
-	finalAddr := fmt.Sprintf("%s:%s", addr, port)
-	return createServerRegisterKey(defaultScheme, p.code, finalAddr), time.Now().Format("2006-01-02 15:04:05")
-}
-
-// register 注册节点
-func (p *Publisher) register(cli *clientv3.Client) error {
-	resp, err := cli.Grant(cli.Ctx(), 5)
-	if err != nil {
-		return err
-	}
-	p.leaseId = resp.ID
-	key, val := p.getRegisterKey()
-	_, err = cli.Put(cli.Ctx(), key, val, clientv3.WithLease(p.leaseId))
-	return err
-}
-
-// keepAliveAsync 续租
-func (p *Publisher) keepAliveAsync(cli *clientv3.Client) error {
-	ch, err := cli.KeepAlive(cli.Ctx(), p.leaseId)
-	if err != nil {
-		return err
-	}
-	threading.GoSafe(func() {
-		for {
-			select {
-			case <-p.stop:
-				p.revoke(cli)
-				fmt.Println("服务主动关闭")
-			case _, ok := <-ch:
-				if !ok {
-					p.revoke(cli)
-					if _, err := p.Register(); err != nil {
-						logx.Errorf("KeepAlive: %s", err.Error())
-					} else {
-						fmt.Printf("重新创建链接")
-					}
-					return
-				}
-			}
-		}
-	})
-	return nil
-}
-
-// revoke 撤销给定的租约
-func (p *Publisher) revoke(cli *clientv3.Client) {
-	if _, err := cli.Revoke(cli.Ctx(), p.leaseId); err != nil {
-		logx.Error(err)
-	}
-}

+ 0 - 51
core/node/hellowrold/main.go

@@ -1,51 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
-	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/node"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-func main() {
-	//node.NewNode().Register("usermodule", "8888", "http://127.0.0.1")
-
-	var serverCode string = "gatewayDemo"
-	var serverPort int = 8099
-
-	server := g.Server()
-	server.SetPort(serverPort)
-	server.BindHandler("/gatewayDemo/{page}", func(r *ghttp.Request) {
-		r.Response.Write(map[string]interface{}{
-			"code": 1,
-			"func": r.Get("page"),
-			"param": map[string]interface{}{
-				"name": r.Get("name").String(),
-				"age":  r.Get("age").Int64(),
-				"eId":  r.Get("entId").Int64(),
-				"uId":  r.Get("userId").String(),
-			},
-		})
-	})
-
-	//向网关注册表注册服务。此步骤应在服务启动后注册。服务有重试机制不受影响。
-	//NewNode可传入etcd节点,默认http://127.0.0.1:2379
-	closeNotify, err := node.NewNode().Register(serverCode, fmt.Sprintf("%d", serverPort))
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		server.Run()
-	}()
-
-	//阻塞主进程,接受退出消息。关闭服务,从注册表中删除。
-	//kill -9 信号接受不到,会有2~3秒延迟。服务有重试机制不受影响。
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
-	<-quit
-	closeNotify()
-}

+ 0 - 50
core/node/node.go

@@ -1,50 +0,0 @@
-package node
-
-import (
-	client "go.etcd.io/etcd/client/v3"
-	"log"
-	"time"
-)
-
-var (
-	defaultEndpoints   = []string{"http://127.0.0.1:2379"}
-	defaultDialTimeout = 5
-)
-
-type Node struct {
-	scheme string //
-	ip     string //节点ip
-	Client *client.Client
-}
-
-// NewNode 快速创建节点
-func NewNode(endpoints ...string) *Node {
-	if len(endpoints) == 0 {
-		endpoints = defaultEndpoints
-	}
-	// etcd 配置
-	defaultConfig := client.Config{
-		Endpoints:   endpoints,
-		DialTimeout: time.Duration(defaultDialTimeout) * time.Second,
-	}
-	return NewNodeWithConfig(defaultConfig)
-}
-
-// NewNodeWithConfig 根据全量配置文件创建节点
-func NewNodeWithConfig(conf client.Config) *Node {
-	// 创建 etcd 客户端
-	etcdClient, err := client.New(conf)
-	if err != nil {
-		log.Fatal("Error: cannot connect to etcd: ", err)
-	}
-	return &Node{
-		Client: etcdClient,
-		scheme: defaultScheme,
-	}
-}
-
-// SetScheme 设置节点注册、监听scheme
-// 禁止在node Register后 或 NewWatcher 后修改
-func (n *Node) SetScheme(scheme string) {
-	n.scheme = scheme
-}

+ 0 - 38
core/node/node_test.go

@@ -1,38 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
-	"os"
-	"os/signal"
-	"syscall"
-	"testing"
-)
-
-// TestServerNodeRegister测试服务注册
-func TestServerNodeRegister(t *testing.T) {
-	var serverCode string = "gatewayDemo"
-	var serverPort int = 8099
-	closeNotify, err := NewNode().Register(serverCode, fmt.Sprintf("%d", serverPort))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	go func() {
-		server := g.Server()
-		server.SetPort(serverPort)
-		server.BindHandler("POST:/gatewayDemo/{page}", func(r *ghttp.Request) {
-			r.Response.Write(map[string]interface{}{
-				"code": 1,
-				"func": r.Get("page"),
-			})
-		})
-		server.Run()
-	}()
-
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
-	<-quit
-	closeNotify()
-}

+ 0 - 73
core/node/register.go

@@ -1,73 +0,0 @@
-package node
-
-import (
-	"app.yhyue.com/moapp/jybase/iputil"
-	"context"
-	"fmt"
-	client "go.etcd.io/etcd/client/v3"
-	"log"
-	"time"
-)
-
-// Register 注册服务
-func (n *Node) Register(serverCode string, serverPort string, serverIp ...string) (func(), error) {
-	stop, err := NewPublisher(serverCode, serverPort, n.Client.Endpoints()...).Register()
-	if err != nil {
-		return nil, err
-	}
-	return func() {
-		stop <- struct{}{}
-	}, nil
-	//return n.RegisterWithContext(context.Background(), serverCode, serverPort, serverIp...)
-}
-
-// RegisterWithContext 注册服务
-func (n *Node) RegisterWithContext(ctx context.Context, serverCode string, serverPort string, domain ...string) (func(), error) {
-	var err error
-	var serverAddr string
-
-	if len(domain) > 0 {
-		serverAddr = domain[0]
-	} else {
-		serverAddr = fmt.Sprintf("http://%s", iputil.InternalIp())
-	}
-	//创建租约
-	lease, err := n.Client.Grant(ctx, 5)
-	if err != nil {
-		return nil, err
-	}
-	//像etcd注册服务
-	finalAddr := serverAddr
-	if serverPort != "" {
-		finalAddr = fmt.Sprintf("%s:%s", serverAddr, serverPort)
-	}
-	key := createServerRegisterKey(n.scheme, serverCode, finalAddr)
-	_, err = n.Client.Put(ctx, key, time.Now().Format(""), client.WithLease(lease.ID))
-	if err != nil {
-		return nil, err
-	}
-	log.Printf("service registed gateway for %s success!\n", key)
-	//续租约
-	keepAlive, err := n.Client.KeepAlive(ctx, lease.ID)
-	if err != nil {
-		return nil, err
-	}
-	go func() {
-		for {
-			select {
-			case <-n.Client.Ctx().Done():
-				fmt.Println("server closed")
-				return
-			case _, ok := <-keepAlive:
-				if !ok {
-					fmt.Println("keep live channel closed")
-					_, _ = n.Client.Revoke(ctx, lease.ID)
-					return
-				}
-			}
-		}
-	}()
-	return func() {
-		_, _ = n.Client.Revoke(ctx, lease.ID)
-	}, nil
-}

+ 0 - 25
core/node/scheme.go

@@ -1,25 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"regexp"
-)
-
-const defaultScheme = "etcd:///com.gateway"
-
-var findServerCodeRegexp = regexp.MustCompile(`.*/(.*)@(.*)`)
-
-// createServerRegisterKey 创建ectd注册key内容
-func createServerRegisterKey(scheme, serverCode, serverAddr string) string {
-	return fmt.Sprintf("%s/%s@%s", scheme, serverCode, serverAddr)
-}
-
-// getServerCodeFromKey 从etcd ServerRegisterKey中获取服务code
-func getServerCodeFromKey(key string) (serverCode, serverAddr string) {
-	strArr := findServerCodeRegexp.FindStringSubmatch(key)
-	if len(strArr) == 3 {
-		serverCode = strArr[1]
-		serverAddr = strArr[2]
-	}
-	return
-}

+ 0 - 49
core/node/watcher.go

@@ -1,49 +0,0 @@
-package node
-
-import (
-	"context"
-	client "go.etcd.io/etcd/client/v3"
-	"log"
-)
-
-// Resolver 需要获取注册服务内容结构体需要实现的方法
-type Resolver interface {
-	// AddNode 添加节点
-	AddNode(code, server string) error
-	// DelNode 删除节点
-	DelNode(code, server string) error
-}
-
-// NewWatcher 获取节点内容
-func (n *Node) NewWatcher(ctx context.Context, resolver Resolver) {
-	// 获取当前已注册的服务
-	registered, err := n.Client.Get(ctx, n.scheme, client.WithPrefix())
-	if err != nil {
-		log.Printf("NewWatcher 获取已注册服务出错%v", err)
-	}
-	for _, value := range registered.Kvs {
-		serverCode, serverAddr := getServerCodeFromKey(string(value.Key))
-		if addRegisteredErr := resolver.AddNode(serverCode, serverAddr); addRegisteredErr != nil {
-			log.Printf("NewWatcher 添加已存在节点 %s:%s 异常%v", serverCode, serverAddr, addRegisteredErr)
-		}
-	}
-	// 持续监听服务变化
-	for wch := range n.Client.Watch(ctx, n.scheme, client.WithPrefix()) {
-		for _, ev := range wch.Events {
-			//获取服务标识代码及服务地址
-			serverCode, serverAddr := getServerCodeFromKey(string(ev.Kv.Key))
-			var operateErr error
-
-			switch ev.Type {
-			case client.EventTypePut:
-				operateErr = resolver.AddNode(serverCode, serverAddr)
-			case client.EventTypeDelete:
-				operateErr = resolver.DelNode(serverCode, serverAddr)
-			}
-
-			if operateErr != nil {
-				log.Printf("NewWatcher 监听 %v 节点 %s:%s 异常%v", ev.Type, serverCode, serverAddr, operateErr)
-			}
-		}
-	}
-}

+ 0 - 133
core/proxy/broker/broker.go

@@ -1,133 +0,0 @@
-package broker
-
-import (
-	"fmt"
-	"github.com/gogf/gf/v2/net/ghttp"
-	"github.com/gogf/gf/v2/net/gtrace"
-	"github.com/gogf/gf/v2/os/gcfg"
-	"github.com/gogf/gf/v2/os/gctx"
-	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/loadmodule"
-	"log"
-	"net/http"
-	"net/url"
-	"sync"
-)
-
-type broker struct {
-	sync.RWMutex
-	addresses map[string]loadmodule.ProxyLoadModule
-	outServer map[string]OutServerInterface
-}
-
-func InitBroker() *broker {
-	b := new(broker)
-	b.addresses = make(map[string]loadmodule.ProxyLoadModule)
-	b.outServer = make(map[string]OutServerInterface)
-	return b
-}
-
-type OutServerInterface interface {
-	AutoLogin() error                    //自动登录
-	RequestLogin(r *ghttp.Request) error //身份状态
-	CheckLoginOut(r *ghttp.Request) bool //状态是否过期
-	Filter(r *ghttp.Request) error       //过滤器
-}
-
-// AddNode 发现注册新节点
-func (r *broker) AddNode(code, address string) error {
-	r.Lock()
-	defer r.Unlock()
-	module, ok := r.addresses[code]
-	if !ok {
-		module = loadmodule.LoadProxyLoadFactory(gcfg.Instance().MustGet(gctx.New(), "system.loadProxyModule", 0).Int())
-		r.addresses[code] = module
-	}
-	log.Printf("节点%s服务注册%s", code, address)
-	return module.Add(address)
-}
-
-// DelNode 节点下线watcher删除节点
-func (r *broker) DelNode(code, address string) error {
-	//进行删除操作
-	r.Lock()
-	defer r.Unlock()
-	module, ok := r.addresses[code]
-	if !ok {
-		log.Printf("节点%s服务关闭异常%s", code, address)
-		return NewErrorWithCode(GATEWAY_MODULE_UNDEFINED, fmt.Sprintf("节点下线异常 module %s", code))
-	}
-	log.Printf("节点%s服务关闭%s", code, address)
-	return module.Del(address)
-}
-
-// GetServerAddr 获取代理节点
-func (r *broker) GetServerAddr(code, ip string) (*url.URL, error) {
-	r.RLock()
-	defer r.RUnlock()
-	module, ok := r.addresses[code]
-	if !ok {
-		return nil, NewErrorWithCode(GATEWAY_MODULE_UNDEFINED, fmt.Sprintf("获取服务地址异常 module %s", code))
-	}
-	return module.Get(ip)
-}
-
-// RegisterOutServer 注册外部服务
-func (b *broker) RegisterOutServer(u *url.URL, outServer OutServerInterface) {
-	if u != nil && outServer != nil {
-		b.outServer[u.String()] = outServer
-	}
-}
-
-// UnLoginSetErr 挂载外部服务,当未登录时,通过处罚异常尝试重新加载
-func UnLoginSetErr(resp *http.Response) error {
-	if resp.StatusCode == 401 {
-		return fmt.Errorf("未登录异常")
-	}
-	return nil
-}
-
-// GetOutSeverAutoLogin 获取代理节点
-func (b *broker) GetOutSeverAutoLogin(address string, r *ghttp.Request) (serverUrl *url.URL, err error) {
-	_, span := gtrace.NewSpan(r.Context(), "GetOutSeverAutoLogin")
-	defer span.End()
-
-	serverUrl, err = url.Parse(address)
-	if err != nil {
-		return nil, err
-	}
-	server, ok := b.outServer[address]
-	if !ok {
-		return nil, fmt.Errorf("未知外部服务")
-	}
-	//装配登录身份
-	err = server.RequestLogin(r)
-	return
-}
-
-// CheckOutSeverLoginOut 获取代理节点
-func (b *broker) CheckOutSeverLoginOut(address string, r *ghttp.Request) bool {
-	server, ok := b.outServer[address]
-	if !ok {
-		return true
-	}
-	return server.CheckLoginOut(r)
-}
-
-// OutSeverLoginIn 获取代理节点
-func (b *broker) OutSeverLoginIn(address string) error {
-	server, ok := b.outServer[address]
-	if !ok {
-		return fmt.Errorf("未知外部服务")
-	}
-	return server.AutoLogin()
-}
-
-// OutSeverFilter 外部程序过滤器
-func (b *broker) OutSeverFilter(address string, r *ghttp.Request) error {
-	server, ok := b.outServer[address]
-	if !ok {
-		return fmt.Errorf("未知外部服务")
-	}
-	return server.Filter(r)
-}

+ 0 - 180
core/proxy/broker/outServer/SussBi.go

@@ -1,180 +0,0 @@
-package outServer
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/gogf/gf/v2/net/ghttp"
-	"github.com/gogf/gf/v2/util/gconv"
-	"golang.org/x/net/publicsuffix"
-)
-
-type sussBi struct {
-	addr       string
-	loginAddr  string
-	user       string
-	pwd        string
-	Url        *url.URL
-	cookiePath string
-	jar        *cookiejar.Jar
-	succbiJar  *cookiejar.Jar
-	prm        *ParamReplaceManager
-}
-
-// 参数替换
-type ParamReplace struct {
-	Replace []ParamReplaceSetting
-	Match   []ParamReplaceSetting
-}
-
-type ParamReplaceSetting struct {
-	Key, Value string
-}
-
-type ParamReplaceManager struct {
-	eqRouters   map[string]*ParamReplace
-	regexRouter map[*regexp.Regexp]*ParamReplace
-}
-
-func InitSussBi(config map[string]interface{}) (*sussBi, error) {
-	address := gconv.String(config["addr"])
-	user := gconv.String(config["user"])
-	password := gconv.String(config["password"])
-	paramReplace := gconv.Map(config["paramReplace"])
-	cookiePath := gconv.String(config["cookiePath"])
-	loginAddr := gconv.String(config["loginAddr"])
-	if address == "" {
-		return nil, fmt.Errorf("配置异常")
-	}
-	sussCookie, err := cookiejar.New(&cookiejar.Options{
-		PublicSuffixList: publicsuffix.List,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("初始化cookie异常")
-	}
-	sussCookie2, err2 := cookiejar.New(&cookiejar.Options{
-		PublicSuffixList: publicsuffix.List,
-	})
-	if err2 != nil {
-		return nil, fmt.Errorf("初始化cookie异常")
-	}
-	prManager := &ParamReplaceManager{
-		eqRouters:   map[string]*ParamReplace{},
-		regexRouter: map[*regexp.Regexp]*ParamReplace{},
-	}
-
-	for url, setting := range paramReplace {
-		pr := &ParamReplace{}
-		settingMap := gconv.Map(setting)
-		if settingMap == nil || len(settingMap) == 0 {
-			continue
-		}
-		if replaceMap := gconv.Map(settingMap["replace"]); replaceMap != nil && len(replaceMap) > 0 {
-			for k, v := range replaceMap {
-				pr.Replace = append(pr.Replace, ParamReplaceSetting{
-					Key:   k,
-					Value: gconv.String(v),
-				})
-			}
-		}
-		replaceMap := gconv.Map(settingMap["match"])
-		if replaceMap != nil && len(replaceMap) > 0 {
-			for k, v := range replaceMap {
-				pr.Match = append(pr.Match, ParamReplaceSetting{
-					Key:   k,
-					Value: gconv.String(v),
-				})
-			}
-		}
-		if len(pr.Match) == 0 && len(pr.Replace) == 0 {
-			continue
-		}
-		if regexp.QuoteMeta(url) == url {
-			prManager.eqRouters[url] = pr
-		} else {
-			if reg, err := regexp.Compile(url); err == nil {
-				prManager.regexRouter[reg] = pr
-			}
-		}
-	}
-	u, _ := url.Parse(address)
-	return &sussBi{
-		addr:       address,
-		user:       user,
-		Url:        u,
-		pwd:        password,
-		loginAddr:  loginAddr,
-		cookiePath: cookiePath,
-		jar:        sussCookie,
-		succbiJar:  sussCookie2,
-		prm:        prManager,
-	}, nil
-}
-
-// AutoLogin 自动登录
-func (s *sussBi) AutoLogin() error {
-	client := &http.Client{
-		Jar: s.jar,
-	}
-	resp, err := client.Get(fmt.Sprintf("%s/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
-	if err != nil {
-		return err
-	}
-	if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
-		return fmt.Errorf("自动登录异常")
-	}
-	client.Jar = s.succbiJar
-	resp, err = client.Get(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
-	if err != nil {
-		return err
-	}
-	if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
-		return fmt.Errorf("自动登录异常")
-	}
-	return nil
-}
-
-// RequestLogin 装配登录状态
-func (s *sussBi) RequestLogin(r *ghttp.Request) error {
-	if strings.HasPrefix(r.URL.Path, "/succbi") {
-		u, e := url.Parse(s.Url.String() + "/succbi")
-		if e != nil {
-			return e
-		}
-		//cookies2 := s.succbiJar.Cookies(s.Url)
-		//fmt.Println(cookies2)
-		if cookies := s.succbiJar.Cookies(u); len(cookies) > 0 {
-			r.Request.AddCookie(cookies[0])
-		}
-	} else {
-		if cookies := s.jar.Cookies(s.Url); len(cookies) > 0 {
-			r.Request.AddCookie(cookies[0])
-		}
-	}
-	return nil
-}
-
-// CheckLoginOut 检测登录状态是否过期
-func (s *sussBi) CheckLoginOut(r *ghttp.Request) bool {
-	return true
-	if r.Response.Status == 401 {
-		return true
-	}
-	return false
-}
-
-func (s *sussBi) Filter(r *ghttp.Request) error {
-	http.SetCookie(r.Response.ResponseWriter, &http.Cookie{
-		Name:     "BITOKEN",
-		Path:     "/",
-		HttpOnly: false,
-		MaxAge:   604800,
-		Expires:  time.Now().AddDate(0, 0, 7),
-	})
-	return nil
-}

+ 0 - 7
core/proxy/filterPoly/filterPoly.go

@@ -1,7 +0,0 @@
-package filterPoly
-
-// ReqFilterPoly 代理应用下每一组action
-type ReqFilterPoly struct {
-	Code string   //别名【用于验证码分组统计】
-	Rule *ReqRule //action分组rule【需要配合Alias使用】
-}

+ 0 - 23
core/proxy/filterPoly/reqRule.go

@@ -1,23 +0,0 @@
-package filterPoly
-
-// ReqRule 请求规则
-type ReqRule struct {
-	Alias           string    `json:"alias"`           //别名
-	CheckWhite      bool      `json:"checkWhite"`      //白名单是否启用
-	CheckBlack      bool      `json:"checkBlack"`      //黑名单是否启用
-	BCheckId        bool      `json:"checkIdBlock"`    //开启用户名单验证
-	IdThreshold     [][]int64 `json:"idThreshold"`     //用户出验证码的阀值
-	IdTimeRange     int64     `json:"idTimeRange"`     //验证码等待时间
-	IdFrep          int64     `json:"idFreq"`          //超过阀值后,按频率出验证码
-	IdMax           []int64   `json:"idMax"`           //超过最大值,进临时黑名单
-	IdMaxBlockTimes []int64   `json:"idMaxBlockTimes"` //最大临时黑名单次数,进永久黑名单
-	BCheckIp        bool      `json:"checkIpBlock"`    //开启ip黑名单验证
-	IpThreshold     [][]int64 `json:"ipThreshold"`     //ip出验证码的阀值
-	IpTimeRange     int64     `json:"ipTimeRange"`     //验证码等待时间
-	IpFrep          int64     `json:"ipFreq"`          //超过阀值后,按频率出验证码
-	IpMax           []int64   `json:"ipMax"`           //超过最大值,进临时黑名单
-	IpMaxBlockTimes []int64   `json:"ipMaxBlockTimes"` //最大临时黑名单次数,进永久黑名单
-	VcodeErrorTimes []int64   `json:"vcodeErrorTimes"` //验证码错误次数,进临时黑名单
-	TempBlockTime   int64     `json:"tempBlockTime"`   //临时黑名单时间
-	VerifyPage      string    `json:"verifyPage"`      //验证码校验页面
-}

+ 0 - 174
core/proxy/filterPoly/wordsclick.go

@@ -1,174 +0,0 @@
-package filterPoly
-
-import (
-	"bytes"
-	"encoding/base64"
-	"github.com/golang/freetype"
-	"image"
-	"image/draw"
-	"image/jpeg"
-	"image/png"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"time"
-)
-
-type WordClickVerify struct {
-	Words     []rune  //生成图片的文字
-	Key       string  //点选字
-	ShowIndex []int   //点选顺序
-	imgBase64 string  //图片
-	CheckArr  [][]int //点选核对信息
-}
-type FontDot struct {
-	Dx   int
-	Dy   int
-	Text string
-}
-
-const (
-	width    = 320 //验证码宽度
-	height   = 100 //验证码高度
-	fontDPI  = 72  //屏幕每英寸的分辨率
-	fontSize = 24  //字体大小
-
-	bgImgFileDir  = "./resources/verify/imageBg/"
-	fontBgFileDir = "./resources/verify/fontBg/"
-	fontFileDir   = "./resources/verify/fontType/"
-
-	verifyTextLen  = 7 //验证码文字长度
-	verifyCheckNum = 3 //验证码点击选择数量
-)
-
-var (
-	bgImgList   []image.Image
-	fontImgList []image.Image
-	fontList    [][]byte
-	vCodeChan   = make(chan *WordClickVerify, 30)
-)
-
-func init() {
-	// 背景图片读入内存
-	bg_list, _ := ioutil.ReadDir(bgImgFileDir)
-	for _, val := range bg_list {
-		fileData, _ := os.Open(bgImgFileDir + val.Name())
-		imgData, _ := jpeg.Decode(fileData)
-		bgImgList = append(bgImgList, imgData)
-		_ = fileData.Close()
-	}
-	//字体背景读入内存
-	font_list, _ := ioutil.ReadDir(fontBgFileDir)
-	for _, val := range font_list {
-		fontfileData, _ := os.Open(fontBgFileDir + val.Name())
-		fontimgData, _ := jpeg.Decode(fontfileData)
-		fontImgList = append(fontImgList, fontimgData)
-		_ = fontfileData.Close()
-	}
-	// 字体库读入内存
-	fontInfoList, _ := ioutil.ReadDir(fontFileDir)
-	for _, val := range fontInfoList {
-		fontBytes, _ := ioutil.ReadFile(fontFileDir + val.Name())
-		fontList = append(fontList, fontBytes)
-	}
-	go func() {
-		for {
-			vObj := CreateVerify()
-			if vObj == nil {
-				continue
-			}
-			vCodeChan <- vObj
-		}
-	}()
-}
-
-// CreateVerify 生成验证码
-func CreateVerify() (verify *WordClickVerify) {
-	verify = &WordClickVerify{}
-	verify.Words = []rune(GenRandZh(verifyTextLen)) //验证码文字
-	//verify.Words = []rune("一弍褕呚騍鯽三") //琖弍褕呚騍鯽鳑
-	rand.Seed(time.Now().UnixNano())
-	//文字背景
-	fontBg := image.NewNRGBA(image.Rect(0, 0, width, height))      //字体背景
-	img := fontImgList[rand.Intn(len(fontImgList))].(*image.YCbCr) //获取背景图片
-	draw.Draw(fontBg, fontBg.Bounds(), img, image.ZP, draw.Src)
-	//文字图层
-	wordCanvas := image.NewNRGBA(image.Rect(0, 0, width, height))
-	fontBytes := fontList[rand.Intn(len(fontList))]
-	font, err := freetype.ParseFont(fontBytes)
-	if err != nil {
-		return nil
-	}
-
-	c := freetype.NewContext()
-	c.SetDPI(fontDPI)
-	c.SetClip(wordCanvas.Bounds())
-	c.SetDst(wordCanvas)
-	c.SetSrc(image.Black)
-
-	allDots := make(map[int]FontDot) //各个文字点位置
-	for i := 0; i < len(verify.Words); i++ {
-		c.SetFontSize(fontSize)
-		c.SetFont(font)
-		w := (width - fontSize) / len(verify.Words)
-		x := i*w + rand.Intn(w-fontSize)
-		y := rand.Intn(height-fontSize) + fontSize
-		pt := freetype.Pt(x, y) // 字出现的位置
-		text := string(verify.Words[i])
-		if _, err := c.DrawString(text, pt); err != nil {
-			return nil
-		}
-		allDots[i] = FontDot{x + fontSize/2, y - fontSize/2, text}
-	}
-	//确定点击顺序和点击文字
-	verify.CheckArr = [][]int{}
-	for _, i := range rand.Perm(len(allDots)) {
-		dot := allDots[i]
-		if len(verify.CheckArr) >= verifyCheckNum {
-			break
-		}
-		verify.Key += dot.Text
-		verify.ShowIndex = append(verify.ShowIndex, i)
-		verify.CheckArr = append(verify.CheckArr, []int{dot.Dx, dot.Dy})
-	}
-	imgRes := bgImgList[rand.Intn(len(bgImgList))]
-	verifyBg := image.NewNRGBA(image.Rect(0, 0, width, height))
-	draw.Draw(verifyBg, verifyBg.Bounds(), imgRes, image.ZP, draw.Src)
-	//合并图层
-	draw.DrawMask(verifyBg, verifyBg.Bounds(), fontBg, image.ZP, wordCanvas, image.ZP, draw.Over)
-	buf := new(bytes.Buffer)
-	_ = png.Encode(buf, verifyBg)
-	verify.imgBase64 = base64.StdEncoding.EncodeToString(buf.Bytes())
-	return
-}
-
-// GenRandZh 获取验证码随机文字
-func GenRandZh(leng int) string {
-	randInt := generateRandomNumber(19968, 40869, leng)
-	str := ""
-	for _, v := range randInt {
-		str += string(v)
-	}
-	return str
-}
-
-// generateRandomNumber 从start-end中获取count个随机数
-func generateRandomNumber(start int, end int, count int) []int {
-	nums := make([]int, 0)
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	for len(nums) < count {
-		num := r.Intn((end - start)) + start
-		//查重
-		exist := false
-		for _, v := range nums {
-			if v == num {
-				exist = true
-				break
-			}
-		}
-		if !exist {
-			nums = append(nums, num)
-		}
-	}
-	return nums
-}

+ 0 - 33
core/proxy/loadmodule/interface.go

@@ -1,33 +0,0 @@
-package loadmodule
-
-import (
-	"net/url"
-)
-
-type ProxyLoadType int
-
-const (
-	RandomProxyModule     ProxyLoadType = iota //随机
-	RoundRobinProxyModule                      //轮询
-	HashProxyModule                            //哈希
-)
-
-type ProxyLoadModule interface {
-	Get(string) (*url.URL, error) //获取节点
-	Add(string) error             //添加节点
-	Del(string) error             //动态添加
-}
-
-// LoadProxyLoadFactory 节点负载模式
-func LoadProxyLoadFactory(value int) ProxyLoadModule {
-	switch ProxyLoadType(value) {
-	case RandomProxyModule: //随机
-		return &RandomProxy{}
-	case RoundRobinProxyModule: //轮询
-		return &RoundRobinProxy{}
-	case HashProxyModule: //哈希
-		return &HashProxy{}
-	default:
-		return &RandomProxy{}
-	}
-}

+ 0 - 62
core/proxy/loadmodule/module_hash.go

@@ -1,62 +0,0 @@
-package loadmodule
-
-import (
-	"fmt"
-	"hash/adler32"
-	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"net/url"
-	"strings"
-	"time"
-)
-
-type HashProxy struct {
-	curIndex int
-	rss      []*url.URL
-}
-
-func (h *HashProxy) Add(path string) error {
-	remoteUrl, err := url.Parse(strings.TrimSpace(path))
-	if err != nil {
-		return NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务地址%s ERR:%v", path, err))
-	}
-	h.rss = append(h.rss, remoteUrl)
-	return nil
-}
-
-func (h *HashProxy) next(ip string) (url *url.URL, err error) {
-	defer func() {
-		//数组线程不安全处理
-		if rec := recover(); rec != nil {
-			err = NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务列表%v 获取服务异常%v ", h.rss, rec))
-		}
-	}()
-	if len(h.rss) == 1 {
-		url = h.rss[0]
-		return
-	}
-	url = h.rss[int64(adler32.Checksum([]byte(ip)))]
-	return
-}
-
-func (h *HashProxy) Get(ip string) (url *url.URL, err error) {
-	for i := 0; i < 3; i++ {
-		url, err = h.next(ip)
-		if err == nil {
-			return
-		}
-		time.Sleep(time.Millisecond * 500 * time.Duration(i))
-	}
-	return
-}
-
-func (h *HashProxy) Del(path string) error {
-	var newRss []*url.URL
-	for _, rss := range h.rss {
-		if rss.String() == path {
-			continue
-		}
-		newRss = append(newRss, rss)
-	}
-	h.rss = newRss
-	return nil
-}

+ 0 - 62
core/proxy/loadmodule/module_random.go

@@ -1,62 +0,0 @@
-package loadmodule
-
-import (
-	"fmt"
-	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"math/rand"
-	"net/url"
-	"strings"
-	"time"
-)
-
-// RandomProxy 负载-随机
-type RandomProxy struct {
-	rss []*url.URL
-}
-
-func (r *RandomProxy) Get(ip string) (url *url.URL, err error) {
-	for i := 0; i < 3; i++ {
-		url, err = r.next()
-		if err == nil {
-			return
-		}
-		time.Sleep(time.Millisecond * 500 * time.Duration(i))
-	}
-	return
-}
-
-func (r *RandomProxy) next() (url *url.URL, err error) {
-	defer func() {
-		//数组线程不安全处理
-		if rec := recover(); rec != nil {
-			err = NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务列表%v 获取服务异常%v ", r.rss, rec))
-		}
-	}()
-
-	if len(r.rss) == 1 {
-		url = r.rss[0]
-		return
-	}
-	return r.rss[rand.Intn(len(r.rss))], nil
-}
-
-func (r *RandomProxy) Add(path string) error {
-	remoteUrl, err := url.Parse(strings.TrimSpace(path))
-	if err != nil {
-		return NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务地址%s ERR:%v", path, err))
-	}
-	r.rss = append(r.rss, remoteUrl)
-	return nil
-}
-
-func (r *RandomProxy) Del(path string) error {
-	var newRss []*url.URL
-	for _, rss := range r.rss {
-		if rss.String() == path {
-			continue
-		}
-		newRss = append(newRss, rss)
-	}
-	r.rss = newRss
-	return nil
-}

+ 0 - 63
core/proxy/loadmodule/module_round.go

@@ -1,63 +0,0 @@
-package loadmodule
-
-import (
-	"fmt"
-	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"net/url"
-	"strings"
-	"time"
-)
-
-type RoundRobinProxy struct {
-	curIndex int
-	rss      []*url.URL
-}
-
-func (r *RoundRobinProxy) Add(path string) error {
-	remoteUrl, err := url.Parse(strings.TrimSpace(path))
-	if err != nil {
-		return NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务地址%s ERR:%v", path, err))
-	}
-	r.rss = append(r.rss, remoteUrl)
-	return nil
-}
-
-func (r *RoundRobinProxy) next() (url *url.URL, err error) {
-	defer func() {
-		//数组线程不安全处理
-		if rec := recover(); rec != nil {
-			err = NewErrorWithCode(GATEWAY_MODULE_SERVER_ERR, fmt.Sprintf("服务列表%v 获取服务异常%v ", r.rss, rec))
-		}
-	}()
-
-	lens := len(r.rss)
-	if r.curIndex >= lens {
-		r.curIndex = 0
-	}
-	url = r.rss[r.curIndex]
-	r.curIndex = (r.curIndex + 1) % lens
-	return
-}
-
-func (r *RoundRobinProxy) Get(ip string) (url *url.URL, err error) {
-	for i := 0; i < 3; i++ {
-		url, err = r.next()
-		if err == nil {
-			return
-		}
-		time.Sleep(time.Millisecond * 500 * time.Duration(i))
-	}
-	return
-}
-
-func (r *RoundRobinProxy) Del(path string) error {
-	var newRss []*url.URL
-	for _, rss := range r.rss {
-		if rss.String() == path {
-			continue
-		}
-		newRss = append(newRss, rss)
-	}
-	r.rss = newRss
-	return nil
-}

+ 39 - 6
core/proxy/middleware/errorHandler.go

@@ -1,15 +1,25 @@
 package middleware
 
 import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	log "app.yhyue.com/moapp/jylog"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/net/gtrace"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/db"
 	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/router"
 )
 
 // ErrorHandler 统一异常拦截、提醒,及日志打印中间件
-func ErrorHandler(r *ghttp.Request) {
+func ErrorHandler(r *ghttp.Request, routerManager *router.Manager) {
 	r.Middleware.Next()
 	_, span := gtrace.NewSpan(r.Context(), "ErrorHandler")
 	defer span.End()
@@ -18,14 +28,37 @@ func ErrorHandler(r *ghttp.Request) {
 	if err != nil {
 		gCode := gerror.Code(err)
 		if gCode == gcode.CodeNil { // 非定义异常
-			gCode = gcode.New(int(OTHER_ERR_UNDEFINED), OTHER_ERR_UNDEFINED.String(), err.Error())
-			err = gerror.NewCode(gCode, "非定义异常")
+			gCode = gcode.New(int(GLOBAL_ERR_ERR), GLOBAL_ERR_ERR.String(), err.Error())
+		}
+		appid := r.GetQuery("appid").String()
+		log.WithContext(r.Context()).Errorln(appid, r.URL.Path, gCode.Code(), gCode.Message(), gCode.Detail())
+		reqBody, _ := ioutil.ReadAll(r.Body)
+		r.Body = ioutil.NopCloser(bytes.NewReader(reqBody))
+		error_msg := gCode.Message()
+		log_error_msg := ""
+		if strings.Contains(error_msg, "%s") {
+			error_msg = fmt.Sprintf(error_msg, gCode.Detail())
+			log_error_msg = error_msg
+		} else {
+			log_error_msg = error_msg
+			if gCode.Detail() != "" {
+				log_error_msg += "," + gconv.String(gCode.Detail())
+			}
+		}
+		router, rErr := routerManager.GetRouterRule(r.URL.Path)
+		if appid != "" && rErr == nil && router.Price > 0 {
+			header := fmt.Sprintf(`{"timestamp":%s,"sign":"%s"}`, r.GetHeader("timestamp"), r.GetHeader("sign"))
+			var surplus int64
+			if gCode.Code() == int(GLOBAL_ERR_NOBALANCE) {
+				surplus = gconv.Int64(gCode.Detail())
+			}
+			db.GateWatMySql.InsertBatch("thirdparty.log", []string{"appid", "url", "header", "param", "price", "surplus", "error_code", "error_msg", "ip", "create_time"}, []interface{}{appid, router.ReqUrl, header, string(reqBody), router.Price, surplus, gCode.Code(), log_error_msg, r.GetClientIp(), gtime.Now().String()})
 		}
-		//	返回固定的友好信息
-		r.Response.ClearBuffer()
+		//返回固定的友好信息
 		r.Response.WriteJson(map[string]interface{}{
 			"error_code": gCode.Code(),
-			"error_msg":  gCode.Message(),
+			"error_msg":  error_msg,
 		})
+		r.Response.ResponseWriter.Flush()
 	}
 }

+ 29 - 19
core/proxy/middleware/filterFuncs.go

@@ -1,22 +1,23 @@
 package middleware
 
 import (
-	"app.yhyue.com/moapp/jybase/common"
-	log "app.yhyue.com/moapp/jylog"
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"regexp"
+	"strings"
+
+	"app.yhyue.com/moapp/jybase/common"
 	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
 	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/db"
 	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"regexp"
-	"strings"
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/router"
 )
 
 // filterBefore 前置拦截处理
 // 校验秘钥对不对
 func filterBefore(r *ghttp.Request) error {
-	log.Println(111, r.Header)
 	url_ := r.Request.URL.Path
 	query := r.Request.URL.Query()
 	bidreg := regexp.MustCompile(".*/getAllbid/(.*)")
@@ -29,32 +30,42 @@ func filterBefore(r *ghttp.Request) error {
 		if signature == querySignature {
 			return nil
 		} else {
-			return NewErrorWithCode(GLOBAL_ERR_RESOURCE_PORWE_FAIL)
+			return NewErrorWithCode(GLOBAL_ERR_PORWE_FAIL)
 		}*/
 		return nil
 	}
-	appid := common.ObjToString(query["appid"][0])
+	appid := ""
+	if len(query["appid"]) > 0 {
+		appid = common.ObjToString(query["appid"][0])
+	}
 	timestamp := r.GetHeader("timestamp")
 	sign := r.GetHeader("sign")
-	if appid == "" || timestamp == "" || sign == "" {
-		return NewErrorWithCode(GLOBAL_ERR_RESOURCE_PORWE_NOTHAS)
+	if appid == "" {
+		return NewErrorWithCode(GLOBAL_ERR_MISSPARAM, "appid")
+	} else if timestamp == "" {
+		return NewErrorWithCode(GLOBAL_ERR_MISSPARAM, "timestamp")
+	} else if sign == "" {
+		return NewErrorWithCode(GLOBAL_ERR_MISSPARAM, "sign")
 	}
-	userMap := db.GateWatMySql.FindOne("user", map[string]interface{}{
-		"appid": appid,
-	}, "", "")
-	if userMap == nil {
-		return NewErrorWithCode(GLOBAL_ERR_RESOURCE_PORWE_NOTHAS)
+	users := db.GateWatMySql.SelectBySql(`select * from user where appid=?`, appid)
+	if users == nil || len(*users) == 0 {
+		return NewErrorWithCode(GLOBAL_ERR_INVALIDPARAM, "appid")
 	}
-	key := common.ObjToString((*userMap)["secretkey"])
+	key := common.ObjToString((*users)[0]["secretkey"])
 	newSign := strings.ToUpper(common.GetMd5String(fmt.Sprintf("%s%s%s", appid, timestamp, key)))
-	log.Println(newSign)
 	if newSign != sign {
-		return NewErrorWithCode(GLOBAL_ERR_RESOURCE_PORWE_NOTHAS)
+		return NewErrorWithCode(GLOBAL_ERR_SIGN)
+	}
+	//校验余额
+	gCtx := router.GetGContext(r.GetCtx())
+	if gCtx.RouterRule.Price <= 0 {
+		return nil
+	} else if amount := gconv.Int64((*users)[0]["amount"]); amount-gCtx.RouterRule.Price < 0 {
+		return NewErrorWithCode(GLOBAL_ERR_NOBALANCE, fmt.Sprint(amount))
 	}
 	return nil
 }
 func signature(appId string, appSecret string, timestamp int64) string {
-	fmt.Println("timestamp :", timestamp)
 	strToSignature := fmt.Sprintf("%s&%s&%d", appId, appSecret, timestamp)
 	// 创建一个新的SHA256哈希对象
 	hash := sha256.New()
@@ -64,6 +75,5 @@ func signature(appId string, appSecret string, timestamp int64) string {
 	byteBuffer := hash.Sum(nil)
 	// 将哈希值转换为十六进制字符串
 	signature := hex.EncodeToString(byteBuffer)
-	fmt.Println("signature:", signature)
 	return signature
 }

+ 113 - 34
core/proxy/proxyServer.go

@@ -1,22 +1,31 @@
 package proxy
 
 import (
-	log "app.yhyue.com/moapp/jylog"
+	"bytes"
+	"database/sql"
+	"errors"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	log "app.yhyue.com/moapp/jylog"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/db"
 	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
 	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware"
 	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/proxyClient"
 	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/router"
-	"net/http"
-	"net/url"
 )
 
-var routerManager *router.Manager
-
 const errTryTime = 10 //错误尝试
 
 // InitGateWayServer 初始化网关服务
@@ -25,29 +34,32 @@ func InitGateWayServer(initCtx gctx.Ctx) *ghttp.Server {
 	defer span.End()
 
 	//初始化可访问路由
-	var err error
-	routerManager, err = router.InitRouterManager()
+	routerManager, err := router.InitRouterManager()
 	if err != nil {
-		log.WithContext(initCtx).Errorln(err)
+		log.WithContext(initCtx).Fatalln(err)
 	}
 
 	gateWayServer := g.Server()
 	//关闭系统自带请求日志
-	gateWayServer.SetLogger(g.Log())
-	gateWayServer.SetErrorLogEnabled(false)
+	//gateWayServer.SetLogger(g.Log())
+	//gateWayServer.SetErrorLogEnabled(false)
 
 	//注册中间件
-	gateWayServer.Use(middleware.ErrorHandler) //错误拦截
+	//错误拦截
 	gateWayServer.Use(func(r *ghttp.Request) {
-		r.SetError(routerManager.InfusionContext(r)) //context注入全局信息
+		middleware.ErrorHandler(r, routerManager)
+	})
+	//context注入全局信息
+	gateWayServer.Use(func(r *ghttp.Request) {
+		r.SetError(routerManager.InfusionContext(r))
 		r.Middleware.Next()
 	})
-	gateWayServer.Use(middleware.FilterHandler) //权限过滤
+	//前置过滤
+	gateWayServer.Use(middleware.FilterHandler)
 
 	//注册代理
-	gateWayServer.BindHandler("POST:/*", proxyHandler)             //接口代理
-	gateWayServer.BindHandler("GET:/*", proxyHandler)              //页面代理
-	gateWayServer.AddStaticPath("/antiRes", "./resources/antiRes") //静态资源
+	gateWayServer.BindHandler("POST:/*", proxyHandler) //接口代理
+	gateWayServer.BindHandler("GET:/*", proxyHandler)  //页面代理
 	return gateWayServer
 }
 
@@ -59,32 +71,99 @@ var proxyHandler = func(r *ghttp.Request) {
 	if r.GetError() != nil {
 		return
 	}
-	// 获取请求上下文内容
 	gCtx := router.GetGContext(r.GetCtx())
+	if gCtx.RouterRule.ReqLimit.Limit() {
+		r.SetError(NewErrorWithCode(GLOBAL_ERR_OFTEN))
+		return
+	}
+	defer gCtx.RouterRule.ReqLimit.UnLimit()
+	time.Sleep(10 * time.Second)
+	reqBody, _ := ioutil.ReadAll(r.Body)
+	r.Body = ioutil.NopCloser(bytes.NewReader(reqBody))
+	// 获取请求上下文内容
+	var hasErr bool
+	errHandel := func(hw http.ResponseWriter, hr *http.Request, err error) {
+		if strings.HasPrefix(err.Error(), "RespError_") {
+			r.SetError(NewErrorWithCode(ErrCode(gconv.Int(strings.TrimPrefix(err.Error(), "RespError_")))))
+			return
+		}
+		hasErr = true
+		if err.Error() == "context canceled" {
+			return
+		}
+		log.WithContext(r.Context()).Error("ErrorHandler ", err)
+	}
+	//计费
+	change := func(resp *http.Response) error {
+		if resp.StatusCode != 200 {
+			return errors.New(fmt.Sprintf("RespError_%d", GLOBAL_ERR_SERVICE))
+		}
+		if gCtx.RouterRule.Price <= 0 {
+			return nil
+		}
+		status := 0
+		b, e := ioutil.ReadAll(resp.Body)
+		if e == nil {
+			resp.Body = ioutil.NopCloser(bytes.NewReader(b))
+		}
+		jn, err := gjson.DecodeToJson(b)
+		if err != nil {
+			log.WithContext(r.Context()).Error("ChangeError", err)
+		} else if !jn.Contains("error_code") {
+			log.WithContext(r.Context()).Error("ChangeError:缺少error_code")
+		} else if jn.Get("error_code").Int64() == 0 {
+			if db.GateWatMySql.ExecTx("计费处理", func(tx *sql.Tx) bool {
+				appid := r.GetQuery("appid").String()
+				updateRes := db.GateWatMySql.UpdateOrDeleteBySqlByTx(tx, `update thirdparty.user set amount=amount-? where appid=?`, gCtx.RouterRule.Price, appid)
+				if updateRes <= 0 {
+					log.WithContext(r.Context()).Error(appid, "更新计费失败")
+					return false
+				}
+				datas := db.GateWatMySql.SelectBySqlByTx(tx, `select amount from thirdparty.user where appid=?`, appid)
+				if datas == nil || len(*datas) == 0 {
+					log.WithContext(r.Context()).Error(appid, "没有找到该账户信息")
+					return false
+				}
+				//余额不足
+				amount := gconv.Int64((*datas)[0]["amount"])
+				if amount < 0 {
+					status = -1
+					log.WithContext(r.Context()).Error(appid, "余额不足")
+					return false
+				}
+				logRes1, logRes2 := db.GateWatMySql.InsertBatchByTx(tx, "thirdparty.log", []string{"appid", "url", "param", "result", "price", "surplus", "ip", "create_time"}, []interface{}{appid, gCtx.RouterRule.ReqUrl, string(reqBody), string(b), gCtx.RouterRule.Price, amount, r.GetClientIp(), gtime.Now().String()})
+				if logRes1 <= 0 || logRes2 <= 0 {
+					return false
+				}
+				return true
+			}) {
+				status = 1
+			}
+		}
+		if status == 0 {
+			return errors.New(fmt.Sprintf("RespError_%d", GLOBAL_ERR_SERVICE))
+		} else if status == -1 {
+			r.SetError(NewErrorWithCode(GLOBAL_ERR_NOBALANCE, "余额不足"))
+			return errors.New(fmt.Sprintf("RespError_%d", GLOBAL_ERR_NOBALANCE))
+		} else if status == 1 {
+			resp.Body = ioutil.NopCloser(bytes.NewReader(b))
+		}
+		return nil
+	}
+	serverUrl, _ := url.Parse(gCtx.RouterRule.Server)
 	// 请求重试,防止某个服务中断不可用,导致接口不可用。
 	for i := 0; i < errTryTime; i++ {
 		// 代理地址存入上下文ctx中
-		serverUrl, _ := url.Parse(gCtx.RouterRule.Server)
-		gCtx.ServerAddr = serverUrl.String()
-		router.UpdateGContext(r, gCtx)
+		//gCtx.ServerAddr = serverUrl.String()
+		//router.UpdateGContext(r, gCtx)
 		// 捕获异常,若代理出错,则进行重试
-		var hasErr bool
-		errHandel := func(hw http.ResponseWriter, hr *http.Request, err error) {
-			hasErr = true
-			if err.Error() == "context canceled" {
-				return
-			}
-			if i == (errTryTime - 1) {
-				r.SetError(NewErrorWithCode(GATEWAY_PROXY_ERR, fmt.Sprintf("代理异常:%s err:%v \n", gCtx.ServerAddr, err.Error())))
-			}
-			log.WithContext(r.Context()).Error("ErrorHandler ", err)
-		}
 		// 代理请求
-		proxyClient.CreateCustomProxyClient(serverUrl, errHandel, nil).ServeHTTP(r.Response.ResponseWriter, r.Request)
-
+		proxyClient.CreateCustomProxyClient(serverUrl, errHandel, change).ServeHTTP(r.Response.ResponseWriter, r.Request)
 		// 未捕获到请求,标识请求成功
 		if !hasErr {
-			return
+			break
+		} else if i == (errTryTime - 1) {
+			r.SetError(NewErrorWithCode(GLOBAL_ERR_SERVICE, fmt.Sprintf("代理异常:%s", serverUrl.String())))
 		}
 	}
 }

+ 0 - 5
core/proxy/vars/vars.go

@@ -1,5 +0,0 @@
-package vars
-
-import "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/broker"
-
-var BManager = broker.InitBroker()

+ 2 - 1
core/router/ctx.go

@@ -2,13 +2,14 @@ package router
 
 import (
 	"context"
+
 	"github.com/gogf/gf/v2/net/ghttp"
 )
 
 // GContext 网关上下文
 type GContext struct {
 	RouterRule *Router // 路由校验规则
-	ServerAddr string  // 服务地址
+	//ServerAddr string  // 服务地址
 }
 
 const GContextKey = "jyCtx"

+ 17 - 14
core/router/manager.go

@@ -1,14 +1,17 @@
 package router
 
 import (
+	"errors"
 	"fmt"
+	"log"
+	"regexp"
+
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"github.com/gogf/gf/v2/util/gconv"
 	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/db"
 	. "jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/common/gatecode"
-	"log"
-	"regexp"
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/util"
 )
 
 type Manager struct {
@@ -19,18 +22,16 @@ type Manager struct {
 // InitRouterManager 初始化系统代理路由
 // 支持完全匹配和正则匹配
 func InitRouterManager() (*Manager, error) {
-
 	//加载规则
-	res := db.GateWatMySql.Query(fmt.Sprintf("SELECT * FROM %s", "front_proxy"))
+	res := db.GateWatMySql.Query(`SELECT * FROM front_proxy`)
 	if res == nil || len(*res) == 0 {
-		return nil, fmt.Errorf("未发现可用路由")
+		return nil, errors.New("未发现可用路由")
 	}
 	// 初始化 routerManager
 	routerManager := &Manager{
 		eqRouters:   make(map[string]*Router),
 		regexRouter: make(map[*regexp.Regexp]*Router),
 	}
-
 	for _, row := range *res {
 		// 获取路由信息
 		router := gconv.String(row["url"])
@@ -40,15 +41,21 @@ func InitRouterManager() (*Manager, error) {
 			TimeOut: gconv.Int64(row["timeout"]),
 			Remark:  gconv.String(row["remark"]),
 			Server:  gconv.String(row["server"]),
+			Price:   gconv.Int64(row["price"]),
+			ReqLimit: &util.ReqLimit{
+				Size: gconv.Int(row["pool_size"]),
+				Key:  fmt.Sprintf("reqLimit_tripartite_%d", gconv.Int(row["id"])),
+			},
 		}
-
+		routerRule.ReqLimit.Init()
 		// 判断路由匹配方式是完全匹配还是正则匹配 (此处逻辑参考x-web框架)
 		if regexp.QuoteMeta(router) == router {
 			routerManager.eqRouters[router] = routerRule
 		} else {
 			reg, err := regexp.Compile(router)
 			if err != nil {
-				log.Printf("路由%s装载异常 %v\n", router, err)
+				log.Println("路由", router, "装载异常", err)
+				continue
 			}
 			routerManager.regexRouter[reg] = routerRule
 		}
@@ -68,12 +75,8 @@ func (m *Manager) GetRouterRule(url string) (*Router, error) {
 			}
 		}
 	}
-	if routerRule == nil {
-		return nil, NewErrorWithCode(GATEWAY_ROUTER_NOTFIND, fmt.Sprintf("未找到请求地址%s,请检查是否注册到数据库\n", url))
-	}
-	// 路由状态判断
-	if routerRule.Status != 1 {
-		return nil, NewErrorWithCode(GATEWAY_ROUTER_UPHOLD, fmt.Sprintf("接口状态:%d\n", routerRule.Status))
+	if routerRule == nil || routerRule.Status != 1 {
+		return nil, NewErrorWithCode(GLOBAL_ERR_NOTFIND, fmt.Sprintf("未找到请求地址%s", url))
 	}
 	return routerRule, nil
 }

+ 11 - 6
core/router/router.go

@@ -1,10 +1,15 @@
 package router
 
+import (
+	"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/util"
+)
+
 type Router struct {
-	Status  int    // 0:冻结不可用 1:正常可用
-	TimeOut int64  // 接口超时提醒,单位毫秒;默认500毫秒
-	ReqUrl  string // 请求地址
-	Remark  string // 路由备注信息
-	//FilterRule *filterPoly.ReqFilterPoly //访问黑名单规则
-	Server string
+	Status   int            //0:冻结不可用 1:正常可用
+	TimeOut  int64          //接口超时提醒,单位毫秒;默认500毫秒
+	ReqUrl   string         //请求地址
+	Remark   string         //路由备注信息
+	Server   string         //服务地址
+	Price    int64          //单价
+	ReqLimit *util.ReqLimit //并发限制
 }

+ 51 - 0
core/util/reqLimit.go

@@ -0,0 +1,51 @@
+package util
+
+import (
+	"app.yhyue.com/moapp/jybase/redis"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+type ReqLimit struct {
+	Key  string
+	Size int
+}
+
+//
+func (r *ReqLimit) Init() {
+	r.Clear()
+	for i := 0; i < r.Size; i++ {
+		redis.RPUSH("other", r.Key, 1)
+	}
+}
+
+//
+func (r *ReqLimit) Clear() {
+	redis.Del("other", r.Key)
+}
+
+//查询是否被限流
+func (r *ReqLimit) IsLimit() bool {
+	if r.Size <= 0 {
+		return false
+	}
+	return redis.LLEN("other", r.Key) == 0
+}
+
+//并发数限制
+//return 1 正常 -1 被限制
+func (r *ReqLimit) Limit() bool {
+	if r.Size <= 0 {
+		return true
+	}
+	return gconv.Int64(redis.LPOP("other", r.Key)) <= 0
+}
+
+//
+func (r *ReqLimit) UnLimit() {
+	if r.Size <= 0 {
+		return
+	}
+	if int(redis.LLEN("other", r.Key)) < r.Size {
+		redis.RPUSH("other", r.Key, 1)
+	}
+}

+ 2 - 6
etc/config.yaml

@@ -4,6 +4,7 @@ server:
 
 #数据库配置
 databases:
+  redis: other=192.168.3.128:5003
   # mysql配置
   mysql:
     dbName: thirdparty
@@ -35,9 +36,4 @@ addressMap:
   "jmfwy": "民政"
   "jy": "教育"
   "yl": "医疗"
-  "wtyly": "文旅"
-
-
-
-
-
+  "wtyly": "文旅"

+ 0 - 86
etc/config_local.yaml

@@ -1,86 +0,0 @@
-# 代理网关服务配置
-server:
-  # 基本配置
-  address: :8080                          # 本地监听地址。默认":80"
-  readTimeout: 60s                        # 请求读取超时时间,一般不需要配置。默认为60秒
-  maxHeaderBytes: 10240                   # 请求Header大小限制(Byte)。默认为10KB
-  serverAgent: jianyu Gateway             # 服务端Agent信息。默认为"GF HTTP Server"
-
-  # 其他配置
-  sessionCookieOutput: false        # 关闭session及返回cookie,是否将SessionId返回到Cookie中。默认true
-  clientMaxBodySize: 810241024      # 客户端最大Body上传限制大小,影响文件上传大小(Byte)。默认为8*1024*1024=8MB
-  formParsingMemory: 1048576        # 解析表单时的缓冲区大小(Byte),一般不需要配置。默认为1024*1024=1MB
-  dumpRouterMap: false              # 是否在Server启动时打印所有的路由列表。默认为true
-  graceful: true                    # 是否开启平滑重启特性,开启时将会在本地增加10000的本地TCP端口用于进程间通信。默认false
-  gracefulTimeout: 10               # 平滑重启父进程最大存活时间。默认2秒
-
-# 基础服务ETCD配置
-etcd:
-  # 基础服务
-  baseserver:
-    appid: 10000
-    # 用户中台配置
-    userCenter:
-      key: usercenter.rpc
-      address:
-        - 127.0.0.1:23792
-    # 资源中台配置
-    resourceCenter:
-      key: resource.rpc
-      address:
-        - 127.0.0.1:23791
-
-#数据库配置
-databases:
-  # redis配置
-  redis: session=123.56.53.97:1713,other=123.56.53.97:1713    # 用户获取剑鱼程序用户session
-
-  # mysql配置
-  mysql:
-    dbName: base_service
-    address: 192.168.3.11:3366
-    userName: root
-    passWord: Topnet123
-    maxOpenConns: 5
-    maxIdleConns: 5
-
-
-# 系统配置
-system:
-  # 监听服务注册etcd配置
-  etcdListen:
-    - 127.0.0.1:2379
-
-  response:
-    head-clear: # 响应头删除
-      - Trace-Id
-      - deductNum
-      - deductIds
-
-  # 系统日志
-  log:
-    path: ./logs                                # 系统日志默认文件默认报错路径。默认为./logs
-    debug: true                                 # 是否打印调试信息。默认false
-    stdout: true                                # 是否输出到控制台。默认false
-    systemLogPattern: system-{Ymd}.log          # 日志文件格式。默认为"system-{Ymd}.log"
-    serverErrorStack: false                     # 当Server捕获到异常时是否记录堆栈信息到日志中。默认为true
-    serverErrorLogEnabled: true                 # 是否记录异常日志信息到日志中。默认为true
-    serverErrorLogPattern: error-{Ymd}.log      # 异常错误日志文件格式。默认为"error-{Ymd}.log"
-    serverAccessLogEnabled: false               # 是否记录访问日志。默认为false
-    serverAccessLogPattern: access-{Ymd}.log    # 访问日志文件格式。默认为"access-{Ymd}.log"
-    serverRequestTimeout: 2000                  # 接口请求超时通知,若注册表中无配置超时提醒使用此配置。默认500毫秒
-
-  # 系统告警
-  alarm:
-    isOpen: true                        # 异常通知开关。默认关闭
-    address: 192.168.3.207:4150         # nsq消息通知地址。默认关闭
-    toppic: jyalert                     # 消息管道
-    isJsonEncode: false                 # 是否加密
-    id: pre_alert                       # id
-    title: 你有新的告警消息处理            # 消息标题
-    text: 前置代理告警请查看               # 消息正文
-
-
-
-
-

+ 4 - 19
go.mod

@@ -6,25 +6,19 @@ require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	github.com/gogf/gf/v2 v2.5.6
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/zeromicro/go-zero v1.5.3
-	go.etcd.io/etcd/client/v3 v3.5.9
-	golang.org/x/net v0.17.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.2.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/garyburd/redigo v1.6.2 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomodule/redigo v1.8.9 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -43,35 +37,26 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sirupsen/logrus v1.8.3 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.15.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/subosito/gotenv v1.4.2 // 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
-	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
 	go.mongodb.org/mongo-driver v1.11.6 // indirect
 	go.opentelemetry.io/otel v1.15.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
 	go.opentelemetry.io/otel/trace v1.15.1 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/automaxprocs v1.5.2 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.56.1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

+ 3 - 36
go.sum

@@ -71,7 +71,6 @@ github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 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=
@@ -96,11 +95,7 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 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/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
-github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -138,6 +133,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 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=
@@ -176,11 +172,8 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gogf/gf/v2 v2.5.6 h1:a1UK1yUP3s+l+vPxmV91+8gTarAP9b1IEOw0W7LNl6E=
 github.com/gogf/gf/v2 v2.5.6/go.mod h1:17K/gBYrp0bHGC3XYC7bSPoywmZ6MrZHrZakTfh4eIQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 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=
@@ -210,11 +203,10 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 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=
@@ -404,7 +396,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 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 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 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 v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -449,7 +440,6 @@ github.com/sirupsen/logrus v1.8.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 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/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 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/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
@@ -480,6 +470,7 @@ github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
@@ -505,17 +496,9 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 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/zeromicro/go-zero v1.5.3 h1:9poyd+raeL7gSMUu6P19N7bssTppieR2j7Oos2j1yFQ=
-github.com/zeromicro/go-zero v1.5.3/go.mod h1:dmoBpgJTxt9KWmgrNGpv06XxZRPXMakrxUVgROFAR3g=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
-go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
-go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
-go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E=
-go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA=
 go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
 go.mongodb.org/mongo-driver v1.11.6 h1:XM7G6PjiGAO5betLF13BIa5TlLUUE3uJ/2Ox3Lz1K+o=
 go.mongodb.org/mongo-driver v1.11.6/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY=
@@ -541,22 +524,13 @@ go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAf
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
-go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
-go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 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/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
 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/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 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=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -584,7 +558,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
 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 h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
 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=
@@ -891,8 +864,6 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/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-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
 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=
@@ -915,8 +886,6 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
 google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 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/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
-google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
 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=
@@ -931,8 +900,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 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=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.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/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

+ 81 - 0
jylog/logfile.log

@@ -0,0 +1,81 @@
+{"level":"info","msg":"初始化Mysql完成 {Address:192.168.3.14:4000 UserName:root PassWord:=PDT49#80Z!RVv52_z DBName:thirdparty DB:\u003cnil\u003e MaxOpenConns:5 MaxIdleConns:5}","time":"2024-09-19 20:27:10"}
+{"level":"info","msg":"Error 1146 (42S02): Table 'thirdparty.front_proxy_c' doesn't exist","time":"2024-09-19 20:27:10"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:30:03"}
+{"level":"info","msg":"Error 1146 (42S02): Table 'thirdparty.front_proxy_c' doesn't exist","time":"2024-09-19 20:30:03"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:31:50"}
+{"level":"info","msg":"Error 1146 (42S02): Table 'thirdparty.front_proxy_c' doesn't exist","time":"2024-09-19 20:31:50"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/proxyServer.go:42","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy.InitGateWayServer","level":"error","msg":"未发现可用路由","time":"2024-09-19 20:31:50"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:33","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi/standard/bid/search68Internal Panic\u003cnil\u003e","time":"2024-09-19 20:31:56"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:32:55"}
+{"level":"info","msg":"Error 1146 (42S02): Table 'thirdparty.front_proxy_c' doesn't exist","time":"2024-09-19 20:32:55"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/proxyServer.go:42","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy.InitGateWayServer","level":"fatal","msg":"未发现可用路由","time":"2024-09-19 20:32:55"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:34:20"}
+{"level":"info","msg":"Error 1146 (42S02): Table 'thirdparty.front_proxy_c' doesn't exist","time":"2024-09-19 20:34:20"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/proxyServer.go:39","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy.InitGateWayServer","level":"fatal","msg":"未发现可用路由","time":"2024-09-19 20:34:20"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:34:33"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-19 20:34:39"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-19 20:34:39"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-19 20:35:05"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-19 20:35:07"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-19 20:35:07"}
+{"level":"info","msg":"权限校验失败: 权限校验失败","time":"2024-09-19 20:35:13"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:33","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"/standard/bid/search1002权限校验失败","time":"2024-09-19 20:35:13"}
+{"level":"info","msg":"权限校验失败: 权限校验失败","time":"2024-09-19 20:35:15"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:33","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"/standard/bid/search1002权限校验失败","time":"2024-09-19 20:35:15"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 09:14:35"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"/standard/bid/search1006缺少参数:%sappid","time":"2024-09-20 09:15:40"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 09:18:09"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"   /standard/bid/search   1006   缺少参数:%s   appid","time":"2024-09-20 09:18:13"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 09:18:40"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":" /standard/bid/search 1006 缺少参数:%s appid","time":"2024-09-20 09:18:42"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1006 缺少参数:%s sign","time":"2024-09-20 09:20:37"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1006 缺少参数:%s timestamp","time":"2024-09-20 09:20:56"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-20 09:21:16"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 权限校验失败 ","time":"2024-09-20 09:21:16"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 10:53:53"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-20 10:53:59"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1001 无效的签名 ","time":"2024-09-20 10:53:59"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-20 10:54:06"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 10:54:06"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/proxyServer.go:106","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy.glob..func1.2","level":"error","msg":"ChangeErrorjson Decode failed: invalid character '\\x1f' looking for beginning of value","time":"2024-09-20 10:54:06"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1007 远端服务异常 ","time":"2024-09-20 10:54:06"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 10:57:51"}
+{"level":"info","msg":"select * from user where appid=? limit 0,1 [JYOJbtfNGSGthaHWUijMPXi]","time":"2024-09-20 10:58:00"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 10:58:00"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1007 远端服务异常 ","time":"2024-09-20 10:58:00"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 11:03:40"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1005 缺少参数:%s timestamp","time":"2024-09-20 11:03:41"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:03:46"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1007 远端服务异常 ","time":"2024-09-20 11:03:46"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:04:02"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:04:04"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:04:05"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:04:06"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:06"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:07"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:08"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:09"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:10"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:11"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:12"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:12"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:13"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:14"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:04:15"}
+{"level":"info","msg":"初始化Mysql完成","time":"2024-09-20 11:05:00"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:05:02"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:05:03"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:05:04"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1002 余额不足 0","time":"2024-09-20 11:05:05"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:05:18"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:05:54"}
+{"level":"info","msg":"\u003cnil\u003e","time":"2024-09-20 11:05:56"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:05:58"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:00"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:01"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:02"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:03"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:04"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:05"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:07"}
+{"file":"D:/workspace/go_project/dataservice/tripartite_gateway/core/proxy/middleware/errorHandler.go:34","func":"jygit.jydev.jianyu360.cn/dataservice/tripartite_gateway/core/proxy/middleware.ErrorHandler","level":"error","msg":"JYOJbtfNGSGthaHWUijMPXi /standard/bid/search 1003 系统繁忙,请稍候再试 ","time":"2024-09-20 11:06:10"}

+ 0 - 577
resources/antiRes/control.html

@@ -1,577 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>剑鱼访问控制台</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"
-          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
-          crossorigin="anonymous">
-</head>
-<style>
-    body, html {
-        margin: 0;
-        padding: 0;
-        background: #eee;
-        min-height: 100vh;
-    }
-
-    .main {
-        width: 1000px;
-        margin: 0 auto;
-        min-height: 100vh;
-        background-color: #f9f9f9;
-    }
-
-    .main .title {
-        text-align: center;
-    }
-
-    .query {
-        display: flex;
-        justify-content: space-around;
-    }
-
-    .query .item {
-        display: flex;
-        flex-direction: row;
-    }
-
-    .query .item .left {
-        line-height: 46px;
-        height: 46px;
-        margin: 0 5px;
-        font-size: 20px;
-    }
-
-    #login {
-        width: 500px;
-        height: 270px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        margin-top: -200px;
-        margin-left: -250px;
-        padding: 20px;
-    }
-
-    #login .input-group {
-        margin: 20px 10px;
-    }
-
-    #login .btns {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-around;
-    }
-
-    #login .btns button {
-        width: 120px;
-        height: 35px;
-    }
-
-    .btns .submit {
-        background-color: #2196f3a1;
-    }
-
-    .btns .cancel {
-        background-color: #9e9e9e6e;
-    }
-
-    #content {
-        display: flex;
-        flex-direction: column;
-        padding: 20px 100px;
-    }
-
-    .line {
-        display: flex;
-        flex-direction: row;
-        line-height: 50px;
-        margin-top: 1px;
-    }
-
-    .line-title {
-        width: 170px;
-        padding: 0 20px;
-        background: #91d3cd;
-    }
-
-    .line-content {
-        width: 100%;
-        padding: 0 20px;
-        background: #b7d9f4;
-        margin-left: 1px;
-    }
-
-    .line-opera {
-        background: #b7d9f4;
-        width: 30px;
-        text-align: center;
-        line-height: 30px;
-    }
-
-    .line-opera span {
-        background: #FF5722;
-        padding: 2px;
-        border-radius: 5px;
-    }
-
-    .line-content .row_30 {
-        display: flex;
-        flex-direction: row;
-        line-height: 30px;
-    }
-
-    .line-content .row_normal {
-        display: flex;
-        flex-direction: row;
-    }
-
-    .line-content div.min {
-        margin-right: 20px;
-        width: 60px;
-    }
-
-    .line-content div.min_2 {
-        margin-right: 20px;
-        width: 120px;
-    }
-
-    .line-content div.min_4 {
-        margin-right: 20px;
-        width: 240px;
-    }
-
-    .alias-title {
-        margin-top: 10px;
-        text-align: center;
-        background-color: #68e3f0d1;
-        color: #a94442;
-        height: 20px;
-        line-height: 20px;
-        border-radius: 12px;
-    }
-
-    .alias-title-head {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-    }
-
-    .alias-title-head .line-opera {
-        padding-top: 10px;
-    }
-
-</style>
-<body>
-<div class="main">
-    <div class="panel panel-default">
-        <div class="panel-body title">
-            <h3>用户访问状态查询</h3>
-        </div>
-    </div>
-
-    <div class="tip">
-    </div>
-
-    <nav class="navbar navbar-default">
-        <div class="container-fluid">
-            <!-- Collect the nav links, forms, and other content for toggling -->
-            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                <input id="appid" type="text" style="display:none">
-                <ul class="nav navbar-nav">
-                    <li class="dropdown">
-                        <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                           aria-expanded="false"><span
-                                    id="userSelect">选择应用</span>
-                            <span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a onclick="ShowLogin()">请登录</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <div class="navbar-form navbar-right">
-                    <div class="form-group">
-                        <input type="text" id="queryValue" class="form-control" style="width: 500px;"
-                               placeholder="输入用户openid/userid/手机号进行查询">
-                    </div>
-                    <button onclick="doSearch()" class="btn btn-default">查询</button>
-                </div>
-            </div><!-- /.navbar-collapse -->
-        </div><!-- /.container-fluid -->
-    </nav>
-
-    <!--内容展示-->
-    <div id="content" style="display: none">
-        <div class="line" v-if="status">
-            <div class="line-title">用户状态</div>
-            <div v-if="status.flag === 1" class="line-content">
-                <div class="row_normal">
-                    <div class="min">验证码</div>
-                    <div class="min_4">{{fotmatData(status.flush)}}</div>
-                </div>
-            </div>
-            <div v-else-if="status.flag === 2" class="line-content">
-                <div class="row_normal">
-                    <div class="min">黑名单</div>
-                    <div class="min_4">{{fotmatData(status.flush)}}</div>
-                </div>
-            </div>
-            <div v-else class="line-content">
-                正常
-            </div>
-            <div class="line-opera" title="清除账户异常状态" onclick="doClear('1')">
-                <span class="glyphicon glyphicon glyphicon-remove"></span>
-            </div>
-        </div>
-        <div class="line" v-if="aliasReq">
-            <div class="line-title">请求频率</div>
-            <div class="line-content">
-                <div class="one" v-for="(alias, i) in aliasReq" v-bind:key="i">
-                    <div class="alias-title">{{i}}</div>
-                    <div>
-                        <div class="alias-title-head">
-                            <div class="">验证码阀值</div>
-                            <div class="line-opera" title="清除验证码阀值" v-on:click="doClear('2',i)">
-                                <span class="glyphicon glyphicon glyphicon-remove"></span>
-                            </div>
-                        </div>
-                        <div>
-                            <div class="row_30">
-                                <div class="min">时间</div>
-                                <div class="min">限制</div>
-                                <div class="min">当前次数</div>
-                                <div class="min_4">清除时间</div>
-                            </div>
-                            <div class="row_30" v-for="(item, i) in alias.allRates" v-bind:key="i">
-                                <div class="min">{{item.k}}</div>
-                                <div class="min">{{item.v}}</div>
-                                <div class="min">{{item.times}}</div>
-                                <div class="min_4">{{fotmatData(item.flush)}}</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div>
-                        <div class="alias-title-head">
-                            <div class="">超出最大阈值次数</div>
-                            <div class="line-opera" title="清除最大请求次数" v-on:click="doClear('6',i)">
-                                <span class="glyphicon glyphicon glyphicon-remove"></span>
-                            </div>
-                        </div>
-                        <div>
-                            <div class="row_30">
-                                <div class="min_2">id超出最大阈值</div>
-                                <div class="min">当前次数</div>
-                                <div class="min_4">清除时间</div>
-                            </div>
-                            <div class="row_30">
-                                <div class="min_2">每{{alias.exceedTime.v}}次</div>
-                                <div class="min">{{alias.exceedTime.times}}</div>
-                                <div class="min_4">{{fotmatData(alias.exceedTime.flush)}}</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div>
-                        <div class="alias-title-head">
-                            <div class="">最大请求次数</div>
-                            <div class="line-opera" title="清除最大请求次数" v-on:click="doClear('3',i)">
-                                <span class="glyphicon glyphicon glyphicon-remove"></span>
-                            </div>
-                        </div>
-                        <div>
-                            <div class="row_30">
-                                <div class="min">时间</div>
-                                <div class="min">限制</div>
-                                <div class="min">当前次数</div>
-                                <div class="min_4">清除时间</div>
-                            </div>
-                            <div class="row_30">
-                                <div class="min">{{alias.maxRate.k}}</div>
-                                <div class="min">{{alias.maxRate.v}}</div>
-                                <div class="min">{{alias.maxRate.times}}</div>
-                                <div class="min_4">{{fotmatData(alias.maxRate.flush)}}</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="line-opera">
-            </div>
-        </div>
-        <div class="line" v-if="verifyErr">
-            <div class="line-title">验证码错误次数</div>
-            <div class="line-content">
-                <div class="row_30">
-                    <div class="min">时间</div>
-                    <div class="min">限制</div>
-                    <div class="min">当前次数</div>
-                    <div class="min_4">清除时间</div>
-                </div>
-                <div class="row_30">
-                    <div class="min">{{verifyErr.k}}</div>
-                    <div class="min">{{verifyErr.v}}</div>
-                    <div class="min">{{verifyErr.times}}</div>
-                    <div class="min_4">{{fotmatData(verifyErr.flush)}}</div>
-                </div>
-            </div>
-            <div class="line-opera" title="清除错误验证码次数" onclick="doClear('4')">
-                <span class="glyphicon glyphicon glyphicon-remove"></span>
-            </div>
-        </div>
-        <div class="line" v-if="blackTmpTimes">
-            <div class="line-title">临时黑名单次数</div>
-            <div class="line-content">
-                <div class="row_30">
-                    <div class="min">时间</div>
-                    <div class="min">限制</div>
-                    <div class="min">当前次数</div>
-                    <div class="min_4">清除时间</div>
-                </div>
-                <div class="row_30">
-                    <div class="min">{{blackTmpTimes.k}}</div>
-                    <div class="min">{{blackTmpTimes.v}}</div>
-                    <div class="min">{{blackTmpTimes.times}}</div>
-                    <div class="min_4">{{fotmatData(blackTmpTimes.flush)}}</div>
-                </div>
-            </div>
-            <div class="line-opera" title="清除临时黑名单次数" onclick="doClear('5')">
-                <span class="glyphicon glyphicon glyphicon-remove"></span>
-            </div>
-        </div>
-    </div>
-
-    <div id="login" class="panel panel-default" style="display:none">
-        <button type="button" class="close cancel" data-dismiss="alert" aria-label="Close"><span
-                    aria-hidden="true">×</span></button>
-        <div class="panel-body ">
-            身份验证
-        </div>
-        <div class="input-group">
-            <span class="input-group-addon">账&nbsp;&nbsp;户:</span>
-            <input type="text" class="form-control" placeholder="请输入账户" id="userName">
-        </div>
-        <div class="input-group">
-            <span class="input-group-addon">密&nbsp;&nbsp;码:</span>
-            <input type="password" class="form-control" placeholder="请输入密码" id="passWord">
-        </div>
-        <div class="btns">
-            <button type="button" class="btn btn-default cancel">取消</button>
-            <button type="button" class="btn btn-default submit">登录</button>
-        </div>
-    </div>
-
-
-</div>
-</body>
-<script src="https://cdn.bootcss.com/vue/2.6.11/vue.min.js"></script>
-<script src="https://cdn.bootcss.com/jquery/1.10.2/jquery.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"
-        integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
-        crossorigin="anonymous"></script>
-<script type="text/javascript">
-
-    Date.prototype.pattern = function (fmt) {
-        var o = {
-            "y+": this.getFullYear(),
-            "M+": this.getMonth() + 1, //月份
-            "d+": this.getDate(), //日
-            "h+": this.getHours() % 12 === 0 ? 12 : this.getHours() % 12, //小时
-            "H+": this.getHours(), //小时
-            "m+": this.getMinutes(), //分
-            "s+": this.getSeconds(), //秒
-            "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-            "S": this.getMilliseconds() //毫秒
-        };
-        var week = {
-            "0": "日",
-            "1": "一",
-            "2": "二",
-            "3": "三",
-            "4": "四",
-            "5": "五",
-            "6": "六"
-        };
-        if (/(y+)/.test(fmt)) {
-            fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-        }
-        if (/(E+)/.test(fmt)) {
-            fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? "星期" : "周") : "") + week[this.getDay() +
-            ""]);
-        }
-        for (var k in o) {
-            if (new RegExp("(" + k + ")").test(fmt)) {
-                fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-            }
-        }
-        return fmt;
-    }
-    var Control = new Vue({
-        el: '#content',
-        data: {
-            "allRates": false,
-            "blackTmpTimes": false,
-            "aliasReq": false,
-            //"maxRate": false,
-            "verifyErr": false
-        },
-        methods: {
-            fotmatData: function (time) {
-                if (time === 0) {
-                    return ""
-                } else if (time === -1) {
-                    return "永久"
-                }
-                return new Date(time * 1000).pattern('yyyy-MM-dd HH.mm.ss')
-            }
-        }
-    });
-    $(function () {
-        $("#login .cancel").on("click", function () {
-            $("#login").hide();
-        });
-
-        $("#login .submit").on("click", function () {
-            var userName = $("#userName").val();
-            var passWord = $("#passWord").val();
-            if (userName !== "" && passWord !== "") {
-                localStorage.UserName = userName;
-                localStorage.Password = passWord;
-                $(".tip").html("");
-                getAppList();
-                $("#login").hide();
-            } else {
-                tipMsg("输入不能为空")
-            }
-        });
-
-        if (!localStorage.UserName || !localStorage.UserName) {
-            ShowLogin()
-        } else {
-            getAppList()
-        }
-
-    });
-
-    function ShowLogin() {
-        $("#login").show();
-    }
-
-    function getAppList() {
-        var param = {};
-        addAuthentication(param);
-        $.post("/antiControl/getAppList", param, function (r) {
-            if (!r.errMsg) {
-                if (r.appList.length > 0) {
-                    var dropdown_mune = "";
-                    for (var i = 0; i < r.appList.length; i++) {
-                        dropdown_mune += "<li data_id=" + r.appList[i] + " onclick='updataSelect(this)'><a>" + r.appList[i] + "</a></li>"
-                    }
-                    $(".dropdown .dropdown-menu").html(dropdown_mune)
-                }
-            } else {
-                tipMsg(r.errMsg)
-            }
-        }, "json")
-    }
-
-    var Reqing = false;
-
-    //查询
-    function doSearch() {
-        var param = {
-            "appName": $("#appid").val(),
-            "searchV": $("#queryValue").val(),
-        };
-
-        if (!param.appName) {
-            tipMsg("请选择应用");
-            return
-        }
-
-        if (!(param.searchV.split(".").length === 4 || param.searchV.length === 11 || param.searchV.length === 24 || param.searchV.length === 28)) {
-            tipMsg("查询内容有误");
-            return
-        }
-
-        addAuthentication(param);
-
-        if (Reqing) {
-            return
-        }
-        $(".tip").html("");
-        Reqing = true;
-        $.post("/antiControl/query", param, function (r) {
-            Reqing = false;
-            if (!r.errMsg) {
-                $("#content").css("display", "");
-                Control.aliasReq = r.rateData;
-                // Control.allRates = r.allRates;
-                //Control.maxRate = r.maxRate;
-                Control.blackTmpTimes = r.blackTmpTimes;
-                Control.verifyErr = r.verifyErr;
-                Control.status = r.status;
-            } else {
-                tipMsg(r.errMsg)
-            }
-        }, "json")
-    }
-
-    //清除 -1清除所有;1用户状态 2验证码阀值 3最大请求次数 4验证码错误次数 5临时黑名单次数
-    function doClear(flag, other) {
-        var param = {
-            "appName": $("#appid").val(),
-            "searchV": $("#queryValue").val(),
-            "flag": flag,
-        };
-        if (other) {
-            param["alias"] = other
-        }
-        addAuthentication(param);
-        if (Reqing) {
-            return
-        }
-        Reqing = true;
-        $.post("/antiControl/clear", param, function (r) {
-            Reqing = false;
-            if (!r.errMsg) {
-                doSearch()
-            } else {
-                tipMsg(r.err)
-            }
-        }, "json")
-    }
-
-    function addAuthentication(param) {
-        if (!localStorage.UserName || !localStorage.UserName) {
-            ShowLogin()
-        } else {
-            param["userName"] = localStorage.UserName;
-            param["passWord"] = localStorage.Password;
-        }
-    }
-
-    function updataSelect(demo) {
-        var name = $(demo).find("a").text();
-        var appid = $(demo).attr("data_id");
-        $("#userSelect").text(name);
-        $("#appid").val(appid);
-    }
-
-
-    function tipMsg(type) {
-        var addHtml = "";
-        if (type === "用户校验失败") {
-            addHtml = '身份验证异常&nbsp;&nbsp;<span style="color:#000;cursor: pointer;" onclick="ShowLogin()">点击重新验证</span>'
-        } else {
-            addHtml = type
-        }
-        var tipHtml = '<div class="alert alert-warning alert-dismissible" role="alert">' +
-            '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>' +
-            '<strong>Warning!</strong> <em>' + addHtml + '</em>' +
-            '</div>';
-        $(".tip").html(tipHtml);
-    }
-
-
-</script>
-</html>

+ 0 - 506
resources/antiRes/css/app.css

@@ -1,506 +0,0 @@
-/*@import url(/jyapp/css/layout.css?v=51430);*/
-/*@import url(/jyapp/css/font.css?v=51430);*/
-body{
-	margin: 0px;
-	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
-	-webkit-tap-highlight-color: transparent;
-	font-size: 16px;
-}
-ul{
-	list-style: none;
-	padding: 0px;
-	margin: 0px;
-}
-img{
-	vertical-align: sub;
-}
-a{
-	color: #0987ff;
-}
-::-webkit-input-placeholder {
-    color: #ddd;
-}
-.overflow-hidden{
-	overflow: hidden;
-	height: 100%;
-}
-[type='text']{
-	border: 1px solid #ccc;
-	border-radius: 4px;
-	padding-left: 10px;
-	padding-right: 0px;
-}
-[type='text'],textarea{
-	box-shadow: 0px 0px 0px rgba(0,0,0,0);
-    -webkit-appearance: none;
-}
-.red-border{
-	border-color: red !important;
-}
-.btn{
-	background-color: #24C0D7;
-	text-align: center;
-	vertical-align: middle;
-	touch-action: manipulation;
-	cursor: pointer;
-	background-image: none;
-	border: 1px solid transparent;
-	white-space: nowrap;
-	padding: 8px 12px;
-	font-size: 14px;
-	line-height: 1.42857143;
-	border-radius: 4px;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	color: #FFFFFF;
-	position: relative;
-	outline-width: 0px;
-	box-shadow: none !important;
-}
-.btn[disabled]{
-	cursor: not-allowed;
-	pointer-events: none;
-	opacity: .5;
-	filter: alpha(opacity=65);
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-.border-top{
-	border-top: 1px solid #CCCCCC;
-}
-.hide{
-	display: none;
-}
-.mustshare-mark{
-	position: fixed;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	top: 0px;
-	background-color: rgba(0,0,0,.84);
-	z-index: 999999;
-	display: none;
-}
-.mustshare-mark img:nth-child(1){
-	position: absolute;
-	top: 140px;
-	left: 50%;
-	margin-left: -141px;
-	width: 282px;
-}
-.mustshare-mark img:nth-child(2){
-	position: absolute;
-	top: 350px;
-	left: 50%;
-	margin-left: -74px;
-	width: 148px;
-}
-
-.error-body {
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	text-align: center;
-}
-
-.verify-body {
-	width: 90vw;
-	margin: 0 auto;
-	text-align: center;
-	padding: 55px 0;
-}
-
-.verify-img{
-	width: 100%;
-}
-
-.verify_logo {
-	width: 100%;
-	display: block;
-}
-
-.verify-content {
-	border: #F5F5F5 solid 1px;
-	margin: auto;
-	background-color: #FFFFFF;
-	box-shadow: 1px 1px 1px 1px grey;
-	padding: 3vw;
-	display: flex;
-	flex-direction: column;
-}
-
-.verify-content .word {
-	text-align: left;
-	margin: 0px;
-}
-
-#antiimg{
-	width: 100%;
-}
-
-.footBtn {
-	margin-top: 5pt;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-}
-
-
-
-
-
-* {
-	-webkit-touch-callout:none;
-	-khtml-user-select:none;
-	-moz-user-select:none;
-	-ms-user-select:none;
-	user-select:none;
-}
-a,input,button{
-	outline: none !important;
-	-webkit-tap-highlight-color: rgba(255, 255, 255, 0) !important;
-	-webkit-focus-ring-color: rgba(0, 0, 0, 0) !important;
-}
-/*****app 第一版 布局*****/
-.app-layout-header{
-	line-height: 44px;
-	background-color: #FFFFFF;
-	text-align: center;
-	border-bottom: 1px solid #E6E6E6;
-	font-size: 17px;
-	position: absolute;
-	padding-top: 20px;
-	z-index: 99999;
-	left: 0;
-	right: 0;
-	top: 0;
-	color: #444444;
-}
-.app-layout-header>.app-back{
-	position: absolute;
-	font-size: 19px;
-	padding-top: 20px;
-	padding-left: 11px;
-	padding-right: 40px;
-	padding-bottom: 7px;
-	left: 0px;
-	top: 18px;
-	color: #444444;
-}
-.app-layout-content-a,.app-layout-content-b{
-	position: absolute;
-	top: 44px;
-	padding-top: 20px;
-	overflow-y: auto;
-	bottom: 0px;
-	left: 0px;
-	right:0px;
-	-webkit-overflow-scrolling:touch;
-}
-.app-layout-content-a{
-	bottom: 65px;
-}
-.app-layout-footer {
-	width: 100%;
-	background: #fff;
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	z-index: 99;
-	border-top: 1px solid #E6E6E6;
-	box-sizing: border-box;
-}
-.app-layout-footer ul {
-	width: 100%;
-}
-
-.app-layout-footer ul li {
-	width: 25%;
-	float: left;
-	text-align: center;
-	color: #888888;
-	height: 49px;
-	position: relative;
-}
-
-.app-layout-footer ul li span {
-	font-size: 21px;
-	display: block;
-	width: 100%;
-	text-align: center;
-	margin-top: 10px;
-}
-
-.app-layout-footer ul li p {
-	margin: 0;
-	font-size: 10px;
-	position: absolute;
-	left: 0px;
-	right: 0px;
-	text-align: center;
-	bottom: 2px;
-	line-height: initial;
-}
-
-.app-layout-footer ul li.active span {
-	color: #2CB7CA;
-}
-
-.app-layout-footer ul li.active p {
-	color: #2CB7CA;
-}
-.easyalert{
-	position: fixed;
-	background-color: rgba(0,0,0,0.7);
-	top: 50%;
-	color: #fff;
-	z-index: 999;
-	border-radius: 6px;
-	padding: 17px 20px;
-	font-size: 15px;
-	line-height: 22px;
-	max-width: 260px;
-	text-align: center;
-	display: none;
-}
-.easyalert-icon{
-	font-size: 13px;
-	border-radius: 5px;
-	width: 120px;
-	height: 120px;
-	padding: 0px;
-	left: 50%;
-	right: 50%;
-	margin-top: -60px;
-	margin-left: -60px;
-	margin-right: -60px;
-}
-.jyapp-li-active{
-	background-color: #e5e5e8 !important;
-}
-.app-layout-footer .jyapp-icon-sousuo{
-	font-size: 42px;
-	top: -17px;
-	left: -10.5px;
-}
-/******************/
-.easypopup{
-	background-color: rgba(0,0,0,0.7);
-	position: fixed;
-	left: 0px;
-	right: 0px;
-	top: 0px;
-	bottom: 0px;
-	display: none;
-	z-index: 999;
-	letter-spacing: 1px;
-}
-.easypopup>div{
-	background-color: #fff;
-	position: fixed;
-	left: 50%;
-	top: 50%;
-	margin-left: -140px;
-	border-radius: 4px;
-	overflow: hidden;
-	width: 280px;
-}
-.easypopup .easypopup-edit{
-	width: 300px;
-	margin-left: -150px;
-}
-.easypopup .easypopup-header{
-	padding-top: 29px;
-	padding-bottom: 16px;
-	text-align: center;
-	font-size: 17px;
-	color: #1d1d1d;
-}
-.easypopup .easypopup-main .easypopup-content{
-	padding: 0px 20px 18px 20px;
-	color: #686868;
-}
-.easypopup .easypopup-edit .easypopup-content{
-	padding: 0px 15px 18px 15px;
-	color: #686868;
-}
-.easypopup .easypopup-alert .easypopup-content{
-	padding: 38px 20px 24px 20px;
-}
-.easypopup .easypopup-content{
-	text-align: center;
-	font-size: 15px;
-}
-.easypopup .easypopup-edit [type='text']{
-	height: 37px;
-	border-radius: 3px;
-	font-size: 16px;
-	color: #1d1d1d;
-	padding-left: 10px;
-	width: 100%;
-}
-.easypopup .easypopup-edit ::-webkit-input-placeholder {
-	color: #686868;
-}
-.easypopup .easypopup-footer{
-	text-align: center;
-	border-top: 1px solid #E0E0E0;
-	display: table;
-	width: 100%;
-	font-size: 18px;
-}
-.easypopup .easypopup-footer>span{
-	height: 50px;
-	line-height: 50px;
-	display: table-cell;
-	background-color: #fff;
-}
-.easypopup .easypopup-footer>span:last-child{
-	color: #2cb7ca;
-	border-left: 1px solid #E0E0E0;
-}
-.easypopup .easypopup-footer>span:first-child{
-	border-left: none;
-}
-.easypopup .easypopup-alert .easypopup-footer>span{
-	width: 100%;
-}
-
-/*分享好友弹窗*/
-.share {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: rgba(0, 0, 0, 0.6);
-	z-index: 99999;
-	display: none;
-}
-
-.share .shareMain {
-	width: 100%;
-	background: #f4f4f9;
-	position: absolute;
-	left: 0;
-	bottom: 0;
-}
-.share .shareMain ul{
-	background-color: #f4f4f9;
-	height: 120px;
-	padding-top: 32px;
-	box-sizing: border-box;
-}
-.share .shareMain ul li {
-	float: left;
-	text-align: center;
-	margin: 0px 15px;
-}
-
-.share .shareMain ul li span {
-	font-size: 50px;
-}
-
-.share .shareMain ul li span.jyapp-icon-weixin {
-	color: #0ab70e;
-}
-
-.share .shareMain ul li span.jyapp-icon-qq {
-	color: #4cafe9;
-}
-
-.share .shareMain ul li span.jyapp-icon-pengyouquan {
-	color: #a5e537;
-}
-
-.share .shareMain ul li p {
-	font-size: 14px;
-	color: #1D1D1D;
-	margin:0px;
-}
-
-.share .shareMain a.shareQx {
-	display: block;
-	height: 50px;
-	line-height: 50px;
-	text-align: center;
-	background: #fff;
-	font-size: 17px;
-	color:#1d1d1d;
-}
-.clearfix::after, .clearfix::before {
-	content: "";
-	display: block;
-	height: 0;
-	clear: both;
-	overflow: hidden;
-}
-ul, li, ol {
-	list-style: none;
-}
-.clearfix a, .clearfix strong {
-	color: #1d1d1d;
-}
-.jyapp-icon-weixin:before {
-	content: "\AC";
-}
-.redspot{
-	position: absolute;
-	width: 8px;
-	height: 8px;
-	background: #f12c20;
-	border-radius: 100%;
-}
-/* 统一头部 */
-.jy-app-header.app-layout-header .app-layout-content-a, .app-layout-content-b{
-	top: 21.33333vw;
-	padding-top: 0;
-}
-.jy-app-header.app-layout-header {
-	display: flex;
-	width: 100%;
-	justify-content: space-between;
-	align-items: center;
-}
-.jy-app-header.app-layout-header + .paddingtop {
-	padding-top: 21.33333vw;
-}
-.jy-app-header.app-layout-header >.app-back,.jy-app-header.app-layout-header >.app-back_,.jy-app-header.app-layout-header > .header-share {
-	top: auto;
-	bottom: 0;
-	position: unset;
-	padding: 16px 0;
-	position: relative;
-}
-.jy-app-header.app-layout-header span.app-back.jyapp-icon.jyapp-icon-zuojiantou::after {
-	content: "";
-	display: inline-block;
-	width: 4em;
-	height: 100%;
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-.j-header.jy-app-header {
-	height: 21.33333vw;
-	padding: 10.66667vw 3.2vw 0 3.2vw;
-	font-family: inherit;
-	background: inherit;
-}
-
-.jy-app-header {
-	height: 21.33333vw;
-	padding: 10.66667vw 3.2vw 0 3.2vw;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
-	background: #fff;
-	font-family: Avenir,Helvetica,Arial,sans-serif;
-}
-.jy-app-header .icon-left {}
-.js_dialog .box .box_bd .weui-icon-checked,
-.vip-check-out .weui-cells_checkbox .weui-check:checked+.weui-icon-checked,
-.vip-check-out .weui-cells_checkbox .weui-check[aria-checked=true]+.weui-icon-checked{
-	color: #2cb7ca;
-}

+ 0 - 86
resources/antiRes/css/default.css

@@ -1,86 +0,0 @@
-body {
-    min-width: auto;
-    font-size: .24rem;
-}
-
-@media only screen and (min-width: 1200px) {
-    body {
-        min-width: 1200px;
-    }
-
-    .verify_logo {
-        width: 350px;
-        display: block;
-    }
-
-    .verify-body {
-        width: 350px;
-        margin: 0 auto;
-        text-align: center;
-        padding: 134px 0;
-    }
-}
-
-@media only screen and (max-width: 1200px) {
-    .verify_logo {
-        width: 7rem;
-        display: block;
-    }
-
-    .verify-body {
-        width: 7rem;
-        margin: 0 auto;
-        text-align: center;
-        padding: 2.38rem 0 0 0;
-    }
-
-    #antiimg {
-        width: 100%;
-    }
-
-}
-
-.logo img {
-    width: 74px;
-}
-
-.j-wx-code > .code-wxm > img {
-    width: 200px;
-    height: 200px;
-    margin-top: -5px;
-}
-
-
-.j-wx-code > .code-bottom > img {
-    position: absolute;
-    left: 280px;
-    top: 88px;
-    -webkit-animation: codeWxMove 10s linear both;
-    -moz-animation: codeWxMove 10s linear both;
-    -o-animation: codeWxMove 10s linear both;
-    animation: codeWxMove 10s linear both;
-    -webkit-animation-fill-mode: forwards;
-    -moz-animation-fill-mode: forwards;
-    -o-animation-fill-mode: forwards;
-    animation-fill-mode: forwards
-}
-
-#antiVerify > div:first-child {
-    display: none;
-}
-
-#antiVerify > div:nth-child(2) {
-    max-width: 360px !important;
-    margin: 0 auto !important;
-    position: unset !important;
-    top: unset !important;
-    left: unset !important;
-    z-index: unset !important;
-    transform:unset !important;
-}
-
-#antiVerify > div:nth-child(2) > div:nth-child(1),
-#antiVerify > div:nth-child(2) > div:nth-child(2),
-#antiVerify > div:nth-child(2) > div:nth-child(1) > img {
-    max-width: 360px !important;
-}

BIN
resources/antiRes/images/flush.png


BIN
resources/antiRes/images/hoverclick.png


BIN
resources/antiRes/images/verify_logo.png


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 3
resources/antiRes/js/jquery.js


+ 0 - 111
resources/antiRes/js/mainHook.js

@@ -1,111 +0,0 @@
-if (typeof $ === 'function'&& typeof(isSpiderPage)==='undefined') {
-    $.ajaxPrefilter(function (options, orginOption, jqXHR) {
-        var beforeCallBack = options.success;
-        var beforeSettring = orginOption;
-        options.success = function (r) {
-            if (r.antiVerify) {
-                if (r.antiVerify === 1) {
-                    antiReload(); //重新请求数据
-                    //移除验证码
-                    var antiVerify = document.querySelector("#antiVerify");
-                    antiVerify.parentNode.removeChild(antiVerify);
-                } else {
-                    window.nextSetting = beforeSettring;//记录请求
-                    shwoCode(r.textVerify, r.imgData);//验证码展示
-                }
-            } else if (r.antiJump) {
-                window.location.href = r.href;
-            } else {
-                if (r.antiData && typeof (antiDecode) !== "function") {//等待初始化完毕
-                    var localInterval = setInterval(function () {
-                        if (typeof (antiDecode) === "function") {
-                            r = JSON.parse(antiDecode(r.antiData))
-                            if (beforeCallBack) beforeCallBack(r)
-                            clearInterval(localInterval)
-                        }
-                    }, 200)
-                } else {
-                    if (r.antiData) {
-                        r = JSON.parse(antiDecode(r.antiData))
-                    }
-                    if (beforeCallBack) beforeCallBack(r)
-                }
-            }
-        }
-    })
-}
-
-
-function antiReload(flag) {
-    try {
-        if (flag === 1) {
-            window.nextSetting.data.antiVerifyCheck = document.querySelector("#antivalue").value.substr(1);
-            window.nextSetting.data.imgw = document.querySelector("#antiimg").width;
-        } else {
-            if (window.nextSetting.data) {
-                delete window.nextSetting.data.antiVerifyCheck;
-            }
-        }
-    } catch (e) {
-        console.log(e)
-    }
-    $.ajax(window.nextSetting)
-}
-
-
-function shwoCode(text, imgdata) {
-    var htmlcode = '<div style="width: 100%;height: 100%;position:absolute;top:0;background-color: #382f3d;opacity: .1;z-index: 99999999999990;"></div>'
-        + '<div style="position: fixed;top: 50%;left: 50%;transform: translateX(-50%) translateY(-50%);z-index: 999999999999990;max-width: 360px;">'
-        + '<div>'
-        + '<img style="width: 90vw;max-width: 360px;display: block;" src="/antiRes/images/verify_logo.png">'
-        + '</div>'
-        + '<div style="border: #F5F5F5 solid 1px;margin: auto;width: 90vw;max-width: 360px;background-color: #FFFFFF;box-shadow: 1px 1px 1px 1px grey;padding: 10pt;display: flex;flex-direction: column;">'
-        + '<div style="margin-bottom:8pt"><div>请在下图依次点击:<span>' + text + '</span></div></div>'
-        + '<div style="position:relative;width:100%">'
-        + '<img id="antiimg" onclick="antiAdd(event,this);" src="data:image/png;base64,' + imgdata + '" style="width:100%">'
-        + '<input type="hidden" id="antivalue" value="">'
-        + '</div>'
-        + '<div style="margin-top: 1vh;display: flex;flex-direction: row;justify-content: space-between;">'
-        + '<img style="argin-left: 8pt;width: 25pt;height: 25pt;float: left;cursor: hand;" onclick="antiReload()" src="/antiRes/images/flush.png" \>'
-        + '<div><button style="background-color: #24C0D7;text-align: center;vertical-align: middle;touch-action: manipulation;cursor: pointer;background-image: none;border: 1px solid transparent;white-space: nowrap;padding: 8px 12px;font-size: 14px;line-height: 1.42857143;border-radius: 4px;-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;color: #FFFFFF;position: relative;outline-width: 0px;box-shadow: none !important;" onclick="antiReload(1);">确定</button></div>'
-        + '</div>'
-        + '</div>'
-        + '</div>'
-    if (document.querySelector("#antiVerify") == null) {
-        var wrap = document.createElement("div");
-        wrap.id = "antiVerify";
-        wrap.innerHTML = htmlcode;
-        var insertParent = document.body
-        if (document.querySelector("#supersearchPage") && document.querySelector("#supersearchPage").className !== "hidden") {//搜索首页验证码要在搜索页内
-            insertParent = document.querySelector("#supersearchPage")
-        } else if (document.querySelector("#entsearchPage") && document.querySelector("#entsearchPage").className !== "hidden") {
-            insertParent = document.querySelector("#entsearchPage")
-        }
-        insertParent.appendChild(wrap);
-    } else {
-        document.querySelector("#antiVerify").innerHTML = htmlcode;
-    }
-    document.querySelector("#antiVerify div").addEventListener('touchmove', function (event) {
-        event.preventDefault();
-    })
-}
-
-function antiAdd(event, obj) {
-    if (obj.parentNode.querySelectorAll(".imgs").length < 3) {
-        var offsetX = event.clientX - obj.getBoundingClientRect().left;
-        var offsetY = event.clientY - obj.getBoundingClientRect().top;
-        var offx = parseInt(offsetX);
-        var offy = parseInt(offsetY);
-        var icon = "<img onclick='antiRemove(this)' class='imgs' src='/antiRes/images/hoverclick.png' "
-            + "style='position:absolute;top:" + (offsetY - 8) + "px;left:" + (offsetX - 8) + "px;'   offx=" + offx + " offy=" + offy + " />";
-        obj.parentNode.innerHTML += icon;
-        document.querySelector("#antivalue").value += (";" + offx + "," + offy)
-    }
-}
-
-function antiRemove(obj) {
-    var offx = obj.getAttribute("offx");
-    var offy = obj.getAttribute("offy");
-    document.querySelector("#antivalue").value = document.querySelector("#antivalue").value.replace((";" + offx + "," + offy), "");
-    obj.parentNode.removeChild(obj);
-}

+ 0 - 19
resources/antiRes/js/rem.js

@@ -1,19 +0,0 @@
-(function(doc, win) {
-	var docEl = doc.documentElement,
-		resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
-		recalc = function() {
-			var fontSize = RootNodeFontSize();
-			if(fontSize == 0) return;
-			docEl.style.fontSize = fontSize + 'px';
-		};
-	if(!doc.addEventListener) return;
-	win.addEventListener(resizeEvt, recalc, false);
-	doc.addEventListener('DOMContentLoaded', recalc, false);
-})(document, window);
-//获取根节点的font-size
-function RootNodeFontSize(){
-	var clientWidth = document.documentElement.clientWidth;
-	if(!clientWidth) return 0;
-	if(clientWidth > 750) clientWidth = 750;
-	return clientWidth / 7.5;
-}

BIN
resources/antiRes/lib/anti_v1.wasm


+ 0 - 87
resources/antiRes/page/app.html

@@ -1,87 +0,0 @@
-<html>
-<head>
-    <title>验证码</title>
-    <meta charset="UTF-8"/>
-    <meta name="format-detection" content="telephone=no, email=no"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link href="/antiRes/css/app.css?v=1429" rel="stylesheet">
-    <script> let isSpiderPage = true</script>
-    <script src="/antiRes/js/jquery.js"></script>
-    <script src="/antiRes/js/rem.js"></script>
-</head>
-<body>
-<div class="error-body">
-    <div class="app-layout-header">
-        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-        验证码
-    </div>
-    <div class="app-layout-content-b">
-        <div class="verify-body">
-            <div class="verify-img">
-                <img class="verify_logo" src="/antiRes/images/verify_logo.png">
-            </div>
-            <div class="verify-content">
-                <div style="margin-bottom:8pt"><p class="word">请在下图依次点击:<span id="words">{{.textVerify}}</span></p></div>
-                <div style="position:relative;width: 100%" class="verify_img">
-                    <img id="antiimg" src="data:image/png;base64,{{.imgData}}" onclick="antiAdd(event,this);"/>
-                    <input type="hidden" value="" id="antivalue"/>
-                </div>
-                <div class="footBtn">
-                    <img onclick="flash()" src="/antiRes/images/flush.png" style="width: 25pt;height: 25pt" alt="">
-                    <div>
-                        <button class="comfirmbtn btn btn-success" onclick="checkdot();">确定</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-<script>
-    //验证码方法
-    function antiAdd(event, obj) {
-        if (obj.parentNode.querySelectorAll(".imgs").length < 3) {
-            var offsetX = event.pageX - (obj.getBoundingClientRect().left + document.body.scrollLeft);
-            var offsetY = event.pageY - (obj.getBoundingClientRect().top + document.body.scrollTop);
-            var offx = parseInt(offsetX);
-            var offy = parseInt(offsetY);
-            var icon = "<img onclick='antiRemove(this)' class='imgs' src='/antiRes/images/hoverclick.png' "
-                + "style='position:absolute;top:" + (offsetY - 8) + "px;left:" + (offsetX - 8) + "px;'   offx=" + offx + " offy=" + offy + " />";
-            obj.parentNode.innerHTML += icon
-            document.querySelector("#antivalue").value += (";" + offx + "," + offy)
-        }
-    }
-
-    //删除验证
-    function antiRemove(obj) {
-        var offx = obj.getAttribute("offx");
-        var offy = obj.getAttribute("offy");
-        document.querySelector("#antivalue").value = document.querySelector("#antivalue").value.replace((";" + offx + "," + offy), "");
-        obj.parentNode.removeChild(obj);
-    }
-
-    //刷新验证码
-    function flash() {
-        window.location.reload()
-    }
-
-    //验证码提交
-    function checkdot() {
-        var param={};
-        param["antiVerifyCheck"]=document.querySelector("#antivalue").value.substr(1);
-        param["imgw"]= document.querySelector("#antiimg").width;
-        $.ajax({
-            type: "POST",
-            url: window.location.href,
-            dataType: "json",
-            data: param,
-            headers : {
-                'app': '{{.appName}}',
-            },
-            success: function(res){
-                window.location.reload()
-            }
-        });
-    }
-</script>
-</html>

+ 0 - 100
resources/antiRes/page/default.html

@@ -1,100 +0,0 @@
-<html>
-<head>
-    <title>验证码</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/>
-    <meta name="renderer" content="webkit">
-    <meta name="viewport"
-          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-    <meta content="telephone=no" name="format-detection"/>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/>
-    <meta name="renderer" content="webkit">
-    <meta name="baidu-site-verification" content="cSFG2PMaYX"/>
-    <meta name="applicable-device" content="pc,mobile"/>
-    <link href="/antiRes/css/default.css?v=1429" rel="stylesheet">
-    <script> let isSpiderPage = true</script>
-    <script src="/antiRes/js/jquery.js"></script>
-    <script src="/antiRes/js/rem.js"></script>
-</head>
-<body>
-<!-- content -->
-<div class="verify-body">
-    <div id="antiVerify">
-        <div></div>
-        <div style="margin: 0 auto;max-width: 360px;">
-            <div style="width: 90vw;max-width: 360px;">
-                <img style="width: 90vw;max-width: 360px;" src="/antiRes/images/verify_logo.png">
-            </div>
-            <div style="width: 90vw;max-width: 360px;border: #F5F5F5 solid 1px;margin: auto;background-color: #FFFFFF;box-shadow: 1px 1px 1px 1px grey;padding: 10pt;display: flex;flex-direction: column;">
-                <div style="margin-bottom:8pt;font-size: .2rem">
-                    <div>请在下图依次点击:<span>{{.textVerify}}</span></div>
-                </div>
-                <div style="position:relative;width:100%">
-                    <img id="antiimg" onclick="antiAdd(event,this);"
-                         src="data:image/png;base64,{{.imgData}}"
-                         style="width:100%"><input type="hidden" id="antivalue"
-                                                   value=""></div>
-                <div style="margin-top: 1vh;display: flex;flex-direction: row;justify-content: space-between;">
-                    <img style="argin-left: 8pt;width: 25pt;height: 25pt;float: left;cursor: hand;"
-                         onclick="antiReload()" src="/antiRes/images/flush.png">
-                    <div>
-                        <button style="background-color: #24C0D7;text-align: center;vertical-align: middle;touch-action: manipulation;cursor: pointer;background-image: none;border: 1px solid transparent;white-space: nowrap;padding: 8px 12px;font-size: 14px;line-height: 1.42857143;border-radius: 4px;-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;color: #FFFFFF;position: relative;outline-width: 0px;box-shadow: none !important;"
-                                onclick="antiReload(1);">确定
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-
-<script>
-    //验证码方法
-    function antiAdd(event, obj) {
-        if (obj.parentNode.querySelectorAll(".imgs").length < 3) {
-            var offsetX = event.pageX - (obj.getBoundingClientRect().left + document.body.scrollLeft);
-            var offsetY = event.pageY - (obj.getBoundingClientRect().top + document.body.scrollTop);
-            var offx = parseInt(offsetX);
-            var offy = parseInt(offsetY);
-            var icon = "<img onclick='antiRemove(this)' class='imgs' src='/antiRes/images/hoverclick.png' "
-                + "style='position:absolute;top:" + (offsetY - 8) + "px;left:" + (offsetX - 8) + "px;'   offx=" + offx + " offy=" + offy + " />";
-            obj.parentNode.innerHTML += icon
-            document.querySelector("#antivalue").value += (";" + offx + "," + offy)
-        }
-    }
-
-    //删除验证
-    function antiRemove(obj) {
-        var offx = obj.getAttribute("offx");
-        var offy = obj.getAttribute("offy");
-        document.querySelector("#antivalue").value = document.querySelector("#antivalue").value.replace((";" + offx + "," + offy), "");
-        obj.parentNode.removeChild(obj);
-    }
-
-    //验证码提交
-    function antiReload(flag) {
-        if (flag === 1) {
-            var param = {};
-            param["antiVerifyCheck"] = document.querySelector("#antivalue").value.substr(1);
-            param["imgw"] = $("#antiimg").width();
-            $.ajax({
-                type: "POST",
-                url: window.location.href,
-                dataType: "json",
-                data: param,
-                headers: {
-                    'app': '{{.appName}}',
-                },
-                success: function (res) {
-                    window.location.reload()
-                }
-            });
-        } else {
-            window.location.reload();
-        }
-    }
-
-</script>
-</body>
-</html>

BIN
resources/verify/fontBg/100.jpg


BIN
resources/verify/fontBg/101.jpg


BIN
resources/verify/fontBg/102.jpg


BIN
resources/verify/fontBg/81.jpg


BIN
resources/verify/fontBg/82.jpg


BIN
resources/verify/fontBg/83.jpg


BIN
resources/verify/fontBg/84.jpg


BIN
resources/verify/fontBg/85.jpg


BIN
resources/verify/fontBg/86.jpg


BIN
resources/verify/fontBg/87.jpg


BIN
resources/verify/fontBg/88.jpg


BIN
resources/verify/fontBg/90.jpg


BIN
resources/verify/fontBg/91.jpg


BIN
resources/verify/fontBg/92.jpg


BIN
resources/verify/fontBg/93.jpg


BIN
resources/verify/fontBg/94.jpg


BIN
resources/verify/fontBg/95.jpg


BIN
resources/verify/fontBg/96.jpg


BIN
resources/verify/fontBg/97.jpg


BIN
resources/verify/fontBg/98.jpg


BIN
resources/verify/fontBg/99.jpg


BIN
resources/verify/fontType/STZHONGS.TTF


BIN
resources/verify/imageBg/10.jpg


BIN
resources/verify/imageBg/15.jpg


BIN
resources/verify/imageBg/17.jpg


BIN
resources/verify/imageBg/18.jpg


BIN
resources/verify/imageBg/2.jpg


BIN
resources/verify/imageBg/23.jpg


BIN
resources/verify/imageBg/24.jpg


BIN
resources/verify/imageBg/3.jpg


BIN
resources/verify/imageBg/32.jpg


BIN
resources/verify/imageBg/37.jpg


BIN
resources/verify/imageBg/39.jpg


BIN
resources/verify/imageBg/4.jpg


BIN
resources/verify/imageBg/65.jpg


BIN
resources/verify/imageBg/66.jpg


BIN
resources/verify/imageBg/67.jpg


BIN
resources/verify/imageBg/68.jpg


BIN
resources/verify/imageBg/69.jpg


BIN
resources/verify/imageBg/7.jpg


BIN
resources/verify/imageBg/70.jpg


BIN
resources/verify/imageBg/72.jpg


BIN
resources/verify/imageBg/73.jpg


BIN
resources/verify/imageBg/74.jpg


BIN
resources/verify/imageBg/75.jpg


BIN
resources/verify/imageBg/76.jpg


BIN
resources/verify/imageBg/77.jpg


BIN
resources/verify/imageBg/78.jpg


BIN
resources/verify/imageBg/8.jpg


BIN
tripartite_gateway.exe


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