作者 陈志颖

合并分支 'dev' 到 'master'

Dev



查看合并请求 !51
# Config file for [Air](https://github.com/cosmtrek/air) in TOML format
# Working directory
# . or absolute path, please note that the directories following must be under root.
root = "."
tmp_dir = "tmp"
[build]
# Just plain old shell command. You could use `make` as well.
cmd = "go build -o ./tmp/main ."
# Binary file yields from `cmd`.
bin = "tmp/main"
# Customize binary.
full_bin = "APP_ENV=dev APP_USER=air ./tmp/main"
# Watch these filename extensions.
include_ext = ["go", "tpl", "tmpl", "html"]
# Ignore these filename extensions or directories.
exclude_dir = ["assets", "tmp", "vendor", "frontend/node_modules"]
# Watch these directories if you specified.
include_dir = []
# Exclude files.
exclude_file = []
# Exclude unchanged files.
exclude_unchanged = true
# This log file places in your tmp_dir.
log = "air.log"
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 1000 # ms
# Stop running old binary when build errors occur.
stop_on_error = true
# Send Interrupt signal before killing process (windows does not support this feature)
send_interrupt = false
# Delay after sending Interrupt signal
kill_delay = 500 # ms
[log]
# Show log time
time = false
[color]
# Customize each part's color. If no color found, use the raw app log.
main = "magenta"
watcher = "cyan"
build = "yellow"
runner = "green"
[misc]
# Delete tmp directory on exit
clean_on_exit = true
\ No newline at end of file
... ...
... ... @@ -83,7 +83,6 @@
### 值对象
### 聚合根
### 领域服务
... ...
... ... @@ -83,7 +83,7 @@ spec:
- name: UCENTER_CHECK_ALT
value: "6DwjBO735"
- name: BUSINESS_ADMIN_HOST
value: "http://suplus-business-admin-dev.fjmaimaimai.com"
value: "https://suplus-business-admin-dev.fjmaimaimai.com"
- name: KAFKA_HOST
value: ""
- name: KAFKA_CONSUMER_ID
... ...
... ... @@ -76,11 +76,11 @@ spec:
- name: UCENTER_SECRET
value: "cykbjnfqgctn"
- name: UCENTER_APP_KEY
value: "39aefef9e22744a3b2d2d3791824ae7b"
value: "39aefef9e22744a3b2d2d3791824ae7b"s
- name: UCENTER_CHECK_ALT
value: "rsF0pL!6DwjBO735"
- name: BUSINESS_ADMIN_HOST
value: "http://suplus-business-admin-prd.fjmaimaimai.com"
value: "https://suplus-business-admin-prd.fjmaimaimai.com"
- name: KAFKA_HOST
value: "192.168.0.250:9092;192.168.0.251:9092;192.168.0.252:9092"
- name: KAFKA_CONSUMER_ID
... ...
... ... @@ -80,7 +80,7 @@ spec:
- name: UCENTER_CHECK_ALT
value: "rsF0pL!6DwjBO735"
- name: BUSINESS_ADMIN_HOST
value: "http://suplus-business-admin-test.fjmaimaimai.com"
value: "https://suplus-business-admin-test.fjmaimaimai.com"
- name: KAFKA_HOST
value: "192.168.0.250:9092;192.168.0.251:9092;192.168.0.252:9092"
- name: KAFKA_CONSUMER_ID
... ...
... ... @@ -20,7 +20,7 @@ var (
var ORDER_BASE = "order_base" // 订单管理栏目
var (
BUSINESS_ADMIN_HOST = "http://suplus-business-admin-test.fjmaimaimai.com" //企业平台的地址
BUSINESS_ADMIN_HOST = "https://suplus-business-admin-test.fjmaimaimai.com" //企业平台的地址
)
// 导入excel文件列总数
... ...
... ... @@ -54,7 +54,7 @@ func (controller *ColumnSettingController) CreateColumnSetting() {
/**
* @Author SteveChan
* @Description // 更新栏目设置
* @Description 更新栏目设置
* @Date 22:52 2021/1/26
* @Param
* @return
... ...
... ... @@ -752,7 +752,7 @@ func (c *OrderInfoController) DownloadTemplate() {
}
// 获取导入模板
req := httplib.Get("http://suplus-file-dev.fjmaimaimai.com/upload/file/2021020111293523855.xlsx")
req := httplib.Get("https://suplus-file-dev.fjmaimaimai.com/upload/file/2021020111293523855.xlsx")
err = req.ToFile(constant.IMPORT_EXCEL)
if err != nil {
logs.Error("could not save to file: ", err)
... ...
不能预览此文件类型