Merge branch 'fixbug' into dev
正在显示
5 个修改的文件
包含
7 行增加
和
5 行删除
| @@ -57,11 +57,11 @@ spec: | @@ -57,11 +57,11 @@ spec: | ||
| 57 | - name: POSTGRESQL_USER | 57 | - name: POSTGRESQL_USER |
| 58 | value: "postgres" | 58 | value: "postgres" |
| 59 | - name: POSTGRESQL_PASSWORD | 59 | - name: POSTGRESQL_PASSWORD |
| 60 | - value: "postgres_55_online" | 60 | + value: "chJVQkg1sys" |
| 61 | - name: POSTGRESQL_HOST | 61 | - name: POSTGRESQL_HOST |
| 62 | - value: "112.124.115.55" | 62 | + value: "114.55.200.59" |
| 63 | - name: POSTGRESQL_PORT | 63 | - name: POSTGRESQL_PORT |
| 64 | - value: "15432" | 64 | + value: "31544" |
| 65 | - name: LOG_LEVEL | 65 | - name: LOG_LEVEL |
| 66 | value: "debug" | 66 | value: "debug" |
| 67 | - name: ERROR_BASE_CODE | 67 | - name: ERROR_BASE_CODE |
| @@ -2,6 +2,7 @@ package subscriber | @@ -2,6 +2,7 @@ package subscriber | ||
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | "fmt" | 4 | "fmt" |
| 5 | + | ||
| 5 | coreDomain "github.com/linmadan/egglib-go/core/domain" | 6 | coreDomain "github.com/linmadan/egglib-go/core/domain" |
| 6 | pgTransaction "github.com/linmadan/egglib-go/transaction/pg" | 7 | pgTransaction "github.com/linmadan/egglib-go/transaction/pg" |
| 7 | "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/factory" | 8 | "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/factory" |
| @@ -234,6 +234,7 @@ func (unifiedUserCenterService *UnifiedUserCenterService) SyncEmployeeCallback(s | @@ -234,6 +234,7 @@ func (unifiedUserCenterService *UnifiedUserCenterService) SyncEmployeeCallback(s | ||
| 234 | if _, err := employeeRepository.Save(employee); err != nil { | 234 | if _, err := employeeRepository.Save(employee); err != nil { |
| 235 | return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 235 | return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 236 | } | 236 | } |
| 237 | + // TODO 业务数据修改 | ||
| 237 | break | 238 | break |
| 238 | case "batchDelete": | 239 | case "batchDelete": |
| 239 | err := employeeDao.BatchRemove(uids) | 240 | err := employeeDao.BatchRemove(uids) |
| @@ -2,7 +2,7 @@ package constant | @@ -2,7 +2,7 @@ package constant | ||
| 2 | 2 | ||
| 3 | import "os" | 3 | import "os" |
| 4 | 4 | ||
| 5 | -var POSTGRESQL_DB_NAME = "mmm_worth" | 5 | +var POSTGRESQL_DB_NAME = "mmmworth_dev" |
| 6 | var POSTGRESQL_USER = "postgres" | 6 | var POSTGRESQL_USER = "postgres" |
| 7 | var POSTGRESQL_PASSWORD = "1993618jack" | 7 | var POSTGRESQL_PASSWORD = "1993618jack" |
| 8 | var POSTGRESQL_HOST = "127.0.0.1" | 8 | var POSTGRESQL_HOST = "127.0.0.1" |
| @@ -54,7 +54,7 @@ func (exchangeCashActivity *ExchangeCashActivity) Update(data map[string]interfa | @@ -54,7 +54,7 @@ func (exchangeCashActivity *ExchangeCashActivity) Update(data map[string]interfa | ||
| 54 | if createTime, ok := data["createTime"]; ok && createTime.(time.Time).IsZero() { | 54 | if createTime, ok := data["createTime"]; ok && createTime.(time.Time).IsZero() { |
| 55 | exchangeCashActivity.CreateTime = createTime.(time.Time) | 55 | exchangeCashActivity.CreateTime = createTime.(time.Time) |
| 56 | } | 56 | } |
| 57 | - exchangeCashActivity.CreateTime = time.Now() | 57 | + //exchangeCashActivity.CreateTime = time.Now() |
| 58 | return nil | 58 | return nil |
| 59 | } | 59 | } |
| 60 | 60 |
-
请 注册 或 登录 后发表评论