caipin vor 4 Jahren
Ursprung
Commit
c56bb51eea
5 geänderte Dateien mit 32 neuen und 5 gelöschten Zeilen
  1. 9 0
      conf/db.go
  2. 10 2
      conf/redis.go
  3. 1 1
      dao/bid_account_dao.go
  4. 10 0
      deployment/cm.sh
  5. 2 2
      web/middleware/accessAuth.go

+ 9 - 0
conf/db.go

@@ -36,6 +36,15 @@ var DbMasterList = []DbConfig{
 		Datebase:  "construction",
 		IsRunning: true,
 	},
+	// qa
+	{
+		Host:      "192.168.1.76",
+		Port:      3306,
+		User:      "zh_dev",
+		Pwd:       "zongheng2019",
+		Datebase:  "construction",
+		IsRunning: true,
+	},
 }
 
 var DbMaster = DbMasterList[1]

+ 10 - 2
conf/redis.go

@@ -1,5 +1,5 @@
 /*
- * @description: 
+ * @description:
  * @Author: CP
  * @Date: 2021-01-27 10:57:57
  * @FilePath: \construction_management\conf\redis.go
@@ -16,6 +16,7 @@ type RdsConfig struct {
 
 // 系统中用到的所有redis缓存资源
 var RdsCacheList = []RdsConfig{
+	// 本机
 	{
 		Host:      "192.168.1.26",
 		Port:      6379,
@@ -23,6 +24,13 @@ var RdsCacheList = []RdsConfig{
 		Pwd:       "",
 		IsRunning: true,
 	},
+	{
+		Host:      "192.168.1.76",
+		Port:      6379,
+		User:      "",
+		Pwd:       "",
+		IsRunning: true,
+	},
 }
 
-var RdsCache RdsConfig = RdsCacheList[0]
+var RdsCache RdsConfig = RdsCacheList[1]

+ 1 - 1
dao/bid_account_dao.go

@@ -34,7 +34,7 @@ func (d *BidAccountDao) GetBidAccount(bidsectionId int, projectId int) []models.
 
 	err := d.engine.
 		Where("bidsection_id = ? and project_id=?", bidsectionId, projectId).
-		Desc("id").
+		Asc("id").
 		Find(&datalist)
 	if err != nil {
 		return datalist

+ 10 - 0
deployment/cm.sh

@@ -0,0 +1,10 @@
+###
+ # @description: 
+ # @Author: CP
+ # @Date: 2021-01-29 11:51:52
+ # @FilePath: \construction_management\deployment\cm.sh
+### 
+docker run  --name construction_management \
+	    -p 2020:6060 \
+	      -d \
+	        registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest

+ 2 - 2
web/middleware/accessAuth.go

@@ -63,8 +63,8 @@ func AccessAuth(ctx iris.Context) {
 	permissionAccountDao := dao.NewPermissionAccountDao(datasource.InstanceDbMaster())
 	permissionData := permissionAccountDao.GetBidsectionIdAccountId(bidsectionId, account.Id)
 	// permissionData := s.permissionAccountDao.GetBidsectionId(bidsectionId)
-	fmt.Println(bidsectionId, account.Id)
-	fmt.Println(permissionData)
+	// fmt.Println(bidsectionId, account.Id)
+	// fmt.Println(permissionData)
 
 	// 1-1.是管理员- 拥有所有权限
 	if account.IsAdmin != 1 {