Jelajahi Sumber

正在添加 WebUI 后端接口

Signed-off-by: allan716 <[email protected]>
allan716 3 tahun lalu
induk
melakukan
3c87240398
36 mengubah file dengan 543 tambahan dan 99 penghapusan
  1. 2 0
      .gitignore
  2. 2 0
      cmd/GetCAPTCHA/main.go
  3. 5 8
      go.mod
  4. 18 5
      go.sum
  5. 21 5
      internal/backend/backend.go
  6. 8 0
      internal/backend/backend_test.go
  7. 23 0
      internal/backend/common/global_value.go
  8. 54 0
      internal/backend/controllers/v1/change_pwd.go
  9. 38 0
      internal/backend/controllers/v1/check_sub_supplier.go
  10. 26 0
      internal/backend/controllers/v1/controller_base.go
  11. 19 0
      internal/backend/controllers/v1/job_things.go
  12. 38 0
      internal/backend/controllers/v1/login.go
  13. 15 0
      internal/backend/controllers/v1/logout.go
  14. 11 0
      internal/backend/controllers/v1/path_things.go
  15. 11 0
      internal/backend/controllers/v1/proxy.go
  16. 11 0
      internal/backend/controllers/v1/settings.go
  17. 47 0
      internal/backend/controllers/v1/setup.go
  18. 27 0
      internal/backend/controllers/v1/system_status.go
  19. 0 1
      internal/backend/global_value.go
  20. 11 3
      internal/backend/middle/auth.go
  21. 36 0
      internal/backend/routers/base_router.go
  22. 0 35
      internal/backend/routers/handler_v1/handler_v1.go
  23. 0 29
      internal/backend/routers/router_v1/router_v1.go
  24. 2 1
      internal/dao/init.go
  25. 23 0
      internal/dao/user_info.go
  26. 2 2
      internal/models/user_info.go
  27. 3 0
      internal/pkg/hot_fix/hot_fix_hub.go
  28. 33 6
      internal/pkg/log_helper/loghelper.go
  29. 7 0
      internal/pkg/my_util/util.go
  30. 21 3
      internal/pkg/sub_formatter/sub_format_changer.go
  31. 5 0
      internal/types/backend/reply_common.go
  32. 2 1
      internal/types/backend/reply_login.go
  33. 4 0
      internal/types/backend/reply_system_status.go
  34. 6 0
      internal/types/backend/req_change_pwd.go
  35. 5 0
      internal/types/backend/req_check_sub_supplier.go
  36. 7 0
      internal/types/backend/req_setup_info.go

+ 2 - 0
.gitignore

@@ -59,3 +59,5 @@ TestData/
 /.rod
 /cmd/GetCAPTCHA
 /.idea
+/internal/backend/Logs
+/internal/backend

+ 2 - 0
cmd/GetCAPTCHA/main.go

