mirror of
				https://github.com/songquanpeng/one-api.git
				synced 2025-10-31 13:53:41 +08:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			v0.5.12-al
			...
			v0.5.10-de
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 5df751f5ca | ||
|  | b519170c06 | ||
|  | 3d9ad0024a | 
							
								
								
									
										12
									
								
								.github/workflows/docker-image-amd64.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/docker-image-amd64.yml
									
									
									
									
										vendored
									
									
								
							| @@ -9,6 +9,8 @@ on: | |||||||
|       name: |       name: | ||||||
|         description: 'reason' |         description: 'reason' | ||||||
|         required: false |         required: false | ||||||
|  | permissions: | ||||||
|  |   packages: write | ||||||
| jobs: | jobs: | ||||||
|   push_to_registries: |   push_to_registries: | ||||||
|     name: Push Docker image to multiple registries |     name: Push Docker image to multiple registries | ||||||
| @@ -25,12 +27,6 @@ jobs: | |||||||
|           git describe --tags > VERSION  |           git describe --tags > VERSION  | ||||||
|  |  | ||||||
|       - name: Log in to Docker Hub |       - name: Log in to Docker Hub | ||||||
|         uses: docker/login-action@v2 |  | ||||||
|         with: |  | ||||||
|           username: ${{ secrets.DOCKERHUB_USERNAME }} |  | ||||||
|           password: ${{ secrets.DOCKERHUB_TOKEN }} |  | ||||||
|  |  | ||||||
|       - name: Log in to the Container registry |  | ||||||
|         uses: docker/login-action@v2 |         uses: docker/login-action@v2 | ||||||
|         with: |         with: | ||||||
|           registry: ghcr.io |           registry: ghcr.io | ||||||
| @@ -41,9 +37,7 @@ jobs: | |||||||
|         id: meta |         id: meta | ||||||
|         uses: docker/metadata-action@v4 |         uses: docker/metadata-action@v4 | ||||||
|         with: |         with: | ||||||
|           images: | |           images: ghcr.io/${{ github.repository }} | ||||||
|             justsong/one-api |  | ||||||
|             ghcr.io/${{ github.repository }} |  | ||||||
|  |  | ||||||
|       - name: Build and push Docker images |       - name: Build and push Docker images | ||||||
|         uses: docker/build-push-action@v3 |         uses: docker/build-push-action@v3 | ||||||
|   | |||||||
| @@ -6,14 +6,15 @@ import ( | |||||||
| 	"gorm.io/gorm" | 	"gorm.io/gorm" | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| 	"strings" | 	"strings" | ||||||
|  | 	"strconv" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // User if you add sensitive fields, don't forget to clean them in setupLogin function. | // User if you add sensitive fields, don't forget to clean them in setupLogin function. | ||||||
| // Otherwise, the sensitive information will be saved on local storage in plain text! | // Otherwise, the sensitive information will be saved on local storage in plain text! | ||||||
| type User struct { | type User struct { | ||||||
| 	Id               int    `json:"id"` | 	Id               int    `json:"id"` | ||||||
| 	Username         string `json:"username" gorm:"unique;index" validate:"max=12"` | 	Username         string `json:"username" gorm:"unique;index" validate:"max=30"` | ||||||
| 	Password         string `json:"password" gorm:"not null;" validate:"min=8,max=20"` | 	Password         string `json:"password" gorm:"not null;" validate:"min=8,max=30"` | ||||||
| 	DisplayName      string `json:"display_name" gorm:"index" validate:"max=20"` | 	DisplayName      string `json:"display_name" gorm:"index" validate:"max=20"` | ||||||
| 	Role             int    `json:"role" gorm:"type:int;default:1"`   // admin, common | 	Role             int    `json:"role" gorm:"type:int;default:1"`   // admin, common | ||||||
| 	Status           int    `json:"status" gorm:"type:int;default:1"` // enabled, disabled | 	Status           int    `json:"status" gorm:"type:int;default:1"` // enabled, disabled | ||||||
| @@ -42,7 +43,12 @@ func GetAllUsers(startIdx int, num int) (users []*User, err error) { | |||||||
| } | } | ||||||
|  |  | ||||||
| func SearchUsers(keyword string) (users []*User, err error) { | func SearchUsers(keyword string) (users []*User, err error) { | ||||||
| 	err = DB.Omit("password").Where("id = ? or username LIKE ? or email LIKE ? or display_name LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&users).Error | 	if uid, ok := strconv.Atoi(keyword); ok == nil { | ||||||
|  | 		err = DB.Omit("password").Where("id = ? or username LIKE ? or email LIKE ? or display_name LIKE ?", uid, keyword+"%", keyword+"%", keyword+"%").Find(&users).Error | ||||||
|  | 	} else { | ||||||
|  | 		err = DB.Omit("password").Where("username LIKE ? or email LIKE ? or display_name LIKE ?", keyword+"%", keyword+"%", keyword+"%").Find(&users).Error | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	return users, err | 	return users, err | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user