Ver código fonte

修改项目目录结构

hongze 2 dias atrás
pai
commit
ff79de8d14
85 arquivos alterados com 293 adições e 296 exclusões
  1. 2 2
      controllers/base_auth.go
  2. 2 2
      controllers/base_auth_v2.go
  3. 1 1
      controllers/base_common.go
  4. 9 9
      controllers/chart.go
  5. 2 2
      controllers/chart_auth.go
  6. 18 18
      controllers/chart_common.go
  7. 1 1
      controllers/error.go
  8. 8 8
      controllers/excel_info.go
  9. 2 2
      controllers/table.go
  10. 1 1
      go.mod
  11. 4 4
      main.go
  12. 1 1
      models/business_conf.go
  13. 2 2
      models/chart.go
  14. 1 1
      models/chart_edb_mapping.go
  15. 1 1
      models/chart_series.go
  16. 1 1
      models/data_manage/cross_variety/chart_tag.go
  17. 1 1
      models/data_manage/cross_variety/chart_tag_variety.go
  18. 1 1
      models/data_manage/cross_variety/chart_variety.go
  19. 1 1
      models/data_manage/edb_info.go
  20. 1 1
      models/data_manage/edb_info_calculate.go
  21. 1 1
      models/data_manage/edb_source.go
  22. 1 1
      models/data_manage/excel/excel_chart_data.go
  23. 2 2
      models/data_manage/excel/excel_chart_edb.go
  24. 1 1
      models/data_manage/excel/excel_classify.go
  25. 1 1
      models/data_manage/excel/excel_edb_mapping.go
  26. 1 1
      models/data_manage/excel/excel_info.go
  27. 1 1
      models/data_manage/excel/excel_sheet_data.go
  28. 1 1
      models/data_manage/excel/response/excel_classify.go
  29. 3 3
      models/data_manage/excel/response/excel_info.go
  30. 1 1
      models/data_manage/excel/response/sheet.go
  31. 1 1
      models/data_manage/factor_edb_series.go
  32. 1 1
      models/data_manage/factor_edb_series_chart_mapping.go
  33. 1 1
      models/data_manage/factor_edb_series_mapping.go
  34. 1 1
      models/data_manage/future_good/future_good_edb_info_data.go
  35. 1 1
      models/data_manage/future_good/request/future_good_chart.go
  36. 1 1
      models/data_manage/future_good/response/future_good_chart_classify.go
  37. 2 2
      models/data_manage/future_good/response/future_good_chart_profit.go
  38. 1 1
      models/data_manage/line_feature/response/line_feature.go
  39. 2 2
      models/data_manage/predict_edb_conf.go
  40. 1 1
      models/data_manage/predict_edb_conf_calculate_mapping.go
  41. 3 3
      models/db.go
  42. 2 2
      models/edb_data_base.go
  43. 1 1
      models/excel_info.go
  44. 1 1
      models/factor_edb_series_calculate_data_qjjs.go
  45. 1 1
      models/handle_data.go
  46. 1 1
      models/mgo/base_from_business_data.go
  47. 1 1
      models/mgo/common.go
  48. 1 1
      models/mgo/edb_data_business.go
  49. 1 1
      models/mgo/edb_data_ths_hf.go
  50. 2 2
      models/mgo_base.go
  51. 3 3
      models/response/excel_info.go
  52. 86 86
      routers/commentsRouter.go
  53. 2 2
      routers/commentsRouter_controllers.go
  54. 1 1
      routers/router.go
  55. 1 1
      services/alarm_msg/alarm_msg.go
  56. 3 3
      services/data/base_edb_lib.go
  57. 3 3
      services/data/chart_extra_config.go
  58. 8 8
      services/data/chart_info.go
  59. 4 4
      services/data/chart_info_excel_balance.go
  60. 2 2
      services/data/chart_info_interface.go
  61. 2 3
      services/data/chart_theme.go
  62. 4 4
      services/data/correlation/chart_info.go
  63. 5 5
      services/data/cross_variety/chart.go
  64. 2 2
      services/data/edb_data.go
  65. 6 8
      services/data/edb_info.go
  66. 4 4
      services/data/excel/balance_table.go
  67. 6 6
      services/data/excel/excel_info.go
  68. 5 5
      services/data/excel/mixed_table.go
  69. 5 5
      services/data/excel/time_table.go
  70. 2 2
      services/data/future_good/base_future_good_lib.go
  71. 6 6
      services/data/future_good/chart_info.go
  72. 3 3
      services/data/future_good/future_edb_info.go
  73. 2 2
      services/data/handle_data.go
  74. 4 4
      services/data/line_equation/chart_info.go
  75. 4 4
      services/data/line_feature/chart_info.go
  76. 3 3
      services/data/predict_edb_info.go
  77. 3 3
      services/data/predict_edb_info_rule.go
  78. 5 5
      services/data/range_analysis/chart_info.go
  79. 1 1
      services/dw_mini/base_mini_lib.go
  80. 2 2
      services/dw_mini/dw_mini.go
  81. 2 2
      services/excel/luck_sheet_table.go
  82. 2 2
      services/excel/lucky_sheet.go
  83. 1 1
      utils/config.go
  84. 1 1
      utils/mgodb/mgo_config.go
  85. 1 1
      utils/redis.go