@@ -10,6 +10,8 @@ import (
 
 func main() {
 
+	log_helper.SetLoggerName(log_helper.LogNameGetCAPTCHA)
+
 	notify_center.Notify = notify_center.NewNotifyCenter(config.GetConfig().WhenSubSupplierInvalidWebHook)
 
 	// 任务还没执行完,下一次执行时间到来,下一次执行就跳过不执行

+ 5 - 8
go.mod

@@ -14,11 +14,15 @@ require (
 	github.com/bodgit/sevenzip v1.1.0
 	github.com/emirpasic/gods v1.12.0
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/gin-contrib/cors v1.3.1
+	github.com/gin-gonic/gin v1.7.7
 	github.com/go-creed/sat v1.0.3
 	github.com/go-echarts/go-echarts/v2 v2.2.4
+	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-resty/resty/v2 v2.6.0
 	github.com/go-rod/rod v0.101.7
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/uuid v1.3.0
 	github.com/grd/stat v0.0.0-20130623202159-138af3fd5012
 	github.com/huandu/go-clone v1.3.0
 	github.com/james-bowman/nlp v0.0.0-20210511120306-26d441fa0ded
@@ -26,7 +30,6 @@ require (
 	github.com/jinzhu/now v1.1.2
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/klauspost/compress v1.12.2 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
 	github.com/magiconair/properties v1.8.4 // indirect
@@ -47,20 +50,18 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.9.4
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/ysmood/gson v0.7.0 // indirect
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
 	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
 	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/text v0.3.7
 	gonum.org/v1/gonum v0.9.3
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/errgo.v2 v2.1.0
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	gorm.io/gorm v1.21.12
 	modernc.org/sqlite v1.12.0
 )
@@ -78,16 +79,13 @@ require (
 	github.com/connesc/cipherio v0.2.1 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.7.7 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect
-	github.com/go-git/go-git/v5 v5.4.2 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.10.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -118,7 +116,6 @@ require (
 	github.com/ysmood/goob v0.3.0 // indirect
 	github.com/ysmood/leakless v0.7.0 // indirect
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
 	golang.org/x/exp v0.0.0-20211123021643-48cbe7f80d7c // indirect
 	golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
 	golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect

+ 18 - 5
go.sum

@@ -58,6 +58,7 @@ github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDa
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
 github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -65,6 +66,7 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
@@ -143,10 +145,14 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA=
+github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-echarts/go-echarts/v2 v2.2.4 h1:SKJpdyNIyD65XjbUZjzg6SwccTNXEgmh+PlaO23g2H0=
 github.com/go-echarts/go-echarts/v2 v2.2.4/go.mod h1:6TOomEztzGDVDkOSCFBq3ed7xOYfbOqhaBzD0YV771A=
@@ -159,6 +165,7 @@ github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4u
 github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
 github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
 github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8=
 github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
 github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
 github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
@@ -173,10 +180,13 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
@@ -336,7 +346,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -344,6 +353,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
@@ -359,11 +369,12 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY=
 github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -483,6 +494,7 @@ github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM=
@@ -623,7 +635,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -702,7 +713,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -736,6 +746,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -762,10 +773,10 @@ golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -889,6 +900,8 @@ gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 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/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

+ 21 - 5
internal/backend/backend.go

@@ -1,11 +1,27 @@
 package backend
 
 import (
-	"github.com/google/uuid"
+	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/routers"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/gin-contrib/cors"
+	"github.com/gin-gonic/gin"
 )
 
-// GenerateAccessToken 生成随机的 AccessToken
-func GenerateAccessToken() string {
-	u4 := uuid.New()
-	return u4.String()
+// StartBackEnd 开启后端的服务器
+func StartBackEnd(httpPort int) {
+
+	log_helper.SetLoggerName(log_helper.LogNameBackEnd)
+
+	engine := gin.Default()
+	// 默认所有都通过
+	engine.Use(cors.Default())
+	routers.InitRouter(engine)
+
+	// listen and serve on 0.0.0.0:8080(default)
+	log_helper.GetLogger().Infoln("Try Start Server At Port", httpPort)
+	err := engine.Run(":" + fmt.Sprintf("%d", httpPort))
+	if err != nil {
+		log_helper.GetLogger().Errorln("Start Server At Port", httpPort, "Error", err)
+	}
 }

+ 8 - 0
internal/backend/backend_test.go

@@ -0,0 +1,8 @@
+package backend
+
+import "testing"
+
+func TestStartBackEnd(t *testing.T) {
+
+	StartBackEnd(9981)
+}

+ 23 - 0
internal/backend/common/global_value.go

@@ -0,0 +1,23 @@
+package common
+
+import "sync"
+
+func SetAccessToken(newToken string) {
+
+	defer mutexAccessToken.Unlock()
+	mutexAccessToken.Lock()
+	accessToken = newToken
+}
+
+func GetAccessToken() string {
+
+	defer mutexAccessToken.RUnlock()
+	mutexAccessToken.RLocker()
+	return accessToken
+
+}
+
+var (
+	accessToken      = ""
+	mutexAccessToken sync.RWMutex
+)

+ 54 - 0
internal/backend/controllers/v1/change_pwd.go

@@ -0,0 +1,54 @@
+package v1
+
+import (
+	"errors"
+	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/dao"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (cb ControllerBase) ChangePwdHandler(c *gin.Context) {
+
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "ChangePwdHandler", err)
+	}()
+
+	changePwd := backend.ReqChangePwd{}
+	err = c.ShouldBindJSON(&changePwd)
+	if err != nil {
+		return
+	}
+
+	found, dbUserInfo, err := dao.GetUserInfo()
+	if err != nil {
+		return
+	}
+
+	if found == false {
+		// 找不到用户
+		c.JSON(http.StatusInternalServerError, backend.ReplyCommon{Message: "Can't Found UserInfo"})
+	} else if dbUserInfo.Password != changePwd.OrgPwd {
+		// 原始的密码不对
+		c.JSON(http.StatusNoContent, backend.ReplyCommon{Message: "Org Password Error"})
+	} else {
+		// 同意修改密码
+		dbUserInfo.Password = changePwd.NewPwd
+		re := dao.GetDb().Updates(dbUserInfo)
+		if re == nil {
+			err = errors.New(fmt.Sprintf("dao.GetDb().Updates return nil"))
+			return
+		}
+		if re.Error != nil {
+			err = re.Error
+			return
+		}
+		// 修改密码成功后,会清理 AccessToken,强制要求重写登录
+		common.SetAccessToken("")
+		c.JSON(http.StatusOK, backend.ReplyCommon{Message: "ok"})
+	}
+}

+ 38 - 0
internal/backend/controllers/v1/check_sub_supplier.go

@@ -0,0 +1,38 @@
+package v1
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/dao"
+	"github.com/allanpk716/ChineseSubFinder/internal/models"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (cb ControllerBase) CheckSubSupplierHandler(c *gin.Context) {
+
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "LoginHandler", err)
+	}()
+	nowUserInfo := models.UserInfo{}
+	err = c.ShouldBindJSON(&nowUserInfo)
+	if err != nil {
+		return
+	}
+
+	found, dbUserInfo, err := dao.GetUserInfo()
+	if err != nil {
+		return
+	}
+
+	if found == false || dbUserInfo.Username != nowUserInfo.Username || dbUserInfo.Password != nowUserInfo.Password {
+		c.JSON(http.StatusNoContent, backend.ReplyCommon{Message: "Username or Password Error"})
+	} else {
+		nowAccessToken := my_util.GenerateAccessToken()
+		common.SetAccessToken(nowAccessToken)
+		c.JSON(http.StatusOK, backend.ReplyLogin{AccessToken: nowAccessToken})
+	}
+}

+ 26 - 0
internal/backend/controllers/v1/controller_base.go

@@ -0,0 +1,26 @@
+package v1
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+type ControllerBase struct {
+}
+
+func NewControllerBase() *ControllerBase {
+	return &ControllerBase{}
+}
+
+func (cb ControllerBase) GetVersion() string {
+	return "v1"
+}
+
+func (cb *ControllerBase) ErrorProcess(c *gin.Context, funcName string, err error) {
+	if err != nil {
+		log_helper.GetLogger().Errorln(funcName, err.Error())
+		c.JSON(http.StatusInternalServerError, backend.ReplyCommon{Message: err.Error()})
+	}
+}

+ 19 - 0
internal/backend/controllers/v1/job_things.go

@@ -0,0 +1,19 @@
+package v1
+
+import "github.com/gin-gonic/gin"
+
+func (cb ControllerBase) JobStartHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "JobStartHandler", err)
+	}()
+}
+
+func (cb ControllerBase) JobStopHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "JobStopHandler", err)
+	}()
+}

