修改引用

.gitignore

@@ -4,8 +4,6 @@
 /binlog
 /rdlucklog
 /*.xlsx
-/go.sum
-/go.mod
 /hongze_task
 hongze_task
 go.sum

models/admin.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type Admin struct {
 	AdminId      int

models/classify.go

@@ -1,8 +1,8 @@
 package models
 
 import (
-	"rdluck_tools/orm"
-	"rdluck_tools/paging"
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 

models/company.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company/company.go

@@ -4,7 +4,7 @@ import (
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/models/company_contract"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_approval.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 func GetCompanyApprovalCount(companyId int,productId int) (count int, err error) {
 	sql:=`SELECT COUNT(1) AS count FROM company_approval WHERE company_id = ? AND product_id = ?  AND approve_status='待审批' `

models/company_approval/company_approval.go

@@ -1,7 +1,7 @@
 package company_approval
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_contract/company_contract.go

@@ -1,7 +1,7 @@
 package company_contract
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_end_date.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_permission_log.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_product.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_report_permission.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/company_report_permission_log.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_entry.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 //数据录入
 

models/data_manage/base_from_smm.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/chart_info.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_base.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"time"
 )

models/data_manage/edb_data_calculate.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_calculate_ljztbpj.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_calculate_time_shift.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_calculate_zjpj.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_cffex.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_dl.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_gl.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_lz.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_manual.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_pb.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_quarter.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 )
 
 func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {

models/data_manage/edb_data_sh.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_shfe.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_ths.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_wind.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_data_ys.go

@@ -15,7 +15,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"time"
 )

models/data_manage/edb_data_zz.go

@@ -3,7 +3,7 @@ package data_manage
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_info_calculate_bp.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_hbz.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_hcz.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_ljztbpj.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"sort"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_ljzzy.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_mapping.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_tbz.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_tcz.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_zjpj.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strings"
 	"time"
 )

models/data_source_longzhong.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/db.go

@@ -9,7 +9,7 @@ import (
 	"hongze/hongze_task/utils"
 	"time"
 
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 )
 
 func init() {

models/edbdata.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/edbdata_classify.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/edbinfo_longzhong.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type DataSourceLongzhong struct {
 	Id int `orm:"column(id);pk"`

models/edbinfo_send_msg_record.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/free_viewer.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type FreeViewerDetails struct {
 	RealName       string

models/longzhong.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 func GetLongzhonginfoByClassifyId(classifyId int) (items []*Longzhonginfo, err error) {
 	sql := `SELECT * FROM longzhonginfo WHERE classify_id=? ORDER BY longzhonginfo_id ASC `

models/report.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/report_send_ths_detail.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/report_view.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 )
 
 type ResearchReportViewers struct {

models/stack_company_statistic.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/user_view_statistics.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/users.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strings"
 )
 

models/wechat.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/http"
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"strings"
 	"time"
 )

models/wx_template_msg.go

@@ -1,6 +1,6 @@
 package models
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type SendTemplateResponse struct {
 	Errcode int    `json:"errcode"`

models/yb/activity.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/yb/activity_register.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/yb/activity_remind.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/yb/activity_type.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/yb/activity_voice.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/yb/yb_speaker.go

@@ -1,7 +1,7 @@
 package yb
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 )
 
 // Speaker 活动表

services/data/data_pb.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_task/models/data_manage"
 	"hongze/hongze_task/utils"
 	"net/url"
-	"rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"strings"
 	"time"
 )

services/data/data_ths.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"hongze/hongze_task/models/data_manage"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"strings"
 	"time"
 )

services/data/data_wind.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"hongze/hongze_task/models/data_manage"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"strings"
 	"time"
 )

services/data/edb_info.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"hongze/hongze_task/models/data_manage"
 	"hongze/hongze_task/utils"
-	"rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"strconv"
 	"sync"
 	"time"

services/data_source_longzhong.go

@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"rdluck_tools/http"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"strconv"
 	"strings"
 	"time"

utils/config.go

@@ -1,7 +1,9 @@
 package utils
 
 import (
+	"fmt"
 	beego "github.com/beego/beego/v2/adapter"
+	"github.com/beego/beego/v2/server/web"
 )
 
 var (
@@ -50,6 +52,15 @@ var (
 
 func init() {
 	RunMode = beego.AppConfig.String("run_mode")
+	if RunMode == "" {
+		RunMode = "release"
+		configPath := `/home/code/config/hongze_task/conf/app.conf`
+		err := web.LoadAppConfig("ini", configPath)
+		if err != nil {
+			fmt.Println("web.LoadAppConfig Err:" + err.Error())
+		}
+	}
+
 	config, err := beego.AppConfig.GetSection(RunMode)
 	if err != nil {
 		panic("配置文件读取错误 " + err.Error())