+ 2 - 2
controllers/base_auth.go

@@ -2,8 +2,8 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
 	"net/http"

+ 2 - 2
controllers/base_auth_v2.go

@@ -2,8 +2,8 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
 	"net/http"

+ 1 - 1
controllers/base_common.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
 	"net/http"

+ 9 - 9
controllers/chart.go

@@ -2,15 +2,15 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/data_manage/cross_variety/request"
-	"eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/services/data/cross_variety"
-	"eta/eta_chart_lib/services/data/range_analysis"
-	dwmini "eta/eta_chart_lib/services/dw_mini"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/data_manage/cross_variety/request"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/services/data/cross_variety"
+	"eta_gn/eta_chart_lib/services/data/range_analysis"
+	dwmini "eta_gn/eta_chart_lib/services/dw_mini"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"strings"
 	"time"

+ 2 - 2
controllers/chart_auth.go

@@ -2,8 +2,8 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 )
 

+ 18 - 18
controllers/chart_common.go

@@ -2,24 +2,24 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	cross_varietyReq "eta/eta_chart_lib/models/data_manage/cross_variety/request"
-	"eta/eta_chart_lib/models/data_manage/future_good"
-	"eta/eta_chart_lib/models/data_manage/future_good/request"
-	"eta/eta_chart_lib/models/data_manage/future_good/response"
-	line_equationReq "eta/eta_chart_lib/models/data_manage/line_equation/request"
-	line_featureReq "eta/eta_chart_lib/models/data_manage/line_feature/request"
-	"eta/eta_chart_lib/services/data"
-	correlationServ "eta/eta_chart_lib/services/data/correlation"
-	"eta/eta_chart_lib/services/data/cross_variety"
-	"eta/eta_chart_lib/services/data/excel"
-	future_goodServ "eta/eta_chart_lib/services/data/future_good"
-	"eta/eta_chart_lib/services/data/line_equation"
-	lineFeatureServ "eta/eta_chart_lib/services/data/line_feature"
-	"eta/eta_chart_lib/services/data/range_analysis"
-	dwmini "eta/eta_chart_lib/services/dw_mini"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	cross_varietyReq "eta_gn/eta_chart_lib/models/data_manage/cross_variety/request"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good/request"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good/response"
+	line_equationReq "eta_gn/eta_chart_lib/models/data_manage/line_equation/request"
+	line_featureReq "eta_gn/eta_chart_lib/models/data_manage/line_feature/request"
+	"eta_gn/eta_chart_lib/services/data"
+	correlationServ "eta_gn/eta_chart_lib/services/data/correlation"
+	"eta_gn/eta_chart_lib/services/data/cross_variety"
+	"eta_gn/eta_chart_lib/services/data/excel"
+	future_goodServ "eta_gn/eta_chart_lib/services/data/future_good"
+	"eta_gn/eta_chart_lib/services/data/line_equation"
+	lineFeatureServ "eta_gn/eta_chart_lib/services/data/line_feature"
+	"eta_gn/eta_chart_lib/services/data/range_analysis"
+	dwmini "eta_gn/eta_chart_lib/services/dw_mini"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"

+ 1 - 1
controllers/error.go

@@ -1,6 +1,6 @@
 package controllers
 
-import "eta/eta_chart_lib/models"
+import "eta_gn/eta_chart_lib/models"
 
 // ErrorController
 // @Description: 该控制器处理页面错误请求

+ 8 - 8
controllers/excel_info.go