+ 38 - 0
internal/backend/controllers/v1/login.go

@@ -0,0 +1,38 @@
+package v1
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/dao"
+	"github.com/allanpk716/ChineseSubFinder/internal/models"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (cb ControllerBase) LoginHandler(c *gin.Context) {
+
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "LoginHandler", err)
+	}()
+	nowUserInfo := models.UserInfo{}
+	err = c.ShouldBindJSON(&nowUserInfo)
+	if err != nil {
+		return
+	}
+
+	found, dbUserInfo, err := dao.GetUserInfo()
+	if err != nil {
+		return
+	}
+
+	if found == false || dbUserInfo.Username != nowUserInfo.Username || dbUserInfo.Password != nowUserInfo.Password {
+		c.JSON(http.StatusNoContent, backend.ReplyCommon{Message: "Username or Password Error"})
+	} else {
+		nowAccessToken := my_util.GenerateAccessToken()
+		common.SetAccessToken(nowAccessToken)
+		c.JSON(http.StatusOK, backend.ReplyLogin{AccessToken: nowAccessToken})
+	}
+}

+ 15 - 0
internal/backend/controllers/v1/logout.go

@@ -0,0 +1,15 @@
+package v1
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (cb ControllerBase) LogoutHandler(c *gin.Context) {
+
+	// 注销
+	common.SetAccessToken("")
+	c.JSON(http.StatusOK, backend.ReplyCommon{Message: "ok"})
+}

