From e095ef6b1d80cd361d9e1478bd86f00b28063996 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 14 十一月 2023 13:59:26 +0800
Subject: [PATCH] 数据库迁移到aps库
---
model/test/supplier_type.go | 2
model/purchase/purchase.go | 4 ++
model/test/product.go | 2
model/purchase/purchase_products.go | 4 ++
service/test/supplier.go | 2
config.yaml | 40 -------------------
model/test/contract.go | 2
model/test/industry.go | 2
model/test/member.go | 2
service/test/product.go | 4 +-
model/purchase/purchase_type.go | 4 ++
model/test/supplier.go | 2
service/purchase/purchase.go | 12 +++---
13 files changed, 28 insertions(+), 54 deletions(-)
diff --git a/config.yaml b/config.yaml
index e1fa5a5..42698de 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,41 +1,3 @@
-aliyun-oss:
- endpoint: yourEndpoint
- access-key-id: yourAccessKeyId
- access-key-secret: yourAccessKeySecret
- bucket-name: yourBucketName
- bucket-url: yourBucketUrl
- base-path: yourBasePath
-autocode:
- server-model: /model/%s
- server-router: /router/%s
- server: /server
- server-api: /api/v1/%s
- server-plug: /plugin/%s
- server-initialize: /initialize
- root: D:\basic.com\gin-vue-admin
- web-table: /view
- web: /web/src
- server-service: /service/%s
- server-request: /model/%s/request/
- web-api: /api
- web-form: /view
- transfer-restart: true
-aws-s3:
- bucket: xxxxx-10005608
- region: ap-shanghai
- endpoint: ""
- secret-id: your-secret-id
- secret-key: your-secret-key
- base-url: https://gin.vue.admin
- path-prefix: srm
- s3-force-path-style: false
- disable-ssl: false
-captcha:
- key-long: 6
- img-width: 240
- img-height: 80
- open-captcha: 0
- open-captcha-timeout: 3600
cors:
mode: strict-whitelist
whitelist:
@@ -84,7 +46,7 @@
prefix: ""
port: "3306"
config: charset=utf8mb4&parseTime=True&loc=Local
- db-name: aps_srm
+ db-name: aps_server2
username: root
password: c++java123
path: 192.168.20.119
diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index 0e9fbdb..01a5e2b 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -39,6 +39,10 @@
PaidAmount decimal.Decimal `json:"paidAmount" form:"paidAmount" gorm:"type:decimal(12,2);not null;default '';comment:宸蹭粯閲戦"` //宸蹭粯閲戦
}
+func (Purchase) TableName() string {
+ return "srm_purchase"
+}
+
type OrderStatus int
const (
diff --git a/model/purchase/purchase_products.go b/model/purchase/purchase_products.go
index c04ff6b..e372392 100644
--- a/model/purchase/purchase_products.go
+++ b/model/purchase/purchase_products.go
@@ -16,3 +16,7 @@
Total decimal.Decimal `json:"total" form:"total" gorm:"type:decimal(12,2);not null;default 0.00;comment:閲囪喘鎬讳环"` // 閲囪喘鎬讳环
Remark string `json:"remark" form:"remark" gorm:"type:varchar(1000);not null; default '';comment:鎻忚堪"` //鎻忚堪
}
+
+func (PurchaseProducts) TableName() string {
+ return "srm_purchase_products"
+}
diff --git a/model/purchase/purchase_type.go b/model/purchase/purchase_type.go
index 4803067..8fc0535 100644
--- a/model/purchase/purchase_type.go
+++ b/model/purchase/purchase_type.go
@@ -11,3 +11,7 @@
Sort int `json:"sort" form:"sort" gorm:"type:int(11);not null;default 0;comment:鎺掑簭"` // 鎺掑簭
Pin bool `json:"pin" form:"pin" gorm:"type:tinyint(1);not null;default 0;comment:閲囪喘鍚嶇О"` // 鏄惁缃《
}
+
+func (PurchaseType) TableName() string {
+ return "srm_purchase_type"
+}
diff --git a/model/test/contract.go b/model/test/contract.go
index 87d5ad4..3689c9d 100644
--- a/model/test/contract.go
+++ b/model/test/contract.go
@@ -16,5 +16,5 @@
// TableName Contract 琛ㄥ悕
func (Contract) TableName() string {
- return "contract"
+ return "srm_contract"
}
diff --git a/model/test/industry.go b/model/test/industry.go
index def6576..30db4bf 100644
--- a/model/test/industry.go
+++ b/model/test/industry.go
@@ -13,5 +13,5 @@
// TableName Industry 琛ㄥ悕
func (Industry) TableName() string {
- return "industry"
+ return "srm_industry"
}
diff --git a/model/test/member.go b/model/test/member.go
index b640c2e..5b9d4eb 100644
--- a/model/test/member.go
+++ b/model/test/member.go
@@ -14,5 +14,5 @@
// TableName Member 琛ㄥ悕
func (Member) TableName() string {
- return "member"
+ return "srm_member"
}
diff --git a/model/test/product.go b/model/test/product.go
index 39f08da..1d8fe9a 100644
--- a/model/test/product.go
+++ b/model/test/product.go
@@ -24,5 +24,5 @@
// TableName Product 琛ㄥ悕
func (Product) TableName() string {
- return "product"
+ return "srm_product"
}
diff --git a/model/test/supplier.go b/model/test/supplier.go
index 394bab4..acba403 100644
--- a/model/test/supplier.go
+++ b/model/test/supplier.go
@@ -28,5 +28,5 @@
// TableName Supplier 琛ㄥ悕
func (Supplier) TableName() string {
- return "supplier"
+ return "srm_supplier"
}
diff --git a/model/test/supplier_type.go b/model/test/supplier_type.go
index ea85b26..5e4d938 100644
--- a/model/test/supplier_type.go
+++ b/model/test/supplier_type.go
@@ -13,5 +13,5 @@
// TableName SupplierType 琛ㄥ悕
func (SupplierType) TableName() string {
- return "supplier_type"
+ return "srm_supplier_type"
}
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index ced5939..87c542e 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -130,12 +130,12 @@
var ids []uint
var purchaseList = make([]*purchase.Purchase, 0)
if info.Keyword != "" {
- db.Distinct("purchases.id").Joins("left join purchase_products on purchase_products.purchase_id = purchases.id").
- Joins("left join Product on Product.Id = purchase_products.product_id").
- Joins("left join supplier on supplier.Id = purchases.supplier_id").
- Where("purchases.name like ?", "%"+info.Keyword+"%").
- Or("Product.name like ?", "%"+info.Keyword+"%").
- Or("supplier.name like ?", "%"+info.Keyword+"%")
+ db.Distinct("srm_purchase.id").Joins("left join srm_purchase_products on srm_purchase_products.purchase_id = srm_purchase.id").
+ Joins("left join srm_product on srm_product.Id = srm_purchase_products.product_id").
+ Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
+ Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
+ Or("srm_product.name like ?", "%"+info.Keyword+"%").
+ Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
err = db.Limit(limit).Offset(offset).Find(&ids).Error
if err != nil {
return purchaseList, total, err
diff --git a/service/test/product.go b/service/test/product.go
index 1079d11..b4d05c2 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -56,7 +56,7 @@
// 濡傛灉鏈夋潯浠舵悳绱� 涓嬫柟浼氳嚜鍔ㄥ垱寤烘悳绱㈣鍙�
//鎼滅储妗嗗悎涓�娣诲姞鏌ヨ鏉′欢
if info.Keyword != "" {
- db = db.Where("Product.name LIKE ?", "%"+info.Keyword+"%").Joins("Supplier").Or("Supplier.name LIKE ?", "%"+info.Keyword+"%")
+ db = db.Where("srm_product.name LIKE ?", "%"+info.Keyword+"%").Joins("srm_supplier").Or("srm_supplier.name LIKE ?", "%"+info.Keyword+"%")
}
if info.StartCreatedAt != nil && info.EndCreatedAt != nil {
db = db.Where("created_at BETWEEN ? AND ?", info.StartCreatedAt, info.EndCreatedAt)
@@ -100,7 +100,7 @@
}
if info.SupplierNumber != "" {
- db = db.Joins("Supplier").Where("Supplier.number LIKE ?", "%"+info.SupplierNumber+"%")
+ db = db.Joins("srm_supplier").Where("srm_supplier.number LIKE ?", "%"+info.SupplierNumber+"%")
}
if info.DeliveryTime != 0 {
diff --git a/service/test/supplier.go b/service/test/supplier.go
index 61417f3..5d7ac0c 100644
--- a/service/test/supplier.go
+++ b/service/test/supplier.go
@@ -64,7 +64,7 @@
db = db.Where("number LIKE ?", "%"+info.Number+"%")
}
if info.SupplierType != "" {
- db = db.Where("supplier_type LIKE ?", "%"+info.SupplierType+"%")
+ db = db.Where("srm_supplier_type LIKE ?", "%"+info.SupplierType+"%")
}
if info.Industry != "" {
db = db.Where("industry LIKE ?", "%"+info.Industry+"%")
--
Gitblit v1.8.0