@@ -2,14 +2,14 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	excel3 "eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/models/response"
-	"eta/eta_chart_lib/services/data"
-	excel2 "eta/eta_chart_lib/services/data/excel"
-	"eta/eta_chart_lib/services/excel"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	excel3 "eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/models/response"
+	"eta_gn/eta_chart_lib/services/data"
+	excel2 "eta_gn/eta_chart_lib/services/data/excel"
+	"eta_gn/eta_chart_lib/services/excel"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"strings"
 	"time"

+ 2 - 2
controllers/table.go

@@ -2,8 +2,8 @@ package controllers
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"time"
 )

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module eta/eta_chart_lib
+module eta_gn/eta_chart_lib
 
 go 1.21.7
 

+ 4 - 4
main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"eta/eta_chart_lib/controllers"
-	_ "eta/eta_chart_lib/routers"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/controllers"
+	_ "eta_gn/eta_chart_lib/routers"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"runtime"
 	"time"

+ 1 - 1
models/business_conf.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"html"

+ 2 - 2
models/chart.go

@@ -2,8 +2,8 @@ package models
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models/mgo"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/mgo"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"strconv"
 	"time"

+ 1 - 1
models/chart_edb_mapping.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 )
 

+ 1 - 1
models/chart_series.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 1 - 1
models/data_manage/cross_variety/chart_tag.go

@@ -1,7 +1,7 @@
 package cross_variety
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/cross_variety/chart_tag_variety.go

@@ -1,7 +1,7 @@
 package cross_variety
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/cross_variety/chart_variety.go

@@ -1,7 +1,7 @@
 package cross_variety
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/edb_info.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/edb_info_calculate.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/edb_source.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"

+ 1 - 1
models/data_manage/excel/excel_chart_data.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 2 - 2
models/data_manage/excel/excel_chart_edb.go

@@ -1,8 +1,8 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strconv"

+ 1 - 1
models/data_manage/excel/excel_classify.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 1 - 1
models/data_manage/excel/excel_edb_mapping.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 1 - 1
models/data_manage/excel/excel_info.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 1 - 1
models/data_manage/excel/excel_sheet_data.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/excel/response/excel_classify.go