+ 11 - 0
internal/backend/controllers/v1/path_things.go

@@ -0,0 +1,11 @@
+package v1
+
+import "github.com/gin-gonic/gin"
+
+func (cb ControllerBase) CheckPathHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "CheckPathHandler", err)
+	}()
+}

+ 11 - 0
internal/backend/controllers/v1/proxy.go

@@ -0,0 +1,11 @@
+package v1
+
+import "github.com/gin-gonic/gin"
+
+func (cb ControllerBase) CheckProxyHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "CheckProxyHandler", err)
+	}()
+}

+ 11 - 0
internal/backend/controllers/v1/settings.go

@@ -0,0 +1,11 @@
+package v1
+
+import "github.com/gin-gonic/gin"
+
+func (cb ControllerBase) SettingsHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "SettingsHandler", err)
+	}()
+}

+ 47 - 0
internal/backend/controllers/v1/setup.go

@@ -0,0 +1,47 @@
+package v1
+
+import (
+	"errors"
+	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/dao"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (cb ControllerBase) SetupHandler(c *gin.Context) {
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "SetupHandler", err)
+	}()
+
+	setupInfo := backend.ReqSetupInfo{}
+	err = c.ShouldBindJSON(&setupInfo)
+	if err != nil {
+		return
+	}
+	// 只有当用户不存在的时候才能够执行初始化操作
+	found, _, err := dao.GetUserInfo()
+	if err != nil {
+		return
+	}
+	if found == true {
+		// 存在则反馈无需初始化
+		c.JSON(http.StatusNoContent, backend.ReplyCommon{Message: "already setup"})
+		return
+	} else {
+		// 需要创建用户,因为上述判断了没有用户存在,所以就默认直接新建了
+		re := dao.GetDb().Create(&setupInfo.UserInfo)
+		if re == nil {
+			err = errors.New(fmt.Sprintf("dao.GetDb().Create return nil"))
+			return
+		}
+		if re.Error != nil {
+			err = re.Error
+			return
+		}
+		c.JSON(http.StatusOK, backend.ReplyCommon{Message: "ok"})
+		return
+	}
+}

+ 27 - 0
internal/backend/controllers/v1/system_status.go

@@ -0,0 +1,27 @@
+package v1
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/dao"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+// SystemStatusHandler 获取系统状态
+func (cb ControllerBase) SystemStatusHandler(c *gin.Context) {
+
+	var err error
+	defer func() {
+		// 统一的异常处理
+		cb.ErrorProcess(c, "SystemStatusHandler", err)
+	}()
+
+	found, _, err := dao.GetUserInfo()
+	if err != nil {
+		return
+	}
+
+	c.JSON(http.StatusOK, backend.ReplySystemStatus{
+		IsSetup: found,
+	})
+}

+ 0 - 1
internal/backend/global_value.go

@@ -1 +0,0 @@
-package backend

+ 11 - 3
internal/backend/middle/auth.go

