Merge remote-tracking branch 'origin/dev_1.4.1'

# Conflicts: # config/settings.yml
2024-07-12 15:54:50 +08:00 · 2024-07-12 09:40:25 +08:00 · 2024-07-05 11:46:06 +08:00 · 2024-07-05 09:30:04 +08:00 · 2024-07-04 16:12:49 +08:00 · 2024-07-04 15:33:23 +08:00
1 changed files with 6 additions and 16 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -1,12 +1,11 @@
 settings:
  application:
    # dev开发环境 test测试环境 prod线上环境
-    mode: dev
+    mode: prod
    # 服务器ip，默认使用 0.0.0.0
-#    host: 192.168.1.109
    host:  0.0.0.0
    # 服务名称
-    name: mh_service
+    name: pro-go-admin
    # 端口号
    port: 8002 # 服务端口号
    readtimeout: 1
@ -30,28 +29,19 @@ settings:
    enabledjob: false
  jwt:
    # token 密钥，生产环境时及的修改
-    secret: go-admin
-#    secret: adminqYrhCcQRvVNAaEo4h4osoW
+    secret: adminqYrhCcQRvVNAaEo4h4osoW
    # token 过期时间 单位：秒
    timeout: 3600
  database:
    # 数据库类型 mysql，sqlite3， postgres
    driver: mysql
    # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-#    source: root:myTest@921@tcp(127.0.0.1:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-    source: mh_dev:d9qy46ONI0ZTF9eH@tcp(112.33.14.191:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-#    source: mh_pro:c5JBW3X6EEVQluYM@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-#    source: mh_test:GPLzZ8rMmbJbKtMh@tcp(112.33.14.191:3306)/mh_test?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-#    source: mh_new_pro:YnzexdTfBHMSGZki@tcp(39.108.188.218:3306)/mh_new_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
-
+    source: mh_new_pro:YnzexdTfBHMSGZki@tcp(39.108.188.218:3306)/mh_new_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
  gen:
    # 代码生成读取的数据库名称
    dbname: dbname
    # 代码生成是使用前端代码存放位置，需要指定到src文件夹，相对路径
    frontpath: ../go-admin-ui/src
-
  export:
-    path: /Users/max/Documents/
-    url:  http://39.108.188.218:8000/img/export/
-#    path: /www/server/images/export/
-#    url:  https://dev.admin.deovo.com/load/export/
+    path: /www/server/images/export/
+    url:  https://admin.deovo.com/load/export/
Author	SHA1	Message	Date
chenlin	86f2ddc6f8	Merge remote-tracking branch 'origin/dev_1.4.1'	2024-07-12 15:54:50 +08:00
chenlin	5abaddf3fd	Merge remote-tracking branch 'origin/dev_1.4.1' # Conflicts: # config/settings.yml	2024-07-12 09:40:25 +08:00
chenlin	b47ea1135f	Merge remote-tracking branch 'origin/dev_1.4.1'	2024-07-05 11:46:06 +08:00
chenlin	b528c53e90	Merge remote-tracking branch 'origin/dev_1.4.1'	2024-07-05 09:30:04 +08:00
chenlin	2ee6ec00a0	Merge remote-tracking branch 'origin/dev_1.4.1'	2024-07-04 16:12:49 +08:00
chenlin	51f41ab996	更新配置文件	2024-07-04 15:33:23 +08:00
chenlin	21b1be03a5	Merge remote-tracking branch 'origin/dev_1.4.1' # Conflicts: # Makefile # app/admin/apis/ordermanage/order.go # app/admin/models/order.go # app/admin/models/store.go	2024-07-04 15:28:00 +08:00
chenlin	a67ea432db	Merge pull request '1.归还订单时如果物流订单号不为空则记录；' (#1 ) from feature_express_revert into master Reviewed-on: #1	2024-02-02 06:35:59 +00:00
chenlin	c971109cef	1.归还订单时如果物流订单号不为空则记录；	2024-02-01 15:45:16 +08:00
chenlin	cac48b5a5f	1.解决新增门店报错问题；	2024-01-12 17:35:00 +08:00
chenlin	9c527664c7	1.补充excel列表名称；	2023-12-28 11:27:03 +08:00
chenlin	5e37171e67	1.修改租赁订单导出接口，导出excel增加商品串码列数据。	2023-12-28 11:23:04 +08:00
chenlin	23afe85436	1.修改错别字；	2023-12-22 17:50:13 +08:00
chenlin	bb20dc76f1	1.修改错别字；	2023-12-22 17:47:33 +08:00
chenlin	17d06467fc	1.修改文件导出路径；	2023-12-22 17:40:52 +08:00
chenlin	63ff71eedb	1.增加订单列表导出接口； 2.调整订单列表"卡片状态"查询规则：查询卡片状态时优先查询order_card表，组合同类状态数据返回；同一订单非同一类型数据不返回	2023-12-14 10:29:22 +08:00