@@ -1,7 +1,7 @@
 package response
 
 import (
-	"eta/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
 )
 
 type ExcelClassifyListResp struct {

+ 3 - 3
models/data_manage/excel/response/excel_info.go

@@ -1,9 +1,9 @@
 package response
 
 import (
-	excel2 "eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/models/data_manage/excel/request"
-	"eta/eta_chart_lib/services/excel"
+	excel2 "eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/data_manage/excel/request"
+	"eta_gn/eta_chart_lib/services/excel"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )

+ 1 - 1
models/data_manage/excel/response/sheet.go

@@ -1,7 +1,7 @@
 package response
 
 import (
-	"eta/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
 	"time"
 )
 

+ 1 - 1
models/data_manage/factor_edb_series.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"

+ 1 - 1
models/data_manage/factor_edb_series_chart_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"

+ 1 - 1
models/data_manage/factor_edb_series_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"

+ 1 - 1
models/data_manage/future_good/future_good_edb_info_data.go

@@ -1,7 +1,7 @@
 package future_good
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"

+ 1 - 1
models/data_manage/future_good/request/future_good_chart.go

@@ -1,7 +1,7 @@
 package request
 
 import (
-	"eta/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models"
 )
 
 type EditChartEnInfoReq struct {

+ 1 - 1
models/data_manage/future_good/response/future_good_chart_classify.go

@@ -1,7 +1,7 @@
 package response
 
 import (
-	"eta/eta_chart_lib/models/data_manage/future_good"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good"
 )
 
 type FutureGoodChartClassifyListResp struct {

+ 2 - 2
models/data_manage/future_good/response/future_good_chart_profit.go

@@ -1,8 +1,8 @@
 package response
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage/future_good/request"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good/request"
 )
 
 // ProfitFutureGoodChartResp 商品利润图

+ 1 - 1
models/data_manage/line_feature/response/line_feature.go

@@ -1,6 +1,6 @@
 package response
 
-import "eta/eta_chart_lib/models"
+import "eta_gn/eta_chart_lib/models"
 
 // LineFeatureDataResp 曲线图的一些数据返回
 type LineFeatureDataResp struct {

+ 2 - 2
models/data_manage/predict_edb_conf.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 1 - 1
models/data_manage/predict_edb_conf_calculate_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )

+ 3 - 3
models/db.go

@@ -1,9 +1,9 @@
 package models
 
 import (
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/data_manage/future_good"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good"
+	"eta_gn/eta_chart_lib/utils"
 	_ "github.com/go-sql-driver/mysql"
 	"time"
 

+ 2 - 2
models/edb_data_base.go

@@ -1,8 +1,8 @@
 package models
 
 import (
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/utils"
 )
 
 func GetEdbDataTableName(source, subSource int) (tableName string) {

+ 1 - 1
models/excel_info.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"

+ 1 - 1
models/factor_edb_series_calculate_data_qjjs.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"strings"

+ 1 - 1
models/handle_data.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"time"
 )
 

+ 1 - 1
models/mgo/base_from_business_data.go

@@ -3,7 +3,7 @@ package mgo
 import (
 	"context"
 	"errors"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/qiniu/qmgo"
 	"go.mongodb.org/mongo-driver/bson"

+ 1 - 1
models/mgo/common.go

@@ -1,7 +1,7 @@
 package mgo
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )

+ 1 - 1
models/mgo/edb_data_business.go

@@ -3,7 +3,7 @@ package mgo
 import (
 	"context"
 	"errors"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/qiniu/qmgo"
 	"go.mongodb.org/mongo-driver/bson"

+ 1 - 1
models/mgo/edb_data_ths_hf.go

@@ -3,7 +3,7 @@ package mgo
 import (
 	"context"
 	"errors"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/qiniu/qmgo"
 	"go.mongodb.org/mongo-driver/bson"

+ 2 - 2
models/mgo_base.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/utils"
-	"eta/eta_chart_lib/utils/mgodb"
+	"eta_gn/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils/mgodb"
 	"fmt"
 )
 

+ 3 - 3
models/response/excel_info.go

@@ -1,9 +1,9 @@
 package response
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/services/excel"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/services/excel"
 	"time"
 )
 

+ 86 - 86
routers/commentsRouter.go

@@ -7,102 +7,102 @@ import (
 
 func init() {
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartAuthController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartAuthController"],
-        beego.ControllerComments{
-            Method: "ChartInfoDetail",
-            Router: `/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartAuthController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartAuthController"],
+		beego.ControllerComments{
+			Method:           "ChartInfoDetail",
+			Router:           `/detail`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "CommonChartInfoDetailFromUniqueCode",
-            Router: `/common/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "CommonChartInfoDetailFromUniqueCode",
+			Router:           `/common/detail`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "CorrelationChartInfoRefresh",
-            Router: `/correlation/refresh`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "CorrelationChartInfoRefresh",
+			Router:           `/correlation/refresh`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "ChartInfoDetail",
-            Router: `/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "ChartInfoDetail",
+			Router:           `/detail`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "Collect",
-            Router: `/dw/collect`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "Collect",
+			Router:           `/dw/collect`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "CollectCancel",
-            Router: `/dw/collectCancel`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "CollectCancel",
+			Router:           `/dw/collectCancel`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "FutureGoodChartInfoRefresh",
-            Router: `/future_good/refresh`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "FutureGoodChartInfoRefresh",
+			Router:           `/future_good/refresh`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "ChartInfoRefresh",
-            Router: `/refresh`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
+		beego.ControllerComments{
+			Method:           "ChartInfoRefresh",
+			Router:           `/refresh`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ExcelInfoController"],
-        beego.ControllerComments{
-            Method: "GetTableDetail",
-            Router: `/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ExcelInfoController"],
+		beego.ControllerComments{
+			Method:           "GetTableDetail",
+			Router:           `/detail`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ExcelInfoController"],
-        beego.ControllerComments{
-            Method: "Refresh",
-            Router: `/refresh`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ExcelInfoController"],
+		beego.ControllerComments{
+			Method:           "Refresh",
+			Router:           `/refresh`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
-    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:TableController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:TableController"],
-        beego.ControllerComments{
-            Method: "TableInfoDetail",
-            Router: `/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:TableController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:TableController"],
+		beego.ControllerComments{
+			Method:           "TableInfoDetail",
+			Router:           `/detail`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
             Filters: nil,
             Params: nil})
 

+ 2 - 2
routers/commentsRouter_controllers.go

@@ -7,7 +7,7 @@ import (
 
 func init() {
 
-	beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
 		beego.ControllerComments{
 			Method:           "ChartInfoDetail",
 			Router:           "/detail",
@@ -16,7 +16,7 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
-	beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:ChartController"],
+	beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta_gn/eta_chart_lib/controllers:ChartController"],
 		beego.ControllerComments{
 			Method:           "ChartInfoRefresh",
 			Router:           "/refresh",

+ 1 - 1
routers/router.go

@@ -8,7 +8,7 @@
 package routers
 
 import (
-	"eta/eta_chart_lib/controllers"
+	"eta_gn/eta_chart_lib/controllers"
 	"github.com/beego/beego/v2/server/web"
 )
 

+ 1 - 1
services/alarm_msg/alarm_msg.go

@@ -2,7 +2,7 @@ package alarm_msg
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/rdlucklib/rdluck_tools/http"
 )
 

+ 3 - 3
services/data/base_edb_lib.go

@@ -2,9 +2,9 @@ package data
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"io/ioutil"
 	"net/http"

+ 3 - 3
services/data/chart_extra_config.go

@@ -2,9 +2,9 @@ package data
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"sort"
 	"strconv"

+ 8 - 8
services/data/chart_info.go

@@ -3,10 +3,10 @@ package data
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"math"
@@ -2014,7 +2014,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(v.ChartLegend)
+					chartLegend, _ := strconv.Atoi(v.ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -2150,7 +2150,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
 							continue
 						}
 						// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
-						chartLegend,_ := strconv.Atoi(v.ChartLegend)
+						chartLegend, _ := strconv.Atoi(v.ChartLegend)
 						if chartLegend < startYear {
 							continue
 						}
@@ -2323,7 +2323,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -2411,7 +2411,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}

+ 4 - 4
services/data/chart_info_excel_balance.go

@@ -3,10 +3,10 @@ package data
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"math"
 	"sort"

+ 2 - 2
services/data/chart_info_interface.go

@@ -1,8 +1,8 @@
 package data
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
 )
 
 type ChartInfoDataShow interface {

+ 2 - 3
services/data/chart_theme.go

@@ -2,8 +2,8 @@ package data
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models/data_manage/chart_theme"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/data_manage/chart_theme"
+	"eta_gn/eta_chart_lib/utils"
 )
 
 // GetChartThemeConfig
@@ -79,7 +79,6 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 	return
 }
 
-
 // 兼容历史数据,加入新字段LineOptionList
 func ConvertOldChartOptions(config string) (newConfig string, err error) {
 	var oldTheme chart_theme.OldChartOptions

+ 4 - 4
services/data/correlation/chart_info.go

@@ -3,10 +3,10 @@ package correlation
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"math"

+ 5 - 5
services/data/cross_variety/chart.go

@@ -2,11 +2,11 @@ package cross_variety
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	cross_varietyModel "eta/eta_chart_lib/models/data_manage/cross_variety"
-	"eta/eta_chart_lib/models/data_manage/cross_variety/request"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	cross_varietyModel "eta_gn/eta_chart_lib/models/data_manage/cross_variety"
+	"eta_gn/eta_chart_lib/models/data_manage/cross_variety/request"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"time"

+ 2 - 2
services/data/edb_data.go

@@ -1,8 +1,8 @@
 package data
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"time"
 )
 

+ 6 - 8
services/data/edb_info.go

@@ -2,10 +2,10 @@ package data
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"math"
@@ -1268,9 +1268,8 @@ func GetEdbSourceByEdbInfoIdListForExcel(edbInfoIdList []int) (sourceNameList, s
 	return
 }
 
-
 // HandleDataByLinearRegressionToList 插值法补充数据(线性方程式)
-func HandleDataByLinearRegressionToList (edbInfoDataList []*models.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToList(edbInfoDataList []*models.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}
@@ -1408,9 +1407,8 @@ func HandleDataByLinearRegressionToListV2(edbInfoDataList []*models.EdbDataList,
 	return
 }
 
-
 // HandleDataByLinearRegressionToListV3 插值法补充数据(线性方程式)-直接补充指标起始日期间的所有数据
-func HandleDataByLinearRegressionToListV3 (edbInfoDataList []*models.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*models.EdbDataList, dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToListV3(edbInfoDataList []*models.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*models.EdbDataList, dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}

+ 4 - 4
services/data/excel/balance_table.go

@@ -3,10 +3,10 @@ package excel
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"github.com/xuri/excelize/v2"

+ 6 - 6
services/data/excel/excel_info.go

@@ -3,12 +3,12 @@ package excel
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/data_manage/excel"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"sort"
 	"time"

+ 5 - 5
services/data/excel/mixed_table.go

@@ -3,11 +3,11 @@ package excel
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"github.com/yidane/formula"

+ 5 - 5
services/data/excel/time_table.go

@@ -2,11 +2,11 @@ package excel
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"sort"
 	"strconv"

+ 2 - 2
services/data/future_good/base_future_good_lib.go

@@ -2,8 +2,8 @@ package future_good
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"io/ioutil"
 	"net/http"

+ 6 - 6
services/data/future_good/chart_info.go

@@ -2,12 +2,12 @@ package future_good
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	future_good2 "eta/eta_chart_lib/models/data_manage/future_good"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	future_good2 "eta_gn/eta_chart_lib/models/data_manage/future_good"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"sort"

+ 3 - 3
services/data/future_good/future_edb_info.go

@@ -1,9 +1,9 @@
 package future_good
 
 import (
-	"eta/eta_chart_lib/models/data_manage/future_good"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/data_manage/future_good"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"time"
 )

+ 2 - 2
services/data/handle_data.go

@@ -2,8 +2,8 @@ package data
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/shopspring/decimal"
 	"math"
 	"time"

+ 4 - 4
services/data/line_equation/chart_info.go

@@ -2,10 +2,10 @@ package line_equation
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage/line_equation/request"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage/line_equation/request"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/shopspring/decimal"
 	"math"
 	"time"

+ 4 - 4
services/data/line_feature/chart_info.go

@@ -2,10 +2,10 @@ package line_feature
 
 import (
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage/line_feature/response"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage/line_feature/response"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/shopspring/decimal"
 	"time"
 )

+ 3 - 3
services/data/predict_edb_info.go

@@ -3,9 +3,9 @@ package data
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/shopspring/decimal"
 	"strconv"
 	"time"

+ 3 - 3
services/data/predict_edb_info_rule.go

@@ -3,9 +3,9 @@ package data
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/nosixtools/solarlunar"
 	"github.com/shopspring/decimal"

+ 5 - 5
services/data/range_analysis/chart_info.go

@@ -3,11 +3,11 @@ package range_analysis
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/models/data_manage"
-	"eta/eta_chart_lib/services/alarm_msg"
-	"eta/eta_chart_lib/services/data"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/models/data_manage"
+	"eta_gn/eta_chart_lib/services/alarm_msg"
+	"eta_gn/eta_chart_lib/services/data"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"math"

+ 1 - 1
services/dw_mini/base_mini_lib.go

@@ -1,7 +1,7 @@
 package dwmini
 
 import (
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"io"
 	"net/http"

+ 2 - 2
services/dw_mini/dw_mini.go

@@ -3,8 +3,8 @@ package dwmini
 import (
 	"encoding/json"
 	"errors"
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 )
 
 type MyChartIsCollect struct {

+ 2 - 2
services/excel/luck_sheet_table.go

@@ -1,8 +1,8 @@
 package excel
 
 import (
-	"eta/eta_chart_lib/models"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models"
+	"eta_gn/eta_chart_lib/utils"
 	"strconv"
 	"strings"
 	"time"

+ 2 - 2
services/excel/lucky_sheet.go

@@ -2,8 +2,8 @@ package excel
 
 import (
 	"encoding/json"
-	"eta/eta_chart_lib/models/request"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/models/request"
+	"eta_gn/eta_chart_lib/utils"
 	"fmt"
 	"math"
 	"reflect"

+ 1 - 1
utils/config.go

@@ -79,7 +79,7 @@ func init() {
 		} else {
 			RunMode = "release"
 		}
-		configPath := `/home/code/config/eta_chart_lib/conf/app.conf`
+		configPath := `/home/code/config/eta_gn/eta_chart_lib/conf/app.conf`
 		err = web.LoadAppConfig("ini", configPath)
 		if err != nil {
 			fmt.Println("web.LoadAppConfig Err:" + err.Error())

+ 1 - 1
utils/mgodb/mgo_config.go

@@ -2,7 +2,7 @@ package mgodb
 
 import (
 	"context"
-	"eta/eta_chart_lib/utils"
+	"eta_gn/eta_chart_lib/utils"
 	"github.com/qiniu/qmgo"
 	"github.com/qiniu/qmgo/options"
 	"go.mongodb.org/mongo-driver/bson"

+ 1 - 1
utils/redis.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"eta/eta_chart_lib/utils/redis"
+	"eta_gn/eta_chart_lib/utils/redis"
 	"time"
 )