@@ -1,17 +1,25 @@
 package middle
 
 import (
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"strings"
 )
 
 func CheckAuth() gin.HandlerFunc {
 
 	return func(context *gin.Context) {
-		authHeader := context.Request.Header.Get("AccessToken")
-		if authHeader != "123456" {
-			context.JSON(http.StatusUnauthorized, backend.ReplyCheckAuth{Message: "Need Login!"})
+		authHeader := context.Request.Header.Get("Authorization")
+		if len(authHeader) <= 1 {
+			context.JSON(http.StatusUnauthorized, backend.ReplyCheckAuth{Message: "Request Header Authorization Error"})
+			context.Abort()
+			return
+		}
+		nowAccessToken := strings.Fields(authHeader)[1]
+		if nowAccessToken != common.GetAccessToken() {
+			context.JSON(http.StatusUnauthorized, backend.ReplyCheckAuth{Message: "AccessToken Error"})
 			context.Abort()
 			return
 		}

+ 36 - 0
internal/backend/routers/base_router.go

@@ -0,0 +1,36 @@
+package routers
+
+import (
+	v1 "github.com/allanpk716/ChineseSubFinder/internal/backend/controllers/v1"
+	"github.com/allanpk716/ChineseSubFinder/internal/backend/middle"
+	"github.com/gin-gonic/gin"
+)
+
+func InitRouter(router *gin.Engine) {
+
+	cbV1 := v1.NewControllerBase()
+
+	router.GET("/system-status", cbV1.SystemStatusHandler)
+
+	router.POST("/setup", cbV1.SetupHandler)
+
+	router.POST("/login", cbV1.LoginHandler)
+
+	GroupV1 := router.Group("/" + cbV1.GetVersion())
+	{
+		GroupV1.Use(middle.CheckAuth())
+
+		GroupV1.POST("/logout", cbV1.LogoutHandler)
+
+		GroupV1.POST("/change-pwd", cbV1.ChangePwdHandler)
+
+		GroupV1.GET("/settings", cbV1.SettingsHandler)
+		GroupV1.PATCH("/settings", cbV1.SettingsHandler)
+
+		GroupV1.POST("/check-proxy", cbV1.CheckProxyHandler)
+
+		GroupV1.POST("/check-path", cbV1.CheckPathHandler)
+		GroupV1.POST("/jobs/start", cbV1.JobStartHandler)
+		GroupV1.POST("/jobs/stop", cbV1.JobStopHandler)
+	}
+}

+ 0 - 35
internal/backend/routers/handler_v1/handler_v1.go

@@ -1,35 +0,0 @@
-package handler_v1
-
-import "github.com/gin-gonic/gin"
-
-func PostLoginHandler(c *gin.Context) {
-
-}
-
-func PostChangePwdHandler(c *gin.Context) {
-
-}
-
-func GetSettingsHandler(c *gin.Context) {
-
-}
-
-func PatchSettingsHandler(c *gin.Context) {
-
-}
-
-func PostCheckProxyHandler(c *gin.Context) {
-
-}
-
-func PostCheckPathHandler(c *gin.Context) {
-
-}
-
-func PostJobStartHandler(c *gin.Context) {
-
-}
-
-func PostJobStopHandler(c *gin.Context) {
-
-}

+ 0 - 29
internal/backend/routers/router_v1/router_v1.go

@@ -1,29 +0,0 @@
-package router_v1
-
-import (
-	"github.com/allanpk716/ChineseSubFinder/internal/backend/middle"
-	"github.com/allanpk716/ChineseSubFinder/internal/backend/routers/handler_v1"
-	"github.com/gin-gonic/gin"
-)
-
-func GetRouters(router *gin.Engine) *gin.RouterGroup {
-
-	router.Use(middle.CheckAuth())
-	v1 := router.Group("/v1")
-	{
-		v1.POST("/login", handler_v1.PostLoginHandler)
-
-		v1.POST("/change-pwd", handler_v1.PostChangePwdHandler)
-
-		v1.GET("/settings", handler_v1.GetSettingsHandler)
-		v1.PATCH("/settings", handler_v1.PatchSettingsHandler)
-
-		v1.POST("/check-proxy", handler_v1.PostCheckProxyHandler)
-
-		v1.POST("/check-path", handler_v1.PostCheckPathHandler)
-
-		v1.POST("/jobs/start", handler_v1.PostJobStartHandler)
-		v1.POST("/jobs/stop", handler_v1.PostJobStopHandler)
-	}
-	return v1
-}

+ 2 - 1
internal/dao/init.go

@@ -71,7 +71,8 @@ you need implement getDbName() in file: internal/dao/init.go `))
 		return errors.New(fmt.Sprintf("failed to connect database, %s", err.Error()))
 	}
 	// 迁移 schema
-	err = db.AutoMigrate(&models.HotFix{}, &models.SubFormatRec{})
+	err = db.AutoMigrate(&models.HotFix{}, &models.SubFormatRec{},
+		&models.UserInfo{})
 	if err != nil {
 		return errors.New(fmt.Sprintf("db AutoMigrate error, %s", err.Error()))
 	}

+ 23 - 0
internal/dao/user_info.go

@@ -0,0 +1,23 @@
+package dao
+
+import (
+	"github.com/allanpk716/ChineseSubFinder/internal/models"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+)
+
+func GetUserInfo() (bool, models.UserInfo, error) {
+	var userInfos []models.UserInfo
+	results := GetDb().Find(&userInfos)
+	if results == nil || len(userInfos) == 0 {
+		log_helper.GetLogger().Infoln("Need Setup For First Time Use.")
+		return false, models.UserInfo{}, nil
+	}
+	if results.Error != nil {
+		return false, models.UserInfo{}, results.Error
+	}
+	if len(userInfos) > 1 {
+		log_helper.GetLogger().Warningln("Found UserInfo len > 2 ")
+	}
+	// 导出第一个用户的信息
+	return true, userInfos[0], nil
+}

+ 2 - 2
internal/models/user_info.go

@@ -4,6 +4,6 @@ import "gorm.io/gorm"
 
 type UserInfo struct {
 	gorm.Model
-	Username string `json:"username"` // 用户名
-	Password string `json:"password"` // 密码
+	Username string `json:"username" binding:"required,alphanum"`     // 用户名
+	Password string `json:"password" binding:"required,min=6,max=12"` // 密码
 }

+ 3 - 0
internal/pkg/hot_fix/hot_fix_hub.go

@@ -56,6 +56,9 @@ func HotFixProcess(param types.HotFixParam) error {
 			// 执行成功则存入数据库中,标记完成
 			markHotFixDone := models.HotFix{Key: hotfixCase.GetKey(), Done: true}
 			result = dao.GetDb().Create(&markHotFixDone)
+			if result == nil {
+				return errors.New(fmt.Sprintf("hotfix %s is done, but record failed, dao.GetDb().Create return nil", hotfixCase.GetKey()))
+			}
 			if result.Error != nil {
 				return errors.New(fmt.Sprintf("hotfix %s is done, but record failed, %s", hotfixCase.GetKey(), result.Error))
 			}

+ 33 - 6
internal/pkg/log_helper/loghelper.go

@@ -41,8 +41,17 @@ func NewLogHelper(appName string, level logrus.Level, maxAge time.Duration, rota
 	return Logger
 }
 
+// SetLoggerName 如果是 ChineseSubFinder 调用则无需使用,其他子程序用的时候,为了区分日子名称,需要设置
+func SetLoggerName(logName string) {
+	if logName == "" {
+		panic("Need Set Logger Name")
+	}
+	logNameBase = logName
+}
+
 func GetLogger() *logrus.Logger {
-	logOnce.Do(func() {
+
+	oneBase.Do(func() {
 
 		var level logrus.Level
 		// 之前是读取配置文件,现在改为,读取当前目录下,是否有一个特殊的文件,有则启动 Debug 日志级别
@@ -52,9 +61,16 @@ func GetLogger() *logrus.Logger {
 		} else {
 			level = logrus.InfoLevel
 		}
-		logger = NewLogHelper("ChineseSubFinder", level, time.Duration(7*24)*time.Hour, time.Duration(24)*time.Hour)
+
+		if logNameBase == "" {
+			// 默认不设置的时候就是这个
+			logNameBase = LogNameChineseSubFinder
+		}
+
+		loggerBase = NewLogHelper(logNameBase, level, time.Duration(7*24)*time.Hour, time.Duration(24)*time.Hour)
 	})
-	return logger
+
+	return loggerBase
 }
 
 func isFile(filePath string) bool {
@@ -71,7 +87,9 @@ func WriteDebugFile() error {
 		return nil
 	}
 	f, err := os.Create(DebugFileName)
-	defer f.Close()
+	defer func() {
+		_ = f.Close()
+	}()
 	if err != nil {
 		return err
 	}
@@ -93,5 +111,14 @@ func DeleteDebugFile() error {
 
 const DebugFileName = "opendebuglog"
 
-var logger *logrus.Logger
-var logOnce sync.Once
+const (
+	LogNameChineseSubFinder = "ChineseSubFinder"
+	LogNameGetCAPTCHA       = "GetCAPTCHA"
+	LogNameBackEnd          = "BackEnd"
+)
+
+var (
+	logNameBase = ""
+	oneBase     = sync.Once{}
+	loggerBase  *logrus.Logger
+)

+ 7 - 0
internal/pkg/my_util/util.go

@@ -11,6 +11,7 @@ import (
 	"github.com/allanpk716/ChineseSubFinder/internal/types"
 	browser "github.com/allanpk716/fake-useragent"
 	"github.com/go-resty/resty/v2"
+	"github.com/google/uuid"
 	"io"
 	"math"
 	"net/http"
@@ -525,3 +526,9 @@ func GetNowTimeString() (string, int, int, int) {
 	addString := fmt.Sprintf("%d-%d-%d", nowTime.Hour(), nowTime.Minute(), nowTime.Nanosecond())
 	return addString, nowTime.Hour(), nowTime.Minute(), nowTime.Nanosecond()
 }
+
+// GenerateAccessToken 生成随机的 AccessToken
+func GenerateAccessToken() string {
+	u4 := uuid.New()
+	return u4.String()
+}

+ 21 - 3
internal/pkg/sub_formatter/sub_format_changer.go

@@ -203,7 +203,13 @@ func GetSubFormatter(subNameFormatter int) ifaces.ISubFormatter {
 // SubFormatChangerProcess 执行 SubFormatChanger 逻辑,并且更新数据库缓存
 func SubFormatChangerProcess(movieRootDir string, seriesRootDir string, nowDesFormatter common.FormatterName) (RenameResults, error) {
 	var subFormatRec models.SubFormatRec
-	dao.GetDb().First(&subFormatRec)
+	re := dao.GetDb().First(&subFormatRec)
+	if re == nil {
+		return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().First return nil"))
+	}
+	if re.Error != nil {
+		return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().First, %v", re.Error))
+	}
 	subFormatChanger := NewSubFormatChanger(movieRootDir, seriesRootDir)
 	// 理论上有且仅有一条记录
 	if subFormatRec.Done == false {
@@ -215,7 +221,13 @@ func SubFormatChangerProcess(movieRootDir string, seriesRootDir string, nowDesFo
 
 		// 需要记录到数据库中
 		oneSubFormatter := models.SubFormatRec{FormatName: int(nowDesFormatter), Done: true}
-		dao.GetDb().Create(&oneSubFormatter)
+		re = dao.GetDb().Create(&oneSubFormatter)
+		if re == nil {
+			return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().Create return nil"))
+		}
+		if re.Error != nil {
+			return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().Create, %v", re.Error))
+		}
 		return renameResults, nil
 	} else {
 		// 找到了,需要判断上一次执行的目标 formatter 是啥,如果这次的目标 formatter 不一样则执行
@@ -232,7 +244,13 @@ func SubFormatChangerProcess(movieRootDir string, seriesRootDir string, nowDesFo
 		// 更新数据库
 		subFormatRec.FormatName = int(nowDesFormatter)
 		subFormatRec.Done = true
-		dao.GetDb().Save(subFormatRec)
+		re = dao.GetDb().Save(subFormatRec)
+		if re == nil {
+			return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().Save return nil"))
+		}
+		if re.Error != nil {
+			return RenameResults{}, errors.New(fmt.Sprintf("SubFormatChangerProcess dao.GetDb().Save, %v", re.Error))
+		}
 		return renameResults, nil
 	}
 }

+ 5 - 0
internal/types/backend/reply_common.go

@@ -0,0 +1,5 @@
+package backend
+
+type ReplyCommon struct {
+	Message string `json:"message,omitempty"`
+}

+ 2 - 1
internal/types/backend/reply_login.go

@@ -1,5 +1,6 @@
 package backend
 
 type ReplyLogin struct {
-	AccessToken string `json:"access_token"` // 登录成功后返回令牌
+	AccessToken string `json:"access_token,omitempty"` // 登录成功后返回令牌
+	Message     string `json:"message,omitempty"`
 }

+ 4 - 0
internal/types/backend/reply_system_status.go

@@ -1 +1,5 @@
 package backend
+
+type ReplySystemStatus struct {
+	IsSetup bool `json:"is_setup"` // 是否进行给初始化设置(引导设置),设置用户名什么的
+}

+ 6 - 0
internal/types/backend/req_change_pwd.go

@@ -0,0 +1,6 @@
+package backend
+
+type ReqChangePwd struct {
+	OrgPwd string `json:"org_pwd" binding:"required,min=6,max=12"`
+	NewPwd string `json:"new_pwd" binding:"required,min=6,max=12"`
+}

+ 5 - 0
internal/types/backend/req_check_sub_supplier.go

@@ -0,0 +1,5 @@
+package backend
+
+type CheckSubSupplier struct {
+	SupplierNames []string `json:"supplier_names" binding:"required"`
+}

+ 7 - 0
internal/types/backend/req_setup_info.go

@@ -0,0 +1,7 @@
+package backend
+
+import "github.com/allanpk716/ChineseSubFinder/internal/models"
+
+type ReqSetupInfo struct {
+	UserInfo models.UserInfo `json:"user_info" binding:"required"`
+}