+
+## Usage
+
+```go
+import (
+ "log/syslog"
+ "github.com/sirupsen/logrus"
+ lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+)
+
+func main() {
+ log := logrus.New()
+ hook, err := lSyslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
+
+ if err == nil {
+ log.Hooks.Add(hook)
+ }
+}
+```
+
+If you want to connect to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). Just assign empty string to the first two parameters of `NewSyslogHook`. It should look like the following.
+
+```go
+import (
+ "log/syslog"
+ "github.com/sirupsen/logrus"
+ lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+)
+
+func main() {
+ log := logrus.New()
+ hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
+
+ if err == nil {
+ log.Hooks.Add(hook)
+ }
+}
+```
diff --git a/logger/logrus/logrus/hooks/syslog/syslog.go b/logger/logrus/logrus/hooks/syslog/syslog.go
new file mode 100644
index 0000000..dafd449
--- /dev/null
+++ b/logger/logrus/logrus/hooks/syslog/syslog.go
@@ -0,0 +1,55 @@
+// +build !windows,!nacl,!plan9
+
+package syslog
+
+import (
+ "fmt"
+ "log/syslog"
+ "os"
+
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+)
+
+// SyslogHook to send logs via syslog.
+type SyslogHook struct {
+ Writer *syslog.Writer
+ SyslogNetwork string
+ SyslogRaddr string
+}
+
+// Creates a hook to be added to an instance of logger. This is called with
+// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
+// `if err == nil { log.Hooks.Add(hook) }`
+func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
+ w, err := syslog.Dial(network, raddr, priority, tag)
+ return &SyslogHook{w, network, raddr}, err
+}
+
+func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
+ line, err := entry.String()
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
+ return err
+ }
+
+ switch entry.Level {
+ case logrus.PanicLevel:
+ return hook.Writer.Crit(line)
+ case logrus.FatalLevel:
+ return hook.Writer.Crit(line)
+ case logrus.ErrorLevel:
+ return hook.Writer.Err(line)
+ case logrus.WarnLevel:
+ return hook.Writer.Warning(line)
+ case logrus.InfoLevel:
+ return hook.Writer.Info(line)
+ case logrus.DebugLevel, logrus.TraceLevel:
+ return hook.Writer.Debug(line)
+ default:
+ return nil
+ }
+}
+
+func (hook *SyslogHook) Levels() []logrus.Level {
+ return logrus.AllLevels
+}
diff --git a/logger/logrus/logrus/hooks/syslog/syslog_test.go b/logger/logrus/logrus/hooks/syslog/syslog_test.go
new file mode 100644
index 0000000..a28f920
--- /dev/null
+++ b/logger/logrus/logrus/hooks/syslog/syslog_test.go
@@ -0,0 +1,29 @@
+// +build !windows,!nacl,!plan9
+
+package syslog
+
+import (
+ "log/syslog"
+ "testing"
+
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+)
+
+func TestLocalhostAddAndPrint(t *testing.T) {
+ log := logrus.New()
+ hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
+
+ if err != nil {
+ t.Errorf("Unable to connect to local syslog.")
+ }
+
+ log.Hooks.Add(hook)
+
+ for _, level := range hook.Levels() {
+ if len(log.Hooks[level]) != 1 {
+ t.Errorf("SyslogHook was not added. The length of log.Hooks[%v]: %v", level, len(log.Hooks[level]))
+ }
+ }
+
+ log.Info("Congratulations!")
+}
diff --git a/logger/logrus/logrus/hooks/test/test.go b/logger/logrus/logrus/hooks/test/test.go
new file mode 100644
index 0000000..e9122f2
--- /dev/null
+++ b/logger/logrus/logrus/hooks/test/test.go
@@ -0,0 +1,92 @@
+// The Test package is used for testing logrus. It is here for backwards
+// compatibility from when logrus' organization was upper-case. Please use
+// lower-case logrus and the `null` package instead of this one.
+package test
+
+import (
+ "io/ioutil"
+ "sync"
+
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+)
+
+// Hook is a hook designed for dealing with logs in test scenarios.
+type Hook struct {
+ // Entries is an array of all entries that have been received by this hook.
+ // For safe access, use the AllEntries() method, rather than reading this
+ // value directly.
+ Entries []logrus.Entry
+ mu sync.RWMutex
+}
+
+// NewGlobal installs a test hook for the global logger.
+func NewGlobal() *Hook {
+
+ hook := new(Hook)
+ logrus.AddHook(hook)
+
+ return hook
+
+}
+
+// NewLocal installs a test hook for a given local logger.
+func NewLocal(logger *logrus.Logger) *Hook {
+
+ hook := new(Hook)
+ logger.Hooks.Add(hook)
+
+ return hook
+
+}
+
+// NewNullLogger creates a discarding logger and installs the test hook.
+func NewNullLogger() (*logrus.Logger, *Hook) {
+
+ logger := logrus.New()
+ logger.Out = ioutil.Discard
+
+ return logger, NewLocal(logger)
+
+}
+
+func (t *Hook) Fire(e *logrus.Entry) error {
+ t.mu.Lock()
+ defer t.mu.Unlock()
+ t.Entries = append(t.Entries, *e)
+ return nil
+}
+
+func (t *Hook) Levels() []logrus.Level {
+ return logrus.AllLevels
+}
+
+// LastEntry returns the last entry that was logged or nil.
+func (t *Hook) LastEntry() *logrus.Entry {
+ t.mu.RLock()
+ defer t.mu.RUnlock()
+ i := len(t.Entries) - 1
+ if i < 0 {
+ return nil
+ }
+ return &t.Entries[i]
+}
+
+// AllEntries returns all entries that were logged.
+func (t *Hook) AllEntries() []*logrus.Entry {
+ t.mu.RLock()
+ defer t.mu.RUnlock()
+ // Make a copy so the returned value won't race with future log requests
+ entries := make([]*logrus.Entry, len(t.Entries))
+ for i := 0; i < len(t.Entries); i++ {
+ // Make a copy, for safety
+ entries[i] = &t.Entries[i]
+ }
+ return entries
+}
+
+// Reset removes all Entries from this test hook.
+func (t *Hook) Reset() {
+ t.mu.Lock()
+ defer t.mu.Unlock()
+ t.Entries = make([]logrus.Entry, 0)
+}
diff --git a/logger/logrus/logrus/hooks/test/test_test.go b/logger/logrus/logrus/hooks/test/test_test.go
new file mode 100644
index 0000000..a578d0a
--- /dev/null
+++ b/logger/logrus/logrus/hooks/test/test_test.go
@@ -0,0 +1,85 @@
+package test
+
+import (
+ "math/rand"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestAllHooks(t *testing.T) {
+ assert := assert.New(t)
+
+ logger, hook := NewNullLogger()
+ assert.Nil(hook.LastEntry())
+ assert.Equal(0, len(hook.Entries))
+
+ logger.Error("Hello error")
+ assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
+ assert.Equal("Hello error", hook.LastEntry().Message)
+ assert.Equal(1, len(hook.Entries))
+
+ logger.Warn("Hello warning")
+ assert.Equal(logrus.WarnLevel, hook.LastEntry().Level)
+ assert.Equal("Hello warning", hook.LastEntry().Message)
+ assert.Equal(2, len(hook.Entries))
+
+ hook.Reset()
+ assert.Nil(hook.LastEntry())
+ assert.Equal(0, len(hook.Entries))
+
+ hook = NewGlobal()
+
+ logrus.Error("Hello error")
+ assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
+ assert.Equal("Hello error", hook.LastEntry().Message)
+ assert.Equal(1, len(hook.Entries))
+}
+
+func TestLoggingWithHooksRace(t *testing.T) {
+
+ rand.Seed(time.Now().Unix())
+ unlocker := rand.Int() % 100
+
+ assert := assert.New(t)
+ logger, hook := NewNullLogger()
+
+ var wgOne, wgAll sync.WaitGroup
+ wgOne.Add(1)
+ wgAll.Add(100)
+
+ for i := 0; i < 100; i++ {
+ go func(i int) {
+ logger.Info("info")
+ wgAll.Done()
+ if i == unlocker {
+ wgOne.Done()
+ }
+ }(i)
+ }
+
+ wgOne.Wait()
+
+ assert.Equal(logrus.InfoLevel, hook.LastEntry().Level)
+ assert.Equal("info", hook.LastEntry().Message)
+
+ wgAll.Wait()
+
+ entries := hook.AllEntries()
+ assert.Equal(100, len(entries))
+}
+
+func TestFatalWithAlternateExit(t *testing.T) {
+ assert := assert.New(t)
+
+ logger, hook := NewNullLogger()
+ logger.ExitFunc = func(code int) {}
+
+ logger.Fatal("something went very wrong")
+ assert.Equal(logrus.FatalLevel, hook.LastEntry().Level)
+ assert.Equal("something went very wrong", hook.LastEntry().Message)
+ assert.Equal(1, len(hook.Entries))
+}
diff --git a/logger/logrus/logrus/internal/testutils/testutils.go b/logger/logrus/logrus/internal/testutils/testutils.go
new file mode 100644
index 0000000..d1acdb7
--- /dev/null
+++ b/logger/logrus/logrus/internal/testutils/testutils.go
@@ -0,0 +1,58 @@
+package testutils
+
+import (
+ "bytes"
+ "encoding/json"
+ "strconv"
+ "strings"
+ "testing"
+
+ . "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+
+ "github.com/stretchr/testify/require"
+)
+
+func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fields)) {
+ var buffer bytes.Buffer
+ var fields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+
+ log(logger)
+
+ err := json.Unmarshal(buffer.Bytes(), &fields)
+ require.Nil(t, err)
+
+ assertions(fields)
+}
+
+func LogAndAssertText(t *testing.T, log func(*Logger), assertions func(fields map[string]string)) {
+ var buffer bytes.Buffer
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = &TextFormatter{
+ DisableColors: true,
+ }
+
+ log(logger)
+
+ fields := make(map[string]string)
+ for _, kv := range strings.Split(strings.TrimRight(buffer.String(), "\n"), " ") {
+ if !strings.Contains(kv, "=") {
+ continue
+ }
+ kvArr := strings.Split(kv, "=")
+ key := strings.TrimSpace(kvArr[0])
+ val := kvArr[1]
+ if kvArr[1][0] == '"' {
+ var err error
+ val, err = strconv.Unquote(val)
+ require.NoError(t, err)
+ }
+ fields[key] = val
+ }
+ assertions(fields)
+}
diff --git a/logger/logrus/logrus/json_formatter.go b/logger/logrus/logrus/json_formatter.go
new file mode 100644
index 0000000..098a21a
--- /dev/null
+++ b/logger/logrus/logrus/json_formatter.go
@@ -0,0 +1,121 @@
+package logrus
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "runtime"
+)
+
+type fieldKey string
+
+// FieldMap allows customization of the key names for default fields.
+type FieldMap map[fieldKey]string
+
+func (f FieldMap) resolve(key fieldKey) string {
+ if k, ok := f[key]; ok {
+ return k
+ }
+
+ return string(key)
+}
+
+// JSONFormatter formats logs into parsable json
+type JSONFormatter struct {
+ // TimestampFormat sets the format used for marshaling timestamps.
+ TimestampFormat string
+
+ // DisableTimestamp allows disabling automatic timestamps in output
+ DisableTimestamp bool
+
+ // DataKey allows users to put all the log entry parameters into a nested dictionary at a given key.
+ DataKey string
+
+ // FieldMap allows users to customize the names of keys for default fields.
+ // As an example:
+ // formatter := &JSONFormatter{
+ // FieldMap: FieldMap{
+ // FieldKeyTime: "@timestamp",
+ // FieldKeyLevel: "@level",
+ // FieldKeyMsg: "@message",
+ // FieldKeyFunc: "@caller",
+ // },
+ // }
+ FieldMap FieldMap
+
+ // CallerPrettyfier can be set by the user to modify the content
+ // of the function and file keys in the json data when ReportCaller is
+ // activated. If any of the returned value is the empty string the
+ // corresponding key will be removed from json fields.
+ CallerPrettyfier func(*runtime.Frame) (function string, file string)
+
+ // PrettyPrint will indent all json logs
+ PrettyPrint bool
+}
+
+// Format renders a single log entry
+func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
+ data := make(Fields, len(entry.Data)+4)
+ for k, v := range entry.Data {
+ switch v := v.(type) {
+ case error:
+ // Otherwise errors are ignored by `encoding/json`
+ // https://github.com/sirupsen/logrus/issues/137
+ data[k] = v.Error()
+ default:
+ data[k] = v
+ }
+ }
+
+ if f.DataKey != "" {
+ newData := make(Fields, 4)
+ newData[f.DataKey] = data
+ data = newData
+ }
+
+ prefixFieldClashes(data, f.FieldMap, entry.HasCaller())
+
+ timestampFormat := f.TimestampFormat
+ if timestampFormat == "" {
+ timestampFormat = defaultTimestampFormat
+ }
+
+ if entry.err != "" {
+ data[f.FieldMap.resolve(FieldKeyLogrusError)] = entry.err
+ }
+ if !f.DisableTimestamp {
+ data[f.FieldMap.resolve(FieldKeyTime)] = entry.Time.Format(timestampFormat)
+ }
+ data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message
+ data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String()
+ if entry.HasCaller() {
+ funcVal := entry.Caller.Function
+ fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+ if f.CallerPrettyfier != nil {
+ funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+ }
+ if funcVal != "" {
+ data[f.FieldMap.resolve(FieldKeyFunc)] = funcVal
+ }
+ if fileVal != "" {
+ data[f.FieldMap.resolve(FieldKeyFile)] = fileVal
+ }
+ }
+
+ var b *bytes.Buffer
+ if entry.Buffer != nil {
+ b = entry.Buffer
+ } else {
+ b = &bytes.Buffer{}
+ }
+
+ encoder := json.NewEncoder(b)
+ if f.PrettyPrint {
+ encoder.SetIndent("", " ")
+ }
+ if err := encoder.Encode(data); err != nil {
+ return nil, fmt.Errorf("failed to marshal fields to JSON, %v", err)
+ }
+
+ return b.Bytes(), nil
+}
diff --git a/logger/logrus/logrus/json_formatter_test.go b/logger/logrus/logrus/json_formatter_test.go
new file mode 100644
index 0000000..695c36e
--- /dev/null
+++ b/logger/logrus/logrus/json_formatter_test.go
@@ -0,0 +1,346 @@
+package logrus
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "runtime"
+ "strings"
+ "testing"
+)
+
+func TestErrorNotLost(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("error", errors.New("wild walrus")))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["error"] != "wild walrus" {
+ t.Fatal("Error field not set")
+ }
+}
+
+func TestErrorNotLostOnFieldNotNamedError(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("omg", errors.New("wild walrus")))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["omg"] != "wild walrus" {
+ t.Fatal("Error field not set")
+ }
+}
+
+func TestFieldClashWithTime(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("time", "right now!"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["fields.time"] != "right now!" {
+ t.Fatal("fields.time not set to original time field")
+ }
+
+ if entry["time"] != "0001-01-01T00:00:00Z" {
+ t.Fatal("time field not set to current time, was: ", entry["time"])
+ }
+}
+
+func TestFieldClashWithMsg(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("msg", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["fields.msg"] != "something" {
+ t.Fatal("fields.msg not set to original msg field")
+ }
+}
+
+func TestFieldClashWithLevel(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["fields.level"] != "something" {
+ t.Fatal("fields.level not set to original level field")
+ }
+}
+
+func TestFieldClashWithRemappedFields(t *testing.T) {
+ formatter := &JSONFormatter{
+ FieldMap: FieldMap{
+ FieldKeyTime: "@timestamp",
+ FieldKeyLevel: "@level",
+ FieldKeyMsg: "@message",
+ },
+ }
+
+ b, err := formatter.Format(WithFields(Fields{
+ "@timestamp": "@timestamp",
+ "@level": "@level",
+ "@message": "@message",
+ "timestamp": "timestamp",
+ "level": "level",
+ "msg": "msg",
+ }))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ for _, field := range []string{"timestamp", "level", "msg"} {
+ if entry[field] != field {
+ t.Errorf("Expected field %v to be untouched; got %v", field, entry[field])
+ }
+
+ remappedKey := fmt.Sprintf("fields.%s", field)
+ if remapped, ok := entry[remappedKey]; ok {
+ t.Errorf("Expected %s to be empty; got %v", remappedKey, remapped)
+ }
+ }
+
+ for _, field := range []string{"@timestamp", "@level", "@message"} {
+ if entry[field] == field {
+ t.Errorf("Expected field %v to be mapped to an Entry value", field)
+ }
+
+ remappedKey := fmt.Sprintf("fields.%s", field)
+ if remapped, ok := entry[remappedKey]; ok {
+ if remapped != field {
+ t.Errorf("Expected field %v to be copied to %s; got %v", field, remappedKey, remapped)
+ }
+ } else {
+ t.Errorf("Expected field %v to be copied to %s; was absent", field, remappedKey)
+ }
+ }
+}
+
+func TestFieldsInNestedDictionary(t *testing.T) {
+ formatter := &JSONFormatter{
+ DataKey: "args",
+ }
+
+ logEntry := WithFields(Fields{
+ "level": "level",
+ "test": "test",
+ })
+ logEntry.Level = InfoLevel
+
+ b, err := formatter.Format(logEntry)
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ args := entry["args"].(map[string]interface{})
+
+ for _, field := range []string{"test", "level"} {
+ if value, present := args[field]; !present || value != field {
+ t.Errorf("Expected field %v to be present under 'args'; untouched", field)
+ }
+ }
+
+ for _, field := range []string{"test", "fields.level"} {
+ if _, present := entry[field]; present {
+ t.Errorf("Expected field %v not to be present at top level", field)
+ }
+ }
+
+ // with nested object, "level" shouldn't clash
+ if entry["level"] != "info" {
+ t.Errorf("Expected 'level' field to contain 'info'")
+ }
+}
+
+func TestJSONEntryEndsWithNewline(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ if b[len(b)-1] != '\n' {
+ t.Fatal("Expected JSON log entry to end with a newline")
+ }
+}
+
+func TestJSONMessageKey(t *testing.T) {
+ formatter := &JSONFormatter{
+ FieldMap: FieldMap{
+ FieldKeyMsg: "message",
+ },
+ }
+
+ b, err := formatter.Format(&Entry{Message: "oh hai"})
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+ s := string(b)
+ if !(strings.Contains(s, "message") && strings.Contains(s, "oh hai")) {
+ t.Fatal("Expected JSON to format message key")
+ }
+}
+
+func TestJSONLevelKey(t *testing.T) {
+ formatter := &JSONFormatter{
+ FieldMap: FieldMap{
+ FieldKeyLevel: "somelevel",
+ },
+ }
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+ s := string(b)
+ if !strings.Contains(s, "somelevel") {
+ t.Fatal("Expected JSON to format level key")
+ }
+}
+
+func TestJSONTimeKey(t *testing.T) {
+ formatter := &JSONFormatter{
+ FieldMap: FieldMap{
+ FieldKeyTime: "timeywimey",
+ },
+ }
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+ s := string(b)
+ if !strings.Contains(s, "timeywimey") {
+ t.Fatal("Expected JSON to format time key")
+ }
+}
+
+func TestFieldDoesNotClashWithCaller(t *testing.T) {
+ SetReportCaller(false)
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("func", "howdy pardner"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["func"] != "howdy pardner" {
+ t.Fatal("func field replaced when ReportCaller=false")
+ }
+}
+
+func TestFieldClashWithCaller(t *testing.T) {
+ SetReportCaller(true)
+ formatter := &JSONFormatter{}
+ e := WithField("func", "howdy pardner")
+ e.Caller = &runtime.Frame{Function: "somefunc"}
+ b, err := formatter.Format(e)
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ entry := make(map[string]interface{})
+ err = json.Unmarshal(b, &entry)
+ if err != nil {
+ t.Fatal("Unable to unmarshal formatted entry: ", err)
+ }
+
+ if entry["fields.func"] != "howdy pardner" {
+ t.Fatalf("fields.func not set to original func field when ReportCaller=true (got '%s')",
+ entry["fields.func"])
+ }
+
+ if entry["func"] != "somefunc" {
+ t.Fatalf("func not set as expected when ReportCaller=true (got '%s')",
+ entry["func"])
+ }
+
+ SetReportCaller(false) // return to default value
+}
+
+func TestJSONDisableTimestamp(t *testing.T) {
+ formatter := &JSONFormatter{
+ DisableTimestamp: true,
+ }
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+ s := string(b)
+ if strings.Contains(s, FieldKeyTime) {
+ t.Error("Did not prevent timestamp", s)
+ }
+}
+
+func TestJSONEnableTimestamp(t *testing.T) {
+ formatter := &JSONFormatter{}
+
+ b, err := formatter.Format(WithField("level", "something"))
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+ s := string(b)
+ if !strings.Contains(s, FieldKeyTime) {
+ t.Error("Timestamp not present", s)
+ }
+}
diff --git a/logger/logrus/logrus/level_test.go b/logger/logrus/logrus/level_test.go
new file mode 100644
index 0000000..6b0fc8b
--- /dev/null
+++ b/logger/logrus/logrus/level_test.go
@@ -0,0 +1,62 @@
+package logrus_test
+
+import (
+ "bytes"
+ "encoding/json"
+ "testing"
+
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+ "github.com/stretchr/testify/require"
+)
+
+func TestLevelJsonEncoding(t *testing.T) {
+ type X struct {
+ Level logrus.Level
+ }
+
+ var x X
+ x.Level = logrus.WarnLevel
+ var buf bytes.Buffer
+ enc := json.NewEncoder(&buf)
+ require.NoError(t, enc.Encode(x))
+ dec := json.NewDecoder(&buf)
+ var y X
+ require.NoError(t, dec.Decode(&y))
+}
+
+func TestLevelUnmarshalText(t *testing.T) {
+ var u logrus.Level
+ for _, level := range logrus.AllLevels {
+ t.Run(level.String(), func(t *testing.T) {
+ require.NoError(t, u.UnmarshalText([]byte(level.String())))
+ require.Equal(t, level, u)
+ })
+ }
+ t.Run("invalid", func(t *testing.T) {
+ require.Error(t, u.UnmarshalText([]byte("invalid")))
+ })
+}
+
+func TestLevelMarshalText(t *testing.T) {
+ levelStrings := []string{
+ "panic",
+ "fatal",
+ "error",
+ "warning",
+ "info",
+ "debug",
+ "trace",
+ }
+ for idx, val := range logrus.AllLevels {
+ level := val
+ t.Run(level.String(), func(t *testing.T) {
+ var cmp logrus.Level
+ b, err := level.MarshalText()
+ require.NoError(t, err)
+ require.Equal(t, levelStrings[idx], string(b))
+ err = cmp.UnmarshalText(b)
+ require.NoError(t, err)
+ require.Equal(t, level, cmp)
+ })
+ }
+}
diff --git a/logger/logrus/logrus/logger.go b/logger/logrus/logrus/logger.go
new file mode 100644
index 0000000..c0c0b1e
--- /dev/null
+++ b/logger/logrus/logrus/logger.go
@@ -0,0 +1,351 @@
+package logrus
+
+import (
+ "context"
+ "io"
+ "os"
+ "sync"
+ "sync/atomic"
+ "time"
+)
+
+type Logger struct {
+ // The logs are `io.Copy`'d to this in a mutex. It's common to set this to a
+ // file, or leave it default which is `os.Stderr`. You can also set this to
+ // something more adventurous, such as logging to Kafka.
+ Out io.Writer
+ // Hooks for the logger instance. These allow firing events based on logging
+ // levels and log entries. For example, to send errors to an error tracking
+ // service, log to StatsD or dump the core on fatal errors.
+ Hooks LevelHooks
+ // All log entries pass through the formatter before logged to Out. The
+ // included formatters are `TextFormatter` and `JSONFormatter` for which
+ // TextFormatter is the default. In development (when a TTY is attached) it
+ // logs with colors, but to a file it wouldn't. You can easily implement your
+ // own that implements the `Formatter` interface, see the `README` or included
+ // formatters for examples.
+ Formatter Formatter
+
+ // Flag for whether to log caller info (off by default)
+ ReportCaller bool
+
+ // The logging level the logger should log at. This is typically (and defaults
+ // to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
+ // logged.
+ Level Level
+ // Used to sync writing to the log. Locking is enabled by Default
+ mu MutexWrap
+ // Reusable empty entry
+ entryPool sync.Pool
+ // Function to exit the application, defaults to `os.Exit()`
+ ExitFunc exitFunc
+}
+
+type exitFunc func(int)
+
+type MutexWrap struct {
+ lock sync.Mutex
+ disabled bool
+}
+
+func (mw *MutexWrap) Lock() {
+ if !mw.disabled {
+ mw.lock.Lock()
+ }
+}
+
+func (mw *MutexWrap) Unlock() {
+ if !mw.disabled {
+ mw.lock.Unlock()
+ }
+}
+
+func (mw *MutexWrap) Disable() {
+ mw.disabled = true
+}
+
+// Creates a new logger. Configuration should be set by changing `Formatter`,
+// `Out` and `Hooks` directly on the default logger instance. You can also just
+// instantiate your own:
+//
+// var log = &Logger{
+// Out: os.Stderr,
+// Formatter: new(JSONFormatter),
+// Hooks: make(LevelHooks),
+// Level: logrus.DebugLevel,
+// }
+//
+// It's recommended to make this a global instance called `log`.
+func New() *Logger {
+ return &Logger{
+ Out: os.Stderr,
+ Formatter: new(TextFormatter),
+ Hooks: make(LevelHooks),
+ Level: InfoLevel,
+ ExitFunc: os.Exit,
+ ReportCaller: false,
+ }
+}
+
+func (logger *Logger) newEntry() *Entry {
+ entry, ok := logger.entryPool.Get().(*Entry)
+ if ok {
+ return entry
+ }
+ return NewEntry(logger)
+}
+
+func (logger *Logger) releaseEntry(entry *Entry) {
+ entry.Data = map[string]interface{}{}
+ logger.entryPool.Put(entry)
+}
+
+// Adds a field to the log entry, note that it doesn't log until you call
+// Debug, Print, Info, Warn, Error, Fatal or Panic. It only creates a log entry.
+// If you want multiple fields, use `WithFields`.
+func (logger *Logger) WithField(key string, value interface{}) *Entry {
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithField(key, value)
+}
+
+// Adds a struct of fields to the log entry. All it does is call `WithField` for
+// each `Field`.
+func (logger *Logger) WithFields(fields Fields) *Entry {
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithFields(fields)
+}
+
+// Add an error as single field to the log entry. All it does is call
+// `WithError` for the given `error`.
+func (logger *Logger) WithError(err error) *Entry {
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithError(err)
+}
+
+// Add a context to the log entry.
+func (logger *Logger) WithContext(ctx context.Context) *Entry {
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithContext(ctx)
+}
+
+// Overrides the time of the log entry.
+func (logger *Logger) WithTime(t time.Time) *Entry {
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithTime(t)
+}
+
+func (logger *Logger) Logf(level Level, format string, args ...interface{}) {
+ if logger.IsLevelEnabled(level) {
+ entry := logger.newEntry()
+ entry.Logf(level, format, args...)
+ logger.releaseEntry(entry)
+ }
+}
+
+func (logger *Logger) Tracef(format string, args ...interface{}) {
+ logger.Logf(TraceLevel, format, args...)
+}
+
+func (logger *Logger) Debugf(format string, args ...interface{}) {
+ logger.Logf(DebugLevel, format, args...)
+}
+
+func (logger *Logger) Infof(format string, args ...interface{}) {
+ logger.Logf(InfoLevel, format, args...)
+}
+
+func (logger *Logger) Printf(format string, args ...interface{}) {
+ entry := logger.newEntry()
+ entry.Printf(format, args...)
+ logger.releaseEntry(entry)
+}
+
+func (logger *Logger) Warnf(format string, args ...interface{}) {
+ logger.Logf(WarnLevel, format, args...)
+}
+
+func (logger *Logger) Warningf(format string, args ...interface{}) {
+ logger.Warnf(format, args...)
+}
+
+func (logger *Logger) Errorf(format string, args ...interface{}) {
+ logger.Logf(ErrorLevel, format, args...)
+}
+
+func (logger *Logger) Fatalf(format string, args ...interface{}) {
+ logger.Logf(FatalLevel, format, args...)
+ logger.Exit(1)
+}
+
+func (logger *Logger) Panicf(format string, args ...interface{}) {
+ logger.Logf(PanicLevel, format, args...)
+}
+
+func (logger *Logger) Log(level Level, args ...interface{}) {
+ if logger.IsLevelEnabled(level) {
+ entry := logger.newEntry()
+ entry.Log(level, args...)
+ logger.releaseEntry(entry)
+ }
+}
+
+func (logger *Logger) Trace(args ...interface{}) {
+ logger.Log(TraceLevel, args...)
+}
+
+func (logger *Logger) Debug(args ...interface{}) {
+ logger.Log(DebugLevel, args...)
+}
+
+func (logger *Logger) Info(args ...interface{}) {
+ logger.Log(InfoLevel, args...)
+}
+
+func (logger *Logger) Print(args ...interface{}) {
+ entry := logger.newEntry()
+ entry.Print(args...)
+ logger.releaseEntry(entry)
+}
+
+func (logger *Logger) Warn(args ...interface{}) {
+ logger.Log(WarnLevel, args...)
+}
+
+func (logger *Logger) Warning(args ...interface{}) {
+ logger.Warn(args...)
+}
+
+func (logger *Logger) Error(args ...interface{}) {
+ logger.Log(ErrorLevel, args...)
+}
+
+func (logger *Logger) Fatal(args ...interface{}) {
+ logger.Log(FatalLevel, args...)
+ logger.Exit(1)
+}
+
+func (logger *Logger) Panic(args ...interface{}) {
+ logger.Log(PanicLevel, args...)
+}
+
+func (logger *Logger) Logln(level Level, args ...interface{}) {
+ if logger.IsLevelEnabled(level) {
+ entry := logger.newEntry()
+ entry.Logln(level, args...)
+ logger.releaseEntry(entry)
+ }
+}
+
+func (logger *Logger) Traceln(args ...interface{}) {
+ logger.Logln(TraceLevel, args...)
+}
+
+func (logger *Logger) Debugln(args ...interface{}) {
+ logger.Logln(DebugLevel, args...)
+}
+
+func (logger *Logger) Infoln(args ...interface{}) {
+ logger.Logln(InfoLevel, args...)
+}
+
+func (logger *Logger) Println(args ...interface{}) {
+ entry := logger.newEntry()
+ entry.Println(args...)
+ logger.releaseEntry(entry)
+}
+
+func (logger *Logger) Warnln(args ...interface{}) {
+ logger.Logln(WarnLevel, args...)
+}
+
+func (logger *Logger) Warningln(args ...interface{}) {
+ logger.Warnln(args...)
+}
+
+func (logger *Logger) Errorln(args ...interface{}) {
+ logger.Logln(ErrorLevel, args...)
+}
+
+func (logger *Logger) Fatalln(args ...interface{}) {
+ logger.Logln(FatalLevel, args...)
+ logger.Exit(1)
+}
+
+func (logger *Logger) Panicln(args ...interface{}) {
+ logger.Logln(PanicLevel, args...)
+}
+
+func (logger *Logger) Exit(code int) {
+ runHandlers()
+ if logger.ExitFunc == nil {
+ logger.ExitFunc = os.Exit
+ }
+ logger.ExitFunc(code)
+}
+
+//When file is opened with appending mode, it's safe to
+//write concurrently to a file (within 4k message on Linux).
+//In these cases user can choose to disable the lock.
+func (logger *Logger) SetNoLock() {
+ logger.mu.Disable()
+}
+
+func (logger *Logger) level() Level {
+ return Level(atomic.LoadUint32((*uint32)(&logger.Level)))
+}
+
+// SetLevel sets the logger level.
+func (logger *Logger) SetLevel(level Level) {
+ atomic.StoreUint32((*uint32)(&logger.Level), uint32(level))
+}
+
+// GetLevel returns the logger level.
+func (logger *Logger) GetLevel() Level {
+ return logger.level()
+}
+
+// AddHook adds a hook to the logger hooks.
+func (logger *Logger) AddHook(hook Hook) {
+ logger.mu.Lock()
+ defer logger.mu.Unlock()
+ logger.Hooks.Add(hook)
+}
+
+// IsLevelEnabled checks if the log level of the logger is greater than the level param
+func (logger *Logger) IsLevelEnabled(level Level) bool {
+ return logger.level() >= level
+}
+
+// SetFormatter sets the logger formatter.
+func (logger *Logger) SetFormatter(formatter Formatter) {
+ logger.mu.Lock()
+ defer logger.mu.Unlock()
+ logger.Formatter = formatter
+}
+
+// SetOutput sets the logger output.
+func (logger *Logger) SetOutput(output io.Writer) {
+ logger.mu.Lock()
+ defer logger.mu.Unlock()
+ logger.Out = output
+}
+
+func (logger *Logger) SetReportCaller(reportCaller bool) {
+ logger.mu.Lock()
+ defer logger.mu.Unlock()
+ logger.ReportCaller = reportCaller
+}
+
+// ReplaceHooks replaces the logger hooks and returns the old ones
+func (logger *Logger) ReplaceHooks(hooks LevelHooks) LevelHooks {
+ logger.mu.Lock()
+ oldHooks := logger.Hooks
+ logger.Hooks = hooks
+ logger.mu.Unlock()
+ return oldHooks
+}
diff --git a/logger/logrus/logrus/logger_bench_test.go b/logger/logrus/logrus/logger_bench_test.go
new file mode 100644
index 0000000..f0a7684
--- /dev/null
+++ b/logger/logrus/logrus/logger_bench_test.go
@@ -0,0 +1,85 @@
+package logrus
+
+import (
+ "io/ioutil"
+ "os"
+ "testing"
+)
+
+// smallFields is a small size data set for benchmarking
+var loggerFields = Fields{
+ "foo": "bar",
+ "baz": "qux",
+ "one": "two",
+ "three": "four",
+}
+
+func BenchmarkDummyLogger(b *testing.B) {
+ nullf, err := os.OpenFile("/dev/null", os.O_WRONLY, 0666)
+ if err != nil {
+ b.Fatalf("%v", err)
+ }
+ defer nullf.Close()
+ doLoggerBenchmark(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
+}
+
+func BenchmarkDummyLoggerNoLock(b *testing.B) {
+ nullf, err := os.OpenFile("/dev/null", os.O_WRONLY|os.O_APPEND, 0666)
+ if err != nil {
+ b.Fatalf("%v", err)
+ }
+ defer nullf.Close()
+ doLoggerBenchmarkNoLock(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
+}
+
+func doLoggerBenchmark(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
+ logger := Logger{
+ Out: out,
+ Level: InfoLevel,
+ Formatter: formatter,
+ }
+ entry := logger.WithFields(fields)
+ b.RunParallel(func(pb *testing.PB) {
+ for pb.Next() {
+ entry.Info("aaa")
+ }
+ })
+}
+
+func doLoggerBenchmarkNoLock(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
+ logger := Logger{
+ Out: out,
+ Level: InfoLevel,
+ Formatter: formatter,
+ }
+ logger.SetNoLock()
+ entry := logger.WithFields(fields)
+ b.RunParallel(func(pb *testing.PB) {
+ for pb.Next() {
+ entry.Info("aaa")
+ }
+ })
+}
+
+func BenchmarkLoggerJSONFormatter(b *testing.B) {
+ doLoggerBenchmarkWithFormatter(b, &JSONFormatter{})
+}
+
+func BenchmarkLoggerTextFormatter(b *testing.B) {
+ doLoggerBenchmarkWithFormatter(b, &TextFormatter{})
+}
+
+func doLoggerBenchmarkWithFormatter(b *testing.B, f Formatter) {
+ b.SetParallelism(100)
+ log := New()
+ log.Formatter = f
+ log.Out = ioutil.Discard
+ b.RunParallel(func(pb *testing.PB) {
+ for pb.Next() {
+ log.
+ WithField("foo1", "bar1").
+ WithField("foo2", "bar2").
+ Info("this is a dummy log")
+ }
+ })
+}
diff --git a/logger/logrus/logrus/logger_test.go b/logger/logrus/logrus/logger_test.go
new file mode 100644
index 0000000..50433e6
--- /dev/null
+++ b/logger/logrus/logrus/logger_test.go
@@ -0,0 +1,65 @@
+package logrus
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestFieldValueError(t *testing.T) {
+ buf := &bytes.Buffer{}
+ l := &Logger{
+ Out: buf,
+ Formatter: new(JSONFormatter),
+ Hooks: make(LevelHooks),
+ Level: DebugLevel,
+ }
+ l.WithField("func", func() {}).Info("test")
+ fmt.Println(buf.String())
+ var data map[string]interface{}
+ json.Unmarshal(buf.Bytes(), &data)
+ _, ok := data[FieldKeyLogrusError]
+ require.True(t, ok)
+}
+
+func TestNoFieldValueError(t *testing.T) {
+ buf := &bytes.Buffer{}
+ l := &Logger{
+ Out: buf,
+ Formatter: new(JSONFormatter),
+ Hooks: make(LevelHooks),
+ Level: DebugLevel,
+ }
+ l.WithField("str", "str").Info("test")
+ fmt.Println(buf.String())
+ var data map[string]interface{}
+ json.Unmarshal(buf.Bytes(), &data)
+ _, ok := data[FieldKeyLogrusError]
+ require.False(t, ok)
+}
+
+func TestWarninglnNotEqualToWarning(t *testing.T) {
+ buf := &bytes.Buffer{}
+ bufln := &bytes.Buffer{}
+
+ formatter := new(TextFormatter)
+ formatter.DisableTimestamp = true
+ formatter.DisableLevelTruncation = true
+
+ l := &Logger{
+ Out: buf,
+ Formatter: formatter,
+ Hooks: make(LevelHooks),
+ Level: DebugLevel,
+ }
+ l.Warning("hello,", "world")
+
+ l.SetOutput(bufln)
+ l.Warningln("hello,", "world")
+
+ assert.NotEqual(t, buf.String(), bufln.String(), "Warning() and Wantingln() should not be equal")
+}
diff --git a/logger/logrus/logrus/logrus.go b/logger/logrus/logrus/logrus.go
new file mode 100644
index 0000000..8644761
--- /dev/null
+++ b/logger/logrus/logrus/logrus.go
@@ -0,0 +1,186 @@
+package logrus
+
+import (
+ "fmt"
+ "log"
+ "strings"
+)
+
+// Fields type, used to pass to `WithFields`.
+type Fields map[string]interface{}
+
+// Level type
+type Level uint32
+
+// Convert the Level to a string. E.g. PanicLevel becomes "panic".
+func (level Level) String() string {
+ if b, err := level.MarshalText(); err == nil {
+ return string(b)
+ } else {
+ return "unknown"
+ }
+}
+
+// ParseLevel takes a string level and returns the Logrus log level constant.
+func ParseLevel(lvl string) (Level, error) {
+ switch strings.ToLower(lvl) {
+ case "panic":
+ return PanicLevel, nil
+ case "fatal":
+ return FatalLevel, nil
+ case "error":
+ return ErrorLevel, nil
+ case "warn", "warning":
+ return WarnLevel, nil
+ case "info":
+ return InfoLevel, nil
+ case "debug":
+ return DebugLevel, nil
+ case "trace":
+ return TraceLevel, nil
+ }
+
+ var l Level
+ return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (level *Level) UnmarshalText(text []byte) error {
+ l, err := ParseLevel(string(text))
+ if err != nil {
+ return err
+ }
+
+ *level = Level(l)
+
+ return nil
+}
+
+func (level Level) MarshalText() ([]byte, error) {
+ switch level {
+ case TraceLevel:
+ return []byte("trace"), nil
+ case DebugLevel:
+ return []byte("debug"), nil
+ case InfoLevel:
+ return []byte("info"), nil
+ case WarnLevel:
+ return []byte("warning"), nil
+ case ErrorLevel:
+ return []byte("error"), nil
+ case FatalLevel:
+ return []byte("fatal"), nil
+ case PanicLevel:
+ return []byte("panic"), nil
+ }
+
+ return nil, fmt.Errorf("not a valid logrus level %d", level)
+}
+
+// A constant exposing all logging levels
+var AllLevels = []Level{
+ PanicLevel,
+ FatalLevel,
+ ErrorLevel,
+ WarnLevel,
+ InfoLevel,
+ DebugLevel,
+ TraceLevel,
+}
+
+// These are the different logging levels. You can set the logging level to log
+// on your instance of logger, obtained with `logrus.New()`.
+const (
+ // PanicLevel level, highest level of severity. Logs and then calls panic with the
+ // message passed to Debug, Info, ...
+ PanicLevel Level = iota
+ // FatalLevel level. Logs and then calls `logger.Exit(1)`. It will exit even if the
+ // logging level is set to Panic.
+ FatalLevel
+ // ErrorLevel level. Logs. Used for errors that should definitely be noted.
+ // Commonly used for hooks to send errors to an error tracking service.
+ ErrorLevel
+ // WarnLevel level. Non-critical entries that deserve eyes.
+ WarnLevel
+ // InfoLevel level. General operational entries about what's going on inside the
+ // application.
+ InfoLevel
+ // DebugLevel level. Usually only enabled when debugging. Very verbose logging.
+ DebugLevel
+ // TraceLevel level. Designates finer-grained informational events than the Debug.
+ TraceLevel
+)
+
+// Won't compile if StdLogger can't be realized by a log.Logger
+var (
+ _ StdLogger = &log.Logger{}
+ _ StdLogger = &Entry{}
+ _ StdLogger = &Logger{}
+)
+
+// StdLogger is what your logrus-enabled library should take, that way
+// it'll accept a stdlib logger and a logrus logger. There's no standard
+// interface, this is the closest we get, unfortunately.
+type StdLogger interface {
+ Print(...interface{})
+ Printf(string, ...interface{})
+ Println(...interface{})
+
+ Fatal(...interface{})
+ Fatalf(string, ...interface{})
+ Fatalln(...interface{})
+
+ Panic(...interface{})
+ Panicf(string, ...interface{})
+ Panicln(...interface{})
+}
+
+// The FieldLogger interface generalizes the Entry and Logger types
+type FieldLogger interface {
+ WithField(key string, value interface{}) *Entry
+ WithFields(fields Fields) *Entry
+ WithError(err error) *Entry
+
+ Debugf(format string, args ...interface{})
+ Infof(format string, args ...interface{})
+ Printf(format string, args ...interface{})
+ Warnf(format string, args ...interface{})
+ Warningf(format string, args ...interface{})
+ Errorf(format string, args ...interface{})
+ Fatalf(format string, args ...interface{})
+ Panicf(format string, args ...interface{})
+
+ Debug(args ...interface{})
+ Info(args ...interface{})
+ Print(args ...interface{})
+ Warn(args ...interface{})
+ Warning(args ...interface{})
+ Error(args ...interface{})
+ Fatal(args ...interface{})
+ Panic(args ...interface{})
+
+ Debugln(args ...interface{})
+ Infoln(args ...interface{})
+ Println(args ...interface{})
+ Warnln(args ...interface{})
+ Warningln(args ...interface{})
+ Errorln(args ...interface{})
+ Fatalln(args ...interface{})
+ Panicln(args ...interface{})
+
+ // IsDebugEnabled() bool
+ // IsInfoEnabled() bool
+ // IsWarnEnabled() bool
+ // IsErrorEnabled() bool
+ // IsFatalEnabled() bool
+ // IsPanicEnabled() bool
+}
+
+// Ext1FieldLogger (the first extension to FieldLogger) is superfluous, it is
+// here for consistancy. Do not use. Use Logger or Entry instead.
+type Ext1FieldLogger interface {
+ FieldLogger
+ Tracef(format string, args ...interface{})
+ Trace(args ...interface{})
+ Traceln(args ...interface{})
+}
diff --git a/logger/logrus/logrus/logrus_test.go b/logger/logrus/logrus/logrus_test.go
new file mode 100644
index 0000000..d4d6b3e
--- /dev/null
+++ b/logger/logrus/logrus/logrus_test.go
@@ -0,0 +1,762 @@
+package logrus_test
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "runtime"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
+ . "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+ . "github.com/sirupsen/logrus/internal/testutils"
+)
+
+// TestReportCaller verifies that when ReportCaller is set, the 'func' field
+// is added, and when it is unset it is not set or modified
+// Verify that functions within the Logrus package aren't considered when
+// discovering the caller.
+func TestReportCallerWhenConfigured(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.ReportCaller = false
+ log.Print("testNoCaller")
+ }, func(fields Fields) {
+ assert.Equal(t, "testNoCaller", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ assert.Equal(t, nil, fields["func"])
+ })
+
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.ReportCaller = true
+ log.Print("testWithCaller")
+ }, func(fields Fields) {
+ assert.Equal(t, "testWithCaller", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ assert.Equal(t,
+ "github.com/sirupsen/logrus_test.TestReportCallerWhenConfigured.func3", fields[FieldKeyFunc])
+ })
+
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.ReportCaller = true
+ log.Formatter.(*JSONFormatter).CallerPrettyfier = func(f *runtime.Frame) (string, string) {
+ return "somekindoffunc", "thisisafilename"
+ }
+ log.Print("testWithCallerPrettyfier")
+ }, func(fields Fields) {
+ assert.Equal(t, "somekindoffunc", fields[FieldKeyFunc])
+ assert.Equal(t, "thisisafilename", fields[FieldKeyFile])
+ })
+
+ LogAndAssertText(t, func(log *Logger) {
+ log.ReportCaller = true
+ log.Formatter.(*TextFormatter).CallerPrettyfier = func(f *runtime.Frame) (string, string) {
+ return "somekindoffunc", "thisisafilename"
+ }
+ log.Print("testWithCallerPrettyfier")
+ }, func(fields map[string]string) {
+ assert.Equal(t, "somekindoffunc", fields[FieldKeyFunc])
+ assert.Equal(t, "thisisafilename", fields[FieldKeyFile])
+ })
+}
+
+func logSomething(t *testing.T, message string) Fields {
+ var buffer bytes.Buffer
+ var fields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+ logger.ReportCaller = true
+
+ entry := logger.WithFields(Fields{
+ "foo": "bar",
+ })
+
+ entry.Info(message)
+
+ err := json.Unmarshal(buffer.Bytes(), &fields)
+ assert.Nil(t, err)
+
+ return fields
+}
+
+// TestReportCallerHelperDirect - verify reference when logging from a regular function
+func TestReportCallerHelperDirect(t *testing.T) {
+ fields := logSomething(t, "direct")
+
+ assert.Equal(t, "direct", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ assert.Regexp(t, "github.com/.*/logrus_test.logSomething", fields["func"])
+}
+
+// TestReportCallerHelperDirect - verify reference when logging from a function called via pointer
+func TestReportCallerHelperViaPointer(t *testing.T) {
+ fptr := logSomething
+ fields := fptr(t, "via pointer")
+
+ assert.Equal(t, "via pointer", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ assert.Regexp(t, "github.com/.*/logrus_test.logSomething", fields["func"])
+}
+
+func TestPrint(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Print("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ })
+}
+
+func TestInfo(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Info("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ assert.Equal(t, "info", fields["level"])
+ })
+}
+
+func TestWarn(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Warn("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ assert.Equal(t, "warning", fields["level"])
+ })
+}
+
+func TestLog(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Log(WarnLevel, "test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ assert.Equal(t, "warning", fields["level"])
+ })
+}
+
+func TestInfolnShouldAddSpacesBetweenStrings(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Infoln("test", "test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test test", fields["msg"])
+ })
+}
+
+func TestInfolnShouldAddSpacesBetweenStringAndNonstring(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Infoln("test", 10)
+ }, func(fields Fields) {
+ assert.Equal(t, "test 10", fields["msg"])
+ })
+}
+
+func TestInfolnShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Infoln(10, 10)
+ }, func(fields Fields) {
+ assert.Equal(t, "10 10", fields["msg"])
+ })
+}
+
+func TestInfoShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Infoln(10, 10)
+ }, func(fields Fields) {
+ assert.Equal(t, "10 10", fields["msg"])
+ })
+}
+
+func TestInfoShouldNotAddSpacesBetweenStringAndNonstring(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Info("test", 10)
+ }, func(fields Fields) {
+ assert.Equal(t, "test10", fields["msg"])
+ })
+}
+
+func TestInfoShouldNotAddSpacesBetweenStrings(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.Info("test", "test")
+ }, func(fields Fields) {
+ assert.Equal(t, "testtest", fields["msg"])
+ })
+}
+
+func TestWithFieldsShouldAllowAssignments(t *testing.T) {
+ var buffer bytes.Buffer
+ var fields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+
+ localLog := logger.WithFields(Fields{
+ "key1": "value1",
+ })
+
+ localLog.WithField("key2", "value2").Info("test")
+ err := json.Unmarshal(buffer.Bytes(), &fields)
+ assert.Nil(t, err)
+
+ assert.Equal(t, "value2", fields["key2"])
+ assert.Equal(t, "value1", fields["key1"])
+
+ buffer = bytes.Buffer{}
+ fields = Fields{}
+ localLog.Info("test")
+ err = json.Unmarshal(buffer.Bytes(), &fields)
+ assert.Nil(t, err)
+
+ _, ok := fields["key2"]
+ assert.Equal(t, false, ok)
+ assert.Equal(t, "value1", fields["key1"])
+}
+
+func TestUserSuppliedFieldDoesNotOverwriteDefaults(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithField("msg", "hello").Info("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ })
+}
+
+func TestUserSuppliedMsgFieldHasPrefix(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithField("msg", "hello").Info("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "test", fields["msg"])
+ assert.Equal(t, "hello", fields["fields.msg"])
+ })
+}
+
+func TestUserSuppliedTimeFieldHasPrefix(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithField("time", "hello").Info("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "hello", fields["fields.time"])
+ })
+}
+
+func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithField("level", 1).Info("test")
+ }, func(fields Fields) {
+ assert.Equal(t, "info", fields["level"])
+ assert.Equal(t, 1.0, fields["fields.level"]) // JSON has floats only
+ })
+}
+
+func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
+ LogAndAssertText(t, func(log *Logger) {
+ ll := log.WithField("herp", "derp")
+ ll.Info("hello")
+ ll.Info("bye")
+ }, func(fields map[string]string) {
+ for _, fieldName := range []string{"fields.level", "fields.time", "fields.msg"} {
+ if _, ok := fields[fieldName]; ok {
+ t.Fatalf("should not have prefixed %q: %v", fieldName, fields)
+ }
+ }
+ })
+}
+
+func TestWithTimeShouldOverrideTime(t *testing.T) {
+ now := time.Now().Add(24 * time.Hour)
+
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithTime(now).Info("foobar")
+ }, func(fields Fields) {
+ assert.Equal(t, fields["time"], now.Format(time.RFC3339))
+ })
+}
+
+func TestWithTimeShouldNotOverrideFields(t *testing.T) {
+ now := time.Now().Add(24 * time.Hour)
+
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithField("herp", "derp").WithTime(now).Info("blah")
+ }, func(fields Fields) {
+ assert.Equal(t, fields["time"], now.Format(time.RFC3339))
+ assert.Equal(t, fields["herp"], "derp")
+ })
+}
+
+func TestWithFieldShouldNotOverrideTime(t *testing.T) {
+ now := time.Now().Add(24 * time.Hour)
+
+ LogAndAssertJSON(t, func(log *Logger) {
+ log.WithTime(now).WithField("herp", "derp").Info("blah")
+ }, func(fields Fields) {
+ assert.Equal(t, fields["time"], now.Format(time.RFC3339))
+ assert.Equal(t, fields["herp"], "derp")
+ })
+}
+
+func TestTimeOverrideMultipleLogs(t *testing.T) {
+ var buffer bytes.Buffer
+ var firstFields, secondFields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ formatter := new(JSONFormatter)
+ formatter.TimestampFormat = time.StampMilli
+ logger.Formatter = formatter
+
+ llog := logger.WithField("herp", "derp")
+ llog.Info("foo")
+
+ err := json.Unmarshal(buffer.Bytes(), &firstFields)
+ assert.NoError(t, err, "should have decoded first message")
+
+ buffer.Reset()
+
+ time.Sleep(10 * time.Millisecond)
+ llog.Info("bar")
+
+ err = json.Unmarshal(buffer.Bytes(), &secondFields)
+ assert.NoError(t, err, "should have decoded second message")
+
+ assert.NotEqual(t, firstFields["time"], secondFields["time"], "timestamps should not be equal")
+}
+
+func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
+
+ var buffer bytes.Buffer
+ var fields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+
+ llog := logger.WithField("context", "eating raw fish")
+
+ llog.Info("looks delicious")
+
+ err := json.Unmarshal(buffer.Bytes(), &fields)
+ assert.NoError(t, err, "should have decoded first message")
+ assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
+ assert.Equal(t, fields["msg"], "looks delicious")
+ assert.Equal(t, fields["context"], "eating raw fish")
+
+ buffer.Reset()
+
+ llog.Warn("omg it is!")
+
+ err = json.Unmarshal(buffer.Bytes(), &fields)
+ assert.NoError(t, err, "should have decoded second message")
+ assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
+ assert.Equal(t, "omg it is!", fields["msg"])
+ assert.Equal(t, "eating raw fish", fields["context"])
+ assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
+
+}
+
+func TestNestedLoggingReportsCorrectCaller(t *testing.T) {
+ var buffer bytes.Buffer
+ var fields Fields
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+ logger.ReportCaller = true
+
+ llog := logger.WithField("context", "eating raw fish")
+
+ llog.Info("looks delicious")
+ _, _, line, _ := runtime.Caller(0)
+
+ err := json.Unmarshal(buffer.Bytes(), &fields)
+ require.NoError(t, err, "should have decoded first message")
+ assert.Equal(t, 6, len(fields), "should have msg/time/level/func/context fields")
+ assert.Equal(t, "looks delicious", fields["msg"])
+ assert.Equal(t, "eating raw fish", fields["context"])
+ assert.Equal(t,
+ "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])
+ cwd, err := os.Getwd()
+ require.NoError(t, err)
+ assert.Equal(t, filepath.ToSlash(fmt.Sprintf("%s/logrus_test.go:%d", cwd, line-1)), filepath.ToSlash(fields["file"].(string)))
+
+ buffer.Reset()
+
+ logger.WithFields(Fields{
+ "Clyde": "Stubblefield",
+ }).WithFields(Fields{
+ "Jab'o": "Starks",
+ }).WithFields(Fields{
+ "uri": "https://www.youtube.com/watch?v=V5DTznu-9v0",
+ }).WithFields(Fields{
+ "func": "y drummer",
+ }).WithFields(Fields{
+ "James": "Brown",
+ }).Print("The hardest workin' man in show business")
+ _, _, line, _ = runtime.Caller(0)
+
+ err = json.Unmarshal(buffer.Bytes(), &fields)
+ assert.NoError(t, err, "should have decoded second message")
+ assert.Equal(t, 11, len(fields), "should have all builtin fields plus foo,bar,baz,...")
+ assert.Equal(t, "Stubblefield", fields["Clyde"])
+ assert.Equal(t, "Starks", fields["Jab'o"])
+ assert.Equal(t, "https://www.youtube.com/watch?v=V5DTznu-9v0", fields["uri"])
+ assert.Equal(t, "y drummer", fields["fields.func"])
+ assert.Equal(t, "Brown", fields["James"])
+ assert.Equal(t, "The hardest workin' man in show business", fields["msg"])
+ assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
+ assert.Equal(t,
+ "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])
+ require.NoError(t, err)
+ assert.Equal(t, filepath.ToSlash(fmt.Sprintf("%s/logrus_test.go:%d", cwd, line-1)), filepath.ToSlash(fields["file"].(string)))
+
+ logger.ReportCaller = false // return to default value
+}
+
+func logLoop(iterations int, reportCaller bool) {
+ var buffer bytes.Buffer
+
+ logger := New()
+ logger.Out = &buffer
+ logger.Formatter = new(JSONFormatter)
+ logger.ReportCaller = reportCaller
+
+ for i := 0; i < iterations; i++ {
+ logger.Infof("round %d of %d", i, iterations)
+ }
+}
+
+// Assertions for upper bounds to reporting overhead
+func TestCallerReportingOverhead(t *testing.T) {
+ iterations := 5000
+ before := time.Now()
+ logLoop(iterations, false)
+ during := time.Now()
+ logLoop(iterations, true)
+ after := time.Now()
+
+ elapsedNotReporting := during.Sub(before).Nanoseconds()
+ elapsedReporting := after.Sub(during).Nanoseconds()
+
+ maxDelta := 1 * time.Second
+ assert.WithinDuration(t, during, before, maxDelta,
+ "%d log calls without caller name lookup takes less than %d second(s) (was %d nanoseconds)",
+ iterations, maxDelta.Seconds(), elapsedNotReporting)
+ assert.WithinDuration(t, after, during, maxDelta,
+ "%d log calls without caller name lookup takes less than %d second(s) (was %d nanoseconds)",
+ iterations, maxDelta.Seconds(), elapsedReporting)
+}
+
+// benchmarks for both with and without caller-function reporting
+func BenchmarkWithoutCallerTracing(b *testing.B) {
+ for i := 0; i < b.N; i++ {
+ logLoop(1000, false)
+ }
+}
+
+func BenchmarkWithCallerTracing(b *testing.B) {
+ for i := 0; i < b.N; i++ {
+ logLoop(1000, true)
+ }
+}
+
+func TestConvertLevelToString(t *testing.T) {
+ assert.Equal(t, "trace", TraceLevel.String())
+ assert.Equal(t, "debug", DebugLevel.String())
+ assert.Equal(t, "info", InfoLevel.String())
+ assert.Equal(t, "warning", WarnLevel.String())
+ assert.Equal(t, "error", ErrorLevel.String())
+ assert.Equal(t, "fatal", FatalLevel.String())
+ assert.Equal(t, "panic", PanicLevel.String())
+}
+
+func TestParseLevel(t *testing.T) {
+ l, err := ParseLevel("panic")
+ assert.Nil(t, err)
+ assert.Equal(t, PanicLevel, l)
+
+ l, err = ParseLevel("PANIC")
+ assert.Nil(t, err)
+ assert.Equal(t, PanicLevel, l)
+
+ l, err = ParseLevel("fatal")
+ assert.Nil(t, err)
+ assert.Equal(t, FatalLevel, l)
+
+ l, err = ParseLevel("FATAL")
+ assert.Nil(t, err)
+ assert.Equal(t, FatalLevel, l)
+
+ l, err = ParseLevel("error")
+ assert.Nil(t, err)
+ assert.Equal(t, ErrorLevel, l)
+
+ l, err = ParseLevel("ERROR")
+ assert.Nil(t, err)
+ assert.Equal(t, ErrorLevel, l)
+
+ l, err = ParseLevel("warn")
+ assert.Nil(t, err)
+ assert.Equal(t, WarnLevel, l)
+
+ l, err = ParseLevel("WARN")
+ assert.Nil(t, err)
+ assert.Equal(t, WarnLevel, l)
+
+ l, err = ParseLevel("warning")
+ assert.Nil(t, err)
+ assert.Equal(t, WarnLevel, l)
+
+ l, err = ParseLevel("WARNING")
+ assert.Nil(t, err)
+ assert.Equal(t, WarnLevel, l)
+
+ l, err = ParseLevel("info")
+ assert.Nil(t, err)
+ assert.Equal(t, InfoLevel, l)
+
+ l, err = ParseLevel("INFO")
+ assert.Nil(t, err)
+ assert.Equal(t, InfoLevel, l)
+
+ l, err = ParseLevel("debug")
+ assert.Nil(t, err)
+ assert.Equal(t, DebugLevel, l)
+
+ l, err = ParseLevel("DEBUG")
+ assert.Nil(t, err)
+ assert.Equal(t, DebugLevel, l)
+
+ l, err = ParseLevel("trace")
+ assert.Nil(t, err)
+ assert.Equal(t, TraceLevel, l)
+
+ l, err = ParseLevel("TRACE")
+ assert.Nil(t, err)
+ assert.Equal(t, TraceLevel, l)
+
+ l, err = ParseLevel("invalid")
+ assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error())
+}
+
+func TestLevelString(t *testing.T) {
+ var loggerlevel Level
+ loggerlevel = 32000
+
+ _ = loggerlevel.String()
+}
+
+func TestGetSetLevelRace(t *testing.T) {
+ wg := sync.WaitGroup{}
+ for i := 0; i < 100; i++ {
+ wg.Add(1)
+ go func(i int) {
+ defer wg.Done()
+ if i%2 == 0 {
+ SetLevel(InfoLevel)
+ } else {
+ GetLevel()
+ }
+ }(i)
+
+ }
+ wg.Wait()
+}
+
+func TestLoggingRace(t *testing.T) {
+ logger := New()
+
+ var wg sync.WaitGroup
+ wg.Add(100)
+
+ for i := 0; i < 100; i++ {
+ go func() {
+ logger.Info("info")
+ wg.Done()
+ }()
+ }
+ wg.Wait()
+}
+
+func TestLoggingRaceWithHooksOnEntry(t *testing.T) {
+ logger := New()
+ hook := new(ModifyHook)
+ logger.AddHook(hook)
+ entry := logger.WithField("context", "clue")
+
+ var wg sync.WaitGroup
+ wg.Add(100)
+
+ for i := 0; i < 100; i++ {
+ go func() {
+ entry.Info("info")
+ wg.Done()
+ }()
+ }
+ wg.Wait()
+}
+
+func TestReplaceHooks(t *testing.T) {
+ old, cur := &TestHook{}, &TestHook{}
+
+ logger := New()
+ logger.SetOutput(ioutil.Discard)
+ logger.AddHook(old)
+
+ hooks := make(LevelHooks)
+ hooks.Add(cur)
+ replaced := logger.ReplaceHooks(hooks)
+
+ logger.Info("test")
+
+ assert.Equal(t, old.Fired, false)
+ assert.Equal(t, cur.Fired, true)
+
+ logger.ReplaceHooks(replaced)
+ logger.Info("test")
+ assert.Equal(t, old.Fired, true)
+}
+
+// Compile test
+func TestLogrusInterfaces(t *testing.T) {
+ var buffer bytes.Buffer
+ // This verifies FieldLogger and Ext1FieldLogger work as designed.
+ // Please don't use them. Use Logger and Entry directly.
+ fn := func(xl Ext1FieldLogger) {
+ var l FieldLogger = xl
+ b := l.WithField("key", "value")
+ b.Debug("Test")
+ }
+ // test logger
+ logger := New()
+ logger.Out = &buffer
+ fn(logger)
+
+ // test Entry
+ e := logger.WithField("another", "value")
+ fn(e)
+}
+
+// Implements io.Writer using channels for synchronization, so we can wait on
+// the Entry.Writer goroutine to write in a non-racey way. This does assume that
+// there is a single call to Logger.Out for each message.
+type channelWriter chan []byte
+
+func (cw channelWriter) Write(p []byte) (int, error) {
+ cw <- p
+ return len(p), nil
+}
+
+func TestEntryWriter(t *testing.T) {
+ cw := channelWriter(make(chan []byte, 1))
+ log := New()
+ log.Out = cw
+ log.Formatter = new(JSONFormatter)
+ log.WithField("foo", "bar").WriterLevel(WarnLevel).Write([]byte("hello\n"))
+
+ bs := <-cw
+ var fields Fields
+ err := json.Unmarshal(bs, &fields)
+ assert.Nil(t, err)
+ assert.Equal(t, fields["foo"], "bar")
+ assert.Equal(t, fields["level"], "warning")
+}
+
+func TestLogLevelEnabled(t *testing.T) {
+ log := New()
+ log.SetLevel(PanicLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(FatalLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(ErrorLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(WarnLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(InfoLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(DebugLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, false, log.IsLevelEnabled(TraceLevel))
+
+ log.SetLevel(TraceLevel)
+ assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(DebugLevel))
+ assert.Equal(t, true, log.IsLevelEnabled(TraceLevel))
+}
+
+func TestReportCallerOnTextFormatter(t *testing.T) {
+ l := New()
+
+ l.Formatter.(*TextFormatter).ForceColors = true
+ l.Formatter.(*TextFormatter).DisableColors = false
+ l.WithFields(Fields{"func": "func", "file": "file"}).Info("test")
+
+ l.Formatter.(*TextFormatter).ForceColors = false
+ l.Formatter.(*TextFormatter).DisableColors = true
+ l.WithFields(Fields{"func": "func", "file": "file"}).Info("test")
+}
+
+func TestSetReportCallerRace(t *testing.T) {
+ l := New()
+ l.Out = ioutil.Discard
+ l.SetReportCaller(true)
+
+ var wg sync.WaitGroup
+ wg.Add(100)
+
+ for i := 0; i < 100; i++ {
+ go func() {
+ l.Error("Some Error")
+ wg.Done()
+ }()
+ }
+ wg.Wait()
+}
diff --git a/logger/logrus/logrus/terminal_check_appengine.go b/logger/logrus/logrus/terminal_check_appengine.go
new file mode 100644
index 0000000..2403de9
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_appengine.go
@@ -0,0 +1,11 @@
+// +build appengine
+
+package logrus
+
+import (
+ "io"
+)
+
+func checkIfTerminal(w io.Writer) bool {
+ return true
+}
diff --git a/logger/logrus/logrus/terminal_check_bsd.go b/logger/logrus/logrus/terminal_check_bsd.go
new file mode 100644
index 0000000..3c4f43f
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_bsd.go
@@ -0,0 +1,13 @@
+// +build darwin dragonfly freebsd netbsd openbsd
+
+package logrus
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TIOCGETA
+
+func isTerminal(fd int) bool {
+ _, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+ return err == nil
+}
+
diff --git a/logger/logrus/logrus/terminal_check_no_terminal.go b/logger/logrus/logrus/terminal_check_no_terminal.go
new file mode 100644
index 0000000..97af92c
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_no_terminal.go
@@ -0,0 +1,11 @@
+// +build js nacl plan9
+
+package logrus
+
+import (
+ "io"
+)
+
+func checkIfTerminal(w io.Writer) bool {
+ return false
+}
diff --git a/logger/logrus/logrus/terminal_check_notappengine.go b/logger/logrus/logrus/terminal_check_notappengine.go
new file mode 100644
index 0000000..3293fb3
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_notappengine.go
@@ -0,0 +1,17 @@
+// +build !appengine,!js,!windows,!nacl,!plan9
+
+package logrus
+
+import (
+ "io"
+ "os"
+)
+
+func checkIfTerminal(w io.Writer) bool {
+ switch v := w.(type) {
+ case *os.File:
+ return isTerminal(int(v.Fd()))
+ default:
+ return false
+ }
+}
diff --git a/logger/logrus/logrus/terminal_check_solaris.go b/logger/logrus/logrus/terminal_check_solaris.go
new file mode 100644
index 0000000..f6710b3
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_solaris.go
@@ -0,0 +1,11 @@
+package logrus
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+// IsTerminal returns true if the given file descriptor is a terminal.
+func isTerminal(fd int) bool {
+ _, err := unix.IoctlGetTermio(fd, unix.TCGETA)
+ return err == nil
+}
diff --git a/logger/logrus/logrus/terminal_check_unix.go b/logger/logrus/logrus/terminal_check_unix.go
new file mode 100644
index 0000000..355dc96
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_unix.go
@@ -0,0 +1,13 @@
+// +build linux aix
+
+package logrus
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TCGETS
+
+func isTerminal(fd int) bool {
+ _, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+ return err == nil
+}
+
diff --git a/logger/logrus/logrus/terminal_check_windows.go b/logger/logrus/logrus/terminal_check_windows.go
new file mode 100644
index 0000000..572889d
--- /dev/null
+++ b/logger/logrus/logrus/terminal_check_windows.go
@@ -0,0 +1,34 @@
+// +build !appengine,!js,windows
+
+package logrus
+
+import (
+ "io"
+ "os"
+ "syscall"
+
+ sequences "github.com/konsorten/go-windows-terminal-sequences"
+)
+
+func initTerminal(w io.Writer) {
+ switch v := w.(type) {
+ case *os.File:
+ sequences.EnableVirtualTerminalProcessing(syscall.Handle(v.Fd()), true)
+ }
+}
+
+func checkIfTerminal(w io.Writer) bool {
+ var ret bool
+ switch v := w.(type) {
+ case *os.File:
+ var mode uint32
+ err := syscall.GetConsoleMode(syscall.Handle(v.Fd()), &mode)
+ ret = (err == nil)
+ default:
+ ret = false
+ }
+ if ret {
+ initTerminal(w)
+ }
+ return ret
+}
diff --git a/logger/logrus/logrus/text_formatter.go b/logger/logrus/logrus/text_formatter.go
new file mode 100644
index 0000000..39b2ebc
--- /dev/null
+++ b/logger/logrus/logrus/text_formatter.go
@@ -0,0 +1,329 @@
+package logrus
+
+import (
+ "bytes"
+ "fmt"
+ "os"
+ "runtime"
+ "sort"
+ "strings"
+ "sync"
+ "time"
+)
+
+const (
+ red = 31
+ yellow = 33
+ blue = 36
+ gray = 37
+)
+
+var baseTimestamp time.Time
+
+func init() {
+ baseTimestamp = time.Now()
+}
+
+// TextFormatter formats logs into text
+type TextFormatter struct {
+ // Set to true to bypass checking for a TTY before outputting colors.
+ ForceColors bool
+
+ // Force disabling colors.
+ DisableColors bool
+
+ // Override coloring based on CLICOLOR and CLICOLOR_FORCE. - https://bixense.com/clicolors/
+ EnvironmentOverrideColors bool
+
+ // Disable timestamp logging. useful when output is redirected to logging
+ // system that already adds timestamps.
+ DisableTimestamp bool
+
+ // Enable logging the full timestamp when a TTY is attached instead of just
+ // the time passed since beginning of execution.
+ FullTimestamp bool
+
+ // TimestampFormat to use for display when a full timestamp is printed
+ TimestampFormat string
+
+ // The fields are sorted by default for a consistent output. For applications
+ // that log extremely frequently and don't use the JSON formatter this may not
+ // be desired.
+ DisableSorting bool
+
+ // The keys sorting function, when uninitialized it uses sort.Strings.
+ SortingFunc func([]string)
+
+ // Disables the truncation of the level text to 4 characters.
+ DisableLevelTruncation bool
+
+ // QuoteEmptyFields will wrap empty fields in quotes if true
+ QuoteEmptyFields bool
+
+ // WithoutKey prints no key
+ WithoutKey bool
+ WithoutQuote bool
+
+ // Whether the logger's out is to a terminal
+ isTerminal bool
+
+ // FieldMap allows users to customize the names of keys for default fields.
+ // As an example:
+ // formatter := &TextFormatter{
+ // FieldMap: FieldMap{
+ // FieldKeyTime: "@timestamp",
+ // FieldKeyLevel: "@level",
+ // FieldKeyMsg: "@message"}}
+ FieldMap FieldMap
+
+ appendKeyValue func(b *bytes.Buffer, key string, value interface{})
+ appendValue func(b *bytes.Buffer, value interface{})
+ // CallerPrettyfier can be set by the user to modify the content
+ // of the function and file keys in the data when ReportCaller is
+ // activated. If any of the returned value is the empty string the
+ // corresponding key will be removed from fields.
+ CallerPrettyfier func(*runtime.Frame) (function string, file string)
+
+ terminalInitOnce sync.Once
+}
+
+func (f *TextFormatter) init(entry *Entry) {
+ if entry.Logger != nil {
+ f.isTerminal = checkIfTerminal(entry.Logger.Out)
+ }
+
+ if f.WithoutKey {
+ f.appendKeyValue = f.appendKeyValueWithoutKey
+ } else {
+ f.appendKeyValue = f.appendKeyValueWithKey
+ }
+
+ if f.WithoutQuote {
+ f.appendValue = f.appendValueWithoutQuote
+ } else {
+ f.appendValue = f.appendValueWithQuote
+ }
+}
+
+func (f *TextFormatter) isColored() bool {
+ isColored := f.ForceColors || (f.isTerminal && (runtime.GOOS != "windows"))
+
+ if f.EnvironmentOverrideColors {
+ if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
+ isColored = true
+ } else if ok && force == "0" {
+ isColored = false
+ } else if os.Getenv("CLICOLOR") == "0" {
+ isColored = false
+ }
+ }
+
+ return isColored && !f.DisableColors
+}
+
+// Format renders a single log entry
+func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
+ data := make(Fields)
+ for k, v := range entry.Data {
+ data[k] = v
+ }
+ prefixFieldClashes(data, f.FieldMap, entry.HasCaller())
+ keys := make([]string, 0, len(data))
+ for k := range data {
+ keys = append(keys, k)
+ }
+
+ var funcVal, fileVal string
+
+ fixedKeys := make([]string, 0, 4+len(data))
+ if !f.DisableTimestamp {
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyTime))
+ }
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyLevel))
+ if entry.Message != "" {
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyMsg))
+ }
+ if entry.err != "" {
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyLogrusError))
+ }
+ if entry.HasCaller() {
+ if f.CallerPrettyfier != nil {
+ funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+ } else {
+ funcVal = entry.Caller.Function
+ fileVal = fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+ }
+
+ if funcVal != "" {
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyFunc))
+ }
+ if fileVal != "" {
+ fixedKeys = append(fixedKeys, f.FieldMap.resolve(FieldKeyFile))
+ }
+ }
+
+ if !f.DisableSorting {
+ if f.SortingFunc == nil {
+ sort.Strings(keys)
+ fixedKeys = append(fixedKeys, keys...)
+ } else {
+ if !f.isColored() {
+ fixedKeys = append(fixedKeys, keys...)
+ f.SortingFunc(fixedKeys)
+ } else {
+ f.SortingFunc(keys)
+ }
+ }
+ } else {
+ fixedKeys = append(fixedKeys, keys...)
+ }
+
+ var b *bytes.Buffer
+ if entry.Buffer != nil {
+ b = entry.Buffer
+ } else {
+ b = &bytes.Buffer{}
+ }
+
+ f.terminalInitOnce.Do(func() { f.init(entry) })
+
+ timestampFormat := f.TimestampFormat
+ if timestampFormat == "" {
+ timestampFormat = defaultTimestampFormat
+ }
+ if f.isColored() {
+ f.printColored(b, entry, keys, data, timestampFormat)
+ } else {
+ for _, key := range fixedKeys {
+ var value interface{}
+ switch {
+ case key == f.FieldMap.resolve(FieldKeyTime):
+ value = entry.Time.Format(timestampFormat)
+ case key == f.FieldMap.resolve(FieldKeyLevel):
+ value = entry.Level.String()
+ case key == f.FieldMap.resolve(FieldKeyMsg):
+ value = entry.Message
+ case key == f.FieldMap.resolve(FieldKeyLogrusError):
+ value = entry.err
+ case key == f.FieldMap.resolve(FieldKeyFunc) && entry.HasCaller():
+ value = funcVal
+ case key == f.FieldMap.resolve(FieldKeyFile) && entry.HasCaller():
+ value = fileVal
+ default:
+ value = data[key]
+ }
+
+ f.appendKeyValue(b, key, value)
+ }
+ }
+
+ b.WriteByte('\n')
+ return b.Bytes(), nil
+}
+
+func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, data Fields, timestampFormat string) {
+ var levelColor int
+ switch entry.Level {
+ case DebugLevel, TraceLevel:
+ levelColor = gray
+ case WarnLevel:
+ levelColor = yellow
+ case ErrorLevel, FatalLevel, PanicLevel:
+ levelColor = red
+ default:
+ levelColor = blue
+ }
+
+ levelText := strings.ToUpper(entry.Level.String())
+ if !f.DisableLevelTruncation {
+ levelText = levelText[0:4]
+ }
+
+ // Remove a single newline if it already exists in the message to keep
+ // the behavior of logrus text_formatter the same as the stdlib log package
+ entry.Message = strings.TrimSuffix(entry.Message, "\n")
+
+ caller := ""
+ if entry.HasCaller() {
+ funcVal := fmt.Sprintf("%s()", entry.Caller.Function)
+ fileVal := fmt.Sprintf("%s:%d", entry.Caller.File, entry.Caller.Line)
+
+ if f.CallerPrettyfier != nil {
+ funcVal, fileVal = f.CallerPrettyfier(entry.Caller)
+ }
+
+ if fileVal == "" {
+ caller = funcVal
+ } else if funcVal == "" {
+ caller = fileVal
+ } else {
+ caller = fileVal + " " + funcVal
+ }
+ }
+
+ if f.DisableTimestamp {
+ fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m%s %-44s ", levelColor, levelText, caller, entry.Message)
+ } else if !f.FullTimestamp {
+ fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d]%s %-44s ", levelColor, levelText, int(entry.Time.Sub(baseTimestamp)/time.Second), caller, entry.Message)
+ } else {
+ fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s]%s %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), caller, entry.Message)
+ }
+ for _, k := range keys {
+ v := data[k]
+ fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=", levelColor, k)
+ f.appendValue(b, v)
+ }
+}
+
+func (f *TextFormatter) needsQuoting(text string) bool {
+ if f.QuoteEmptyFields && len(text) == 0 {
+ return true
+ }
+ for _, ch := range text {
+ if !((ch >= 'a' && ch <= 'z') ||
+ (ch >= 'A' && ch <= 'Z') ||
+ (ch >= '0' && ch <= '9') ||
+ ch == '-' || ch == '.' || ch == '_' || ch == '/' || ch == '@' || ch == '^' || ch == '+') {
+ return true
+ }
+ }
+ return false
+}
+
+func (f *TextFormatter) appendKeyValueWithoutKey(b *bytes.Buffer, key string, value interface{}) {
+ if b.Len() > 0 {
+ b.WriteByte(' ')
+ }
+ f.appendValue(b, value)
+}
+
+func (f *TextFormatter) appendKeyValueWithKey(b *bytes.Buffer, key string, value interface{}) {
+ if b.Len() > 0 {
+ b.WriteByte(' ')
+ }
+ b.WriteString(key)
+ b.WriteByte('=')
+ f.appendValue(b, value)
+}
+
+func (f *TextFormatter) appendValueWithoutQuote(b *bytes.Buffer, value interface{}) {
+ stringVal, ok := value.(string)
+ if !ok {
+ stringVal = fmt.Sprint(value)
+ }
+
+ b.WriteString(stringVal)
+}
+
+func (f *TextFormatter) appendValueWithQuote(b *bytes.Buffer, value interface{}) {
+ stringVal, ok := value.(string)
+ if !ok {
+ stringVal = fmt.Sprint(value)
+ }
+
+ if !f.needsQuoting(stringVal) {
+ b.WriteString(stringVal)
+ } else {
+ b.WriteString(fmt.Sprintf("%q", stringVal))
+ }
+}
diff --git a/logger/logrus/logrus/text_formatter_test.go b/logger/logrus/logrus/text_formatter_test.go
new file mode 100644
index 0000000..9c5e6f0
--- /dev/null
+++ b/logger/logrus/logrus/text_formatter_test.go
@@ -0,0 +1,485 @@
+package logrus
+
+import (
+ "bytes"
+ "errors"
+ "fmt"
+ "os"
+ "runtime"
+ "sort"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestFormatting(t *testing.T) {
+ tf := &TextFormatter{DisableColors: true}
+
+ testCases := []struct {
+ value string
+ expected string
+ }{
+ {`foo`, "time=\"0001-01-01T00:00:00Z\" level=panic test=foo\n"},
+ }
+
+ for _, tc := range testCases {
+ b, _ := tf.Format(WithField("test", tc.value))
+
+ if string(b) != tc.expected {
+ t.Errorf("formatting expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
+ }
+ }
+}
+
+func TestQuoting(t *testing.T) {
+ tf := &TextFormatter{DisableColors: true}
+
+ checkQuoting := func(q bool, value interface{}) {
+ b, _ := tf.Format(WithField("test", value))
+ idx := bytes.Index(b, ([]byte)("test="))
+ cont := bytes.Contains(b[idx+5:], []byte("\""))
+ if cont != q {
+ if q {
+ t.Errorf("quoting expected for: %#v", value)
+ } else {
+ t.Errorf("quoting not expected for: %#v", value)
+ }
+ }
+ }
+
+ checkQuoting(false, "")
+ checkQuoting(false, "abcd")
+ checkQuoting(false, "v1.0")
+ checkQuoting(false, "1234567890")
+ checkQuoting(false, "/foobar")
+ checkQuoting(false, "foo_bar")
+ checkQuoting(false, "foo@bar")
+ checkQuoting(false, "foobar^")
+ checkQuoting(false, "+/-_^@f.oobar")
+ checkQuoting(true, "foobar$")
+ checkQuoting(true, "&foobar")
+ checkQuoting(true, "x y")
+ checkQuoting(true, "x,y")
+ checkQuoting(false, errors.New("invalid"))
+ checkQuoting(true, errors.New("invalid argument"))
+
+ // Test for quoting empty fields.
+ tf.QuoteEmptyFields = true
+ checkQuoting(true, "")
+ checkQuoting(false, "abcd")
+ checkQuoting(true, errors.New("invalid argument"))
+}
+
+func TestEscaping(t *testing.T) {
+ tf := &TextFormatter{DisableColors: true}
+
+ testCases := []struct {
+ value string
+ expected string
+ }{
+ {`ba"r`, `ba\"r`},
+ {`ba'r`, `ba'r`},
+ }
+
+ for _, tc := range testCases {
+ b, _ := tf.Format(WithField("test", tc.value))
+ if !bytes.Contains(b, []byte(tc.expected)) {
+ t.Errorf("escaping expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
+ }
+ }
+}
+
+func TestEscaping_Interface(t *testing.T) {
+ tf := &TextFormatter{DisableColors: true}
+
+ ts := time.Now()
+
+ testCases := []struct {
+ value interface{}
+ expected string
+ }{
+ {ts, fmt.Sprintf("\"%s\"", ts.String())},
+ {errors.New("error: something went wrong"), "\"error: something went wrong\""},
+ }
+
+ for _, tc := range testCases {
+ b, _ := tf.Format(WithField("test", tc.value))
+ if !bytes.Contains(b, []byte(tc.expected)) {
+ t.Errorf("escaping expected for %q (result was %q instead of %q)", tc.value, string(b), tc.expected)
+ }
+ }
+}
+
+func TestTimestampFormat(t *testing.T) {
+ checkTimeStr := func(format string) {
+ customFormatter := &TextFormatter{DisableColors: true, TimestampFormat: format}
+ customStr, _ := customFormatter.Format(WithField("test", "test"))
+ timeStart := bytes.Index(customStr, ([]byte)("time="))
+ timeEnd := bytes.Index(customStr, ([]byte)("level="))
+ timeStr := customStr[timeStart+5+len("\"") : timeEnd-1-len("\"")]
+ if format == "" {
+ format = time.RFC3339
+ }
+ _, e := time.Parse(format, (string)(timeStr))
+ if e != nil {
+ t.Errorf("time string \"%s\" did not match provided time format \"%s\": %s", timeStr, format, e)
+ }
+ }
+
+ checkTimeStr("2006-01-02T15:04:05.000000000Z07:00")
+ checkTimeStr("Mon Jan _2 15:04:05 2006")
+ checkTimeStr("")
+}
+
+func TestDisableLevelTruncation(t *testing.T) {
+ entry := &Entry{
+ Time: time.Now(),
+ Message: "testing",
+ }
+ keys := []string{}
+ timestampFormat := "Mon Jan 2 15:04:05 -0700 MST 2006"
+ checkDisableTruncation := func(disabled bool, level Level) {
+ tf := &TextFormatter{DisableLevelTruncation: disabled}
+ var b bytes.Buffer
+ entry.Level = level
+ tf.printColored(&b, entry, keys, nil, timestampFormat)
+ logLine := (&b).String()
+ if disabled {
+ expected := strings.ToUpper(level.String())
+ if !strings.Contains(logLine, expected) {
+ t.Errorf("level string expected to be %s when truncation disabled", expected)
+ }
+ } else {
+ expected := strings.ToUpper(level.String())
+ if len(level.String()) > 4 {
+ if strings.Contains(logLine, expected) {
+ t.Errorf("level string %s expected to be truncated to %s when truncation is enabled", expected, expected[0:4])
+ }
+ } else {
+ if !strings.Contains(logLine, expected) {
+ t.Errorf("level string expected to be %s when truncation is enabled and level string is below truncation threshold", expected)
+ }
+ }
+ }
+ }
+
+ checkDisableTruncation(true, DebugLevel)
+ checkDisableTruncation(true, InfoLevel)
+ checkDisableTruncation(false, ErrorLevel)
+ checkDisableTruncation(false, InfoLevel)
+}
+
+func TestDisableTimestampWithColoredOutput(t *testing.T) {
+ tf := &TextFormatter{DisableTimestamp: true, ForceColors: true}
+
+ b, _ := tf.Format(WithField("test", "test"))
+ if strings.Contains(string(b), "[0000]") {
+ t.Error("timestamp not expected when DisableTimestamp is true")
+ }
+}
+
+func TestNewlineBehavior(t *testing.T) {
+ tf := &TextFormatter{ForceColors: true}
+
+ // Ensure a single new line is removed as per stdlib log
+ e := NewEntry(StandardLogger())
+ e.Message = "test message\n"
+ b, _ := tf.Format(e)
+ if bytes.Contains(b, []byte("test message\n")) {
+ t.Error("first newline at end of Entry.Message resulted in unexpected 2 newlines in output. Expected newline to be removed.")
+ }
+
+ // Ensure a double new line is reduced to a single new line
+ e = NewEntry(StandardLogger())
+ e.Message = "test message\n\n"
+ b, _ = tf.Format(e)
+ if bytes.Contains(b, []byte("test message\n\n")) {
+ t.Error("Double newline at end of Entry.Message resulted in unexpected 2 newlines in output. Expected single newline")
+ }
+ if !bytes.Contains(b, []byte("test message\n")) {
+ t.Error("Double newline at end of Entry.Message did not result in a single newline after formatting")
+ }
+}
+
+func TestTextFormatterFieldMap(t *testing.T) {
+ formatter := &TextFormatter{
+ DisableColors: true,
+ FieldMap: FieldMap{
+ FieldKeyMsg: "message",
+ FieldKeyLevel: "somelevel",
+ FieldKeyTime: "timeywimey",
+ },
+ }
+
+ entry := &Entry{
+ Message: "oh hi",
+ Level: WarnLevel,
+ Time: time.Date(1981, time.February, 24, 4, 28, 3, 100, time.UTC),
+ Data: Fields{
+ "field1": "f1",
+ "message": "messagefield",
+ "somelevel": "levelfield",
+ "timeywimey": "timeywimeyfield",
+ },
+ }
+
+ b, err := formatter.Format(entry)
+ if err != nil {
+ t.Fatal("Unable to format entry: ", err)
+ }
+
+ assert.Equal(t,
+ `timeywimey="1981-02-24T04:28:03Z" `+
+ `somelevel=warning `+
+ `message="oh hi" `+
+ `field1=f1 `+
+ `fields.message=messagefield `+
+ `fields.somelevel=levelfield `+
+ `fields.timeywimey=timeywimeyfield`+"\n",
+ string(b),
+ "Formatted output doesn't respect FieldMap")
+}
+
+func TestTextFormatterIsColored(t *testing.T) {
+ params := []struct {
+ name string
+ expectedResult bool
+ isTerminal bool
+ disableColor bool
+ forceColor bool
+ envColor bool
+ clicolorIsSet bool
+ clicolorForceIsSet bool
+ clicolorVal string
+ clicolorForceVal string
+ }{
+ // Default values
+ {
+ name: "testcase1",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: false,
+ envColor: false,
+ clicolorIsSet: false,
+ clicolorForceIsSet: false,
+ },
+ // Output on terminal
+ {
+ name: "testcase2",
+ expectedResult: true,
+ isTerminal: true,
+ disableColor: false,
+ forceColor: false,
+ envColor: false,
+ clicolorIsSet: false,
+ clicolorForceIsSet: false,
+ },
+ // Output on terminal with color disabled
+ {
+ name: "testcase3",
+ expectedResult: false,
+ isTerminal: true,
+ disableColor: true,
+ forceColor: false,
+ envColor: false,
+ clicolorIsSet: false,
+ clicolorForceIsSet: false,
+ },
+ // Output not on terminal with color disabled
+ {
+ name: "testcase4",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: true,
+ forceColor: false,
+ envColor: false,
+ clicolorIsSet: false,
+ clicolorForceIsSet: false,
+ },
+ // Output not on terminal with color forced
+ {
+ name: "testcase5",
+ expectedResult: true,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: true,
+ envColor: false,
+ clicolorIsSet: false,
+ clicolorForceIsSet: false,
+ },
+ // Output on terminal with clicolor set to "0"
+ {
+ name: "testcase6",
+ expectedResult: false,
+ isTerminal: true,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "0",
+ },
+ // Output on terminal with clicolor set to "1"
+ {
+ name: "testcase7",
+ expectedResult: true,
+ isTerminal: true,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "1",
+ },
+ // Output not on terminal with clicolor set to "0"
+ {
+ name: "testcase8",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "0",
+ },
+ // Output not on terminal with clicolor set to "1"
+ {
+ name: "testcase9",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "1",
+ },
+ // Output not on terminal with clicolor set to "1" and force color
+ {
+ name: "testcase10",
+ expectedResult: true,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: true,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "1",
+ },
+ // Output not on terminal with clicolor set to "0" and force color
+ {
+ name: "testcase11",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: true,
+ envColor: true,
+ clicolorIsSet: true,
+ clicolorForceIsSet: false,
+ clicolorVal: "0",
+ },
+ // Output not on terminal with clicolor_force set to "1"
+ {
+ name: "testcase12",
+ expectedResult: true,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: false,
+ clicolorForceIsSet: true,
+ clicolorForceVal: "1",
+ },
+ // Output not on terminal with clicolor_force set to "0"
+ {
+ name: "testcase13",
+ expectedResult: false,
+ isTerminal: false,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: false,
+ clicolorForceIsSet: true,
+ clicolorForceVal: "0",
+ },
+ // Output on terminal with clicolor_force set to "0"
+ {
+ name: "testcase14",
+ expectedResult: false,
+ isTerminal: true,
+ disableColor: false,
+ forceColor: false,
+ envColor: true,
+ clicolorIsSet: false,
+ clicolorForceIsSet: true,
+ clicolorForceVal: "0",
+ },
+ }
+
+ cleanenv := func() {
+ os.Unsetenv("CLICOLOR")
+ os.Unsetenv("CLICOLOR_FORCE")
+ }
+
+ defer cleanenv()
+
+ for _, val := range params {
+ t.Run("textformatter_"+val.name, func(subT *testing.T) {
+ tf := TextFormatter{
+ isTerminal: val.isTerminal,
+ DisableColors: val.disableColor,
+ ForceColors: val.forceColor,
+ EnvironmentOverrideColors: val.envColor,
+ }
+ cleanenv()
+ if val.clicolorIsSet {
+ os.Setenv("CLICOLOR", val.clicolorVal)
+ }
+ if val.clicolorForceIsSet {
+ os.Setenv("CLICOLOR_FORCE", val.clicolorForceVal)
+ }
+ res := tf.isColored()
+ if runtime.GOOS == "windows" && !tf.ForceColors && !val.clicolorForceIsSet {
+ assert.Equal(subT, false, res)
+ } else {
+ assert.Equal(subT, val.expectedResult, res)
+ }
+ })
+ }
+}
+
+func TestCustomSorting(t *testing.T) {
+ formatter := &TextFormatter{
+ DisableColors: true,
+ SortingFunc: func(keys []string) {
+ sort.Slice(keys, func(i, j int) bool {
+ if keys[j] == "prefix" {
+ return false
+ }
+ if keys[i] == "prefix" {
+ return true
+ }
+ return strings.Compare(keys[i], keys[j]) == -1
+ })
+ },
+ }
+
+ entry := &Entry{
+ Message: "Testing custom sort function",
+ Time: time.Now(),
+ Level: InfoLevel,
+ Data: Fields{
+ "test": "testvalue",
+ "prefix": "the application prefix",
+ "blablabla": "blablabla",
+ },
+ }
+ b, err := formatter.Format(entry)
+ require.NoError(t, err)
+ require.True(t, strings.HasPrefix(string(b), "prefix="), "format output is %q", string(b))
+}
diff --git a/logger/logrus/logrus/travis/cross_build.sh b/logger/logrus/logrus/travis/cross_build.sh
new file mode 100644
index 0000000..545d8c3
--- /dev/null
+++ b/logger/logrus/logrus/travis/cross_build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ "$TRAVIS_GO_VERSION" =~ ^1.\12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+ /tmp/gox/gox -build-lib -all
+fi
diff --git a/logger/logrus/logrus/travis/install.sh b/logger/logrus/logrus/travis/install.sh
new file mode 100644
index 0000000..07f4532
--- /dev/null
+++ b/logger/logrus/logrus/travis/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$TRAVIS_GO_VERSION" =~ ^1.\12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+ git clone https://github.com/dgsb/gox.git /tmp/gox
+ pushd /tmp/gox
+ git checkout new_master
+ go build ./
+ popd
+fi
diff --git a/logger/logrus/logrus/writer.go b/logger/logrus/logrus/writer.go
new file mode 100644
index 0000000..9e1f751
--- /dev/null
+++ b/logger/logrus/logrus/writer.go
@@ -0,0 +1,64 @@
+package logrus
+
+import (
+ "bufio"
+ "io"
+ "runtime"
+)
+
+func (logger *Logger) Writer() *io.PipeWriter {
+ return logger.WriterLevel(InfoLevel)
+}
+
+func (logger *Logger) WriterLevel(level Level) *io.PipeWriter {
+ return NewEntry(logger).WriterLevel(level)
+}
+
+func (entry *Entry) Writer() *io.PipeWriter {
+ return entry.WriterLevel(InfoLevel)
+}
+
+func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
+ reader, writer := io.Pipe()
+
+ var printFunc func(args ...interface{})
+
+ switch level {
+ case TraceLevel:
+ printFunc = entry.Trace
+ case DebugLevel:
+ printFunc = entry.Debug
+ case InfoLevel:
+ printFunc = entry.Info
+ case WarnLevel:
+ printFunc = entry.Warn
+ case ErrorLevel:
+ printFunc = entry.Error
+ case FatalLevel:
+ printFunc = entry.Fatal
+ case PanicLevel:
+ printFunc = entry.Panic
+ default:
+ printFunc = entry.Print
+ }
+
+ go entry.writerScanner(reader, printFunc)
+ runtime.SetFinalizer(writer, writerFinalizer)
+
+ return writer
+}
+
+func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
+ scanner := bufio.NewScanner(reader)
+ for scanner.Scan() {
+ printFunc(scanner.Text())
+ }
+ if err := scanner.Err(); err != nil {
+ entry.Errorf("Error while reading from Writer: %s", err)
+ }
+ reader.Close()
+}
+
+func writerFinalizer(writer *io.PipeWriter) {
+ writer.Close()
+}
diff --git a/logger/logrus/options.go b/logger/logrus/options.go
index 7ab8b3f..f3d9b9c 100644
--- a/logger/logrus/options.go
+++ b/logger/logrus/options.go
@@ -1,7 +1,7 @@
package logrus
import (
- "github.com/sirupsen/logrus"
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
"github.com/stack-labs/stack-rpc/logger"
)
@@ -9,8 +9,11 @@ type Options struct {
logger.Options
Formatter logrus.Formatter
// Flag for whether to log caller info (off by default)
- ReportCaller bool
- SplitLevel bool
+ ReportCaller bool
+ SplitLevel bool
+ WithoutKey bool
+ WithoutQuote bool
+ TimestampFormat string
// Exit Function to call when FatalLevel log
ExitFunc func(int)
}
@@ -19,6 +22,9 @@ type formatterKey struct{}
type splitLevelKey struct{}
type reportCallerKey struct{}
type exitKey struct{}
+type withoutKeyKey struct{}
+type withoutQuoteKey struct{}
+type timestampFormat struct{}
func TextFormatter(formatter *logrus.TextFormatter) logger.Option {
return logger.SetOption(formatterKey{}, formatter)
@@ -36,8 +42,20 @@ func SplitLevel(s bool) logger.Option {
return logger.SetOption(splitLevelKey{}, s)
}
+func WithoutKey(w bool) logger.Option {
+ return logger.SetOption(withoutKeyKey{}, w)
+}
+
+func WithoutQuote(w bool) logger.Option {
+ return logger.SetOption(withoutQuoteKey{}, w)
+}
+
+func TimestampFormat(format string) logger.Option {
+ return logger.SetOption(timestampFormat{}, format)
+}
+
// warning to use this option. because logrus doest not open CallerDepth option
// this will only print this package
-func ReportCaller() logger.Option {
- return logger.SetOption(reportCallerKey{}, true)
+func ReportCaller(r bool) logger.Option {
+ return logger.SetOption(reportCallerKey{}, r)
}
diff --git a/logger/logrus/plugin.go b/logger/logrus/plugin.go
new file mode 100644
index 0000000..1eef259
--- /dev/null
+++ b/logger/logrus/plugin.go
@@ -0,0 +1,62 @@
+package logrus
+
+import (
+ "github.com/stack-labs/stack-rpc-plugins/logger/logrus/logrus"
+ "github.com/stack-labs/stack-rpc/config"
+ "github.com/stack-labs/stack-rpc/logger"
+ "github.com/stack-labs/stack-rpc/plugin"
+ scfg "github.com/stack-labs/stack-rpc/service/config"
+)
+
+var options struct {
+ Stack struct {
+ Logger struct {
+ scfg.Logger
+ Logrus struct {
+ SplitLevel bool `sc:"split-level"`
+ ReportCaller bool `sc:"report-caller"`
+ Formatter string `sc:"formatter"`
+ WithoutKey bool `sc:"without-key"`
+ WithoutQuote bool `sc:"without-quote"`
+ TimestampFormat string `sc:"timestamp-format"`
+ } `sc:"slogrus"`
+ } `sc:"logger"`
+ } `sc:"stack"`
+}
+
+type logrusLogPlugin struct{}
+
+func (l *logrusLogPlugin) Name() string {
+ return "slogrus"
+}
+
+func (l *logrusLogPlugin) Options() []logger.Option {
+ var opts []logger.Option
+ lc := options.Stack.Logger.Logrus
+ opts = append(opts, SplitLevel(lc.SplitLevel))
+ opts = append(opts, ReportCaller(lc.ReportCaller))
+ opts = append(opts, WithoutKey(lc.WithoutKey))
+ opts = append(opts, WithoutQuote(lc.WithoutQuote))
+
+ if len(lc.TimestampFormat) > 0 {
+ opts = append(opts, TimestampFormat(lc.TimestampFormat))
+ }
+
+ switch lc.Formatter {
+ case "text":
+ opts = append(opts, TextFormatter(new(logrus.TextFormatter)))
+ case "json":
+ opts = append(opts, JSONFormatter(new(logrus.JSONFormatter)))
+ }
+
+ return opts
+}
+
+func (l *logrusLogPlugin) New(opts ...logger.Option) logger.Logger {
+ return NewLogger(opts...)
+}
+
+func init() {
+ config.RegisterOptions(&options)
+ plugin.LoggerPlugins["slogrus"] = &logrusLogPlugin{}
+}
diff --git a/registry/consul/consul.go b/registry/consul/consul.go
index 96f6a55..5aa5ea5 100755
--- a/registry/consul/consul.go
+++ b/registry/consul/consul.go
@@ -13,6 +13,7 @@ import (
consul "github.com/hashicorp/consul/api"
hash "github.com/mitchellh/hashstructure"
+ "github.com/stack-labs/stack-rpc/plugin"
"github.com/stack-labs/stack-rpc/registry"
mnet "github.com/stack-labs/stack-rpc/util/net"
)
@@ -35,6 +36,10 @@ type consulRegistry struct {
lastChecked map[string]time.Time
}
+func init() {
+ plugin.RegistryPlugins["consul"] = &consulRegistryPlugin{}
+}
+
func getDeregisterTTL(t time.Duration) time.Duration {
// splay slightly for the watcher?
splay := time.Second * 5
diff --git a/registry/consul/go.mod b/registry/consul/go.mod
index 3a9fdb4..5c5a724 100755
--- a/registry/consul/go.mod
+++ b/registry/consul/go.mod
@@ -2,6 +2,10 @@ module github.com/stack-labs/stack-rpc-plugins/registry/consul
go 1.14
+replace (
+ github.com/stack-labs/stack-rpc v1.0.0 => ../../../stack-rpc
+)
+
require (
github.com/hashicorp/consul/api v1.3.0
github.com/stack-labs/stack-rpc v1.0.0
diff --git a/registry/consul/plugin.go b/registry/consul/plugin.go
new file mode 100644
index 0000000..60c08d4
--- /dev/null
+++ b/registry/consul/plugin.go
@@ -0,0 +1,17 @@
+package consul
+
+import "github.com/stack-labs/stack-rpc/registry"
+
+type consulRegistryPlugin struct{}
+
+func (c *consulRegistryPlugin) Name() string {
+ return "consul"
+}
+
+func (c *consulRegistryPlugin) Options() []registry.Option {
+ return nil
+}
+
+func (c *consulRegistryPlugin) New(opts ...registry.Option) registry.Registry {
+ return NewRegistry(opts...)
+}
diff --git a/registry/consul/watcher.go b/registry/consul/watcher.go
index 961a3ea..980f956 100755
--- a/registry/consul/watcher.go
+++ b/registry/consul/watcher.go
@@ -9,6 +9,7 @@ import (
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"
"github.com/stack-labs/stack-rpc/registry"
+ rUtil "github.com/stack-labs/stack-rpc/util/registry"
)
type consulWatcher struct {
@@ -163,7 +164,7 @@ func (cw *consulWatcher) serviceHandler(idx uint64, data interface{}) {
// it's an update rather than creation
if len(nodes) > 0 {
- delService := registry.CopyService(oldService)
+ delService := rUtil.CopyService(oldService)
delService.Nodes = nodes
cw.next <- ®istry.Result{Action: "delete", Service: delService}
}
diff --git a/registry/zookeeper/go.mod b/registry/zookeeper/go.mod
index cb1d277..e37ef22 100644
--- a/registry/zookeeper/go.mod
+++ b/registry/zookeeper/go.mod
@@ -2,6 +2,10 @@ module github.com/stack-labs/stack-rpc-plugins/registry/zookeeper
go 1.14
+replace (
+ github.com/stack-labs/stack-rpc v1.0.0 => ../../../stack-rpc
+)
+
require (
github.com/go-zookeeper/zk v1.0.2
github.com/google/uuid v1.1.2
diff --git a/registry/zookeeper/plugin.go b/registry/zookeeper/plugin.go
new file mode 100644
index 0000000..f7b76e0
--- /dev/null
+++ b/registry/zookeeper/plugin.go
@@ -0,0 +1,25 @@
+package zookeeper
+
+import (
+ "github.com/stack-labs/stack-rpc/plugin"
+ "github.com/stack-labs/stack-rpc/registry"
+)
+
+type zkRegistryPlugin struct {
+}
+
+func (z *zkRegistryPlugin) Name() string {
+ return "zookeeper"
+}
+
+func (z *zkRegistryPlugin) Options() []registry.Option {
+ return nil
+}
+
+func (z *zkRegistryPlugin) New(opts ...registry.Option) registry.Registry {
+ return NewRegistry(opts...)
+}
+
+func init() {
+ plugin.RegistryPlugins["zookeeper"] = &zkRegistryPlugin{}
+}
diff --git a/registry/zookeeper/util.go b/registry/zookeeper/util.go
index b8c0fac..a333c38 100644
--- a/registry/zookeeper/util.go
+++ b/registry/zookeeper/util.go
@@ -7,7 +7,6 @@ import (
"time"
"github.com/go-zookeeper/zk"
- log "github.com/stack-labs/stack-rpc/logger"
"github.com/stack-labs/stack-rpc/registry"
)
@@ -25,7 +24,6 @@ func nodePath(domain, name, id string) string {
service := strings.Replace(name, "/", "-", -1)
node := strings.Replace(id, "/", "-", -1)
p := path.Join(prefixWithDomain(domain), service, node)
- log.Infof("register path: %s", p)
return p
}
diff --git a/service/stackway/README.md b/service/stackway/README.md
index 42b6064..3386f4e 100644
--- a/service/stackway/README.md
+++ b/service/stackway/README.md
@@ -1,5 +1,5 @@
# Stackway
```shell script
-$ go run main.go --config=stack_config.yml
+$ go run main.go --config=stack.yml
```
diff --git a/service/stackway/api/api.go b/service/stackway/api/api.go
index 8aa7464..1fd5f45 100644
--- a/service/stackway/api/api.go
+++ b/service/stackway/api/api.go
@@ -3,10 +3,11 @@ package api
import (
"github.com/stack-labs/stack-rpc"
"github.com/stack-labs/stack-rpc/pkg/cli"
+ "github.com/stack-labs/stack-rpc/service"
)
// api stackway options
-func Options() (options []stack.Option) {
+func Options() (options []service.Option) {
flags := []cli.Flag{
cli.StringFlag{
Name: "stackway_name",
diff --git a/service/stackway/api/http.go b/service/stackway/api/http.go
index b958ad0..dbac85d 100644
--- a/service/stackway/api/http.go
+++ b/service/stackway/api/http.go
@@ -6,6 +6,10 @@ import (
"github.com/gorilla/mux"
"github.com/stack-labs/stack-rpc"
+ "github.com/stack-labs/stack-rpc-plugins/service/stackway/handler"
+ "github.com/stack-labs/stack-rpc-plugins/service/stackway/helper"
+ "github.com/stack-labs/stack-rpc-plugins/service/stackway/plugin"
+ gwServer "github.com/stack-labs/stack-rpc-plugins/service/stackway/server"
ahandler "github.com/stack-labs/stack-rpc/api/handler"
aapi "github.com/stack-labs/stack-rpc/api/handler/api"
"github.com/stack-labs/stack-rpc/api/handler/event"
@@ -23,12 +27,8 @@ import (
"github.com/stack-labs/stack-rpc/api/server/acme"
"github.com/stack-labs/stack-rpc/api/server/acme/autocert"
httpapi "github.com/stack-labs/stack-rpc/api/server/http"
+ "github.com/stack-labs/stack-rpc/service"
"github.com/stack-labs/stack-rpc/util/log"
-
- "github.com/stack-labs/stack-rpc-plugins/service/stackway/handler"
- "github.com/stack-labs/stack-rpc-plugins/service/stackway/helper"
- "github.com/stack-labs/stack-rpc-plugins/service/stackway/plugin"
- gwServer "github.com/stack-labs/stack-rpc-plugins/service/stackway/server"
)
type config struct {
@@ -87,11 +87,11 @@ func newDefaultConfig() *config {
}
type httpServer struct {
- svc stack.Service
+ svc service.Service
api apiServer.Server
}
-func (s *httpServer) Options() []stack.Option {
+func (s *httpServer) Options() []service.Option {
opts := Options()
opts = append(
opts,
@@ -307,6 +307,6 @@ func (s *httpServer) Stop() error {
return s.api.Stop()
}
-func NewServer(svc stack.Service) *httpServer {
+func NewServer(svc service.Service) *httpServer {
return &httpServer{svc: svc}
}
diff --git a/service/stackway/go.mod b/service/stackway/go.mod
index 5789eef..717a9be 100644
--- a/service/stackway/go.mod
+++ b/service/stackway/go.mod
@@ -3,14 +3,13 @@ module github.com/stack-labs/stack-rpc-plugins/service/stackway
go 1.14
replace (
- github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4
- google.golang.org/grpc => google.golang.org/grpc v1.26.0
+ github.com/stack-labs/stack-rpc v1.0.1 => ../../../stack-rpc
)
require (
github.com/golang/protobuf v1.4.3
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.4
- github.com/stack-labs/stack-rpc v1.0.0
+ github.com/stack-labs/stack-rpc v1.0.1
github.com/stretchr/testify v1.4.0
)
diff --git a/service/stackway/go.sum b/service/stackway/go.sum
index 2aafbd0..45ff765 100644
--- a/service/stackway/go.sum
+++ b/service/stackway/go.sum
@@ -1,8 +1,18 @@
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -58,11 +68,14 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
github.com/bwmarrin/discordgo v0.20.1/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -85,6 +98,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok=
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.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -104,7 +118,9 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -120,8 +136,11 @@ github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aev
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-acme/lego/v3 v3.1.0 h1:yanYFoYW8azFkCvJfIk7edWWfjkYkhDxe45ZsxoW4Xk=
github.com/go-acme/lego/v3 v3.1.0/go.mod h1:074uqt+JS6plx+c9Xaiz6+L+GBb+7itGtzfcDM2AhEE=
+github.com/go-acme/lego/v3 v3.4.0 h1:deB9NkelA+TfjGHVw8J7iKl/rMtffcGMWSMmptvMv0A=
+github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M=
github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ini/ini v1.44.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -146,8 +165,10 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
@@ -167,6 +188,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -178,6 +200,7 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -232,6 +255,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -240,6 +265,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
@@ -252,6 +278,7 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA=
github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
@@ -279,6 +306,8 @@ github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00v
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.22 h1:Jm64b3bO9kP43ddLjL2EY3Io6bmy1qGb9Xxz6TqS6rc=
github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
+github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y=
@@ -308,8 +337,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
github.com/nrdcg/auroradns v1.0.0/go.mod h1:6JPXKzIRzZzMqtTDgueIhTi6rFf1QvYE/HzqidhOhjw=
+github.com/nrdcg/dnspod-go v0.4.0/go.mod h1:vZSoFSFeQVm2gWLMkyX61LZ8HI3BaqtHZWgPTGKr6KQ=
github.com/nrdcg/goinwx v0.6.1/go.mod h1:XPiut7enlbEdntAqalBIqcYcTEVhpv/dKWgDCX2SwKQ=
github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@@ -346,6 +377,8 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -482,6 +515,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
@@ -494,17 +528,26 @@ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNm
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b h1:GgiSbuUyC0BlbUmHQBgFqu32eiRR/CEYdjOjOd4zE6Y=
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -524,11 +567,13 @@ golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
@@ -547,6 +592,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -564,6 +610,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -591,22 +639,33 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w=
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa h1:5E4dL8+NgFOgjwbTKz+OOEGGhP+ectTmF842l6KjupQ=
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -618,12 +677,16 @@ google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+
google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -633,12 +696,27 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
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=
@@ -654,6 +732,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
@@ -683,6 +762,7 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -690,6 +770,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
diff --git a/service/stackway/handler/meta.go b/service/stackway/handler/meta.go
index 3221d34..946a77e 100644
--- a/service/stackway/handler/meta.go
+++ b/service/stackway/handler/meta.go
@@ -3,12 +3,11 @@ package handler
import (
"net/http"
- "github.com/stack-labs/stack-rpc"
"github.com/stack-labs/stack-rpc/api/handler"
"github.com/stack-labs/stack-rpc/api/handler/event"
"github.com/stack-labs/stack-rpc/api/router"
+ "github.com/stack-labs/stack-rpc/service"
"github.com/stack-labs/stack-rpc/util/errors"
-
// TODO: only import handler package
aapi "github.com/stack-labs/stack-rpc/api/handler/api"
ahttp "github.com/stack-labs/stack-rpc/api/handler/http"
@@ -17,7 +16,7 @@ import (
)
type metaHandler struct {
- s stack.Service
+ s service.Service
r router.Router
}
@@ -59,7 +58,7 @@ func (m *metaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
// Meta is a http.Handler that routes based on endpoint metadata
-func Meta(s stack.Service, r router.Router) http.Handler {
+func Meta(s service.Service, r router.Router) http.Handler {
return &metaHandler{
s: s,
r: r,
diff --git a/service/stackway/handler/rpc.go b/service/stackway/handler/rpc.go
index 9f75be9..65accf4 100644
--- a/service/stackway/handler/rpc.go
+++ b/service/stackway/handler/rpc.go
@@ -7,11 +7,10 @@ import (
"strings"
"time"
- "github.com/stack-labs/stack-rpc"
+ "github.com/stack-labs/stack-rpc-plugins/service/stackway/helper"
"github.com/stack-labs/stack-rpc/client"
+ "github.com/stack-labs/stack-rpc/service"
"github.com/stack-labs/stack-rpc/util/errors"
-
- "github.com/stack-labs/stack-rpc-plugins/service/stackway/helper"
)
type rpcRequest struct {
@@ -23,10 +22,10 @@ type rpcRequest struct {
}
type rpcHandler struct {
- opts stack.Options
+ opts service.Options
}
-func NewRPCHandlerFunc(opts stack.Options) http.HandlerFunc {
+func NewRPCHandlerFunc(opts service.Options) http.HandlerFunc {
rpc := rpcHandler{opts: opts}
return rpc.Handler
}
diff --git a/service/stackway/hook/hook.go b/service/stackway/hook/hook.go
index e084db4..cbc99e8 100644
--- a/service/stackway/hook/hook.go
+++ b/service/stackway/hook/hook.go
@@ -2,13 +2,13 @@ package hook
import (
"github.com/stack-labs/stack-rpc"
- "github.com/stack-labs/stack-rpc/util/log"
-
"github.com/stack-labs/stack-rpc-plugins/service/stackway/api"
"github.com/stack-labs/stack-rpc-plugins/service/stackway/plugin"
+ "github.com/stack-labs/stack-rpc/service"
+ "github.com/stack-labs/stack-rpc/util/log"
)
-func Hook(svc stack.Service) {
+func Hook(svc service.Service) {
apiServer := api.NewServer(svc)
// stackway options
diff --git a/service/stackway/stack.yml b/service/stackway/stack.yml
new file mode 100644
index 0000000..90b9dd2
--- /dev/null
+++ b/service/stackway/stack.yml
@@ -0,0 +1,24 @@
+stack:
+ server:
+ name: stack.rpc.stackway
+ version: 1.0.0
+ address: :8080 # stackway run as server address
+ registry:
+ name: mdns
+ stackway:
+ handler: meta
+ resolver: stack
+ rpc_path: /rpc
+ api_path: /
+ proxy_path: /{service:[a-zA-Z0-9]+}
+ namespace: stack.rpc.api
+ header_prefix: X-Stack-
+ enable_rpc: true
+ enable_acme: false
+ enable_tls: false
+ acme:
+ provider: autocert
+ challenge_provider: cloudflare
+ ca: https://acme-v02.api.letsencrypt.org/directory
+ hosts:
+ - ""
diff --git a/service/stackway/stack_config.yml b/service/stackway/stack_config.yml
deleted file mode 100644
index 834d630..0000000
--- a/service/stackway/stack_config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-stack:
- server:
- name: "stack.rpc.stackway"
- version: "1.0.0"
- address: :8080 # stackway run as server address
-
- registry:
- name: mdns
-
- stackway:
- handler: "meta"
- resolver: "stack"
- rpc_path: "/rpc"
- api_path: "/"
- proxy_path: "/{service:[a-zA-Z0-9]+}"
- namespace: "stack.rpc.api"
- header_prefix: "X-Stack-"
- enable_rpc: true
- enable_acme: false
- enable_tls: false
- acme:
- provider: "autocert"
- challenge_provider: "cloudflare"
- ca: "https://acme-v02.api.letsencrypt.org/directory"
- hosts:
- - ""
diff --git a/service/stackweb/backend/Makefile b/service/stackweb/backend/Makefile
new file mode 100644
index 0000000..7caf623
--- /dev/null
+++ b/service/stackweb/backend/Makefile
@@ -0,0 +1,14 @@
+
+GOPATH:=$(shell go env GOPATH)
+
+.PHONY: build
+build:
+ go build -o platform-web main.go module.go
+
+.PHONY: test
+test:
+ go test -v ./... -cover
+
+.PHONY: docker
+docker:
+ docker build . -t user-srv:latest
diff --git a/service/stackweb/backend/README.md b/service/stackweb/backend/README.md
new file mode 100644
index 0000000..a8915b3
--- /dev/null
+++ b/service/stackweb/backend/README.md
@@ -0,0 +1,16 @@
+# platform-web backend
+
+## Overview
+
+srv is the backend code directory of platform-web.
+
+## Content
+
+```text
+├── README.md
+├── cmd # platform-web command line interface
+├── conf # config files dir, if want
+├── logs # default log files dir
+├── main.go # entrance
+├── plugins.go # plugins
+```
diff --git a/service/stackweb/backend/go.mod b/service/stackweb/backend/go.mod
new file mode 100644
index 0000000..6e6f764
--- /dev/null
+++ b/service/stackweb/backend/go.mod
@@ -0,0 +1,13 @@
+module github.com/stack-labs/stack-rpc-plugins/service/stackweb
+
+go 1.14
+
+replace (
+ github.com/stack-labs/stack-rpc v1.0.1 => ../../../../stack-rpc
+ github.com/stack-labs/stack-rpc-plugins/logger/logrus v1.0.0 => ../../../../stack-rpc-plugins/logger/logrus
+)
+
+require (
+ github.com/stack-labs/stack-rpc v1.0.1
+ github.com/stack-labs/stack-rpc-plugins/logger/logrus v1.0.0
+)
diff --git a/service/stackweb/backend/internal/config/config.go b/service/stackweb/backend/internal/config/config.go
new file mode 100644
index 0000000..5f6bdfb
--- /dev/null
+++ b/service/stackweb/backend/internal/config/config.go
@@ -0,0 +1,11 @@
+package config
+
+import (
+ "github.com/micro/go-config/reader"
+ "github.com/micro/go-micro/config"
+)
+
+func GetConfig(names ...string) reader.Value {
+ names2 := append([]string{"micro", "platform_web"}, names...)
+ return config.Get(names2...)
+}
diff --git a/service/stackweb/backend/internal/db/db.go b/service/stackweb/backend/internal/db/db.go
new file mode 100644
index 0000000..84dddda
--- /dev/null
+++ b/service/stackweb/backend/internal/db/db.go
@@ -0,0 +1,69 @@
+package db
+
+import (
+ "database/sql"
+ "sync"
+
+ "github.com/micro/cli"
+)
+
+var (
+ pgConfig *PGConfig
+ pgDB *sql.DB
+ m sync.RWMutex
+ once sync.Once
+)
+
+type PGConfig struct {
+ DBName string `json:"dbName"` // The name of the database to connect to
+ User string `json:"user"` // the user to sign in as
+ Password string `json:"password"` // The user's password
+ Host string `json:"host"` // The host to connect to.Values that start with / are for unix domain sockets. (default is localhost)
+ Port int `json:"port"` // The port to bind to.(default is 5432)
+ SSLMode string `json:"sslMode"` // Whether or not to use SSL (default is require, this is not the default for libpq)
+ ConnectTimeout int `json:"connectTimeout"` // Maximum wait for connection, in seconds.Zero or not specified means wait indefinitely.
+ SSLCert string `json:"sslCert"` // Cert file location. The file must contain PEM encoded data.
+ SSLKey string `json:"sslKey"` // Key file location.The file must contain PEM encoded data.
+ SSLRootCert string `json:"sslRootCert"` // The location of the root certificate file.The file must contain PEM encoded data.)
+ MaxOpenConnection int `json:"maxOpenConnection"` // use the default 0
+ MaxIdleConnection int `json:"maxIdleConnection"` // use the default 0
+}
+
+func Init(ctx *cli.Context) {
+ m.Lock()
+ defer m.Unlock()
+
+ pgConfig = newPGConfig()
+
+ if pgConfigFile := ctx.String("pg_config_file"); len(pgConfigFile) > 0 {
+ if err := config.Get(pgConfigFile).Scan(&pgConfig); err != nil {
+ panic(err)
+ }
+ }
+
+ initDB()
+}
+
+func newPGConfig() *PGConfig {
+ return &PGConfig{
+ DBName: "postgres",
+ User: "postgres",
+ Password: "password",
+ Host: "localhost",
+ ConnectTimeout: 10,
+ Port: 5432,
+ SSLMode: "disable",
+ }
+}
+
+// initDB 初始化数据库
+func initDB() {
+ once.Do(func() {
+ initPG()
+ })
+}
+
+// GetPG get postgre db
+func GetPG() *sql.DB {
+ return pgDB
+}
diff --git a/service/stackweb/backend/internal/db/pg.go b/service/stackweb/backend/internal/db/pg.go
new file mode 100644
index 0000000..f09537a
--- /dev/null
+++ b/service/stackweb/backend/internal/db/pg.go
@@ -0,0 +1,54 @@
+package db
+
+import (
+ "database/sql"
+ "fmt"
+)
+
+func initPG() {
+ log.Logf("[initPG] init postgreSQL")
+
+ var err error
+
+ pgDB, err = sql.Open("postgres", parseConnectStr())
+ if err != nil {
+ log.Fatal(err)
+ panic(err)
+ }
+
+ pgDB.SetMaxOpenConns(pgConfig.MaxOpenConnection)
+ pgDB.SetMaxIdleConns(pgConfig.MaxIdleConnection)
+
+ if err = pgDB.Ping(); err != nil {
+ log.Fatal(err)
+ }
+
+ log.Logf("[initPG] pg connected")
+}
+
+func parseConnectStr() string {
+ str := fmt.Sprintf("postgres://%s:%s@%s:%d/%s?", pgConfig.User, pgConfig.Password, pgConfig.Host, pgConfig.Port, pgConfig.DBName)
+
+ log.Logf("[initPG] pg connected %s", str)
+
+ str = fmt.Sprintf("%ssslmode=%s", str, pgConfig.SSLMode)
+
+ if pgConfig.SSLMode != "disable" {
+
+ if pgConfig.SSLCert != "" {
+ str += "&sslcert=" + pgConfig.SSLCert
+ }
+
+ if pgConfig.SSLKey != "" {
+ str += "&sslkey=" + pgConfig.SSLKey
+ }
+
+ if pgConfig.SSLRootCert != "" {
+ str += "&sslrootcert=" + pgConfig.SSLRootCert
+ }
+ } else {
+ // do something
+ }
+
+ return str
+}
diff --git a/service/stackweb/backend/internal/proxy/proxy.go b/service/stackweb/backend/internal/proxy/proxy.go
new file mode 100644
index 0000000..646b77a
--- /dev/null
+++ b/service/stackweb/backend/internal/proxy/proxy.go
@@ -0,0 +1,106 @@
+package proxy
+
+import (
+ "io"
+ "net"
+ "net/http"
+ "net/http/httputil"
+ "regexp"
+ "strings"
+)
+
+var (
+ re = regexp.MustCompile("^[a-zA-Z0-9]+([a-zA-Z0-9-]*[a-zA-Z0-9]*)?$")
+ // Base path sent to web service.
+ // This is stripped from the request path
+ // Allows the web service to define absolute paths
+ BasePathHeader = "X-Micro-Web-Base-Path"
+)
+
+type Proxy struct {
+ Default *httputil.ReverseProxy
+ Director func(r *http.Request)
+}
+
+func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ if !isWebSocket(r) {
+ // the usual path
+ p.Default.ServeHTTP(w, r)
+ return
+ }
+
+ // the websocket path
+ req := new(http.Request)
+ *req = *r
+ p.Director(req)
+ host := req.URL.Host
+
+ if len(host) == 0 {
+ http.Error(w, "invalid host", 500)
+ return
+ }
+
+ // set x-forward-for
+ if clientIP, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+ if ips, ok := req.Header["X-Forwarded-For"]; ok {
+ clientIP = strings.Join(ips, ", ") + ", " + clientIP
+ }
+ req.Header.Set("X-Forwarded-For", clientIP)
+ }
+
+ // connect to the backend host
+ conn, err := net.Dial("tcp", host)
+ if err != nil {
+ http.Error(w, err.Error(), 500)
+ return
+ }
+
+ // hijack the connection
+ hj, ok := w.(http.Hijacker)
+ if !ok {
+ http.Error(w, "failed to connect", 500)
+ return
+ }
+
+ nc, _, err := hj.Hijack()
+ if err != nil {
+ return
+ }
+
+ defer nc.Close()
+ defer conn.Close()
+
+ if err = req.Write(conn); err != nil {
+ return
+ }
+
+ errCh := make(chan error, 2)
+
+ cp := func(dst io.Writer, src io.Reader) {
+ _, err := io.Copy(dst, src)
+ errCh <- err
+ }
+
+ go cp(conn, nc)
+ go cp(nc, conn)
+
+ <-errCh
+}
+
+func isWebSocket(r *http.Request) bool {
+ contains := func(key, val string) bool {
+ vv := strings.Split(r.Header.Get(key), ",")
+ for _, v := range vv {
+ if val == strings.ToLower(strings.TrimSpace(v)) {
+ return true
+ }
+ }
+ return false
+ }
+
+ if contains("Connection", "upgrade") && contains("Upgrade", "websocket") {
+ return true
+ }
+
+ return false
+}
diff --git a/service/stackweb/backend/internal/tools/number.go b/service/stackweb/backend/internal/tools/number.go
new file mode 100644
index 0000000..bebd8d0
--- /dev/null
+++ b/service/stackweb/backend/internal/tools/number.go
@@ -0,0 +1,10 @@
+package tools
+
+func Int32ArrayTo64(in []int32) []int64 {
+ ret := make([]int64, len(in))
+ for _, v := range in {
+ ret = append(ret, int64(v))
+ }
+
+ return ret
+}
diff --git a/service/stackweb/backend/internal/tools/sort.go b/service/stackweb/backend/internal/tools/sort.go
new file mode 100644
index 0000000..d724423
--- /dev/null
+++ b/service/stackweb/backend/internal/tools/sort.go
@@ -0,0 +1,21 @@
+package tools
+
+import (
+ "github.com/micro/go-micro/registry"
+)
+
+type SortedServices struct {
+ Services []*registry.Service
+}
+
+func (s SortedServices) Len() int {
+ return len(s.Services)
+}
+
+func (s SortedServices) Less(i, j int) bool {
+ return s.Services[i].Name < s.Services[j].Name
+}
+
+func (s SortedServices) Swap(i, j int) {
+ s.Services[i], s.Services[j] = s.Services[j], s.Services[i]
+}
diff --git a/service/stackweb/backend/internal/tools/time.go b/service/stackweb/backend/internal/tools/time.go
new file mode 100644
index 0000000..906c5b4
--- /dev/null
+++ b/service/stackweb/backend/internal/tools/time.go
@@ -0,0 +1,31 @@
+package tools
+
+import (
+ "github.com/golang/protobuf/ptypes"
+ "github.com/golang/protobuf/ptypes/timestamp"
+ "github.com/micro/go-log"
+ "time"
+)
+
+func TimeFixRange(start, end string, startFixed, endFixed time.Duration) (s, e time.Time) {
+ s, err := time.Parse(time.RFC3339, start)
+ if err != nil {
+ s = time.Now()
+ log.Log(err)
+ s = s.Add(startFixed)
+ }
+
+ e, err = time.Parse(time.RFC3339, end)
+ if err != nil {
+ e = time.Now()
+ log.Log(err)
+ e = e.Add(endFixed)
+ }
+
+ return
+}
+
+func PTimestamp(ts *timestamp.Timestamp) (t time.Time) {
+ t, _ = ptypes.Timestamp(ts)
+ return t
+}
diff --git a/service/stackweb/backend/main.go b/service/stackweb/backend/main.go
new file mode 100644
index 0000000..fd4c33d
--- /dev/null
+++ b/service/stackweb/backend/main.go
@@ -0,0 +1,78 @@
+package main
+
+import (
+ "fmt"
+
+ "github.com/stack-labs/stack-rpc"
+ _ "github.com/stack-labs/stack-rpc-plugins/logger/logrus"
+ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins"
+ _ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins/basic"
+ cfg "github.com/stack-labs/stack-rpc/config"
+ "github.com/stack-labs/stack-rpc/service"
+ "github.com/stack-labs/stack-rpc/service/web"
+)
+
+type config struct {
+ Stack struct {
+ Stackweb struct {
+ Name string `sc:"name"`
+ Address string `sc:"address"`
+ ApiPath string `sc:"api-path"`
+ RootPath string `sc:"root-path"`
+ StaticDir string `sc:"static-dir"`
+ FaviconIco string `sc:"favicon-ico"`
+ } `sc:"stackweb"`
+ } `sc:"stack"`
+}
+
+var (
+ stackwebConfig config
+)
+
+func init() {
+ cfg.RegisterOptions(&stackwebConfig)
+}
+
+func main() {
+ s := stack.NewWebService(
+ stack.Name("stack.rpc.stackweb"),
+ stack.Address(":8090"),
+ stack.WebHandleFuncs(handlers()...),
+ )
+ if err := s.Init(stack.AfterStart(func() error {
+ return loadPlugins(s.Options())
+ })); err != nil {
+ panic(err)
+ }
+
+ if err := s.Run(); err != nil {
+ panic(err)
+ }
+}
+
+func handlers() []web.HandlerFunc {
+ handlers := make([]web.HandlerFunc, 0)
+ for _, m := range plugins.Plugins() {
+ for k, h := range m.Handlers() {
+ if h.IsFunc() {
+ handlers = append(handlers, web.HandlerFunc{
+ Route: k,
+ Func: h.Func,
+ })
+ }
+ }
+ }
+
+ return handlers
+}
+
+func loadPlugins(s service.Options) (err error) {
+ for _, m := range plugins.Plugins() {
+ err := m.Init(plugins.Service(s))
+ if err != nil {
+ return fmt.Errorf("plugin [%s] init err: %s", m.Name(), err)
+ }
+ }
+
+ return nil
+}
diff --git a/service/stackweb/backend/plugins/basic/api.go b/service/stackweb/backend/plugins/basic/api.go
new file mode 100644
index 0000000..08dcd34
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/api.go
@@ -0,0 +1,263 @@
+package basic
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "sort"
+ "strconv"
+ "strings"
+
+ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins/basic/tools"
+ "github.com/stack-labs/stack-rpc/client/selector"
+ "github.com/stack-labs/stack-rpc/pkg/metadata"
+ "github.com/stack-labs/stack-rpc/registry"
+ "github.com/stack-labs/stack-rpc/service"
+)
+
+type api struct {
+ service service.Options
+}
+
+type rpcRequest struct {
+ Service string
+ Endpoint string
+ Method string
+ Address string
+ URL string
+ timeout int
+ Request interface{}
+}
+
+// serviceAPIDetail is the service api detail
+type serviceAPIDetail struct {
+ Name string `json:"name,omitempty"`
+ Endpoints []*registry.Endpoint `json:"endpoints,omitempty"`
+}
+
+func (a *api) webServices(w http.ResponseWriter, r *http.Request) {
+ services, err := a.service.Registry.ListServices()
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ webServices := make([]*registry.Service, 0)
+ for _, s := range services {
+ for _, webN := range WebNamespacePrefix {
+ if strings.Index(s.Name, webN) == 0 && len(strings.TrimPrefix(s.Name, webN)) > 0 {
+ s.Name = strings.Replace(s.Name, webN+".", "", 1)
+ webServices = append(webServices, s)
+ }
+ }
+ }
+
+ sort.Sort(tools.SortedServices{Services: services})
+
+ tools.WriteJsonData(w, webServices)
+
+ return
+}
+
+func (a *api) services(w http.ResponseWriter, r *http.Request) {
+ services, err := a.service.Registry.ListServices()
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ for _, service := range services {
+ ss, err := a.service.Registry.GetService(service.Name)
+ if err != nil {
+ continue
+ }
+ if len(ss) == 0 {
+ continue
+ }
+
+ for _, s := range ss {
+ service.Nodes = append(service.Nodes, s.Nodes...)
+ service.Endpoints = s.Endpoints
+ }
+
+ }
+
+ sort.Sort(tools.SortedServices{Services: services})
+
+ tools.WriteJsonData(w, services)
+ return
+}
+
+func (a *api) microServices(w http.ResponseWriter, r *http.Request) {
+ services, err := a.service.Registry.ListServices()
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ ret := make([]*registry.Service, 0)
+
+ for _, srv := range services {
+ temp, err := a.service.Registry.GetService(srv.Name)
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ for _, s := range temp {
+ for _, n := range s.Nodes {
+ if n.Metadata["registry"] != "" {
+ ret = append(ret, s)
+ break
+ }
+ }
+ }
+ }
+
+ sort.Sort(tools.SortedServices{Services: ret})
+
+ tools.WriteJsonData(w, ret)
+ return
+}
+
+func (a *api) serviceDetails(w http.ResponseWriter, r *http.Request) {
+ services, err := a.service.Registry.ListServices()
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ sort.Sort(tools.SortedServices{Services: services})
+
+ serviceDetails := make([]*serviceAPIDetail, 0)
+ for _, service := range services {
+ s, err := a.service.Registry.GetService(service.Name)
+ if err != nil {
+ continue
+ }
+ if len(s) == 0 {
+ continue
+ }
+
+ serviceDetails = append(serviceDetails, &serviceAPIDetail{
+ Name: service.Name,
+ Endpoints: s[0].Endpoints,
+ })
+ }
+
+ tools.WriteJsonData(w, serviceDetails)
+ return
+}
+
+func (a *api) handler(w http.ResponseWriter, r *http.Request) {
+ serviceName := r.URL.Query().Get("service")
+
+ if len(serviceName) > 0 {
+ s, err := a.service.Registry.GetService(serviceName)
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ if len(s) == 0 {
+ tools.WriteError(w, fmt.Errorf("Service Is Not found %s: ", serviceName))
+ return
+ }
+
+ tools.WriteJsonData(w, s)
+ return
+ }
+
+ return
+}
+
+func (a *api) apiGatewayServices(w http.ResponseWriter, r *http.Request) {
+ services, err := a.service.Registry.ListServices()
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ ret := make([]*registry.Service, 0)
+ for _, service := range services {
+ _, _ = a.service.Selector.Next(service.Name, func(options *selector.SelectOptions) {
+ filter := func(services []*registry.Service) []*registry.Service {
+ for _, s := range services {
+ for _, gwN := range GatewayNamespaces {
+ if s.Name == gwN {
+ ret = append(ret, s)
+ break
+ }
+ }
+ }
+ return ret
+ }
+
+ options.Filters = append(options.Filters, filter)
+ })
+ }
+
+ tools.WriteJsonData(w, ret)
+ return
+}
+
+func (a *api) rpc(w http.ResponseWriter, r *http.Request) {
+ defer r.Body.Close()
+ rpcReq := &rpcRequest{}
+
+ d := json.NewDecoder(r.Body)
+ d.UseNumber()
+
+ if err := d.Decode(&rpcReq); err != nil {
+ tools.WriteError(w, fmt.Errorf("rpc decode err %s: ", err))
+ return
+ }
+
+ if len(rpcReq.Endpoint) == 0 {
+ rpcReq.Endpoint = rpcReq.Method
+ }
+
+ rpcReq.timeout, _ = strconv.Atoi(r.Header.Get("Timeout"))
+ rpcReq.URL = r.URL.Path
+
+ a.rpcCall(w, requestToContext(r), rpcReq)
+}
+
+func (a *api) health(w http.ResponseWriter, r *http.Request) {
+ defer r.Body.Close()
+
+ rpcReq := &rpcRequest{
+ Service: r.URL.Query().Get("service"),
+ Endpoint: "Debug.Health",
+ Request: "{}",
+ URL: r.URL.Path,
+ Address: r.URL.Query().Get("address"),
+ }
+
+ a.rpcCall(w, requestToContext(r), rpcReq)
+}
+
+func (a *api) stats(w http.ResponseWriter, r *http.Request) {
+ defer r.Body.Close()
+
+ rpcReq := &rpcRequest{
+ Service: r.URL.Query().Get("service"),
+ Endpoint: "Debug.Stats",
+ Request: "{}",
+ URL: r.URL.Path,
+ Address: r.URL.Query().Get("address"),
+ }
+
+ a.rpcCall(w, requestToContext(r), rpcReq)
+ return
+}
+
+func requestToContext(r *http.Request) context.Context {
+ ctx := context.Background()
+ md := make(metadata.Metadata)
+ for k, v := range r.Header {
+ md[k] = strings.Join(v, ",")
+ }
+ return metadata.NewContext(ctx, md)
+}
diff --git a/service/stackweb/backend/plugins/basic/basic.go b/service/stackweb/backend/plugins/basic/basic.go
new file mode 100644
index 0000000..3857acc
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/basic.go
@@ -0,0 +1,105 @@
+package basic
+
+import (
+ "sync"
+
+ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins"
+)
+
+func init() {
+ m = &basicModule{
+ name: "basic",
+ path: "/b",
+ }
+
+ plugins.Register(m)
+}
+
+var (
+ m *basicModule
+
+ // Default address to bind to
+ GatewayNamespaces = []string{"stack.stackway.api"}
+ WebNamespacePrefix = []string{"stack.web"}
+)
+
+// basicModule includes web, registry, CLI, Stats submodules.
+type basicModule struct {
+ name string
+ path string
+ sync.RWMutex
+ api *api
+}
+
+func (m *basicModule) Name() string {
+ return m.name
+}
+
+func (m *basicModule) Path() string {
+ return m.path
+}
+
+func (m *basicModule) Init(opts ...plugins.Option) error {
+ options := &plugins.Options{}
+ for _, opt := range opts {
+ opt(options)
+ }
+
+ m.api = &api{
+ service: options.Service,
+ }
+ return nil
+}
+
+func (m *basicModule) Handlers() (mp map[string]*plugins.Handler) {
+ m.Lock()
+ defer m.Unlock()
+
+ mp = make(map[string]*plugins.Handler)
+ mp["/services"] = &plugins.Handler{
+ Func: m.api.services,
+ Method: []string{"GET"},
+ }
+
+ mp["/micro-services"] = &plugins.Handler{
+ Func: m.api.microServices,
+ Method: []string{"GET"},
+ }
+
+ mp["/service"] = &plugins.Handler{
+ Func: m.api.handler,
+ Method: []string{"GET"},
+ }
+
+ mp["/api-gateway-services"] = &plugins.Handler{
+ Func: m.api.apiGatewayServices,
+ Method: []string{"GET"},
+ }
+
+ mp["/service-details"] = &plugins.Handler{
+ Func: m.api.serviceDetails,
+ Method: []string{"GET"},
+ }
+
+ mp["/stats"] = &plugins.Handler{
+ Func: m.api.stats,
+ Method: []string{"GET"},
+ }
+
+ mp["/web-services"] = &plugins.Handler{
+ Func: m.api.webServices,
+ Method: []string{"GET"},
+ }
+
+ mp["/rpc"] = &plugins.Handler{
+ Func: m.api.rpc,
+ Method: []string{"POST"},
+ }
+
+ mp["/health"] = &plugins.Handler{
+ Func: m.api.health,
+ Method: []string{"GET"},
+ }
+
+ return
+}
diff --git a/service/stackweb/backend/plugins/basic/internal.go b/service/stackweb/backend/plugins/basic/internal.go
new file mode 100644
index 0000000..48d88ef
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/internal.go
@@ -0,0 +1,80 @@
+package basic
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "strings"
+ "time"
+
+ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins/basic/tools"
+ "github.com/stack-labs/stack-rpc/client"
+ "github.com/stack-labs/stack-rpc/util/errors"
+)
+
+func (a *api) rpcCall(w http.ResponseWriter, ctx context.Context, rpcReq *rpcRequest) {
+ if len(rpcReq.Service) == 0 {
+ tools.WriteError(w, fmt.Errorf("Service Is Not found "))
+ return
+ }
+
+ if len(rpcReq.Endpoint) == 0 {
+ tools.WriteError(w, fmt.Errorf("Endpoint Is Not found err "))
+ return
+ }
+
+ // decode rpc request param body
+ if req, ok := rpcReq.Request.(string); ok {
+ d := json.NewDecoder(strings.NewReader(req))
+ d.UseNumber()
+
+ if err := d.Decode(&rpcReq.Request); err != nil {
+ tools.WriteError(w, fmt.Errorf("error decoding request string err: %s", err))
+ return
+ }
+ }
+
+ // create request/response
+ var response json.RawMessage
+ var err error
+ req := a.service.Client.NewRequest(rpcReq.Service, rpcReq.Endpoint, rpcReq.Request, client.WithContentType("application/json"))
+
+ var opts []client.CallOption
+
+ // set timeout
+ if rpcReq.timeout > 0 {
+ opts = append(opts, client.WithRequestTimeout(time.Duration(rpcReq.timeout)*time.Second))
+ }
+
+ // remote call
+ if len(rpcReq.Address) > 0 {
+ opts = append(opts, client.WithAddress(rpcReq.Address))
+ }
+
+ // remote call
+ err = a.service.Client.Call(ctx, req, &response, opts...)
+ if err != nil {
+ ce := errors.Parse(err.Error())
+ switch ce.Code {
+ case 0:
+ // assuming it's totally screwed
+ ce.Code = 500
+ ce.Id = "stack.rpc"
+ ce.Status = http.StatusText(500)
+ ce.Detail = "error during request: " + ce.Detail
+ w.WriteHeader(500)
+ default:
+ w.WriteHeader(int(ce.Code))
+ }
+ w.Write([]byte(ce.Error()))
+ return
+ }
+
+ if strings.Contains(rpcReq.URL, "/v1/rpc") {
+ w.Header().Set("Content-Type", "application/json")
+ w.Write(response)
+ } else {
+ tools.WriteJsonData(w, response)
+ }
+}
diff --git a/service/stackweb/backend/plugins/basic/tools.go b/service/stackweb/backend/plugins/basic/tools.go
new file mode 100644
index 0000000..8e1ef80
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/tools.go
@@ -0,0 +1,21 @@
+package basic
+
+import (
+ "github.com/stack-labs/stack-rpc/registry"
+)
+
+type SortedServices struct {
+ Services []*registry.Service
+}
+
+func (s SortedServices) Len() int {
+ return len(s.Services)
+}
+
+func (s SortedServices) Less(i, j int) bool {
+ return s.Services[i].Name < s.Services[j].Name
+}
+
+func (s SortedServices) Swap(i, j int) {
+ s.Services[i], s.Services[j] = s.Services[j], s.Services[i]
+}
diff --git a/service/stackweb/backend/plugins/basic/tools/json.go b/service/stackweb/backend/plugins/basic/tools/json.go
new file mode 100644
index 0000000..eed9464
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/tools/json.go
@@ -0,0 +1,40 @@
+package tools
+
+import (
+ "encoding/json"
+ "net/http"
+
+ "github.com/stack-labs/stack-rpc-plugins/service/stackweb/plugins"
+)
+
+func WriteJsonData(w http.ResponseWriter, data interface{}) {
+ rsp := &plugins.Rsp{
+ Data: data,
+ Success: true,
+ }
+
+ b, err := json.Marshal(rsp)
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ w.Header().Set("Content-Type", "application/json")
+ w.Write(b)
+}
+
+func WriteError(w http.ResponseWriter, err error) {
+ rsp := &plugins.Rsp{
+ Error: err.Error(),
+ Success: false,
+ }
+
+ b, err := json.Marshal(rsp)
+ if err != nil {
+ http.Error(w, "Error occurred:"+err.Error(), 500)
+ return
+ }
+
+ w.Header().Set("Content-Type", "application/json")
+ w.Write(b)
+}
diff --git a/service/stackweb/backend/plugins/basic/tools/number.go b/service/stackweb/backend/plugins/basic/tools/number.go
new file mode 100644
index 0000000..bebd8d0
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/tools/number.go
@@ -0,0 +1,10 @@
+package tools
+
+func Int32ArrayTo64(in []int32) []int64 {
+ ret := make([]int64, len(in))
+ for _, v := range in {
+ ret = append(ret, int64(v))
+ }
+
+ return ret
+}
diff --git a/service/stackweb/backend/plugins/basic/tools/sort.go b/service/stackweb/backend/plugins/basic/tools/sort.go
new file mode 100644
index 0000000..c02985d
--- /dev/null
+++ b/service/stackweb/backend/plugins/basic/tools/sort.go
@@ -0,0 +1,21 @@
+package tools
+
+import (
+ "github.com/stack-labs/stack-rpc/registry"
+)
+
+type SortedServices struct {
+ Services []*registry.Service
+}
+
+func (s SortedServices) Len() int {
+ return len(s.Services)
+}
+
+func (s SortedServices) Less(i, j int) bool {
+ return s.Services[i].Name < s.Services[j].Name
+}
+
+func (s SortedServices) Swap(i, j int) {
+ s.Services[i], s.Services[j] = s.Services[j], s.Services[i]
+}
diff --git a/service/stackweb/backend/plugins/options.go b/service/stackweb/backend/plugins/options.go
new file mode 100644
index 0000000..81dacc7
--- /dev/null
+++ b/service/stackweb/backend/plugins/options.go
@@ -0,0 +1,17 @@
+package plugins
+
+import (
+ "github.com/stack-labs/stack-rpc/service"
+)
+
+type Option func(o *Options)
+
+type Options struct {
+ Service service.Options
+}
+
+func Service(s service.Options) Option {
+ return func(o *Options) {
+ o.Service = s
+ }
+}
diff --git a/service/stackweb/backend/plugins/plugin.go b/service/stackweb/backend/plugins/plugin.go
new file mode 100644
index 0000000..d163e84
--- /dev/null
+++ b/service/stackweb/backend/plugins/plugin.go
@@ -0,0 +1,53 @@
+package plugins
+
+import (
+ "net/http"
+)
+
+// Plugin is the biggest unit of web component.
+// a component is a webapp which will be registered on root path by Name function
+type Plugin interface {
+ // Name of module
+ Name() string
+
+ // Path returns the root path of this module
+ Path() string
+
+ // Init initializes the module
+ Init(...Option) error
+
+ // Handlers returns http handler of this module
+ Handlers() map[string]*Handler
+}
+
+type Handler struct {
+ Name string
+ Func func(w http.ResponseWriter, r *http.Request)
+ Method []string
+ Hld http.Handler
+}
+
+func (h Handler) IsFunc() bool {
+ return h.Func != nil
+}
+
+// Rsp is the struct of http api response
+type Rsp struct {
+ Code uint `json:"code,omitempty"`
+ Success bool `json:"success"`
+ Data interface{} `json:"data,omitempty"`
+ Error interface{} `json:"error,omitempty"`
+}
+
+var (
+ modules []Plugin
+)
+
+func Register(m Plugin) {
+ modules = append(modules, m)
+}
+
+// Plugins returns all of the registered modules
+func Plugins() []Plugin {
+ return modules
+}
diff --git a/service/stackweb/backend/stack.yml b/service/stackweb/backend/stack.yml
new file mode 100644
index 0000000..d985cd5
--- /dev/null
+++ b/service/stackweb/backend/stack.yml
@@ -0,0 +1,18 @@
+stack:
+ service:
+ name: stack.rpc.stackweb
+ web:
+ root-path: /stack
+ static:
+ route: webapp
+ dir: static
+ # todo
+ favicon-ico:
+ server:
+ address: :8090
+ config:
+ hierarchy-merge: true
+ storege: false
+ logger:
+ name: console
+ level: info
diff --git a/service/stackweb/frontend/.editorconfig b/service/stackweb/frontend/.editorconfig
new file mode 100644
index 0000000..7e3649a
--- /dev/null
+++ b/service/stackweb/frontend/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/service/stackweb/frontend/.eslintignore b/service/stackweb/frontend/.eslintignore
new file mode 100644
index 0000000..16116a2
--- /dev/null
+++ b/service/stackweb/frontend/.eslintignore
@@ -0,0 +1,4 @@
+/lambda/
+/scripts
+/config
+.history
\ No newline at end of file
diff --git a/service/stackweb/frontend/.eslintrc.js b/service/stackweb/frontend/.eslintrc.js
new file mode 100644
index 0000000..b882c20
--- /dev/null
+++ b/service/stackweb/frontend/.eslintrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+ extends: [require.resolve('@umijs/fabric/dist/eslint')],
+ globals: {
+ ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
+ page: true,
+ REACT_APP_ENV: true,
+ },
+};
diff --git a/service/stackweb/frontend/.gitignore b/service/stackweb/frontend/.gitignore
new file mode 100644
index 0000000..7fd9f58
--- /dev/null
+++ b/service/stackweb/frontend/.gitignore
@@ -0,0 +1,40 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+**/node_modules
+# roadhog-api-doc ignore
+/src/utils/request-temp.js
+_roadhog-api-doc
+
+# production
+/dist
+/.vscode
+
+# misc
+.DS_Store
+npm-debug.log*
+yarn-error.log
+
+/coverage
+.idea
+yarn.lock
+package-lock.json
+*bak
+.vscode
+
+# visual studio code
+.history
+*.log
+functions/*
+.temp/**
+
+# umi
+.umi
+.umi-production
+
+# screenshot
+screenshot
+.firebase
+.eslintcache
+
+build
diff --git a/service/stackweb/frontend/.prettierignore b/service/stackweb/frontend/.prettierignore
new file mode 100644
index 0000000..5456c4f
--- /dev/null
+++ b/service/stackweb/frontend/.prettierignore
@@ -0,0 +1,22 @@
+**/*.svg
+package.json
+.umi
+.umi-production
+/dist
+.dockerignore
+.DS_Store
+.eslintignore
+*.png
+*.toml
+docker
+.editorconfig
+Dockerfile*
+.gitignore
+.prettierignore
+LICENSE
+.eslintcache
+*.lock
+yarn-error.log
+.history
+CNAME
+/build
diff --git a/service/stackweb/frontend/.prettierrc.js b/service/stackweb/frontend/.prettierrc.js
new file mode 100644
index 0000000..7b597d7
--- /dev/null
+++ b/service/stackweb/frontend/.prettierrc.js
@@ -0,0 +1,5 @@
+const fabric = require('@umijs/fabric');
+
+module.exports = {
+ ...fabric.prettier,
+};
diff --git a/service/stackweb/frontend/.stylelintrc.js b/service/stackweb/frontend/.stylelintrc.js
new file mode 100644
index 0000000..c203078
--- /dev/null
+++ b/service/stackweb/frontend/.stylelintrc.js
@@ -0,0 +1,5 @@
+const fabric = require('@umijs/fabric');
+
+module.exports = {
+ ...fabric.stylelint,
+};
diff --git a/service/stackweb/frontend/README.md b/service/stackweb/frontend/README.md
new file mode 100644
index 0000000..6404215
--- /dev/null
+++ b/service/stackweb/frontend/README.md
@@ -0,0 +1 @@
+＃ Platform Web UI
diff --git a/service/stackweb/frontend/config/config.ts b/service/stackweb/frontend/config/config.ts
new file mode 100644
index 0000000..361556c
--- /dev/null
+++ b/service/stackweb/frontend/config/config.ts
@@ -0,0 +1,372 @@
+// https://umijs.org/config/
+import {defineConfig, utils} from 'umi';
+import defaultSettings from './defaultSettings';
+import proxy from './proxy';
+import webpackPlugin from './plugin.config';
+
+const {winPath} = utils; // preview.pro.ant.design only do not use in your production ;
+// preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+
+const {ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION, REACT_APP_ENV, GA_KEY} = process.env;
+export default defineConfig({
+ hash: true,
+ antd: {},
+ analytics: GA_KEY
+ ? {
+ ga: GA_KEY,
+ }
+ : false,
+ dva: {
+ hmr: true,
+ },
+ locale: {
+ // default zh-CN
+ default: 'zh-CN',
+ // default true, when it is true, will use `navigator.language` overwrite default
+ antd: true,
+ baseNavigator: true,
+ },
+ dynamicImport: {
+ loading: '@/components/PageLoading/index',
+ },
+ targets: {
+ ie: 11,
+ },
+ // umi routes: https://umijs.org/docs/routing
+ routes: [
+ {
+ path: '/',
+ component: '../layouts/BlankLayout',
+ routes: [
+ {
+ path: '/user',
+ component: '../layouts/UserLayout',
+ routes: [
+ {
+ path: '/user',
+ redirect: '/user/login',
+ },
+ {
+ name: 'login',
+ icon: 'smile',
+ path: '/user/login',
+ component: './user/login',
+ },
+ {
+ name: 'register-result',
+ icon: 'smile',
+ path: '/user/register-result',
+ component: './user/register-result',
+ },
+ {
+ name: 'register',
+ icon: 'smile',
+ path: '/user/register',
+ component: './user/register',
+ },
+ {
+ component: '404',
+ },
+ ],
+ },
+ {
+ path: '/',
+ component: '../layouts/BasicLayout',
+ Routes: ['src/pages/Authorized'],
+ authority: ['admin', 'user'],
+ routes: [
+ {
+ path: '/service',
+ name: 'service',
+ icon: 'service',
+ routes: [
+ {
+ name: 'service-list',
+ icon: 'smile',
+ path: '/service/service-list',
+ component: './service/service-list',
+ },
+ {
+ name: 'call-service',
+ icon: 'smile',
+ path: '/service/call-service',
+ component: './service/call',
+ }
+ ],
+ },
+ {
+ path: '/dashboard',
+ name: 'dashboard',
+ icon: 'dashboard',
+ routes: [
+ {
+ name: 'analysis',
+ icon: 'smile',
+ path: '/dashboard/analysis',
+ component: './dashboard/analysis',
+ },
+ {
+ name: 'monitor',
+ icon: 'smile',
+ path: '/dashboard/monitor',
+ component: './dashboard/monitor',
+ },
+ {
+ name: 'workplace',
+ icon: 'smile',
+ path: '/dashboard/workplace',
+ component: './dashboard/workplace',
+ },
+ ],
+ },
+ {
+ path: '/form',
+ icon: 'form',
+ name: 'form',
+ routes: [
+ {
+ name: 'basic-form',
+ icon: 'smile',
+ path: '/form/basic-form',
+ component: './form/basic-form',
+ },
+ {
+ name: 'step-form',
+ icon: 'smile',
+ path: '/form/step-form',
+ component: './form/step-form',
+ },
+ {
+ name: 'advanced-form',
+ icon: 'smile',
+ path: '/form/advanced-form',
+ component: './form/advanced-form',
+ },
+ ],
+ },
+ {
+ path: '/list',
+ icon: 'table',
+ name: 'list',
+ routes: [
+ {
+ path: '/list/search',
+ name: 'search-list',
+ component: './list/search',
+ routes: [
+ {
+ path: '/list/search',
+ redirect: '/list/search/articles',
+ },
+ {
+ name: 'articles',
+ icon: 'smile',
+ path: '/list/search/articles',
+ component: './list/search/articles',
+ },
+ {
+ name: 'projects',
+ icon: 'smile',
+ path: '/list/search/projects',
+ component: './list/search/projects',
+ },
+ {
+ name: 'applications',
+ icon: 'smile',
+ path: '/list/search/applications',
+ component: './list/search/applications',
+ },
+ ],
+ },
+ {
+ name: 'table-list',
+ icon: 'smile',
+ path: '/list/table-list',
+ component: './list/table-list',
+ },
+ {
+ name: 'basic-list',
+ icon: 'smile',
+ path: '/list/basic-list',
+ component: './list/basic-list',
+ },
+ {
+ name: 'card-list',
+ icon: 'smile',
+ path: '/list/card-list',
+ component: './list/card-list',
+ },
+ ],
+ },
+ {
+ path: '/profile',
+ name: 'profile',
+ icon: 'profile',
+ routes: [
+ {
+ name: 'basic',
+ icon: 'smile',
+ path: '/profile/basic',
+ component: './profile/basic',
+ },
+ {
+ name: 'advanced',
+ icon: 'smile',
+ path: '/profile/advanced',
+ component: './profile/advanced',
+ },
+ ],
+ },
+ {
+ name: 'result',
+ icon: 'CheckCircleOutlined',
+ path: '/result',
+ routes: [
+ {
+ name: 'success',
+ icon: 'smile',
+ path: '/result/success',
+ component: './result/success',
+ },
+ {
+ name: 'fail',
+ icon: 'smile',
+ path: '/result/fail',
+ component: './result/fail',
+ },
+ ],
+ },
+ {
+ name: 'exception',
+ icon: 'warning',
+ path: '/exception',
+ routes: [
+ {
+ name: '403',
+ icon: 'smile',
+ path: '/exception/403',
+ component: './exception/403',
+ },
+ {
+ name: '404',
+ icon: 'smile',
+ path: '/exception/404',
+ component: './exception/404',
+ },
+ {
+ name: '500',
+ icon: 'smile',
+ path: '/exception/500',
+ component: './exception/500',
+ },
+ ],
+ },
+ {
+ name: 'account',
+ icon: 'user',
+ path: '/account',
+ routes: [
+ {
+ name: 'center',
+ icon: 'smile',
+ path: '/account/center',
+ component: './account/center',
+ },
+ {
+ name: 'settings',
+ icon: 'smile',
+ path: '/account/settings',
+ component: './account/settings',
+ },
+ ],
+ },
+ {
+ name: 'editor',
+ icon: 'highlight',
+ path: '/editor',
+ routes: [
+ {
+ name: 'flow',
+ icon: 'smile',
+ path: '/editor/flow',
+ component: './editor/flow',
+ },
+ {
+ name: 'mind',
+ icon: 'smile',
+ path: '/editor/mind',
+ component: './editor/mind',
+ },
+ {
+ name: 'koni',
+ icon: 'smile',
+ path: '/editor/koni',
+ component: './editor/koni',
+ },
+ ],
+ },
+ {
+ path: '/',
+ redirect: '/dashboard/analysis',
+ authority: ['admin', 'user'],
+ },
+ {
+ component: '404',
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ // Theme for antd: https://ant.design/docs/react/customize-theme-cn
+ theme: {
+ // ...darkTheme,
+ 'primary-color': defaultSettings.primaryColor,
+ },
+ define: {
+ REACT_APP_ENV: REACT_APP_ENV || false,
+ ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:
+ ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION || '', // preview.pro.ant.design only do not use in your production ; preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
+ },
+ ignoreMomentLocale: true,
+ lessLoader: {
+ javascriptEnabled: true,
+ },
+ cssLoader: {
+ modules: {
+ getLocalIdent: (
+ context: {
+ resourcePath: string;
+ },
+ _: string,
+ localName: string,
+ ) => {
+ if (
+ context.resourcePath.includes('node_modules') ||
+ context.resourcePath.includes('ant.design.pro.less') ||
+ context.resourcePath.includes('global.less')
+ ) {
+ return localName;
+ }
+
+ const match = context.resourcePath.match(/src(.*)/);
+
+ if (match && match[1]) {
+ const antdProPath = match[1].replace('.less', '');
+ const arr = winPath(antdProPath)
+ .split('/')
+ .map((a: string) => a.replace(/([A-Z])/g, '-$1'))
+ .map((a: string) => a.toLowerCase());
+ return `antd-pro${arr.join('-')}-${localName}`.replace(/--/g, '-');
+ }
+
+ return localName;
+ },
+ },
+ },
+ manifest: {
+ basePath: '/',
+ },
+ proxy: proxy[REACT_APP_ENV || 'dev'],
+ chainWebpack: webpackPlugin,
+});
diff --git a/service/stackweb/frontend/config/defaultSettings.ts b/service/stackweb/frontend/config/defaultSettings.ts
new file mode 100644
index 0000000..888bcef
--- /dev/null
+++ b/service/stackweb/frontend/config/defaultSettings.ts
@@ -0,0 +1,61 @@
+import { MenuTheme } from 'antd/es/menu/MenuContext';
+
+export type ContentWidth = 'Fluid' | 'Fixed';
+
+export interface DefaultSettings {
+ /**
+ * theme for nav menu
+ */
+ navTheme: MenuTheme;
+ /**
+ * primary color of ant design
+ */
+ primaryColor: string;
+ /**
+ * nav menu position: `sidemenu` or `topmenu`
+ */
+ layout: 'sidemenu' | 'topmenu';
+ /**
+ * layout of content: `Fluid` or `Fixed`, only works when layout is topmenu
+ */
+ contentWidth: ContentWidth;
+ /**
+ * sticky header
+ */
+ fixedHeader: boolean;
+ /**
+ * auto hide header
+ */
+ autoHideHeader: boolean;
+ /**
+ * sticky siderbar
+ */
+ fixSiderbar: boolean;
+ menu: { locale: boolean };
+ title: string;
+ pwa: boolean;
+ // Your custom iconfont Symbol script Url
+ // eg：//at.alicdn.com/t/font_1039637_btcrd5co4w.js
+ // 注意：如果需要图标多色，Iconfont 图标项目里要进行批量去色处理
+ // Usage: https://github.com/ant-design/ant-design-pro/pull/3517
+ iconfontUrl: string;
+ colorWeak: boolean;
+}
+
+export default {
+ navTheme: 'dark',
+ // 拂晓蓝
+ primaryColor: '#1890ff',
+ layout: 'sidemenu',
+ contentWidth: 'Fluid',
+ fixedHeader: false,
+ autoHideHeader: false,
+ fixSiderbar: false,
+ colorWeak: false,
+ menu: {
+ locale: true,
+ },
+ title: 'Platform Web',
+ pwa: false,
+ iconfontUrl: '',
+} as DefaultSettings;
diff --git a/service/stackweb/frontend/config/plugin.config.ts b/service/stackweb/frontend/config/plugin.config.ts
new file mode 100644
index 0000000..aff2d47
--- /dev/null
+++ b/service/stackweb/frontend/config/plugin.config.ts
@@ -0,0 +1,65 @@
+import path from 'path';
+
+import * as IWebpackChainConfig from 'webpack-chain';
+
+function getModulePackageName(module: { context: string }) {
+ if (!module.context) return null;
+
+ const nodeModulesPath = path.join(__dirname, '../node_modules/');
+ if (module.context.substring(0, nodeModulesPath.length) !== nodeModulesPath) {
+ return null;
+ }
+
+ const moduleRelativePath = module.context.substring(nodeModulesPath.length);
+ const [moduleDirName] = moduleRelativePath.split(path.sep);
+ let packageName: string | null = moduleDirName;
+ // handle tree shaking
+ if (packageName && packageName.match('^_')) {
+ // eslint-disable-next-line prefer-destructuring
+ packageName = packageName.match(/^_(@?[^@]+)/)![1];
+ }
+ return packageName;
+}
+
+const webpackPlugin = (config: IWebpackChainConfig) => {
+ // optimize chunks
+ config.optimization
+ // share the same chunks across different modules
+ .runtimeChunk(false)
+ .splitChunks({
+ chunks: 'async',
+ name: 'vendors',
+ maxInitialRequests: Infinity,
+ minSize: 0,
+ cacheGroups: {
+ vendors: {
+ test: (module: { context: string }) => {
+ const packageName = getModulePackageName(module) || '';
+ if (packageName) {
+ return [
+ 'bizcharts',
+ 'gg-editor',
+ 'g6',
+ '@antv',
+ 'l7',
+ 'gg-editor-core',
+ 'bizcharts-plugin-slider',
+ ].includes(packageName);
+ }
+ return false;
+ },
+ name(module: { context: string }) {
+ const packageName = getModulePackageName(module);
+ if (packageName) {
+ if (['bizcharts', '@antv_data-set'].indexOf(packageName) >= 0) {
+ return 'viz'; // visualization package
+ }
+ }
+ return 'misc';
+ },
+ },
+ },
+ });
+};
+
+export default webpackPlugin;
diff --git a/service/stackweb/frontend/config/proxy.ts b/service/stackweb/frontend/config/proxy.ts
new file mode 100644
index 0000000..50c562b
--- /dev/null
+++ b/service/stackweb/frontend/config/proxy.ts
@@ -0,0 +1,35 @@
+/**
+ * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
+ * The agent cannot take effect in the production environment
+ * so there is no configuration of the production environment
+ * For details, please see
+ * https://pro.ant.design/docs/deploy
+ */
+export default {
+ dev: {
+ '/api/': {
+ target: 'https://preview.pro.ant.design',
+ changeOrigin: true,
+ pathRewrite: { '^': '' },
+ },
+ '/stackweb': {
+ target: 'http://localhost:9082',
+ changeOrigin: true,
+ pathRewrite: { '^': '' },
+ },
+ },
+ test: {
+ '/api/': {
+ target: 'https://preview.pro.ant.design',
+ changeOrigin: true,
+ pathRewrite: { '^': '' },
+ },
+ },
+ pre: {
+ '/api/': {
+ target: 'your pre url',
+ changeOrigin: true,
+ pathRewrite: { '^': '' },
+ },
+ },
+};
diff --git a/service/stackweb/frontend/jest.config.js b/service/stackweb/frontend/jest.config.js
new file mode 100644
index 0000000..c82d7f1
--- /dev/null
+++ b/service/stackweb/frontend/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+ testURL: 'http://localhost:8000',
+ extraSetupFiles: ['./tests/setupTests.js'],
+ globals: {
+ ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: false,
+ localStorage: null,
+ },
+};
diff --git a/service/stackweb/frontend/jsconfig.json b/service/stackweb/frontend/jsconfig.json
new file mode 100644
index 0000000..f87334d
--- /dev/null
+++ b/service/stackweb/frontend/jsconfig.json
@@ -0,0 +1,10 @@
+{
+ "compilerOptions": {
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ }
+}
diff --git a/service/stackweb/frontend/mock/listTableList.ts b/service/stackweb/frontend/mock/listTableList.ts
new file mode 100644
index 0000000..efc3224
--- /dev/null
+++ b/service/stackweb/frontend/mock/listTableList.ts
@@ -0,0 +1,153 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Request, Response } from 'express';
+import { parse } from 'url';
+import { TableListItem, TableListParams } from '@/pages/ListTableList/data';
+
+// mock tableListDataSource
+const genList = (current: number, pageSize: number) => {
+ const tableListDataSource: TableListItem[] = [];
+
+ for (let i = 0; i < pageSize; i += 1) {
+ const index = (current - 1) * 10 + i;
+ tableListDataSource.push({
+ key: index,
+ disabled: i % 6 === 0,
+ href: 'https://ant.design',
+ avatar: [
+ 'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
+ 'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
+ ][i % 2],
+ name: `TradeCode ${index}`,
+ owner: '曲丽丽',
+ desc: '这是一段描述',
+ callNo: Math.floor(Math.random() * 1000),
+ status: Math.floor(Math.random() * 10) % 4,
+ updatedAt: new Date(),
+ createdAt: new Date(),
+ progress: Math.ceil(Math.random() * 100),
+ });
+ }
+ tableListDataSource.reverse();
+ return tableListDataSource;
+};
+
+let tableListDataSource = genList(1, 100);
+
+function getRule(req: Request, res: Response, u: string) {
+ let realUrl = u;
+ if (!realUrl || Object.prototype.toString.call(realUrl) !== '[object String]') {
+ realUrl = req.url;
+ }
+ const { current = 1, pageSize = 10 } = req.query;
+ const params = (parse(realUrl, true).query as unknown) as TableListParams;
+
+ let dataSource = [...tableListDataSource].slice((current - 1) * pageSize, current * pageSize);
+ if (params.sorter) {
+ const s = params.sorter.split('_');
+ dataSource = dataSource.sort((prev, next) => {
+ if (s[1] === 'descend') {
+ return next[s[0]] - prev[s[0]];
+ }
+ return prev[s[0]] - next[s[0]];
+ });
+ }
+
+ if (params.status) {
+ const status = params.status.split(',');
+ let filterDataSource: TableListItem[] = [];
+ status.forEach((s: string) => {
+ filterDataSource = filterDataSource.concat(
+ dataSource.filter((item) => {
+ if (parseInt(`${item.status}`, 10) === parseInt(s.split('')[0], 10)) {
+ return true;
+ }
+ return false;
+ }),
+ );
+ });
+ dataSource = filterDataSource;
+ }
+
+ if (params.name) {
+ dataSource = dataSource.filter((data) => data.name.includes(params.name || ''));
+ }
+ const result = {
+ data: dataSource,
+ total: tableListDataSource.length,
+ success: true,
+ pageSize,
+ current: parseInt(`${params.currentPage}`, 10) || 1,
+ };
+
+ return res.json(result);
+}
+
+function postRule(req: Request, res: Response, u: string, b: Request) {
+ let realUrl = u;
+ if (!realUrl || Object.prototype.toString.call(realUrl) !== '[object String]') {
+ realUrl = req.url;
+ }
+
+ const body = (b && b.body) || req.body;
+ const { method, name, desc, key } = body;
+
+ switch (method) {
+ /* eslint no-case-declarations:0 */
+ case 'delete':
+ tableListDataSource = tableListDataSource.filter((item) => key.indexOf(item.key) === -1);
+ break;
+ case 'post':
+ (() => {
+ const i = Math.ceil(Math.random() * 10000);
+ const newRule = {
+ key: tableListDataSource.length,
+ href: 'https://ant.design',
+ avatar: [
+ 'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
+ 'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
+ ][i % 2],
+ name,
+ owner: '曲丽丽',
+ desc,
+ callNo: Math.floor(Math.random() * 1000),
+ status: Math.floor(Math.random() * 10) % 2,
+ updatedAt: new Date(),
+ createdAt: new Date(),
+ progress: Math.ceil(Math.random() * 100),
+ };
+ tableListDataSource.unshift(newRule);
+ return res.json(newRule);
+ })();
+ return;
+
+ case 'update':
+ (() => {
+ let newRule = {};
+ tableListDataSource = tableListDataSource.map((item) => {
+ if (item.key === key) {
+ newRule = { ...item, desc, name };
+ return { ...item, desc, name };
+ }
+ return item;
+ });
+ return res.json(newRule);
+ })();
+ return;
+ default:
+ break;
+ }
+
+ const result = {
+ list: tableListDataSource,
+ pagination: {
+ total: tableListDataSource.length,
+ },
+ };
+
+ res.json(result);
+}
+
+export default {
+ 'GET /api/rule': getRule,
+ 'POST /api/rule': postRule,
+};
diff --git a/service/stackweb/frontend/mock/notices.ts b/service/stackweb/frontend/mock/notices.ts
new file mode 100644
index 0000000..b9e3bf2
--- /dev/null
+++ b/service/stackweb/frontend/mock/notices.ts
@@ -0,0 +1,105 @@
+import { Request, Response } from 'express';
+
+const getNotices = (req: Request, res: Response) => {
+ res.json([
+ {
+ id: '000000001',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+ title: '你收到了 14 份新周报',
+ datetime: '2017-08-09',
+ type: 'notification',
+ },
+ {
+ id: '000000002',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
+ title: '你推荐的 曲妮妮 已通过第三轮面试',
+ datetime: '2017-08-08',
+ type: 'notification',
+ },
+ {
+ id: '000000003',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png',
+ title: '这种模板可以区分多种通知类型',
+ datetime: '2017-08-07',
+ read: true,
+ type: 'notification',
+ },
+ {
+ id: '000000004',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png',
+ title: '左侧图标用于区分不同的类型',
+ datetime: '2017-08-07',
+ type: 'notification',
+ },
+ {
+ id: '000000005',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+ title: '内容不要超过两行字，超出时自动截断',
+ datetime: '2017-08-07',
+ type: 'notification',
+ },
+ {
+ id: '000000006',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+ title: '曲丽丽 评论了你',
+ description: '描述信息描述信息描述信息',
+ datetime: '2017-08-07',
+ type: 'message',
+ clickClose: true,
+ },
+ {
+ id: '000000007',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+ title: '朱偏右 回复了你',
+ description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+ datetime: '2017-08-07',
+ type: 'message',
+ clickClose: true,
+ },
+ {
+ id: '000000008',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
+ title: '标题',
+ description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
+ datetime: '2017-08-07',
+ type: 'message',
+ clickClose: true,
+ },
+ {
+ id: '000000009',
+ title: '任务名称',
+ description: '任务需要在 2017-01-12 20:00 前启动',
+ extra: '未开始',
+ status: 'todo',
+ type: 'event',
+ },
+ {
+ id: '000000010',
+ title: '第三方紧急代码变更',
+ description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+ extra: '马上到期',
+ status: 'urgent',
+ type: 'event',
+ },
+ {
+ id: '000000011',
+ title: '信息安全考试',
+ description: '指派竹尔于 2017-01-09 前完成更新并发布',
+ extra: '已耗时 8 天',
+ status: 'doing',
+ type: 'event',
+ },
+ {
+ id: '000000012',
+ title: 'ABCD 版本发布',
+ description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
+ extra: '进行中',
+ status: 'processing',
+ type: 'event',
+ },
+ ]);
+};
+
+export default {
+ 'GET /api/notices': getNotices,
+};
diff --git a/service/stackweb/frontend/mock/route.ts b/service/stackweb/frontend/mock/route.ts
new file mode 100644
index 0000000..418d10f
--- /dev/null
+++ b/service/stackweb/frontend/mock/route.ts
@@ -0,0 +1,5 @@
+export default {
+ '/api/auth_routes': {
+ '/form/advanced-form': { authority: ['admin', 'user'] },
+ },
+};
diff --git a/service/stackweb/frontend/mock/user.ts b/service/stackweb/frontend/mock/user.ts
new file mode 100644
index 0000000..24fa3f7
--- /dev/null
+++ b/service/stackweb/frontend/mock/user.ts
@@ -0,0 +1,154 @@
+import { Request, Response } from 'express';
+
+function getFakeCaptcha(req: Request, res: Response) {
+ return res.json('captcha-xxx');
+}
+// 代码中会兼容本地 service mock 以及部署站点的静态数据
+export default {
+ // 支持值为 Object 和 Array
+ 'GET /api/currentUser': {
+ name: 'Serati Ma',
+ avatar: 'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
+ userid: '00000001',
+ email: 'antdesign@alipay.com',
+ signature: '海纳百川，有容乃大',
+ title: '交互专家',
+ group: '蚂蚁金服－某某某事业群－某某平台部－某某技术部－UED',
+ tags: [
+ {
+ key: '0',
+ label: '很有想法的',
+ },
+ {
+ key: '1',
+ label: '专注设计',
+ },
+ {
+ key: '2',
+ label: '辣~',
+ },
+ {
+ key: '3',
+ label: '大长腿',
+ },
+ {
+ key: '4',
+ label: '川妹子',
+ },
+ {
+ key: '5',
+ label: '海纳百川',
+ },
+ ],
+ notifyCount: 12,
+ unreadCount: 11,
+ country: 'China',
+ geographic: {
+ province: {
+ label: '浙江省',
+ key: '330000',
+ },
+ city: {
+ label: '杭州市',
+ key: '330100',
+ },
+ },
+ address: '西湖区工专路 77 号',
+ phone: '0752-268888888',
+ },
+ // GET POST 可省略
+ 'GET /api/users': [
+ {
+ key: '1',
+ name: 'John Brown',
+ age: 32,
+ address: 'New York No. 1 Lake Park',
+ },
+ {
+ key: '2',
+ name: 'Jim Green',
+ age: 42,
+ address: 'London No. 1 Lake Park',
+ },
+ {
+ key: '3',
+ name: 'Joe Black',
+ age: 32,
+ address: 'Sidney No. 1 Lake Park',
+ },
+ ],
+ 'POST /api/login/account': (req: Request, res: Response) => {
+ const { password, userName, type } = req.body;
+ if (password === 'ant.design' && userName === 'admin') {
+ res.send({
+ status: 'ok',
+ type,
+ currentAuthority: 'admin',
+ });
+ return;
+ }
+ if (password === 'ant.design' && userName === 'user') {
+ res.send({
+ status: 'ok',
+ type,
+ currentAuthority: 'user',
+ });
+ return;
+ }
+ if (type === 'mobile') {
+ res.send({
+ status: 'ok',
+ type,
+ currentAuthority: 'admin',
+ });
+ return;
+ }
+
+ res.send({
+ status: 'error',
+ type,
+ currentAuthority: 'guest',
+ });
+ },
+ 'POST /api/register': (req: Request, res: Response) => {
+ res.send({ status: 'ok', currentAuthority: 'user' });
+ },
+ 'GET /api/500': (req: Request, res: Response) => {
+ res.status(500).send({
+ timestamp: 1513932555104,
+ status: 500,
+ error: 'error',
+ message: 'error',
+ path: '/base/category/list',
+ });
+ },
+ 'GET /api/404': (req: Request, res: Response) => {
+ res.status(404).send({
+ timestamp: 1513932643431,
+ status: 404,
+ error: 'Not Found',
+ message: 'No message available',
+ path: '/base/category/list/2121212',
+ });
+ },
+ 'GET /api/403': (req: Request, res: Response) => {
+ res.status(403).send({
+ timestamp: 1513932555104,
+ status: 403,
+ error: 'Unauthorized',
+ message: 'Unauthorized',
+ path: '/base/category/list',
+ });
+ },
+ 'GET /api/401': (req: Request, res: Response) => {
+ res.status(401).send({
+ timestamp: 1513932555104,
+ status: 401,
+ error: 'Unauthorized',
+ message: 'Unauthorized',
+ path: '/base/category/list',
+ });
+ },
+
+ 'GET /api/login/captcha': getFakeCaptcha,
+};
diff --git a/service/stackweb/frontend/package.json b/service/stackweb/frontend/package.json
new file mode 100644
index 0000000..7948caf
--- /dev/null
+++ b/service/stackweb/frontend/package.json
@@ -0,0 +1,129 @@
+{
+ "name": "platform-web",
+ "version": "1.0.0",
+ "private": true,
+ "description": "Go-Micro 治理一站式解决方案",
+ "scripts": {
+ "analyze": "cross-env ANALYZE=1 umi build",
+ "build": "umi build",
+ "deploy": "npm run site && npm run gh-pages",
+ "dev": "npm run start:dev",
+ "fetch:blocks": "pro fetch-blocks --branch=umi@3 && npm run prettier",
+ "gh-pages": "cp CNAME ./dist/ && gh-pages -d dist",
+ "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
+ "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier",
+ "lint-staged": "lint-staged",
+ "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ",
+ "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style",
+ "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
+ "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
+ "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
+ "prettier": "prettier -c --write \"**/*\"",
+ "start": "umi dev",
+ "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none umi dev",
+ "start:no-mock": "cross-env MOCK=none umi dev",
+ "start:no-ui": "cross-env UMI_UI=none umi dev",
+ "start:pre": "cross-env REACT_APP_ENV=pre umi dev",
+ "start:test": "cross-env REACT_APP_ENV=test MOCK=none umi dev",
+ "test": "umi test",
+ "test:all": "node ./tests/run-tests.js",
+ "test:component": "umi test ./src/components",
+ "tsc": "tsc"
+ },
+ "husky": {
+ "hooks": {
+ "pre-commit": "npm run lint-staged"
+ }
+ },
+ "lint-staged": {
+ "**/*.less": "stylelint --syntax less",
+ "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
+ "**/*.{js,jsx,tsx,ts,less,md,json}": [
+ "prettier --write"
+ ]
+ },
+ "browserslist": [
+ "> 1%",
+ "last 2 versions",
+ "not ie <= 10"
+ ],
+ "dependencies": {
+ "@ant-design/icons": "^4.0.0",
+ "@ant-design/pro-layout": "^5.0.8",
+ "@ant-design/pro-table": "^2.1.11",
+ "@antv/data-set": "^0.11.0",
+ "@antv/l7": "^2.0.0",
+ "@antv/l7-maps": "^2.0.0",
+ "@types/lodash.debounce": "^4.0.6",
+ "@types/lodash.isequal": "^4.5.5",
+ "antd": "^4.0.0",
+ "bizcharts": "^3.5.3-beta.0",
+ "bizcharts-plugin-slider": "^2.1.1-beta.1",
+ "classnames": "^2.2.6",
+ "gg-editor": "^2.0.2",
+ "lodash": "^4.17.11",
+ "lodash-decorators": "^6.0.0",
+ "lodash.debounce": "^4.0.8",
+ "lodash.isequal": "^4.5.0",
+ "mockjs": "^1.0.1-beta3",
+ "moment": "^2.24.0",
+ "numeral": "^2.0.6",
+ "nzh": "^1.0.3",
+ "omit.js": "^1.0.2",
+ "path-to-regexp": "2.4.0",
+ "prop-types": "^15.5.10",
+ "qs": "^6.9.0",
+ "react": "^16.8.6",
+ "react-dom": "^16.8.6",
+ "react-fittext": "^1.0.0",
+ "react-helmet-async": "^1.0.4",
+ "react-router": "^4.3.1",
+ "umi": "^3.0.14",
+ "umi-request": "^1.0.8",
+ "use-merge-value": "^1.0.1"
+ },
+ "devDependencies": {
+ "@ant-design/pro-cli": "^1.0.18",
+ "@types/classnames": "^2.2.7",
+ "@types/express": "^4.17.0",
+ "@types/history": "^4.7.2",
+ "@types/jest": "^25.1.0",
+ "@types/lodash": "^4.14.144",
+ "@types/qs": "^6.5.3",
+ "@types/react": "^16.9.17",
+ "@types/react-dom": "^16.8.4",
+ "@types/react-helmet": "^5.0.13",
+ "@umijs/fabric": "^2.0.5",
+ "@umijs/plugin-blocks": "^2.0.5",
+ "@umijs/preset-ant-design-pro": "^1.0.1",
+ "@umijs/preset-react": "^1.4.8",
+ "@umijs/preset-ui": "^2.0.9",
+ "chalk": "^3.0.0",
+ "cross-env": "^7.0.0",
+ "cross-port-killer": "^1.1.1",
+ "enzyme": "^3.11.0",
+ "eslint": "^6.8.0",
+ "express": "^4.17.1",
+ "gh-pages": "^2.0.1",
+ "husky": "^4.0.7",
+ "jsdom-global": "^3.0.2",
+ "lint-staged": "^10.0.0",
+ "mockjs": "^1.0.1-beta3",
+ "prettier": "^2.0.1",
+ "pro-download": "1.0.1",
+ "stylelint": "^13.0.0"
+ },
+ "optionalDependencies": {
+ "puppeteer": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "checkFiles": [
+ "src/**/*.js*",
+ "src/**/*.ts*",
+ "src/**/*.less",
+ "config/**/*.js*",
+ "scripts/**/*.js"
+ ]
+}
diff --git a/service/stackweb/frontend/public/CNAME b/service/stackweb/frontend/public/CNAME
new file mode 100644
index 0000000..30c2d4d
--- /dev/null
+++ b/service/stackweb/frontend/public/CNAME
@@ -0,0 +1 @@
+preview.pro.ant.design
\ No newline at end of file
diff --git a/service/stackweb/frontend/public/favicon.png b/service/stackweb/frontend/public/favicon.png
new file mode 100644
index 0000000..ece59ce
Binary files /dev/null and b/service/stackweb/frontend/public/favicon.png differ
diff --git a/service/stackweb/frontend/public/home_bg.png b/service/stackweb/frontend/public/home_bg.png
new file mode 100644
index 0000000..7c92a4b
Binary files /dev/null and b/service/stackweb/frontend/public/home_bg.png differ
diff --git a/service/stackweb/frontend/public/icons/icon-128x128.png b/service/stackweb/frontend/public/icons/icon-128x128.png
new file mode 100644
index 0000000..48d0e23
Binary files /dev/null and b/service/stackweb/frontend/public/icons/icon-128x128.png differ
diff --git a/service/stackweb/frontend/public/icons/icon-192x192.png b/service/stackweb/frontend/public/icons/icon-192x192.png
new file mode 100644
index 0000000..938e9b5
Binary files /dev/null and b/service/stackweb/frontend/public/icons/icon-192x192.png differ
diff --git a/service/stackweb/frontend/public/icons/icon-512x512.png b/service/stackweb/frontend/public/icons/icon-512x512.png
new file mode 100644
index 0000000..21fc108
Binary files /dev/null and b/service/stackweb/frontend/public/icons/icon-512x512.png differ
diff --git a/service/stackweb/frontend/public/logo.svg b/service/stackweb/frontend/public/logo.svg
new file mode 100644
index 0000000..90a8f2b
--- /dev/null
+++ b/service/stackweb/frontend/public/logo.svg
@@ -0,0 +1,55 @@
+
+
\ No newline at end of file
diff --git a/service/stackweb/frontend/public/pw.svg b/service/stackweb/frontend/public/pw.svg
new file mode 100644
index 0000000..5739fa7
--- /dev/null
+++ b/service/stackweb/frontend/public/pw.svg
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/service/stackweb/frontend/src/assets/logo-white.svg b/service/stackweb/frontend/src/assets/logo-white.svg
new file mode 100644
index 0000000..4b4a0ea
--- /dev/null
+++ b/service/stackweb/frontend/src/assets/logo-white.svg
@@ -0,0 +1,3 @@
+
diff --git a/service/stackweb/frontend/src/assets/logo.svg b/service/stackweb/frontend/src/assets/logo.svg
new file mode 100644
index 0000000..90a8f2b
--- /dev/null
+++ b/service/stackweb/frontend/src/assets/logo.svg
@@ -0,0 +1,55 @@
+
+
\ No newline at end of file
diff --git a/service/stackweb/frontend/src/components/Authorized/Authorized.tsx b/service/stackweb/frontend/src/components/Authorized/Authorized.tsx
new file mode 100644
index 0000000..d91b7b5
--- /dev/null
+++ b/service/stackweb/frontend/src/components/Authorized/Authorized.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Result } from 'antd';
+import check, { IAuthorityType } from './CheckPermissions';
+
+import AuthorizedRoute from './AuthorizedRoute';
+import Secured from './Secured';
+
+interface AuthorizedProps {
+ authority: IAuthorityType;
+ noMatch?: React.ReactNode;
+}
+
+type IAuthorizedType = React.FunctionComponent
+
+ );
+ }
+}
diff --git a/service/stackweb/frontend/src/components/Authorized/Secured.tsx b/service/stackweb/frontend/src/components/Authorized/Secured.tsx
new file mode 100644
index 0000000..0bdbbe4
--- /dev/null
+++ b/service/stackweb/frontend/src/components/Authorized/Secured.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import CheckPermissions from './CheckPermissions';
+
+/**
+ * 默认不能访问任何页面
+ * default is "NULL"
+ */
+const Exception403 = () => 403;
+
+export const isComponentClass = (component: React.ComponentClass | React.ReactNode): boolean => {
+ if (!component) return false;
+ const proto = Object.getPrototypeOf(component);
+ if (proto === React.Component || proto === Function.prototype) return true;
+ return isComponentClass(proto);
+};
+
+// Determine whether the incoming component has been instantiated
+// AuthorizedRoute is already instantiated
+// Authorized render is already instantiated, children is no instantiated
+// Secured is not instantiated
+const checkIsInstantiation = (target: React.ComponentClass | React.ReactNode) => {
+ if (isComponentClass(target)) {
+ const Target = target as React.ComponentClass;
+ return (props: any) =>
+ umi ui,
+ value: 'umi ui',
+ },
+ {
+ label: Ant Design,
+ value: 'Ant Design',
+ },
+ {
+ label: Pro Table,
+ value: 'Pro Table',
+ },
+ {
+ label: Pro Layout,
+ value: 'Pro Layout',
+ },
+ ]} // onSearch={value => {
+ // //console.log('input', value);
+ // }}
+ />
+
+
+
+ {REACT_APP_ENV}
+
+ )}
+
+ );
+};
+
+export default connect(({ settings }: ConnectState) => ({
+ theme: settings.navTheme,
+ layout: settings.layout,
+}))(GlobalHeaderRight);
diff --git a/service/stackweb/frontend/src/components/GlobalHeader/index.less b/service/stackweb/frontend/src/components/GlobalHeader/index.less
new file mode 100644
index 0000000..6a156db
--- /dev/null
+++ b/service/stackweb/frontend/src/components/GlobalHeader/index.less
@@ -0,0 +1,105 @@
+@import '~antd/es/style/themes/default.less';
+
+@pro-header-hover-bg: rgba(0, 0, 0, 0.025);
+
+.menu {
+ :global(.anticon) {
+ margin-right: 8px;
+ }
+ :global(.ant-dropdown-menu-item) {
+ min-width: 160px;
+ }
+}
+
+.right {
+ display: flex;
+ float: right;
+ height: @layout-header-height;
+ margin-left: auto;
+ overflow: hidden;
+ .action {
+ display: flex;
+ align-items: center;
+ height: 100%;
+ padding: 0 12px;
+ cursor: pointer;
+ transition: all 0.3s;
+ > span {
+ color: @text-color;
+ vertical-align: middle;
+ }
+ &:hover {
+ background: @pro-header-hover-bg;
+ }
+ &:global(.opened) {
+ background: @pro-header-hover-bg;
+ }
+ }
+ .search {
+ padding: 0 12px;
+ &:hover {
+ background: transparent;
+ }
+ }
+ .account {
+ .avatar {
+ margin: ~'calc((@{layout-header-height} - 24px) / 2)' 0;
+ margin-right: 8px;
+ color: @primary-color;
+ vertical-align: top;
+ background: rgba(255, 255, 255, 0.85);
+ }
+ }
+}
+
+.dark {
+ .action {
+ color: rgba(255, 255, 255, 0.85);
+ > span {
+ color: rgba(255, 255, 255, 0.85);
+ }
+ &:hover,
+ &:global(.opened) {
+ background: @primary-color;
+ }
+ }
+}
+
+:global(.ant-pro-global-header) {
+ .dark {
+ .action {
+ color: @text-color;
+ > span {
+ color: @text-color;
+ }
+ &:hover {
+ color: rgba(255, 255, 255, 0.85);
+ > span {
+ color: rgba(255, 255, 255, 0.85);
+ }
+ }
+ }
+ }
+}
+
+@media only screen and (max-width: @screen-md) {
+ :global(.ant-divider-vertical) {
+ vertical-align: unset;
+ }
+ .name {
+ display: none;
+ }
+ .right {
+ position: absolute;
+ top: 0;
+ right: 12px;
+ .account {
+ .avatar {
+ margin-right: 0;
+ }
+ }
+ .search {
+ display: none;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/components/HeaderDropdown/index.less b/service/stackweb/frontend/src/components/HeaderDropdown/index.less
new file mode 100644
index 0000000..004b53e
--- /dev/null
+++ b/service/stackweb/frontend/src/components/HeaderDropdown/index.less
@@ -0,0 +1,16 @@
+@import '~antd/es/style/themes/default.less';
+
+.container > * {
+ background-color: @popover-bg;
+ border-radius: 4px;
+ box-shadow: @shadow-1-down;
+}
+
+@media screen and (max-width: @screen-xs) {
+ .container {
+ width: 100% !important;
+ }
+ .container > * {
+ border-radius: 0 !important;
+ }
+}
diff --git a/service/stackweb/frontend/src/components/HeaderDropdown/index.tsx b/service/stackweb/frontend/src/components/HeaderDropdown/index.tsx
new file mode 100644
index 0000000..cc60727
--- /dev/null
+++ b/service/stackweb/frontend/src/components/HeaderDropdown/index.tsx
@@ -0,0 +1,19 @@
+import { DropDownProps } from 'antd/es/dropdown';
+import { Dropdown } from 'antd';
+import React from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+declare type OverlayFunc = () => React.ReactNode;
+
+export interface HeaderDropdownProps extends Omit {
+ setSearchMode(true);
+ if (searchMode && inputRef.current) {
+ inputRef.current.focus();
+ }
+ }}
+ onTransitionEnd={({ propertyName }) => {
+ if (propertyName === 'width' && !searchMode) {
+ if (onVisibleChange) {
+ onVisibleChange(searchMode);
+ }
+ }
+ }}
+ >
+
+ {
+ if (e.key === 'Enter') {
+ if (restProps.onSearch) {
+ restProps.onSearch(value);
+ }
+ }
+ }}
+ onBlur={() => {
+ setSearchMode(false);
+ }}
+ />
+
+
+ );
+};
+
+export default HeaderSearch;
diff --git a/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.less b/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.less
new file mode 100644
index 0000000..65e0c40
--- /dev/null
+++ b/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.less
@@ -0,0 +1,103 @@
+@import '~antd/es/style/themes/default.less';
+
+.list {
+ max-height: 400px;
+ overflow: auto;
+ &::-webkit-scrollbar {
+ display: none;
+ }
+ .item {
+ padding-right: 24px;
+ padding-left: 24px;
+ overflow: hidden;
+ cursor: pointer;
+ transition: all 0.3s;
+
+ .meta {
+ width: 100%;
+ }
+
+ .avatar {
+ margin-top: 4px;
+ background: @component-background;
+ }
+ .iconElement {
+ font-size: 32px;
+ }
+
+ &.read {
+ opacity: 0.4;
+ }
+ &:last-child {
+ border-bottom: 0;
+ }
+ &:hover {
+ background: @primary-1;
+ }
+ .title {
+ margin-bottom: 8px;
+ font-weight: normal;
+ }
+ .description {
+ font-size: 12px;
+ line-height: @line-height-base;
+ }
+ .datetime {
+ margin-top: 4px;
+ font-size: 12px;
+ line-height: @line-height-base;
+ }
+ .extra {
+ float: right;
+ margin-top: -1.5px;
+ margin-right: 0;
+ color: @text-color-secondary;
+ font-weight: normal;
+ }
+ }
+ .loadMore {
+ padding: 8px 0;
+ color: @primary-6;
+ text-align: center;
+ cursor: pointer;
+ &.loadedAll {
+ color: rgba(0, 0, 0, 0.25);
+ cursor: unset;
+ }
+ }
+}
+
+.notFound {
+ padding: 73px 0 88px;
+ color: @text-color-secondary;
+ text-align: center;
+ img {
+ display: inline-block;
+ height: 76px;
+ margin-bottom: 16px;
+ }
+}
+
+.bottomBar {
+ height: 46px;
+ color: @text-color;
+ line-height: 46px;
+ text-align: center;
+ border-top: 1px solid @border-color-split;
+ border-radius: 0 0 @border-radius-base @border-radius-base;
+ transition: all 0.3s;
+ div {
+ display: inline-block;
+ width: 50%;
+ cursor: pointer;
+ transition: all 0.3s;
+ user-select: none;
+
+ &:only-child {
+ width: 100%;
+ }
+ &:not(:only-child):last-child {
+ border-left: 1px solid @border-color-split;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.tsx b/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.tsx
new file mode 100644
index 0000000..7c1b6ab
--- /dev/null
+++ b/service/stackweb/frontend/src/components/NoticeIcon/NoticeList.tsx
@@ -0,0 +1,114 @@
+import { Avatar, List } from 'antd';
+
+import React from 'react';
+import classNames from 'classnames';
+import { NoticeIconData } from './index';
+import styles from './NoticeList.less';
+
+export interface NoticeIconTabProps {
+ count?: number;
+ name?: string;
+ showClear?: boolean;
+ showViewMore?: boolean;
+ style?: React.CSSProperties;
+ title: string;
+ tabKey: string;
+ data?: NoticeIconData[];
+ onClick?: (item: NoticeIconData) => void;
+ onClear?: () => void;
+ emptyText?: string;
+ clearText?: string;
+ viewMoreText?: string;
+ list: NoticeIconData[];
+ onViewMore?: (e: any) => void;
+}
+const NoticeList: React.SFC
+ 
+
+ );
+ }
+ return (
+
+ {emptyText}
+
+
+ className={styles.list}
+ dataSource={data}
+ renderItem={(item, i) => {
+ const itemCls = classNames(styles.item, {
+ [styles.read]: item.read,
+ });
+ // eslint-disable-next-line no-nested-ternary
+ const leftIcon = item.avatar ? (
+ typeof item.avatar === 'string' ? (
+ onClick && onClick(item)}
+ >
+
+ {item.title}
+
+ }
+ description={
+ {item.extra}
+
+
+ }
+ />
+
+ );
+ }}
+ />
+ {item.description}
+ {item.datetime}
+
+ {showClear ? (
+
+
+ );
+};
+
+export default NoticeList;
diff --git a/service/stackweb/frontend/src/components/NoticeIcon/index.less b/service/stackweb/frontend/src/components/NoticeIcon/index.less
new file mode 100644
index 0000000..650ccd2
--- /dev/null
+++ b/service/stackweb/frontend/src/components/NoticeIcon/index.less
@@ -0,0 +1,31 @@
+@import '~antd/es/style/themes/default.less';
+
+.popover {
+ position: relative;
+ width: 336px;
+}
+
+.noticeButton {
+ display: inline-block;
+ cursor: pointer;
+ transition: all 0.3s;
+}
+.icon {
+ padding: 4px;
+ vertical-align: middle;
+}
+
+.badge {
+ font-size: 16px;
+}
+
+.tabs {
+ :global {
+ .ant-tabs-nav-scroll {
+ text-align: center;
+ }
+ .ant-tabs-bar {
+ margin-bottom: 0;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/components/NoticeIcon/index.tsx b/service/stackweb/frontend/src/components/NoticeIcon/index.tsx
new file mode 100644
index 0000000..c4b001f
--- /dev/null
+++ b/service/stackweb/frontend/src/components/NoticeIcon/index.tsx
@@ -0,0 +1,135 @@
+import { BellOutlined } from '@ant-design/icons';
+import { Badge, Spin, Tabs } from 'antd';
+import useMergeValue from 'use-merge-value';
+import React from 'react';
+import classNames from 'classnames';
+import NoticeList, { NoticeIconTabProps } from './NoticeList';
+
+import HeaderDropdown from '../HeaderDropdown';
+import styles from './index.less';
+
+const { TabPane } = Tabs;
+
+export interface NoticeIconData {
+ avatar?: string | React.ReactNode;
+ title?: React.ReactNode;
+ description?: React.ReactNode;
+ datetime?: React.ReactNode;
+ extra?: React.ReactNode;
+ style?: React.CSSProperties;
+ key?: string | number;
+ read?: boolean;
+}
+
+export interface NoticeIconProps {
+ count?: number;
+ bell?: React.ReactNode;
+ className?: string;
+ loading?: boolean;
+ onClear?: (tabName: string, tabKey: string) => void;
+ onItemClick?: (item: NoticeIconData, tabProps: NoticeIconTabProps) => void;
+ onViewMore?: (tabProps: NoticeIconTabProps, e: MouseEvent) => void;
+ onTabChange?: (tabTile: string) => void;
+ style?: React.CSSProperties;
+ onPopupVisibleChange?: (visible: boolean) => void;
+ popupVisible?: boolean;
+ clearText?: string;
+ viewMoreText?: string;
+ clearClose?: boolean;
+ emptyImage?: string;
+ children: React.ReactElement
+ {clearText} {title}
+
+ ) : null}
+ {showViewMore ? (
+ {
+ if (onViewMore) {
+ onViewMore(e);
+ }
+ }}
+ >
+ {viewMoreText}
+
+ ) : null}
+
+
+
+
+
+
+
+
+ {children}
+
+
+ 
+ Ant Design
+
+
+ Ant Design 是西湖区最具影响力的 Web 设计规范
+ + Want to add more pages? Please refer to{' '} + + use block + + 。 +
+
+ 已选择 {selectedRowKeys.length} 项
+
+ 服务调用次数总计 {(selectedRows || []).reduce((pre, item) => pre + item.callNo, 0)} 万
+
+
+ )}
+ request={(params) => queryRule(params)}
+ columns={columns}
+ rowSelection={{}}
+ />
+
+
+ {children}
+
+
+);
+
+export default (): React.ReactNode => (
+ + Want to add more pages? Please refer to{' '} + + use block + + 。 +
+
+
+ );
+ return (
+
+
+ 活跃用户
+{activeUser}
+
+
+ 新增用户
+{newUser}
+- (
+
- {menuMap[item]} ); + }; + + getRightTitle = () => { + const { selectKey, menuMap } = this.state; + return menuMap[selectKey]; + }; + + selectKey = (key: SettingsStateKeys) => { + this.setState({ + selectKey: key, + }); + }; + + resize = () => { + if (!this.main) { + return; + } + requestAnimationFrame(() => { + if (!this.main) { + return; + } + let mode: 'inline' | 'horizontal' = 'inline'; + const { offsetWidth } = this.main; + if (this.main.offsetWidth < 641 && offsetWidth > 400) { + mode = 'horizontal'; + } + if (window.innerWidth < 768 && offsetWidth > 400) { + mode = 'horizontal'; + } + this.setState({ + mode, + }); + }); + }; + + renderChildren = () => { + const { selectKey } = this.state; + switch (selectKey) { + case 'base': + return
- this.handleLegendClick(item, i)}>
+
+ {item.x}
+
+ + {`${(Number.isNaN(item.percent) ? 0 : item.percent * 100).toFixed(2)}%`} + + {valueFormat ? valueFormat(item.y) : item.y} +
+ ))}
+ - + + {i + 1} + + + {item.title} + + + {numeral(item.total).format('0,0')} + + + ))} +
- + + {i + 1} + + + {item.title} + + {numeral(item.total).format('0,0')} + + ))} +
- this.handleLegendClick(item, i)}>
+
+ {item.x}
+
+ + {`${(Number.isNaN(item.percent) ? 0 : item.percent * 100).toFixed(2)}%`} + + {valueFormat ? valueFormat(item.y) : item.y} +
+ ))}
+ - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
+
+
+
+ );
+};
+
+AvatarList.Item = Item;
+
+export default AvatarList;
diff --git a/service/stackweb/frontend/src/pages/account/center/components/Projects/index.less b/service/stackweb/frontend/src/pages/account/center/components/Projects/index.less
new file mode 100644
index 0000000..ab2fcfc
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/account/center/components/Projects/index.less
@@ -0,0 +1,56 @@
+@import '~antd/es/style/themes/default.less';
+
+.coverCardList {
+ margin-bottom: -24px;
+
+ .card {
+ :global {
+ .ant-card-meta-title {
+ margin-bottom: 4px;
+ & > a {
+ display: inline-block;
+ max-width: 100%;
+ color: @heading-color;
+ }
+ }
+ .ant-card-meta-description {
+ height: 44px;
+ overflow: hidden;
+ line-height: 22px;
+ }
+ }
+
+ &:hover {
+ :global {
+ .ant-card-meta-title > a {
+ color: @primary-color;
+ }
+ }
+ }
+ }
+
+ .cardItemContent {
+ display: flex;
+ height: 20px;
+ margin-top: 16px;
+ margin-bottom: -4px;
+ line-height: 20px;
+ & > span {
+ flex: 1;
+ color: @text-color-secondary;
+ font-size: 12px;
+ }
+ .avatarList {
+ flex: 0 1 auto;
+ }
+ }
+ .cardList {
+ margin-top: 24px;
+ }
+
+ :global {
+ .ant-list .ant-list-item-content-single {
+ max-width: 100%;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/account/center/components/Projects/index.tsx b/service/stackweb/frontend/src/pages/account/center/components/Projects/index.tsx
new file mode 100644
index 0000000..33dfd71
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/account/center/components/Projects/index.tsx
@@ -0,0 +1,46 @@
+import { Card, List } from 'antd';
+import React from 'react';
+
+import { connect } from 'umi';
+import moment from 'moment';
+import AvatarList from '../AvatarList';
+import { ListItemDataType } from '../../data.d';
+import { ModalState } from '../../model';
+import styles from './index.less';
+
+const Projects: React.FC- {childrenWithProps}
+ {moment(item.updatedAt).fromNow()}
+
+
+
+
+ {item.members.map((member) => (
+
+
+
+
+ )}
+
+ 
+
+ {currentUser.name}
+ {currentUser.signature}
+
+
+ + + {currentUser.title} +
++ + {currentUser.group} +
++ + {(currentUser.geographic || { province: { label: '' } }).province.label} + { + ( + currentUser.geographic || { + city: { + label: '', + }, + } + ).city.label + } +
+
+ {item.label}
+ ))}
+ {inputVisible && (
+ this.saveInputRef(ref)}
+ type="text"
+ size="small"
+ style={{ width: 78 }}
+ value={inputValue}
+ onChange={this.handleInputChange}
+ onBlur={this.handleInputConfirm}
+ onPressEnter={this.handleInputConfirm}
+ />
+ )}
+ {!inputVisible && (
+
+
+ )}
+
+ 标签
+ {(currentUser.tags || []).concat(newTags).map((item) => (
+
+
+ {currentUser.notice &&
+ currentUser.notice.map((item) => (
+
+
+ 团队
+
+
+
+ 
+
+
+
+
+
+
+ );
+ }
+}
+
+export default connect(
+ ({ accountAndsettings }: { accountAndsettings: { currentUser: CurrentUser } }) => ({
+ currentUser: accountAndsettings.currentUser,
+ }),
+)(BaseView);
diff --git a/service/stackweb/frontend/src/pages/account/settings/components/binding.tsx b/service/stackweb/frontend/src/pages/account/settings/components/binding.tsx
new file mode 100644
index 0000000..389b646
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/account/settings/components/binding.tsx
@@ -0,0 +1,61 @@
+import { FormattedMessage, formatMessage } from 'umi';
+import { AlipayOutlined, DingdingOutlined, TaobaoOutlined } from '@ant-design/icons';
+import { List } from 'antd';
+import React, { Component, Fragment } from 'react';
+
+class BindingView extends Component {
+ getData = () => [
+ {
+ title: formatMessage({ id: 'accountandsettings.binding.taobao' }, {}),
+ description: formatMessage({ id: 'accountandsettings.binding.taobao-description' }, {}),
+ actions: [
+
+
+
+
+
+
+ - (
+
{
+ if (ref) {
+ this.main = ref;
+ }
+ }}
+ >
+
+
+
+
+
+
+ {this.getRightTitle()}
+ {this.renderChildren()}
+
+
+ );
+ }
+}
+
+export default autoHeight()(Bar);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.less
new file mode 100644
index 0000000..d7bf6dd
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.less
@@ -0,0 +1,75 @@
+@import '~antd/es/style/themes/default.less';
+
+.chartCard {
+ position: relative;
+ .chartTop {
+ position: relative;
+ width: 100%;
+ overflow: hidden;
+ }
+ .chartTopMargin {
+ margin-bottom: 12px;
+ }
+ .chartTopHasMargin {
+ margin-bottom: 20px;
+ }
+ .metaWrap {
+ float: left;
+ }
+ .avatar {
+ position: relative;
+ top: 4px;
+ float: left;
+ margin-right: 20px;
+ img {
+ border-radius: 100%;
+ }
+ }
+ .meta {
+ height: 22px;
+ color: @text-color-secondary;
+ font-size: @font-size-base;
+ line-height: 22px;
+ }
+ .action {
+ position: absolute;
+ top: 4px;
+ right: 0;
+ line-height: 1;
+ cursor: pointer;
+ }
+ .total {
+ height: 38px;
+ margin-top: 4px;
+ margin-bottom: 0;
+ overflow: hidden;
+ color: @heading-color;
+ font-size: 30px;
+ line-height: 38px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ word-break: break-all;
+ }
+ .content {
+ position: relative;
+ width: 100%;
+ margin-bottom: 12px;
+ }
+ .contentFixed {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ }
+ .footer {
+ margin-top: 8px;
+ padding-top: 9px;
+ border-top: 1px solid @border-color-split;
+ & > * {
+ position: relative;
+ }
+ }
+ .footerMargin {
+ margin-top: 20px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.tsx
new file mode 100644
index 0000000..4bd9f70
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/ChartCard/index.tsx
@@ -0,0 +1,97 @@
+import { Card } from 'antd';
+import { CardProps } from 'antd/es/card';
+import React from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+type totalType = () => React.ReactNode;
+
+const renderTotal = (total?: number | totalType | React.ReactNode) => {
+ if (!total && total !== 0) {
+ return null;
+ }
+ let totalDom;
+ switch (typeof total) {
+ case 'undefined':
+ totalDom = null;
+ break;
+ case 'function':
+ totalDom =
+ {title &&
+
+
+ {title}
} +{total()}
;
+ break;
+ default:
+ totalDom = {total}
;
+ }
+ return totalDom;
+};
+
+export interface ChartCardProps extends CardProps {
+ title: React.ReactNode;
+ action?: React.ReactNode;
+ total?: React.ReactNode | number | (() => React.ReactNode | number);
+ footer?: React.ReactNode;
+ contentHeight?: number;
+ avatar?: React.ReactNode;
+ style?: React.CSSProperties;
+}
+
+class ChartCard extends React.Component
+
+ );
+ };
+
+ render() {
+ const {
+ loading = false,
+ contentHeight,
+ title,
+ avatar,
+ action,
+ total,
+ footer,
+ children,
+ ...rest
+ } = this.props;
+ return (
+
+
+ {children && (
+ {avatar}
+
+
+
+ {title}
+ {action}
+
+ {renderTotal(total)}
+
+
+ )}
+ {footer && (
+ {children}
+
+ {footer}
+
+ )}
+
+ {label}
+ {value}
+
+);
+
+export default Field;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Gauge/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Gauge/index.tsx
new file mode 100644
index 0000000..d4206d8
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Gauge/index.tsx
@@ -0,0 +1,179 @@
+import { Axis, Chart, Coord, Geom, Guide, Shape } from 'bizcharts';
+
+import React from 'react';
+import autoHeight from '../autoHeight';
+
+const { Arc, Html, Line } = Guide;
+
+export interface GaugeProps {
+ title: React.ReactNode;
+ color?: string;
+ height?: number;
+ bgColor?: number;
+ percent: number;
+ forceFit?: boolean;
+ style?: React.CSSProperties;
+ formatter: (value: string) => string;
+}
+
+const defaultFormatter = (val: string): string => {
+ switch (val) {
+ case '2':
+ return '差';
+ case '4':
+ return '中';
+ case '6':
+ return '良';
+ case '8':
+ return '优';
+ default:
+ return '';
+ }
+};
+
+if (Shape.registerShape) {
+ Shape.registerShape('point', 'pointer', {
+ drawShape(cfg: any, group: any) {
+ let point = cfg.points[0];
+ point = (this as any).parsePoint(point);
+ const center = (this as any).parsePoint({
+ x: 0,
+ y: 0,
+ });
+ group.addShape('line', {
+ attrs: {
+ x1: center.x,
+ y1: center.y,
+ x2: point.x,
+ y2: point.y,
+ stroke: cfg.color,
+ lineWidth: 2,
+ lineCap: 'round',
+ },
+ });
+ return group.addShape('circle', {
+ attrs: {
+ x: center.x,
+ y: center.y,
+ r: 6,
+ stroke: cfg.color,
+ lineWidth: 3,
+ fill: '#fff',
+ },
+ });
+ },
+ });
+}
+
+const Gauge: React.FC
+
`;
+ const textStyle: {
+ fontSize: number;
+ fill: string;
+ textAlign: 'center';
+ } = {
+ fontSize: 12,
+ fill: 'rgba(0, 0, 0, 0.65)',
+ textAlign: 'center',
+ };
+
+ return (
+ ${title}
+
+ ${(data[0].value * 10).toFixed(2)}%
+
+
+
+ );
+};
+
+export default autoHeight()(MiniArea);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniBar/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniBar/index.tsx
new file mode 100644
index 0000000..f1d805d
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniBar/index.tsx
@@ -0,0 +1,54 @@
+import { Chart, Geom, Tooltip } from 'bizcharts';
+
+import React from 'react';
+import autoHeight from '../autoHeight';
+import styles from '../index.less';
+
+export interface MiniBarProps {
+ color?: string;
+ height?: number;
+ data: {
+ x: number | string;
+ y: number;
+ }[];
+ forceFit?: boolean;
+ style?: React.CSSProperties;
+}
+
+const MiniBar: React.FC
+ {height > 0 && (
+
+
+ )}
+
+
+
+ );
+};
+export default autoHeight()(MiniBar);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.less
new file mode 100644
index 0000000..918d6ac
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.less
@@ -0,0 +1,37 @@
+@import '~antd/es/style/themes/default.less';
+
+.miniProgress {
+ position: relative;
+ width: 100%;
+ padding: 5px 0;
+ .progressWrap {
+ position: relative;
+ background-color: @background-color-base;
+ }
+ .progress {
+ width: 0;
+ height: 100%;
+ background-color: @primary-color;
+ border-radius: 1px 0 0 1px;
+ transition: all 0.4s cubic-bezier(0.08, 0.82, 0.17, 1) 0s;
+ }
+ .target {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ z-index: 9;
+ width: 20px;
+ span {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 2px;
+ height: 4px;
+ border-radius: 100px;
+ }
+ span:last-child {
+ top: auto;
+ bottom: 0;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.tsx
new file mode 100644
index 0000000..6ce321d
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/MiniProgress/index.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import styles from './index.less';
+
+export interface MiniProgressProps {
+ target: number;
+ targetLabel?: string;
+ color?: string;
+ strokeWidth?: number;
+ percent?: number;
+ style?: React.CSSProperties;
+}
+
+const MiniProgress: React.FC
+
+
+
+
+
+
+
+);
+
+export default MiniProgress;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.less
new file mode 100644
index 0000000..8641d65
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.less
@@ -0,0 +1,94 @@
+@import '~antd/es/style/themes/default.less';
+
+.pie {
+ position: relative;
+ .chart {
+ position: relative;
+ }
+ &.hasLegend .chart {
+ width: ~'calc(100% - 240px)';
+ }
+ .legend {
+ position: absolute;
+ top: 50%;
+ right: 0;
+ min-width: 200px;
+ margin: 0 20px;
+ padding: 0;
+ list-style: none;
+ transform: translateY(-50%);
+ li {
+ height: 22px;
+ margin-bottom: 16px;
+ line-height: 22px;
+ cursor: pointer;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
+ .dot {
+ position: relative;
+ top: -1px;
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ margin-right: 8px;
+ border-radius: 8px;
+ }
+ .line {
+ display: inline-block;
+ width: 1px;
+ height: 16px;
+ margin-right: 8px;
+ background-color: @border-color-split;
+ }
+ .legendTitle {
+ color: @text-color;
+ }
+ .percent {
+ color: @text-color-secondary;
+ }
+ .value {
+ position: absolute;
+ right: 0;
+ }
+ .title {
+ margin-bottom: 8px;
+ }
+ .total {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ max-height: 62px;
+ text-align: center;
+ transform: translate(-50%, -50%);
+ & > h4 {
+ height: 22px;
+ margin-bottom: 8px;
+ color: @text-color-secondary;
+ font-weight: normal;
+ font-size: 14px;
+ line-height: 22px;
+ }
+ & > p {
+ display: block;
+ height: 32px;
+ color: @heading-color;
+ font-size: 1.2em;
+ line-height: 32px;
+ white-space: nowrap;
+ }
+ }
+}
+
+.legendBlock {
+ &.hasLegend .chart {
+ width: 100%;
+ margin: 0 0 32px 0;
+ }
+ .legend {
+ position: relative;
+ transform: none;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.tsx
new file mode 100644
index 0000000..c877eea
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/Pie/index.tsx
@@ -0,0 +1,309 @@
+import { Chart, Coord, Geom, Tooltip } from 'bizcharts';
+import React, { Component } from 'react';
+
+import { DataView } from '@antv/data-set';
+import Debounce from 'lodash.debounce';
+import { Divider } from 'antd';
+import ReactFitText from 'react-fittext';
+import classNames from 'classnames';
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+export interface PieProps {
+ animate?: boolean;
+ color?: string;
+ colors?: string[];
+ selected?: boolean;
+ height?: number;
+ margin?: [number, number, number, number];
+ hasLegend?: boolean;
+ padding?: [number, number, number, number];
+ percent?: number;
+ data?: {
+ x: string | string;
+ y: number;
+ }[];
+ inner?: number;
+ lineWidth?: number;
+ forceFit?: boolean;
+ style?: React.CSSProperties;
+ className?: string;
+ total?: React.ReactNode | number | (() => React.ReactNode | number);
+ title?: React.ReactNode;
+ tooltip?: boolean;
+ valueFormat?: (value: string) => string | React.ReactNode;
+ subTitle?: React.ReactNode;
+}
+interface PieState {
+ legendData: { checked: boolean; x: string; color: string; percent: number; y: string }[];
+ legendBlock: boolean;
+}
+class Pie extends Component
+
+
+
+
+
+
+
+
+
+
+ {hasLegend && (
+
+ );
+ }
+}
+
+export default autoHeight()(Pie);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.less
new file mode 100644
index 0000000..db8e4da
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.less
@@ -0,0 +1,6 @@
+.tagCloud {
+ overflow: hidden;
+ canvas {
+ transform-origin: 0 0;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.tsx
new file mode 100644
index 0000000..8515ad8
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TagCloud/index.tsx
@@ -0,0 +1,212 @@
+import { Chart, Coord, Geom, Shape, Tooltip } from 'bizcharts';
+import React, { Component } from 'react';
+
+import DataSet from '@antv/data-set';
+import Debounce from 'lodash.debounce';
+import classNames from 'classnames';
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+/* eslint no-underscore-dangle: 0 */
+/* eslint no-param-reassign: 0 */
+
+const imgUrl = 'https://gw.alipayobjects.com/zos/rmsportal/gWyeGLCdFFRavBGIDzWk.png';
+
+export interface TagCloudProps {
+ data: {
+ name: string;
+ value: number;
+ }[];
+ height?: number;
+ className?: string;
+ style?: React.CSSProperties;
+}
+
+interface TagCloudState {
+ dv: any;
+ height?: number;
+ width: number;
+}
+
+class TagCloud extends Component
+
+ {!!tooltip &&
+
+ {(subTitle || total) && (
+
+
+ {subTitle &&
+ )}
+ {subTitle}
} + {/* eslint-disable-next-line */} + {total && ( +{typeof total === 'function' ? total() : total}
+ )}
+ -
+ {legendData.map((item, i) => (
+
+ {dv && (
+
+
+ )}
+
+ );
+ }
+}
+
+export default autoHeight()(TagCloud);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.less
new file mode 100644
index 0000000..eadb5bc
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.less
@@ -0,0 +1,5 @@
+@import '~antd/es/style/themes/default.less';
+
+.timelineChart {
+ background: @component-background;
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.tsx
new file mode 100644
index 0000000..3e0b132
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/TimelineChart/index.tsx
@@ -0,0 +1,132 @@
+import { Axis, Chart, Geom, Legend, Tooltip } from 'bizcharts';
+
+import DataSet from '@antv/data-set';
+import React from 'react';
+import Slider from 'bizcharts-plugin-slider';
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+export interface TimelineChartProps {
+ data: {
+ x: number;
+ y1: number;
+ y2: number;
+ }[];
+ title?: string;
+ titleMap: { y1: string; y2: string };
+ padding?: [number, number, number, number];
+ height?: number;
+ style?: React.CSSProperties;
+ borderWidth?: number;
+}
+
+const TimelineChart: React.FC
+
+ );
+};
+
+export default autoHeight()(TimelineChart);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.less
new file mode 100644
index 0000000..f52ac14
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.less
@@ -0,0 +1,28 @@
+@import '~antd/es/style/themes/default.less';
+
+.waterWave {
+ position: relative;
+ display: inline-block;
+ transform-origin: left;
+ .text {
+ position: absolute;
+ top: 32px;
+ left: 0;
+ width: 100%;
+ text-align: center;
+ span {
+ color: @text-color-secondary;
+ font-size: 14px;
+ line-height: 22px;
+ }
+ h4 {
+ color: @heading-color;
+ font-size: 24px;
+ line-height: 32px;
+ }
+ }
+ .waterWaveCanvasWrapper {
+ transform: scale(0.5);
+ transform-origin: 0 0;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.tsx
new file mode 100644
index 0000000..b522142
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/WaterWave/index.tsx
@@ -0,0 +1,236 @@
+import React, { Component } from 'react';
+
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+/* eslint no-return-assign: 0 */
+/* eslint no-mixed-operators: 0 */
+// riddle: https://riddle.alibaba-inc.com/riddles/2d9a4b90
+
+export interface WaterWaveProps {
+ title: React.ReactNode;
+ color?: string;
+ height?: number;
+ percent: number;
+ style?: React.CSSProperties;
+}
+
+class WaterWave extends Component
+ {title &&
+
+
+ {title}
} +
+
+ (this.root = n)}
+ style={{ transform: `scale(${radio})` }}
+ >
+
+ );
+ }
+}
+
+export default autoHeight()(WaterWave);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/autoHeight.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/autoHeight.tsx
new file mode 100644
index 0000000..ed9acd7
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/autoHeight.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+
+export type IReactComponent
+
+
+ {title && {title}}
+
+ {percent}%
+= + | React.StatelessComponent
+ | React.ComponentClass
+ | React.ClassicComponentClass
; + +function computeHeight(node: HTMLDivElement) { + const { style } = node; + style.height = '100%'; + const totalHeight = parseInt(`${getComputedStyle(node).height}`, 10); + const padding = + parseInt(`${getComputedStyle(node).paddingTop}`, 10) + + parseInt(`${getComputedStyle(node).paddingBottom}`, 10); + return totalHeight - padding; +} + +function getAutoHeight(n: HTMLDivElement | undefined) { + if (!n) { + return 0; + } + + const node = n; + + let height = computeHeight(node); + const parentNode = node.parentNode as HTMLDivElement; + if (parentNode) { + height = computeHeight(parentNode); + } + + return height; +} + +interface AutoHeightProps { + height?: number; +} + +function autoHeight() { + return
( + WrappedComponent: React.ComponentClass
| React.FC
, + ): React.ComponentClass
=> { + class AutoHeightComponent extends React.Component
{ + state = { + computedHeight: 0, + }; + + root: HTMLDivElement | undefined = undefined; + + componentDidMount() { + const { height } = this.props; + if (!height) { + let h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + if (h < 1) { + h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + } + } + } + + handleRoot = (node: HTMLDivElement) => { + this.root = node; + }; + + render() { + const { height } = this.props; + const { computedHeight } = this.state; + const h = height || computedHeight; + return ( +
+ {h > 0 &&
+ );
+ }
+ }
+ return AutoHeightComponent;
+ };
+}
+export default autoHeight;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/bizcharts.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/bizcharts.tsx
new file mode 100644
index 0000000..e08db8d
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/bizcharts.tsx
@@ -0,0 +1,3 @@
+import * as BizChart from 'bizcharts';
+
+export default BizChart;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.less b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.less
new file mode 100644
index 0000000..190428b
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.less
@@ -0,0 +1,19 @@
+.miniChart {
+ position: relative;
+ width: 100%;
+ .chartContent {
+ position: absolute;
+ bottom: -28px;
+ width: 100%;
+ > div {
+ margin: 0 -5px;
+ overflow: hidden;
+ }
+ }
+ .chartLoading {
+ position: absolute;
+ top: 16px;
+ left: 50%;
+ margin-left: -7px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.tsx
new file mode 100644
index 0000000..50c2703
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/Charts/index.tsx
@@ -0,0 +1,45 @@
+import numeral from 'numeral';
+import Bar from './Bar';
+import ChartCard from './ChartCard';
+import Field from './Field';
+import Gauge from './Gauge';
+import MiniArea from './MiniArea';
+import MiniBar from './MiniBar';
+import MiniProgress from './MiniProgress';
+import Pie from './Pie';
+import TagCloud from './TagCloud';
+import TimelineChart from './TimelineChart';
+import WaterWave from './WaterWave';
+
+const yuan = (val: number | string) => `¥ ${numeral(val).format('0,0')}`;
+
+const Charts = {
+ yuan,
+ Bar,
+ Pie,
+ Gauge,
+ MiniBar,
+ MiniArea,
+ MiniProgress,
+ ChartCard,
+ Field,
+ WaterWave,
+ TagCloud,
+ TimelineChart,
+};
+
+export {
+ Charts as default,
+ yuan,
+ Bar,
+ Pie,
+ Gauge,
+ MiniBar,
+ MiniArea,
+ MiniProgress,
+ ChartCard,
+ Field,
+ WaterWave,
+ TagCloud,
+ TimelineChart,
+};
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/IntroduceRow.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/IntroduceRow.tsx
new file mode 100644
index 0000000..0c9bd8a
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/IntroduceRow.tsx
@@ -0,0 +1,195 @@
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Col, Row, Tooltip } from 'antd';
+
+import { FormattedMessage } from 'umi';
+import React from 'react';
+import numeral from 'numeral';
+import { ChartCard, MiniArea, MiniBar, MiniProgress, Field } from './Charts';
+import { VisitDataType } from '../data.d';
+import Trend from './Trend';
+import Yuan from '../utils/Yuan';
+import styles from '../style.less';
+
+const topColResponsiveProps = {
+ xs: 24,
+ sm: 12,
+ md: 12,
+ lg: 12,
+ xl: 6,
+ style: { marginBottom: 24 },
+};
+
+const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: VisitDataType[] }) => (
+
+
+
+
+
+
+ }
+ contentHeight={46}
+ >
+
+ {title && (
+
+);
+
+export default NumberInfo;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/OfflineData.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/OfflineData.tsx
new file mode 100644
index 0000000..e5fa393
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/OfflineData.tsx
@@ -0,0 +1,80 @@
+import { Card, Col, Row, Tabs } from 'antd';
+import { FormattedMessage, formatMessage } from 'umi';
+import React from 'react';
+import { OfflineChartData, OfflineDataType } from '../data.d';
+
+import { TimelineChart, Pie } from './Charts';
+import NumberInfo from './NumberInfo';
+import styles from '../style.less';
+
+const CustomTab = ({
+ data,
+ currentTabKey: currentKey,
+}: {
+ data: OfflineDataType;
+ currentTabKey: string;
+}) => (
+
+ {title}
+
+ )}
+ {subTitle && (
+
+ {subTitle}
+
+ )}
+
+
+ {total}
+ {suffix && {suffix}}
+
+ {(status || subTotal) && (
+
+ {subTotal}
+ {status && status === 'up' ?
+
+
+
+ ))}
+
+
+);
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/ProportionSales.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/ProportionSales.tsx
new file mode 100644
index 0000000..d71f47b
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/ProportionSales.tsx
@@ -0,0 +1,75 @@
+import { Card, Radio } from 'antd';
+
+import { FormattedMessage } from 'umi';
+import { RadioChangeEvent } from 'antd/es/radio';
+import React from 'react';
+import { VisitDataType } from '../data.d';
+import { Pie } from './Charts';
+import Yuan from '../utils/Yuan';
+import styles from '../style.less';
+
+const ProportionSales = ({
+ dropdownGroup,
+ salesType,
+ loading,
+ salesPieData,
+ handleChangeSalesType,
+}: {
+ loading: boolean;
+ dropdownGroup: React.ReactNode;
+ salesType: 'all' | 'online' | 'stores';
+ salesPieData: VisitDataType[];
+ handleChangeSalesType?: (e: RadioChangeEvent) => void;
+}) => (
+
+ {dropdownGroup}
+
+ }
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {salesPieData.reduce((pre, now) => now.y + pre, 0)} }
+ data={salesPieData}
+ valueFormat={(value) => {value} }
+ height={248}
+ lineWidth={4}
+ />
+
+
+);
+
+export default ProportionSales;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/components/SalesCard.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/components/SalesCard.tsx
new file mode 100644
index 0000000..256afab
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/components/SalesCard.tsx
@@ -0,0 +1,178 @@
+import { Card, Col, DatePicker, Row, Tabs } from 'antd';
+import { FormattedMessage, formatMessage } from 'umi';
+import { RangePickerProps } from 'antd/es/date-picker/generatePicker';
+import moment from 'moment';
+
+import React from 'react';
+import numeral from 'numeral';
+import { VisitDataType } from '../data.d';
+import { Bar } from './Charts';
+import styles from '../style.less';
+
+const { RangePicker } = DatePicker;
+const { TabPane } = Tabs;
+
+const rankingListData: { title: string; total: number }[] = [];
+for (let i = 0; i < 7; i += 1) {
+ rankingListData.push({
+ title: formatMessage({ id: 'dashboardandanalysis.analysis.test' }, { no: i }),
+ total: 323234,
+ });
+}
+
+type RangePickerValue = RangePickerProps
+
+
+
+
+ }
+ size="large"
+ tabBarStyle={{ marginBottom: 24 }}
+ >
+
+ selectDate('today')}>
+
+
+
+
+
+
+
+
+
+
+
+ -
+ {rankingListData.map((item, i) => (
+
+
+
+
+
+
+
+
+
+
+ -
+ {rankingListData.map((item, i) => (
+
+ {children}
+ {flag && (
+
+ {flag === 'up' ?
+ );
+};
+
+export default Trend;
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/data.d.ts b/service/stackweb/frontend/src/pages/dashboard/analysis/data.d.ts
new file mode 100644
index 0000000..adc1c99
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/data.d.ts
@@ -0,0 +1,42 @@
+export interface VisitDataType {
+ x: string;
+ y: number;
+}
+
+export interface SearchDataType {
+ index: number;
+ keyword: string;
+ count: number;
+ range: number;
+ status: number;
+}
+
+export interface OfflineDataType {
+ name: string;
+ cvr: number;
+}
+
+export interface OfflineChartData {
+ x: any;
+ y1: number;
+ y2: number;
+}
+
+export interface RadarData {
+ name: string;
+ label: string;
+ value: number;
+}
+
+export interface AnalysisData {
+ visitData: VisitDataType[];
+ visitData2: VisitDataType[];
+ salesData: VisitDataType[];
+ searchData: SearchDataType[];
+ offlineData: OfflineDataType[];
+ offlineChartData: OfflineChartData[];
+ salesTypeData: VisitDataType[];
+ salesTypeDataOnline: VisitDataType[];
+ salesTypeDataOffline: VisitDataType[];
+ radarData: RadarData[];
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/analysis/index.tsx b/service/stackweb/frontend/src/pages/dashboard/analysis/index.tsx
new file mode 100644
index 0000000..e1ea380
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/analysis/index.tsx
@@ -0,0 +1,227 @@
+import { EllipsisOutlined } from '@ant-design/icons';
+import { Col, Dropdown, Menu, Row } from 'antd';
+import React, { Component, Suspense } from 'react';
+import { GridContent } from '@ant-design/pro-layout';
+import { RadioChangeEvent } from 'antd/es/radio';
+import { RangePickerProps } from 'antd/es/date-picker/generatePicker';
+import moment from 'moment';
+import { connect, Dispatch } from 'umi';
+
+import PageLoading from './components/PageLoading';
+import { getTimeDistance } from './utils/utils';
+import { AnalysisData } from './data.d';
+import styles from './style.less';
+
+const IntroduceRow = React.lazy(() => import('./components/IntroduceRow'));
+const SalesCard = React.lazy(() => import('./components/SalesCard'));
+const TopSearch = React.lazy(() => import('./components/TopSearch'));
+const ProportionSales = React.lazy(() => import('./components/ProportionSales'));
+const OfflineData = React.lazy(() => import('./components/OfflineData'));
+
+type RangePickerValue = RangePickerProps
+
+ );
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Gauge/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Gauge/index.tsx
new file mode 100644
index 0000000..bc20ad0
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Gauge/index.tsx
@@ -0,0 +1,180 @@
+import { Axis, Chart, Coord, Geom, Guide, Shape } from 'bizcharts';
+
+import React from 'react';
+import autoHeight from '../autoHeight';
+
+const { Arc, Html, Line } = Guide;
+
+export interface GaugeProps {
+ title: React.ReactNode;
+ color?: string;
+ height?: number;
+ bgColor?: number;
+ percent: number;
+ forceFit?: boolean;
+ style?: React.CSSProperties;
+ formatter?: (value: string) => string;
+}
+
+const defaultFormatter = (val: string): string => {
+ switch (val) {
+ case '2':
+ return '差';
+ case '4':
+ return '中';
+ case '6':
+ return '良';
+ case '8':
+ return '优';
+ default:
+ return '';
+ }
+};
+
+if (Shape.registerShape) {
+ Shape.registerShape('point', 'pointer', {
+ drawShape(cfg: any, group: any) {
+ let point = cfg.points[0];
+ point = (this as any).parsePoint(point);
+ const center = (this as any).parsePoint({
+ x: 0,
+ y: 0,
+ });
+ group.addShape('line', {
+ attrs: {
+ x1: center.x,
+ y1: center.y,
+ x2: point.x,
+ y2: point.y,
+ stroke: cfg.color,
+ lineWidth: 2,
+ lineCap: 'round',
+ },
+ });
+ return group.addShape('circle', {
+ attrs: {
+ x: center.x,
+ y: center.y,
+ r: 6,
+ stroke: cfg.color,
+ lineWidth: 3,
+ fill: '#fff',
+ },
+ });
+ },
+ });
+}
+
+const Gauge: React.FC
+
+ {activeData && (
+
+
+ )}
+ {activeData && (
+
+
+ {[...activeData].sort()[activeData.length - 1].y + 200} 亿元
+{[...activeData].sort()[Math.floor(activeData.length / 2)].y} 亿元
+
+
+
+
+
+
+
+ 00:00
+ {activeData[Math.floor(activeData.length / 2)].x}
+ {activeData[activeData.length - 1].x}
+
+ )}
+
+
`;
+
+ const textStyle: {
+ fontSize: number;
+ fill: string;
+ textAlign: 'center';
+ } = {
+ fontSize: 12,
+ fill: 'rgba(0, 0, 0, 0.65)',
+ textAlign: 'center',
+ };
+ return (
+ ${title}
+
+ ${(data[0].value * 10).toFixed(2)}%
+
+
+
+ );
+};
+
+export default autoHeight()(MiniArea);
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.less b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.less
new file mode 100644
index 0000000..8641d65
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.less
@@ -0,0 +1,94 @@
+@import '~antd/es/style/themes/default.less';
+
+.pie {
+ position: relative;
+ .chart {
+ position: relative;
+ }
+ &.hasLegend .chart {
+ width: ~'calc(100% - 240px)';
+ }
+ .legend {
+ position: absolute;
+ top: 50%;
+ right: 0;
+ min-width: 200px;
+ margin: 0 20px;
+ padding: 0;
+ list-style: none;
+ transform: translateY(-50%);
+ li {
+ height: 22px;
+ margin-bottom: 16px;
+ line-height: 22px;
+ cursor: pointer;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
+ .dot {
+ position: relative;
+ top: -1px;
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ margin-right: 8px;
+ border-radius: 8px;
+ }
+ .line {
+ display: inline-block;
+ width: 1px;
+ height: 16px;
+ margin-right: 8px;
+ background-color: @border-color-split;
+ }
+ .legendTitle {
+ color: @text-color;
+ }
+ .percent {
+ color: @text-color-secondary;
+ }
+ .value {
+ position: absolute;
+ right: 0;
+ }
+ .title {
+ margin-bottom: 8px;
+ }
+ .total {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ max-height: 62px;
+ text-align: center;
+ transform: translate(-50%, -50%);
+ & > h4 {
+ height: 22px;
+ margin-bottom: 8px;
+ color: @text-color-secondary;
+ font-weight: normal;
+ font-size: 14px;
+ line-height: 22px;
+ }
+ & > p {
+ display: block;
+ height: 32px;
+ color: @heading-color;
+ font-size: 1.2em;
+ line-height: 32px;
+ white-space: nowrap;
+ }
+ }
+}
+
+.legendBlock {
+ &.hasLegend .chart {
+ width: 100%;
+ margin: 0 0 32px 0;
+ }
+ .legend {
+ position: relative;
+ transform: none;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.tsx
new file mode 100644
index 0000000..7fb29dc
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/Pie/index.tsx
@@ -0,0 +1,310 @@
+import { Chart, Coord, Geom, Tooltip } from 'bizcharts';
+import React, { Component } from 'react';
+
+import { DataView } from '@antv/data-set';
+import Debounce from 'lodash.debounce';
+import { Divider } from 'antd';
+import ReactFitText from 'react-fittext';
+import classNames from 'classnames';
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+export interface PieProps {
+ animate?: boolean;
+ color?: string;
+ colors?: string[];
+ selected?: boolean;
+ height?: number;
+ margin?: [number, number, number, number];
+ hasLegend?: boolean;
+ padding?: [number, number, number, number];
+ percent?: number;
+ data?: {
+ x: string | string;
+ y: number;
+ }[];
+ inner?: number;
+ lineWidth?: number;
+ forceFit?: boolean;
+ style?: React.CSSProperties;
+ className?: string;
+ total?: React.ReactNode | number | (() => React.ReactNode | number);
+ title?: React.ReactNode;
+ tooltip?: boolean;
+ valueFormat?: (value: string) => string | React.ReactNode;
+ subTitle?: React.ReactNode;
+}
+interface PieState {
+ legendData: { checked: boolean; x: string; color: string; percent: number; y: string }[];
+ legendBlock: boolean;
+}
+class Pie extends Component
+ {height > 0 && (
+
+
+ )}
+
+
+
+
+
+ {hasLegend && (
+
+ );
+ }
+}
+
+export default autoHeight()(Pie);
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.less b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.less
new file mode 100644
index 0000000..db8e4da
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.less
@@ -0,0 +1,6 @@
+.tagCloud {
+ overflow: hidden;
+ canvas {
+ transform-origin: 0 0;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.tsx
new file mode 100644
index 0000000..c656542
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/TagCloud/index.tsx
@@ -0,0 +1,211 @@
+import { Chart, Coord, Geom, Shape, Tooltip } from 'bizcharts';
+import React, { Component } from 'react';
+
+import DataSet from '@antv/data-set';
+import Debounce from 'lodash.debounce';
+import classNames from 'classnames';
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+/* eslint no-underscore-dangle: 0 */
+/* eslint no-param-reassign: 0 */
+
+const imgUrl = 'https://gw.alipayobjects.com/zos/rmsportal/gWyeGLCdFFRavBGIDzWk.png';
+
+export interface TagCloudProps {
+ data: {
+ name: string;
+ value: string;
+ }[];
+ height?: number;
+ className?: string;
+ style?: React.CSSProperties;
+}
+
+interface TagCloudState {
+ dv: any;
+ height?: number;
+ width: number;
+}
+
+class TagCloud extends Component
+
+ {!!tooltip &&
+
+ {(subTitle || total) && (
+
+
+ {subTitle &&
+ )}
+ {subTitle}
} + {/* eslint-disable-next-line */} + {total && ( +{typeof total === 'function' ? total() : total}
+ )}
+ -
+ {legendData.map((item, i) => (
+
+ {dv && (
+
+
+ )}
+
+ );
+ }
+}
+
+export default autoHeight()(TagCloud);
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.less b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.less
new file mode 100644
index 0000000..f52ac14
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.less
@@ -0,0 +1,28 @@
+@import '~antd/es/style/themes/default.less';
+
+.waterWave {
+ position: relative;
+ display: inline-block;
+ transform-origin: left;
+ .text {
+ position: absolute;
+ top: 32px;
+ left: 0;
+ width: 100%;
+ text-align: center;
+ span {
+ color: @text-color-secondary;
+ font-size: 14px;
+ line-height: 22px;
+ }
+ h4 {
+ color: @heading-color;
+ font-size: 24px;
+ line-height: 32px;
+ }
+ }
+ .waterWaveCanvasWrapper {
+ transform: scale(0.5);
+ transform-origin: 0 0;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.tsx
new file mode 100644
index 0000000..b522142
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/WaterWave/index.tsx
@@ -0,0 +1,236 @@
+import React, { Component } from 'react';
+
+import autoHeight from '../autoHeight';
+import styles from './index.less';
+
+/* eslint no-return-assign: 0 */
+/* eslint no-mixed-operators: 0 */
+// riddle: https://riddle.alibaba-inc.com/riddles/2d9a4b90
+
+export interface WaterWaveProps {
+ title: React.ReactNode;
+ color?: string;
+ height?: number;
+ percent: number;
+ style?: React.CSSProperties;
+}
+
+class WaterWave extends Component (this.root = n)}
+ style={{ transform: `scale(${radio})` }}
+ >
+
+ );
+ }
+}
+
+export default autoHeight()(WaterWave);
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/autoHeight.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/autoHeight.tsx
new file mode 100644
index 0000000..a05a15e
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/autoHeight.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+
+export type IReactComponent
+
+
+ {title && {title}}
+
+ {percent}%
+= + | React.StatelessComponent
+ | React.ComponentClass
+ | React.ClassicComponentClass
; + +function computeHeight(node: HTMLDivElement) { + const { style } = node; + style.height = '100%'; + const totalHeight = parseInt(`${getComputedStyle(node).height}`, 10); + const padding = + parseInt(`${getComputedStyle(node).paddingTop}`, 10) + + parseInt(`${getComputedStyle(node).paddingBottom}`, 10); + return totalHeight - padding; +} + +function getAutoHeight(n: HTMLDivElement) { + if (!n) { + return 0; + } + + const node = n; + + let height = computeHeight(node); + const parentNode = node.parentNode as HTMLDivElement; + if (parentNode) { + height = computeHeight(parentNode); + } + + return height; +} + +interface AutoHeightProps { + height?: number; +} + +function autoHeight() { + return
( + WrappedComponent: React.ComponentClass
| React.FC
, + ): React.ComponentClass
=> { + class AutoHeightComponent extends React.Component
{ + state = { + computedHeight: 0, + }; + + root: HTMLDivElement | null = null; + + componentDidMount() { + const { height } = this.props; + if (!height && this.root) { + let h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + if (h < 1) { + h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + } + } + } + + handleRoot = (node: HTMLDivElement) => { + this.root = node; + }; + + render() { + const { height } = this.props; + const { computedHeight } = this.state; + const h = height || computedHeight; + return ( +
+ {h > 0 &&
+ );
+ }
+ }
+ return AutoHeightComponent;
+ };
+}
+export default autoHeight;
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.less b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.less
new file mode 100644
index 0000000..190428b
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.less
@@ -0,0 +1,19 @@
+.miniChart {
+ position: relative;
+ width: 100%;
+ .chartContent {
+ position: absolute;
+ bottom: -28px;
+ width: 100%;
+ > div {
+ margin: 0 -5px;
+ overflow: hidden;
+ }
+ }
+ .chartLoading {
+ position: absolute;
+ top: 16px;
+ left: 50%;
+ margin-left: -7px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.tsx
new file mode 100644
index 0000000..85cd77e
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/components/Charts/index.tsx
@@ -0,0 +1,17 @@
+import Gauge from './Gauge';
+import MiniArea from './MiniArea';
+import Pie from './Pie';
+import TagCloud from './TagCloud';
+import WaterWave from './WaterWave';
+import Map from './Map';
+
+const Charts = {
+ Pie,
+ WaterWave,
+ Gauge,
+ MiniArea,
+ TagCloud,
+ Map,
+};
+
+export { Charts as default, Pie, WaterWave, Gauge, TagCloud, MiniArea, Map };
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/data.d.ts b/service/stackweb/frontend/src/pages/dashboard/monitor/data.d.ts
new file mode 100644
index 0000000..1ee2217
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/data.d.ts
@@ -0,0 +1,5 @@
+export interface TagType {
+ name: string;
+ value: string;
+ type: string;
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/monitor/index.tsx b/service/stackweb/frontend/src/pages/dashboard/monitor/index.tsx
new file mode 100644
index 0000000..1da405d
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/monitor/index.tsx
@@ -0,0 +1,257 @@
+import { Card, Col, Row, Statistic } from 'antd';
+import { FormattedMessage, connect, formatMessage, Dispatch } from 'umi';
+import React, { Component } from 'react';
+
+import { GridContent } from '@ant-design/pro-layout';
+import numeral from 'numeral';
+import { StateType } from './model';
+import { Pie, WaterWave, Gauge, TagCloud, Map } from './components/Charts';
+import ActiveChart from './components/ActiveChart';
+import styles from './style.less';
+
+const { Countdown } = Statistic;
+
+const deadline = Date.now() + 1000 * 60 * 60 * 24 * 2 + 1000 * 30; // Moment is also OK
+
+interface MonitorProps {
+ dashboardAndmonitor: StateType;
+ dispatch: Dispatch
+
+
+
+
+
+ {links.map((link) =>
+ createElement(
+ linkElement,
+ {
+ key: `linkGroup-item-${link.id || link.title}`,
+ to: link.href,
+ href: link.href,
+ },
+ link.title,
+ ),
+ )}
+
+
+ );
+};
+
+EditableLinkGroup.defaultProps = {
+ links: [],
+ onAdd: () => {},
+ linkElement: 'a',
+};
+
+export default EditableLinkGroup;
diff --git a/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/autoHeight.tsx b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/autoHeight.tsx
new file mode 100644
index 0000000..ed9acd7
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/autoHeight.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+
+export type IReactComponent= + | React.StatelessComponent
+ | React.ComponentClass
+ | React.ClassicComponentClass
; + +function computeHeight(node: HTMLDivElement) { + const { style } = node; + style.height = '100%'; + const totalHeight = parseInt(`${getComputedStyle(node).height}`, 10); + const padding = + parseInt(`${getComputedStyle(node).paddingTop}`, 10) + + parseInt(`${getComputedStyle(node).paddingBottom}`, 10); + return totalHeight - padding; +} + +function getAutoHeight(n: HTMLDivElement | undefined) { + if (!n) { + return 0; + } + + const node = n; + + let height = computeHeight(node); + const parentNode = node.parentNode as HTMLDivElement; + if (parentNode) { + height = computeHeight(parentNode); + } + + return height; +} + +interface AutoHeightProps { + height?: number; +} + +function autoHeight() { + return
( + WrappedComponent: React.ComponentClass
| React.FC
, + ): React.ComponentClass
=> { + class AutoHeightComponent extends React.Component
{ + state = { + computedHeight: 0, + }; + + root: HTMLDivElement | undefined = undefined; + + componentDidMount() { + const { height } = this.props; + if (!height) { + let h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + if (h < 1) { + h = getAutoHeight(this.root); + this.setState({ computedHeight: h }); + } + } + } + + handleRoot = (node: HTMLDivElement) => { + this.root = node; + }; + + render() { + const { height } = this.props; + const { computedHeight } = this.state; + const h = height || computedHeight; + return ( +
+ {h > 0 &&
+ );
+ }
+ }
+ return AutoHeightComponent;
+ };
+}
+export default autoHeight;
diff --git a/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.less b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.less
new file mode 100644
index 0000000..f3c1af3
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.less
@@ -0,0 +1,46 @@
+@import '~antd/es/style/themes/default.less';
+
+.radar {
+ .legend {
+ margin-top: 16px;
+ .legendItem {
+ position: relative;
+ color: @text-color-secondary;
+ line-height: 22px;
+ text-align: center;
+ cursor: pointer;
+ p {
+ margin: 0;
+ }
+ h6 {
+ margin-top: 4px;
+ margin-bottom: 0;
+ padding-left: 16px;
+ color: @heading-color;
+ font-size: 24px;
+ line-height: 32px;
+ }
+ &::after {
+ position: absolute;
+ top: 8px;
+ right: 0;
+ width: 1px;
+ height: 40px;
+ background-color: @border-color-split;
+ content: '';
+ }
+ }
+ > :last-child .legendItem::after {
+ display: none;
+ }
+ .dot {
+ position: relative;
+ top: -1px;
+ display: inline-block;
+ width: 6px;
+ height: 6px;
+ margin-right: 6px;
+ border-radius: 6px;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.tsx b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.tsx
new file mode 100644
index 0000000..95fca0b
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/workplace/components/Radar/index.tsx
@@ -0,0 +1,219 @@
+import { Axis, Chart, Coord, Geom, Tooltip } from 'bizcharts';
+import { Col, Row } from 'antd';
+import React, { Component } from 'react';
+
+import autoHeight from './autoHeight';
+import styles from './index.less';
+
+export interface RadarProps {
+ title?: React.ReactNode;
+ height?: number;
+ padding?: [number, number, number, number];
+ hasLegend?: boolean;
+ data: {
+ name: string;
+ label: string;
+ value: string | number;
+ }[];
+ colors?: string[];
+ animate?: boolean;
+ forceFit?: boolean;
+ tickCount?: number;
+ style?: React.CSSProperties;
+}
+interface RadarState {
+ legendData: {
+ checked: boolean;
+ name: string;
+ color: string;
+ percent: number;
+ value: string;
+ }[];
+}
+/* eslint react/no-danger:0 */
+class Radar extends Component
+ {title &&
+
+ {hasLegend && (
+
+ {legendData.map((item, i) => (
+
+ )}
+
+ );
+ }
+}
+
+export default autoHeight()(Radar);
diff --git a/service/stackweb/frontend/src/pages/dashboard/workplace/data.d.ts b/service/stackweb/frontend/src/pages/dashboard/workplace/data.d.ts
new file mode 100644
index 0000000..e4482a9
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/workplace/data.d.ts
@@ -0,0 +1,116 @@
+export interface TagType {
+ key: string;
+ label: string;
+}
+export interface VisitDataType {
+ x: string;
+ y: number;
+}
+
+export interface SearchDataType {
+ index: number;
+ keyword: string;
+ count: number;
+ range: number;
+ status: number;
+}
+
+export interface OfflineDataType {
+ name: string;
+ cvr: number;
+}
+
+export interface OfflineChartData {
+ x: any;
+ y1: number;
+ y2: number;
+}
+
+export interface RadarData {
+ name: string;
+ label: string;
+ value: number;
+}
+
+export interface AnalysisData {
+ visitData: VisitDataType[];
+ visitData2: VisitDataType[];
+ salesData: VisitDataType[];
+ searchData: SearchDataType[];
+ offlineData: OfflineDataType[];
+ offlineChartData: OfflineChartData[];
+ salesTypeData: VisitDataType[];
+ salesTypeDataOnline: VisitDataType[];
+ salesTypeDataOffline: VisitDataType[];
+ radarData: RadarData[];
+}
+
+export interface GeographicType {
+ province: {
+ label: string;
+ key: string;
+ };
+ city: {
+ label: string;
+ key: string;
+ };
+}
+
+export interface NoticeType {
+ id: string;
+ title: string;
+ logo: string;
+ description: string;
+ updatedAt: string;
+ member: string;
+ href: string;
+ memberLink: string;
+}
+
+export interface CurrentUser {
+ name: string;
+ avatar: string;
+ userid: string;
+ notice: NoticeType[];
+ email: string;
+ signature: string;
+ title: string;
+ group: string;
+ tags: TagType[];
+ notifyCount: number;
+ unreadCount: number;
+ country: string;
+ geographic: GeographicType;
+ address: string;
+ phone: string;
+}
+export interface Member {
+ avatar: string;
+ name: string;
+ id: string;
+}
+
+export interface ActivitiesType {
+ id: string;
+ updatedAt: string;
+ user: {
+ name: string;
+ avatar: string;
+ };
+ group: {
+ name: string;
+ link: string;
+ };
+ project: {
+ name: string;
+ link: string;
+ };
+
+ template: string;
+}
+
+export interface RadarDataType {
+ label: string;
+ name: string;
+ value: number;
+}
diff --git a/service/stackweb/frontend/src/pages/dashboard/workplace/index.tsx b/service/stackweb/frontend/src/pages/dashboard/workplace/index.tsx
new file mode 100644
index 0000000..8a1d522
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/dashboard/workplace/index.tsx
@@ -0,0 +1,270 @@
+import { Avatar, Card, Col, List, Skeleton, Row, Statistic } from 'antd';
+import React, { Component } from 'react';
+
+import { Link, Dispatch, connect } from 'umi';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import Radar from './components/Radar';
+import { ModalState } from './model';
+import EditableLinkGroup from './components/EditableLinkGroup';
+import styles from './style.less';
+import { ActivitiesType, CurrentUser, NoticeType, RadarDataType } from './data.d';
+
+const links = [
+ {
+ title: '操作一',
+ href: '',
+ },
+ {
+ title: '操作二',
+ href: '',
+ },
+ {
+ title: '操作三',
+ href: '',
+ },
+ {
+ title: '操作四',
+ href: '',
+ },
+ {
+ title: '操作五',
+ href: '',
+ },
+ {
+ title: '操作六',
+ href: '',
+ },
+];
+
+interface WorkplaceProps {
+ currentUser?: CurrentUser;
+ projectNotice: NoticeType[];
+ activities: ActivitiesType[];
+ radarData: RadarDataType[];
+ dispatch: Dispatch{title}
} +
+
+
+ ))}
+ + + {item.name} +
+{item.value}
+
+
+ );
+};
+
+const ExtraContent: React.FC<{}> = () => (
+
+
+
+
+
+ 早安，
+ {currentUser.name}
+ ，祝你开心每一天！
+
+
+ {currentUser.title} |{currentUser.group}
+
+
+
+);
+
+class Workplace extends Component
+
+
+
+
+
+
+ {item.member || ''}
+ {item.updatedAt && (
+
+ {moment(item.updatedAt).fromNow()}
+
+ )}
+
+
+
+
+
+ {projectNotice.map((item) => (
+
+
+
+
+
+
+
diff --git a/service/stackweb/frontend/src/pages/editor/flow/common/IconFont/index.ts b/service/stackweb/frontend/src/pages/editor/flow/common/IconFont/index.ts
new file mode 100644
index 0000000..987647c
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/editor/flow/common/IconFont/index.ts
@@ -0,0 +1,7 @@
+import { createFromIconfontCN } from '@ant-design/icons';
+
+const IconFont = createFromIconfontCN({
+ scriptUrl: 'https://at.alicdn.com/t/font_1101588_01zniftxm9yp.js',
+});
+
+export default IconFont;
diff --git a/service/stackweb/frontend/src/pages/editor/flow/components/EditorContextMenu/FlowContextMenu.tsx b/service/stackweb/frontend/src/pages/editor/flow/components/EditorContextMenu/FlowContextMenu.tsx
new file mode 100644
index 0000000..32f17aa
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/editor/flow/components/EditorContextMenu/FlowContextMenu.tsx
@@ -0,0 +1,35 @@
+import { CanvasMenu, ContextMenu, EdgeMenu, GroupMenu, MultiMenu, NodeMenu } from 'gg-editor';
+
+import React from 'react';
+import MenuItem from './MenuItem';
+import styles from './index.less';
+
+const FlowContextMenu = () => (
+
+ 
+
+
+
+
+
+
+
+
+ 
+ Micro 中国站
+
+
+ Micro 中国站
+
+
+
+
+
+
+
+
+);
diff --git a/service/stackweb/frontend/src/pages/form/advanced-form/_mock.ts b/service/stackweb/frontend/src/pages/form/advanced-form/_mock.ts
new file mode 100644
index 0000000..1f9461e
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/form/advanced-form/_mock.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Request, Response } from 'express';
+
+export default {
+ 'POST /api/forms': (_: Request, res: Response) => {
+ res.send({ message: 'Ok' });
+ },
+};
diff --git a/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.less b/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.less
new file mode 100644
index 0000000..2e6d830
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.less
@@ -0,0 +1,33 @@
+@import '~antd/es/style/themes/default.less';
+
+.toolbar {
+ position: fixed;
+ right: 0;
+ bottom: 0;
+ z-index: 99;
+ width: 100%;
+ height: 56px;
+ padding: 0 24px;
+ line-height: 56px;
+ background: @component-background;
+ border-top: 1px solid @border-color-split;
+ box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.03);
+
+ &::after {
+ display: block;
+ clear: both;
+ content: '';
+ }
+
+ .left {
+ float: left;
+ }
+
+ .right {
+ float: right;
+ }
+
+ button + button {
+ margin-left: 8px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.tsx b/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.tsx
new file mode 100644
index 0000000..a04ee15
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/form/advanced-form/components/FooterToolbar/index.tsx
@@ -0,0 +1,47 @@
+import React, { Component } from 'react';
+import { RouteContext } from '@ant-design/pro-layout';
+import classNames from 'classnames';
+import styles from './index.less';
+
+export interface FooterToolbarProps {
+ extra?: React.ReactNode;
+ style?: React.CSSProperties;
+ className?: string;
+ isMobile?: boolean;
+}
+
+export default class FooterToolbar extends Component
+
+
+
+ )}
+ {extra}
+ {children}
+ {err.errors[0]}
+ {fieldLabels[key]}
+
+
+
+ );
+};
+
+export default connect(({ formAndstepForm }: { formAndstepForm: StateType }) => ({
+ data: formAndstepForm.step,
+}))(Step1);
diff --git a/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.less b/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.less
new file mode 100644
index 0000000..45f9b35
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.less
@@ -0,0 +1,78 @@
+@import '~antd/es/style/themes/default.less';
+
+.stepForm {
+ max-width: 500px;
+ margin: 40px auto 0;
+}
+
+.stepFormText {
+ margin-bottom: 24px;
+ :global {
+ .ant-form-item-label,
+ .ant-form-item-control {
+ line-height: 22px;
+ }
+ }
+}
+
+.result {
+ max-width: 560px;
+ margin: 0 auto;
+ padding: 24px 0 8px;
+}
+
+.desc {
+ padding: 0 56px;
+ color: @text-color-secondary;
+ h3 {
+ margin: 0 0 12px 0;
+ color: @text-color-secondary;
+ font-size: 16px;
+ line-height: 32px;
+ }
+ h4 {
+ margin: 0 0 4px 0;
+ color: @text-color-secondary;
+ font-size: 14px;
+ line-height: 22px;
+ }
+ p {
+ margin-top: 0;
+ margin-bottom: 12px;
+ line-height: 22px;
+ }
+}
+
+@media screen and (max-width: @screen-md) {
+ .desc {
+ padding: 0;
+ }
+}
+
+.information {
+ line-height: 22px;
+ :global {
+ .ant-row:not(:last-child) {
+ margin-bottom: 24px;
+ }
+ }
+ .label {
+ padding-right: 8px;
+ color: @heading-color;
+ text-align: right;
+ @media screen and (max-width: @screen-sm) {
+ text-align: left;
+ }
+ }
+}
+
+.money {
+ font-weight: 500;
+ font-size: 20px;
+ font-family: 'Helvetica Neue', sans-serif;
+ line-height: 14px;
+}
+
+.uppercase {
+ font-size: 12px;
+}
diff --git a/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.tsx b/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.tsx
new file mode 100644
index 0000000..41f7c51
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/form/step-form/components/Step2/index.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { Form, Alert, Button, Descriptions, Divider, Statistic, Input } from 'antd';
+import { connect, Dispatch } from 'umi';
+import { StateType } from '../../model';
+import styles from './index.less';
+
+const formItemLayout = {
+ labelCol: {
+ span: 5,
+ },
+ wrapperCol: {
+ span: 19,
+ },
+};
+interface Step2Props {
+ data?: StateType['step'];
+ dispatch?: Dispatch说明
+转账到支付宝账户
++ 如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。 +
+转账到银行卡
++ 如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。 +
+
+
+ {payAccount}
+ {receiverAccount}
+ {receiverName}
+
+
+
+
+ );
+ const extra = (
+ <>
+
+
+
+ );
+ return (
+
+ {title}
+
+);
+
+const ListContent = ({
+ data: { owner, createdAt, percent, status },
+}: {
+ data: BasicListItemDataType;
+}) => (
+ {value}
+ {bordered && } +
+
+);
+
+export const BasicList: FC
+ Owner
+
+ {owner}
+
+ 开始时间
+
+ {moment(createdAt).format('YYYY-MM-DD HH:mm')}
+
+
+
+
+
+ 全部
+ 进行中
+ 等待中
+
+ ({})} />
+
+ );
+
+ const MoreBtn: React.FC<{
+ item: BasicListItemDataType;
+ }> = ({ item }) => (
+
+
+
+
+
+ );
+};
+
+export default connect(
+ ({
+ listAndbasicList,
+ loading,
+ }: {
+ listAndbasicList: StateType;
+ loading: {
+ models: { [key: string]: boolean };
+ };
+ }) => ({
+ listAndbasicList,
+ loading: loading.models.listAndbasicList,
+ }),
+)(BasicList);
diff --git a/service/stackweb/frontend/src/pages/list/basic-list/model.ts b/service/stackweb/frontend/src/pages/list/basic-list/model.ts
new file mode 100644
index 0000000..2cdff53
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/basic-list/model.ts
@@ -0,0 +1,77 @@
+import { Effect, Reducer } from 'umi';
+import { addFakeList, queryFakeList, removeFakeList, updateFakeList } from './service';
+
+import { BasicListItemDataType } from './data.d';
+
+export interface StateType {
+ list: BasicListItemDataType[];
+}
+
+export interface ModelType {
+ namespace: string;
+ state: StateType;
+ effects: {
+ fetch: Effect;
+ appendFetch: Effect;
+ submit: Effect;
+ };
+ reducers: {
+ queryList: Reducer
+
+
+
+
+
+
+
+
+
+
+ - (
+
+
+ );
+
+ const extraContent = (
+ + 段落示意：蚂蚁金服务设计平台 ant.design，用最小的工作量，无缝接入蚂蚁金服生态， + 提供跨越设计与开发的体验解决方案。 +
+ +
{' '}
+ 快速开始
+ 
{' '}
+ 产品简介
+ 
{' '}
+ 产品文档
+
+ 
+
+ );
+ const nullData: Partial
+
+ >
+ rowKey="id"
+ loading={loading}
+ grid={{ gutter: 24, lg: 3, md: 2, sm: 1, xs: 1 }}
+ dataSource={[nullData, ...list]}
+ renderItem={(item) => {
+ if (item && item.id) {
+ return (
+
+ 操作一, 操作二]}
+ >
+
+ {item.description}
+
+ }
+ />
+
+
+ );
+ }
+ return (
+
+
+
+ );
+ }}
+ />
+
+
+ {title && (
+
+ );
+};
+
+export default StandardFormRow;
diff --git a/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.less b/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.less
new file mode 100644
index 0000000..f366c58
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.less
@@ -0,0 +1,34 @@
+@import '~antd/es/style/themes/default.less';
+
+.tagSelect {
+ position: relative;
+ max-height: 32px;
+ margin-left: -8px;
+ overflow: hidden;
+ line-height: 32px;
+ transition: all 0.3s;
+ user-select: none;
+ :global {
+ .ant-tag {
+ margin-right: 24px;
+ padding: 0 8px;
+ font-size: @font-size-base;
+ }
+ }
+ &.expanded {
+ max-height: 200px;
+ transition: all 0.3s;
+ }
+ .trigger {
+ position: absolute;
+ top: 0;
+ right: 0;
+
+ span.anticon {
+ font-size: 12px;
+ }
+ }
+ &.hasExpandTag {
+ padding-right: 50px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.tsx b/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.tsx
new file mode 100644
index 0000000..13c5ccf
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/applications/components/TagSelect/index.tsx
@@ -0,0 +1,182 @@
+import React, { Component } from 'react';
+import { Tag } from 'antd';
+import { UpOutlined, DownOutlined } from '@ant-design/icons';
+
+import classNames from 'classnames';
+import styles from './index.less';
+
+const { CheckableTag } = Tag;
+
+export interface TagSelectOptionProps {
+ value?: string | number;
+ style?: React.CSSProperties;
+ checked?: boolean;
+ onChange?: (value: string | number | undefined, state: boolean) => void;
+}
+
+export interface TagSelectProps {
+ onChange?: (value: (string | number)[]) => void;
+ expandable?: boolean;
+ value?: (string | number)[];
+ defaultValue?: (string | number)[];
+ style?: React.CSSProperties;
+ hideCheckAll?: boolean;
+ actionsText?: {
+ expandText?: React.ReactNode;
+ collapseText?: React.ReactNode;
+ selectAllText?: React.ReactNode;
+ };
+ className?: string;
+ Option?: TagSelectOptionProps;
+ children?: React.ReactElement
+ {title}
+
+ )}
+ {children}
+
+ {hideCheckAll ? null : (
+
+ {selectAllText}
+
+ )}
+ {value &&
+ children &&
+ React.Children.map(children, (child: React.ReactElement) => {
+ if (this.isTagSelectOption(child)) {
+ return React.cloneElement(child, {
+ key: `tag-select-${child.props.value}`,
+ value: child.props.value,
+ checked: value.indexOf(child.props.value) > -1,
+ onChange: this.handleTagChange,
+ });
+ }
+ return child;
+ })}
+ {expandable && (
+
+ {expand ? (
+ <>
+ {collapseText}
+ );
+ }
+}
+
+export default TagSelect;
diff --git a/service/stackweb/frontend/src/pages/list/search/applications/data.d.ts b/service/stackweb/frontend/src/pages/list/search/applications/data.d.ts
new file mode 100644
index 0000000..6a4a88c
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/applications/data.d.ts
@@ -0,0 +1,29 @@
+export interface Member {
+ avatar: string;
+ name: string;
+ id: string;
+}
+
+export interface ListItemDataType {
+ id: string;
+ owner: string;
+ title: string;
+ avatar: string;
+ cover: string;
+ status: 'normal' | 'exception' | 'active' | 'success';
+ percent: number;
+ logo: string;
+ href: string;
+ body?: any;
+ updatedAt: number;
+ createdAt: number;
+ subDescription: string;
+ description: string;
+ activeUser: number;
+ newUser: number;
+ star: number;
+ like: number;
+ message: number;
+ content: string;
+ members: Member[];
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/applications/index.tsx b/service/stackweb/frontend/src/pages/list/search/applications/index.tsx
new file mode 100644
index 0000000..6833dc2
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/applications/index.tsx
@@ -0,0 +1,214 @@
+import {
+ DownloadOutlined,
+ EditOutlined,
+ EllipsisOutlined,
+ ShareAltOutlined,
+} from '@ant-design/icons';
+import { Avatar, Card, Col, Dropdown, List, Menu, Row, Select, Tooltip, Form } from 'antd';
+import React, { FC, useEffect } from 'react';
+import { connect, Dispatch } from 'umi';
+import numeral from 'numeral';
+import { ListItemDataType } from './data.d';
+import StandardFormRow from './components/StandardFormRow';
+import TagSelect from './components/TagSelect';
+import styles from './style.less';
+import { StateType } from './model';
+
+const { Option } = Select;
+
+export function formatWan(val: number) {
+ const v = val * 1;
+ if (!v || Number.isNaN(v)) return '';
+
+ let result: React.ReactNode = val;
+ if (val > 10000) {
+ result = (
+
+ {Math.floor(val / 10000)}
+
+ 万
+
+
+ );
+ }
+ return result;
+}
+
+interface ApplicationsProps {
+ dispatch: Dispatch
+
+);
+
+export const Applications: FC
+
+ 活跃用户
+{activeUser}
+
+
+ 新增用户
+{newUser}
+
+
+
+
+
+
+ rowKey="id"
+ grid={{ gutter: 24, xl: 4, lg: 3, md: 3, sm: 2, xs: 1 }}
+ loading={loading}
+ dataSource={list}
+ renderItem={(item) => (
+
+
+
+ ,
+
+ ,
+
+ ,
+ ]}
+ >
+
+
+ )}
+ />
+
+ );
+};
+
+export default connect(
+ ({
+ listAndsearchAndapplications,
+ loading,
+ }: {
+ listAndsearchAndapplications: StateType;
+ loading: { models: { [key: string]: boolean } };
+ }) => ({
+ listAndsearchAndapplications,
+ loading: loading.models.listAndsearchAndapplications,
+ }),
+)(Applications);
diff --git a/service/stackweb/frontend/src/pages/list/search/applications/model.ts b/service/stackweb/frontend/src/pages/list/search/applications/model.ts
new file mode 100644
index 0000000..635479c
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/applications/model.ts
@@ -0,0 +1,48 @@
+import { Effect, Reducer } from 'umi';
+
+import { ListItemDataType } from './data.d';
+import { queryFakeList } from './service';
+
+export interface StateType {
+ list: ListItemDataType[];
+}
+
+export interface ModelType {
+ namespace: string;
+ state: StateType;
+ effects: {
+ fetch: Effect;
+ };
+ reducers: {
+ queryList: Reducer+
+
+
+ {title && (
+
+ );
+};
+
+export default StandardFormRow;
diff --git a/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.less b/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.less
new file mode 100644
index 0000000..b174f04
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.less
@@ -0,0 +1,33 @@
+@import '~antd/es/style/themes/default.less';
+
+.tagSelect {
+ position: relative;
+ max-height: 32px;
+ margin-left: -8px;
+ overflow: hidden;
+ line-height: 32px;
+ transition: all 0.3s;
+ user-select: none;
+ :global {
+ .ant-tag {
+ margin-right: 24px;
+ padding: 0 8px;
+ font-size: @font-size-base;
+ }
+ }
+ &.expanded {
+ max-height: 200px;
+ transition: all 0.3s;
+ }
+ .trigger {
+ position: absolute;
+ top: 0;
+ right: 0;
+ span.anticon {
+ font-size: 12px;
+ }
+ }
+ &.hasExpandTag {
+ padding-right: 50px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.tsx b/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.tsx
new file mode 100644
index 0000000..13c5ccf
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/articles/components/TagSelect/index.tsx
@@ -0,0 +1,182 @@
+import React, { Component } from 'react';
+import { Tag } from 'antd';
+import { UpOutlined, DownOutlined } from '@ant-design/icons';
+
+import classNames from 'classnames';
+import styles from './index.less';
+
+const { CheckableTag } = Tag;
+
+export interface TagSelectOptionProps {
+ value?: string | number;
+ style?: React.CSSProperties;
+ checked?: boolean;
+ onChange?: (value: string | number | undefined, state: boolean) => void;
+}
+
+export interface TagSelectProps {
+ onChange?: (value: (string | number)[]) => void;
+ expandable?: boolean;
+ value?: (string | number)[];
+ defaultValue?: (string | number)[];
+ style?: React.CSSProperties;
+ hideCheckAll?: boolean;
+ actionsText?: {
+ expandText?: React.ReactNode;
+ collapseText?: React.ReactNode;
+ selectAllText?: React.ReactNode;
+ };
+ className?: string;
+ Option?: TagSelectOptionProps;
+ children?: React.ReactElement
+ {title}
+
+ )}
+ {children}
+
+ {hideCheckAll ? null : (
+
+ {selectAllText}
+
+ )}
+ {value &&
+ children &&
+ React.Children.map(children, (child: React.ReactElement) => {
+ if (this.isTagSelectOption(child)) {
+ return React.cloneElement(child, {
+ key: `tag-select-${child.props.value}`,
+ value: child.props.value,
+ checked: value.indexOf(child.props.value) > -1,
+ onChange: this.handleTagChange,
+ });
+ }
+ return child;
+ })}
+ {expandable && (
+
+ {expand ? (
+ <>
+ {collapseText}
+ );
+ }
+}
+
+export default TagSelect;
diff --git a/service/stackweb/frontend/src/pages/list/search/articles/data.d.ts b/service/stackweb/frontend/src/pages/list/search/articles/data.d.ts
new file mode 100644
index 0000000..6a4a88c
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/articles/data.d.ts
@@ -0,0 +1,29 @@
+export interface Member {
+ avatar: string;
+ name: string;
+ id: string;
+}
+
+export interface ListItemDataType {
+ id: string;
+ owner: string;
+ title: string;
+ avatar: string;
+ cover: string;
+ status: 'normal' | 'exception' | 'active' | 'success';
+ percent: number;
+ logo: string;
+ href: string;
+ body?: any;
+ updatedAt: number;
+ createdAt: number;
+ subDescription: string;
+ description: string;
+ activeUser: number;
+ newUser: number;
+ star: number;
+ like: number;
+ message: number;
+ content: string;
+ members: Member[];
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/articles/index.tsx b/service/stackweb/frontend/src/pages/list/search/articles/index.tsx
new file mode 100644
index 0000000..2a84fe3
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/articles/index.tsx
@@ -0,0 +1,249 @@
+import React, { FC, useEffect } from 'react';
+import { Button, Card, Col, Form, List, Row, Select, Tag } from 'antd';
+import { LoadingOutlined, StarOutlined, LikeOutlined, MessageOutlined } from '@ant-design/icons';
+import { connect, Dispatch } from 'umi';
+import ArticleListContent from './components/ArticleListContent';
+import { StateType } from './model';
+import { ListItemDataType } from './data.d';
+import StandardFormRow from './components/StandardFormRow';
+import TagSelect from './components/TagSelect';
+import styles from './style.less';
+
+const { Option } = Select;
+const FormItem = Form.Item;
+
+const pageSize = 5;
+
+interface ArticlesProps {
+ dispatch: Dispatch
+
+
+ );
+
+ return (
+ <>
+
+
+ );
+
+ const { children } = this.props;
+
+ return (
+
+
+ );
+};
+
+AvatarList.Item = Item;
+
+export default AvatarList;
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.less b/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.less
new file mode 100644
index 0000000..d619cd2
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.less
@@ -0,0 +1,88 @@
+@import '~antd/es/style/themes/default.less';
+
+.standardFormRow {
+ display: flex;
+ width: 100%;
+ margin-bottom: 16px;
+ padding-bottom: 16px;
+ border-bottom: 1px dashed @border-color-split;
+ :global {
+ .ant-form-item,
+ .ant-legacy-form-item {
+ margin-right: 24px;
+ }
+ .ant-form-item-label,
+ .ant-legacy-form-item-label {
+ label {
+ margin-right: 0;
+ color: @text-color;
+ }
+ }
+ .ant-form-item-label,
+ .ant-legacy-form-item-label,
+ .ant-form-item-control,
+ .ant-legacy-form-item-control {
+ padding: 0;
+ line-height: 32px;
+ }
+ }
+ .label {
+ flex: 0 0 auto;
+ margin-right: 24px;
+ color: @heading-color;
+ font-size: @font-size-base;
+ text-align: right;
+ & > span {
+ display: inline-block;
+ height: 32px;
+ line-height: 32px;
+ &::after {
+ content: '：';
+ }
+ }
+ }
+ .content {
+ flex: 1 1 0;
+ :global {
+ .ant-form-item,
+ .ant-legacy-form-item {
+ &:last-child {
+ display: block;
+ margin-right: 0;
+ }
+ }
+ }
+ }
+}
+
+.standardFormRowLast {
+ margin-bottom: 0;
+ padding-bottom: 0;
+ border: none;
+}
+
+.standardFormRowBlock {
+ :global {
+ .ant-form-item,
+ .ant-legacy-form-item,
+ div.ant-form-item-control-wrapper,
+ div.ant-legacy-form-item-control-wrapper {
+ display: block;
+ }
+ }
+}
+
+.standardFormRowGrid {
+ :global {
+ .ant-form-item,
+ .ant-legacy-form-item,
+ div.ant-form-item-control-wrapper,
+ div.ant-legacy-form-item-control-wrapper {
+ display: block;
+ }
+ .ant-form-item-label,
+ .ant-legacy-form-item-label {
+ float: left;
+ }
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.tsx b/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.tsx
new file mode 100644
index 0000000..0db92cf
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/components/StandardFormRow/index.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+interface StandardFormRowProps {
+ title?: string;
+ last?: boolean;
+ block?: boolean;
+ grid?: boolean;
+ style?: React.CSSProperties;
+}
+
+const StandardFormRow: React.FC- {childrenWithProps}
+ {title && (
+
+ );
+};
+
+export default StandardFormRow;
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.less b/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.less
new file mode 100644
index 0000000..b174f04
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.less
@@ -0,0 +1,33 @@
+@import '~antd/es/style/themes/default.less';
+
+.tagSelect {
+ position: relative;
+ max-height: 32px;
+ margin-left: -8px;
+ overflow: hidden;
+ line-height: 32px;
+ transition: all 0.3s;
+ user-select: none;
+ :global {
+ .ant-tag {
+ margin-right: 24px;
+ padding: 0 8px;
+ font-size: @font-size-base;
+ }
+ }
+ &.expanded {
+ max-height: 200px;
+ transition: all 0.3s;
+ }
+ .trigger {
+ position: absolute;
+ top: 0;
+ right: 0;
+ span.anticon {
+ font-size: 12px;
+ }
+ }
+ &.hasExpandTag {
+ padding-right: 50px;
+ }
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.tsx b/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.tsx
new file mode 100644
index 0000000..35da9c9
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/components/TagSelect/index.tsx
@@ -0,0 +1,184 @@
+import React, { Component } from 'react';
+import { Tag } from 'antd';
+import { UpOutlined, DownOutlined } from '@ant-design/icons';
+
+import classNames from 'classnames';
+import styles from './index.less';
+
+const { CheckableTag } = Tag;
+
+export interface TagSelectOptionProps {
+ value?: string | number;
+ style?: React.CSSProperties;
+ checked?: boolean;
+ onChange?: (value: string | number | undefined, state: boolean) => void;
+}
+
+export interface TagSelectProps {
+ onChange?: (value: (string | number)[]) => void;
+ expandable?: boolean;
+ value?: (string | number)[];
+ defaultValue?: (string | number)[];
+ style?: React.CSSProperties;
+ hideCheckAll?: boolean;
+ actionsText?: {
+ expandText?: React.ReactNode;
+ collapseText?: React.ReactNode;
+ selectAllText?: React.ReactNode;
+ };
+ className?: string;
+ Option?: TagSelectOptionProps;
+ children?: React.ReactElement
+ {title}
+
+ )}
+ {children}
+
+ {hideCheckAll ? null : (
+
+ {selectAllText}
+
+ )}
+ {value &&
+ children &&
+ React.Children.map(children, (child: any) => {
+ if (this.isTagSelectOption(child)) {
+ return React.cloneElement(child, {
+ key: `tag-select-${child.props.value}`,
+ value: child.props.value,
+ checked: value.indexOf(child.props.value) > -1,
+ onChange: this.handleTagChange,
+ });
+ }
+ return child;
+ })}
+ {expandable && (
+
+ {expand ? (
+ <>
+ {collapseText}
+ );
+ }
+}
+
+export default TagSelect;
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/data.d.ts b/service/stackweb/frontend/src/pages/list/search/projects/data.d.ts
new file mode 100644
index 0000000..6a4a88c
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/data.d.ts
@@ -0,0 +1,29 @@
+export interface Member {
+ avatar: string;
+ name: string;
+ id: string;
+}
+
+export interface ListItemDataType {
+ id: string;
+ owner: string;
+ title: string;
+ avatar: string;
+ cover: string;
+ status: 'normal' | 'exception' | 'active' | 'success';
+ percent: number;
+ logo: string;
+ href: string;
+ body?: any;
+ updatedAt: number;
+ createdAt: number;
+ subDescription: string;
+ description: string;
+ activeUser: number;
+ newUser: number;
+ star: number;
+ like: number;
+ message: number;
+ content: string;
+ members: Member[];
+}
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/index.tsx b/service/stackweb/frontend/src/pages/list/search/projects/index.tsx
new file mode 100644
index 0000000..83c5081
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/index.tsx
@@ -0,0 +1,152 @@
+import { Card, Col, Form, List, Row, Select, Typography } from 'antd';
+import React, { FC, useEffect } from 'react';
+import { connect, Dispatch } from 'umi';
+import moment from 'moment';
+import AvatarList from './components/AvatarList';
+import { StateType } from './model';
+import { ListItemDataType } from './data.d';
+import StandardFormRow from './components/StandardFormRow';
+import TagSelect from './components/TagSelect';
+import styles from './style.less';
+
+const { Option } = Select;
+const FormItem = Form.Item;
+const { Paragraph } = Typography;
+
+interface ProjectsProps {
+ dispatch: Dispatch
+ {moment(item.updatedAt).fromNow()}
+
+
+
+
+ {item.members.map((member, i) => (
+
+
+
+
+
+
+
+ );
+};
+
+export default connect(
+ ({
+ listAndsearchAndprojects,
+ loading,
+ }: {
+ listAndsearchAndprojects: StateType;
+ loading: { models: { [key: string]: boolean } };
+ }) => ({
+ listAndsearchAndprojects,
+ loading: loading.models.listAndsearchAndprojects,
+ }),
+)(Projects);
diff --git a/service/stackweb/frontend/src/pages/list/search/projects/model.ts b/service/stackweb/frontend/src/pages/list/search/projects/model.ts
new file mode 100644
index 0000000..83080df
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/list/search/projects/model.ts
@@ -0,0 +1,48 @@
+import { Effect, Reducer } from 'umi';
+
+import { ListItemDataType } from './data.d';
+import { queryFakeList } from './service';
+
+export interface StateType {
+ list: ListItemDataType[];
+}
+
+export interface ModelType {
+ namespace: string;
+ state: StateType;
+ effects: {
+ fetch: Effect;
+ };
+ reducers: {
+ queryList: Reducer{cardList}
+
+ 已选择 {selectedRowKeys.length} 项
+
+ 服务调用次数总计 {(selectedRows || []).reduce((pre, item) => pre + item.callNo, 0)} 万
+
+
+ )}
+ request={(params) => queryRule(params)}
+ columns={columns}
+ rowSelection={{}}
+ />
+
+
+);
+
+const description = (
+
+
+ 曲丽丽
+
+
+);
+
+const desc2 = (
+ 2016-12-12 12:32
+
+
+ 周毛毛
+
+
+);
+
+const popoverContent = (
+
+ 催一下
+
+
+ 吴加号
+
+ 未响应 } />
+
+
+);
+
+const customDot = (
+ dot: React.ReactNode,
+ {
+ status,
+ }: {
+ status: string;
+ },
+) => {
+ if (status === 'process') {
+ return (
+
+ 耗时：2小时25分钟
+
+
+
+
+
+ {({ isMobile }) => (
+
+
+ )}
+
+
+
+
+ 付小小
+ 32943898021309809423
+ 3321944288191034921
+ 18112345678
+
+ 曲丽丽 18100000000 浙江省杭州市西湖区黄姑山路工专路交叉路口
+
+
+
+ 725
+ 2017-08-08
+
+ 某某数据
+
+
+
+ }
+ >
+ 725
+
+ 2017-08-08
+
+
+
+ 林东东
+ 1234567
+ XX公司 - YY部
+ 2017-08-08
+
+ 这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...
+
+
+
+
+ Citrullus lanatus (Thunb.) Matsum. et
+ Nakai一年生蔓生藤本；茎、枝粗壮，具明显的棱。卷须较粗..
+
+
+
+ 付小小
+ 1234568
+
+
+
+
+
+
+ {contentList[operationKey]}
+
+
+
+ 信息组
+退货商品
+ 退货进度
+
+
+
+
+
+
+);
+
+const desc2 = (
+
+
+ 2016-12-12 12:32
+
+
+);
+
+const content = (
+ <>
+
+
+ +
+
+
+
+
+
+ } onClick={onSearch}>
+ Search
+
+
+
+
+
+ rowKey={(row: Service) => {
+ return row.name;
+ }}
+ loading={list.length === 0 ? loading : false}
+ columns={columns}
+ expandable={{ expandedRowRender }}
+ dataSource={list}
+ pagination={false}
+ />
+
+
+
+ );
+};
+
+export default connect(
+ ({
+ searchServices,
+ loading,
+ }: {
+ searchServices: ServicesState;
+ loading: { models: { [key: string]: boolean } };
+ }) => ({
+ searchServices,
+ loading: loading.models.listAndsearchAndarticles,
+ }),
+)(Services);
diff --git a/service/stackweb/frontend/src/pages/service/service-list/model.ts b/service/stackweb/frontend/src/pages/service/service-list/model.ts
new file mode 100644
index 0000000..938bff1
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/service/service-list/model.ts
@@ -0,0 +1,111 @@
+import {Effect, Reducer} from 'umi';
+import {Node, Service} from './data.d';
+import {queryServices} from './service';
+
+export interface ServicesState {
+ list: Service[];
+ filters: FiltersState;
+}
+
+export interface FiltersState {
+ service: string;
+ node: string;
+}
+
+export interface ModelType {
+ namespace: string;
+ state: ServicesState;
+ effects: {
+ fetch: Effect;
+ };
+ reducers: {
+ queryList: Reducer
+
+
+
+
+
+ {status === 'error' && loginType === 'account' && !submitting && (
+
+
+ {status === 'error' && loginType === 'mobile' && !submitting && (
+
+ 登录
+
+
+ );
+};
+
+export default connect(
+ ({
+ userAndlogin,
+ loading,
+ }: {
+ userAndlogin: StateType;
+ loading: {
+ effects: {
+ [key: string]: boolean;
+ };
+ };
+ }) => ({
+ userAndlogin,
+ submitting: loading.effects['userAndlogin/login'],
+ }),
+)(Login);
diff --git a/service/stackweb/frontend/src/pages/user/login/locales/en-US.ts b/service/stackweb/frontend/src/pages/user/login/locales/en-US.ts
new file mode 100644
index 0000000..f0bf354
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/user/login/locales/en-US.ts
@@ -0,0 +1,78 @@
+export default {
+ 'userandlogin.login.userName': 'userName',
+ 'userandlogin.login.password': 'password',
+ 'userandlogin.login.message-invalid-credentials':
+ 'Invalid username or password（admin/ant.design）',
+ 'userandlogin.login.message-invalid-verification-code': 'Invalid verification code',
+ 'userandlogin.login.tab-login-credentials': 'Credentials',
+ 'userandlogin.login.tab-login-mobile': 'Mobile number',
+ 'userandlogin.login.remember-me': 'Remember me',
+ 'userandlogin.login.forgot-password': 'Forgot your password?',
+ 'userandlogin.login.sign-in-with': 'Sign in with',
+ 'userandlogin.login.signup': 'Sign up',
+ 'userandlogin.login.login': 'Login',
+ 'userandlogin.register.register': 'Register',
+ 'userandlogin.register.get-verification-code': 'Get code',
+ 'userandlogin.register.sign-in': 'Already have an account?',
+ 'userandlogin.register-result.msg': 'Account：registered at {email}',
+ 'userandlogin.register-result.activation-email':
+ 'The activation email has been sent to your email address and is valid for 24 hours. Please log in to the email in time and click on the link in the email to activate the account.',
+ 'userandlogin.register-result.back-home': 'Back to home',
+ 'userandlogin.register-result.view-mailbox': 'View mailbox',
+ 'userandlogin.email.required': 'Please enter your email!',
+ 'userandlogin.email.wrong-format': 'The email address is in the wrong format!',
+ 'userandlogin.userName.required': 'Please enter your userName!',
+ 'userandlogin.password.required': 'Please enter your password!',
+ 'userandlogin.password.twice': 'The passwords entered twice do not match!',
+ 'userandlogin.strength.msg':
+ "Please enter at least 6 characters and don't use passwords that are easy to guess.",
+ 'userandlogin.strength.strong': 'Strength: strong',
+ 'userandlogin.strength.medium': 'Strength: medium',
+ 'userandlogin.strength.short': 'Strength: too short',
+ 'userandlogin.confirm-password.required': 'Please confirm your password!',
+ 'userandlogin.phone-number.required': 'Please enter your phone number!',
+ 'userandlogin.phone-number.wrong-format': 'Malformed phone number!',
+ 'userandlogin.verification-code.required': 'Please enter the verification code!',
+ 'userandlogin.title.required': 'Please enter a title',
+ 'userandlogin.date.required': 'Please select the start and end date',
+ 'userandlogin.goal.required': 'Please enter a description of the goal',
+ 'userandlogin.standard.required': 'Please enter a metric',
+ 'userandlogin.form.get-captcha': 'Get Captcha',
+ 'userandlogin.captcha.second': 'sec',
+ 'userandlogin.form.optional': ' (optional) ',
+ 'userandlogin.form.submit': 'Submit',
+ 'userandlogin.form.save': 'Save',
+ 'userandlogin.email.placeholder': 'Email',
+ 'userandlogin.password.placeholder': 'Password',
+ 'userandlogin.confirm-password.placeholder': 'Confirm password',
+ 'userandlogin.phone-number.placeholder': 'Phone number',
+ 'userandlogin.verification-code.placeholder': 'Verification code',
+ 'userandlogin.title.label': 'Title',
+ 'userandlogin.title.placeholder': 'Give the target a name',
+ 'userandlogin.date.label': 'Start and end date',
+ 'userandlogin.placeholder.start': 'Start date',
+ 'userandlogin.placeholder.end': 'End date',
+ 'userandlogin.goal.label': 'Goal description',
+ 'userandlogin.goal.placeholder': 'Please enter your work goals',
+ 'userandlogin.standard.label': 'Metrics',
+ 'userandlogin.standard.placeholder': 'Please enter a metric',
+ 'userandlogin.client.label': 'Client',
+ 'userandlogin.label.tooltip': 'Target service object',
+ 'userandlogin.client.placeholder':
+ 'Please describe your customer service, internal customers directly @ Name / job number',
+ 'userandlogin.invites.label': 'Inviting critics',
+ 'userandlogin.invites.placeholder':
+ 'Please direct @ Name / job number, you can invite up to 5 people',
+ 'userandlogin.weight.label': 'Weight',
+ 'userandlogin.weight.placeholder': 'Please enter weight',
+ 'userandlogin.public.label': 'Target disclosure',
+ 'userandlogin.label.help': 'Customers and invitees are shared by default',
+ 'userandlogin.radio.public': 'Public',
+ 'userandlogin.radio.partially-public': 'Partially public',
+ 'userandlogin.radio.private': 'Private',
+ 'userandlogin.publicUsers.placeholder': 'Open to',
+ 'userandlogin.option.A': 'Colleague A',
+ 'userandlogin.option.B': 'Colleague B',
+ 'userandlogin.option.C': 'Colleague C',
+ 'userandlogin.navBar.lang': 'Languages',
+};
diff --git a/service/stackweb/frontend/src/pages/user/login/locales/zh-CN.ts b/service/stackweb/frontend/src/pages/user/login/locales/zh-CN.ts
new file mode 100644
index 0000000..e5533fc
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/user/login/locales/zh-CN.ts
@@ -0,0 +1,74 @@
+export default {
+ 'userandlogin.login.userName': '用户名',
+ 'userandlogin.login.password': '密码',
+ 'userandlogin.login.message-invalid-credentials': '账户或密码错误（admin/ant.design）',
+ 'userandlogin.login.message-invalid-verification-code': '验证码错误',
+ 'userandlogin.login.tab-login-credentials': '账户密码登录',
+ 'userandlogin.login.tab-login-mobile': '手机号登录',
+ 'userandlogin.login.remember-me': '自动登录',
+ 'userandlogin.login.forgot-password': '忘记密码',
+ 'userandlogin.login.sign-in-with': '其他登录方式',
+ 'userandlogin.login.signup': '注册账户',
+ 'userandlogin.login.login': '登录',
+ 'userandlogin.register.register': '注册',
+ 'userandlogin.register.get-verification-code': '获取验证码',
+ 'userandlogin.register.sign-in': '使用已有账户登录',
+ 'userandlogin.register-result.msg': '你的账户：{email} 注册成功',
+ 'userandlogin.register-result.activation-email':
+ '激活邮件已发送到你的邮箱中，邮件有效期为24小时。请及时登录邮箱，点击邮件中的链接激活帐户。',
+ 'userandlogin.register-result.back-home': '返回首页',
+ 'userandlogin.register-result.view-mailbox': '查看邮箱',
+ 'userandlogin.email.required': '请输入邮箱地址！',
+ 'userandlogin.email.wrong-format': '邮箱地址格式错误！',
+ 'userandlogin.userName.required': '请输入用户名!',
+ 'userandlogin.password.required': '请输入密码！',
+ 'userandlogin.password.twice': '两次输入的密码不匹配!',
+ 'userandlogin.strength.msg': '请至少输入 6 个字符。请不要使用容易被猜到的密码。',
+ 'userandlogin.strength.strong': '强度：强',
+ 'userandlogin.strength.medium': '强度：中',
+ 'userandlogin.strength.short': '强度：太短',
+ 'userandlogin.confirm-password.required': '请确认密码！',
+ 'userandlogin.phone-number.required': '请输入手机号！',
+ 'userandlogin.phone-number.wrong-format': '手机号格式错误！',
+ 'userandlogin.verification-code.required': '请输入验证码！',
+ 'userandlogin.title.required': '请输入标题',
+ 'userandlogin.date.required': '请选择起止日期',
+ 'userandlogin.goal.required': '请输入目标描述',
+ 'userandlogin.standard.required': '请输入衡量标准',
+ 'userandlogin.form.get-captcha': '获取验证码',
+ 'userandlogin.captcha.second': '秒',
+ 'userandlogin.form.optional': '（选填）',
+ 'userandlogin.form.submit': '提交',
+ 'userandlogin.form.save': '保存',
+ 'userandlogin.email.placeholder': '邮箱',
+ 'userandlogin.password.placeholder': '至少6位密码，区分大小写',
+ 'userandlogin.confirm-password.placeholder': '确认密码',
+ 'userandlogin.phone-number.placeholder': '手机号',
+ 'userandlogin.verification-code.placeholder': '验证码',
+ 'userandlogin.title.label': '标题',
+ 'userandlogin.title.placeholder': '给目标起个名字',
+ 'userandlogin.date.label': '起止日期',
+ 'userandlogin.placeholder.start': '开始日期',
+ 'userandlogin.placeholder.end': '结束日期',
+ 'userandlogin.goal.label': '目标描述',
+ 'userandlogin.goal.placeholder': '请输入你的阶段性工作目标',
+ 'userandlogin.standard.label': '衡量标准',
+ 'userandlogin.standard.placeholder': '请输入衡量标准',
+ 'userandlogin.client.label': '客户',
+ 'userandlogin.label.tooltip': '目标的服务对象',
+ 'userandlogin.client.placeholder': '请描述你服务的客户，内部客户直接 @姓名／工号',
+ 'userandlogin.invites.label': '邀评人',
+ 'userandlogin.invites.placeholder': '请直接 @姓名／工号，最多可邀请 5 人',
+ 'userandlogin.weight.label': '权重',
+ 'userandlogin.weight.placeholder': '请输入',
+ 'userandlogin.public.label': '目标公开',
+ 'userandlogin.label.help': '客户、邀评人默认被分享',
+ 'userandlogin.radio.public': '公开',
+ 'userandlogin.radio.partially-public': '部分公开',
+ 'userandlogin.radio.private': '不公开',
+ 'userandlogin.publicUsers.placeholder': '公开给',
+ 'userandlogin.option.A': '同事甲',
+ 'userandlogin.option.B': '同事乙',
+ 'userandlogin.option.C': '同事丙',
+ 'userandlogin.navBar.lang': '语言',
+};
diff --git a/service/stackweb/frontend/src/pages/user/login/locales/zh-TW.ts b/service/stackweb/frontend/src/pages/user/login/locales/zh-TW.ts
new file mode 100644
index 0000000..f5289f4
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/user/login/locales/zh-TW.ts
@@ -0,0 +1,74 @@
+export default {
+ 'userandlogin.login.userName': '賬戶',
+ 'userandlogin.login.password': '密碼',
+ 'userandlogin.login.message-invalid-credentials': '賬戶或密碼錯誤（admin/ant.design）',
+ 'userandlogin.login.message-invalid-verification-code': '驗證碼錯誤',
+ 'userandlogin.login.tab-login-credentials': '賬戶密碼登錄',
+ 'userandlogin.login.tab-login-mobile': '手機號登錄',
+ 'userandlogin.login.remember-me': '自動登錄',
+ 'userandlogin.login.forgot-password': '忘記密碼',
+ 'userandlogin.login.sign-in-with': '其他登錄方式',
+ 'userandlogin.login.signup': '註冊賬戶',
+ 'userandlogin.login.login': '登錄',
+ 'userandlogin.register.register': '註冊',
+ 'userandlogin.register.get-verification-code': '獲取驗證碼',
+ 'userandlogin.register.sign-in': '使用已有賬戶登錄',
+ 'userandlogin.register-result.msg': '妳的賬戶：{email} 註冊成功',
+ 'userandlogin.register-result.activation-email':
+ '激活郵件已發送到妳的郵箱中，郵件有效期為24小時。請及時登錄郵箱，點擊郵件中的鏈接激活帳戶。',
+ 'userandlogin.register-result.back-home': '返回首頁',
+ 'userandlogin.register-result.view-mailbox': '查看郵箱',
+ 'userandlogin.email.required': '請輸入郵箱地址！',
+ 'userandlogin.email.wrong-format': '郵箱地址格式錯誤！',
+ 'userandlogin.userName.required': '請輸入賬戶!',
+ 'userandlogin.password.required': '請輸入密碼！',
+ 'userandlogin.password.twice': '兩次輸入的密碼不匹配!',
+ 'userandlogin.strength.msg': '請至少輸入 6 個字符。請不要使用容易被猜到的密碼。',
+ 'userandlogin.strength.strong': '強度：強',
+ 'userandlogin.strength.medium': '強度：中',
+ 'userandlogin.strength.short': '強度：太短',
+ 'userandlogin.confirm-password.required': '請確認密碼！',
+ 'userandlogin.phone-number.required': '請輸入手機號！',
+ 'userandlogin.phone-number.wrong-format': '手機號格式錯誤！',
+ 'userandlogin.verification-code.required': '請輸入驗證碼！',
+ 'userandlogin.title.required': '請輸入標題',
+ 'userandlogin.date.required': '請選擇起止日期',
+ 'userandlogin.goal.required': '請輸入目標描述',
+ 'userandlogin.standard.required': '請輸入衡量標淮',
+ 'userandlogin.form.get-captcha': '獲取驗證碼',
+ 'userandlogin.captcha.second': '秒',
+ 'userandlogin.form.optional': '（選填）',
+ 'userandlogin.form.submit': '提交',
+ 'userandlogin.form.save': '保存',
+ 'userandlogin.email.placeholder': '郵箱',
+ 'userandlogin.password.placeholder': '至少6位密碼，區分大小寫',
+ 'userandlogin.confirm-password.placeholder': '確認密碼',
+ 'userandlogin.phone-number.placeholder': '手機號',
+ 'userandlogin.verification-code.placeholder': '驗證碼',
+ 'userandlogin.title.label': '標題',
+ 'userandlogin.title.placeholder': '給目標起個名字',
+ 'userandlogin.date.label': '起止日期',
+ 'userandlogin.placeholder.start': '開始日期',
+ 'userandlogin.placeholder.end': '結束日期',
+ 'userandlogin.goal.label': '目標描述',
+ 'userandlogin.goal.placeholder': '請輸入妳的階段性工作目標',
+ 'userandlogin.standard.label': '衡量標淮',
+ 'userandlogin.standard.placeholder': '請輸入衡量標淮',
+ 'userandlogin.client.label': '客戶',
+ 'userandlogin.label.tooltip': '目標的服務對象',
+ 'userandlogin.client.placeholder': '請描述妳服務的客戶，內部客戶直接 @姓名／工號',
+ 'userandlogin.invites.label': '邀評人',
+ 'userandlogin.invites.placeholder': '請直接 @姓名／工號，最多可邀請 5 人',
+ 'userandlogin.weight.label': '權重',
+ 'userandlogin.weight.placeholder': '請輸入',
+ 'userandlogin.public.label': '目標公開',
+ 'userandlogin.label.help': '客戶、邀評人默認被分享',
+ 'userandlogin.radio.public': '公開',
+ 'userandlogin.radio.partially-public': '部分公開',
+ 'userandlogin.radio.private': '不公開',
+ 'userandlogin.publicUsers.placeholder': '公開給',
+ 'userandlogin.option.A': '同事甲',
+ 'userandlogin.option.B': '同事乙',
+ 'userandlogin.option.C': '同事丙',
+ 'userandlogin.navBar.lang': '語言',
+};
diff --git a/service/stackweb/frontend/src/pages/user/login/model.ts b/service/stackweb/frontend/src/pages/user/login/model.ts
new file mode 100644
index 0000000..5176de6
--- /dev/null
+++ b/service/stackweb/frontend/src/pages/user/login/model.ts
@@ -0,0 +1,77 @@
+import { Effect, history, Reducer } from 'umi';
+import { message } from 'antd';
+import { fakeAccountLogin, getFakeCaptcha } from './service';
+import { getPageQuery, setAuthority } from './utils/utils';
+
+export interface StateType {
+ status?: 'ok' | 'error';
+ type?: string;
+ currentAuthority?: 'user' | 'guest' | 'admin';
+}
+
+export interface ModelType {
+ namespace: string;
+ state: StateType;
+ effects: {
+ login: Effect;
+ getCaptcha: Effect;
+ };
+ reducers: {
+ changeLoginStatus: Reducer
+ setAutoLogin(e.target.checked)}>
+ 自动登录
+
+
+ 忘记密码
+
+
+
+ 其他登录方式
+
+
+
+
+
+
+
+
+
+);
+
+const RegisterResult: React.FC
+
+ ),
+ pass: (
+
+
+ ),
+ poor: (
+
+
+ ),
+};
+
+const passwordProgressMap: {
+ ok: 'success';
+ pass: 'normal';
+ poor: 'exception';
+} = {
+ ok: 'success',
+ pass: 'normal',
+ poor: 'exception',
+};
+
+interface RegisterProps {
+ dispatch: Dispatch
+