Add DefaultAvatar to org.

controllers/account.go

@@ -141,7 +141,7 @@ func (c *ApiController) Signup() {
 		Type:          "normal-user",
 		Password:      form.Password,
 		DisplayName:   form.Name,
-		Avatar:        "https://casbin.org/img/casbin.svg",
+		Avatar:        organization.DefaultAvatar,
 		Email:         form.Email,
 		Phone:         form.Phone,
 		Affiliation:   form.Affiliation,

object/organization.go

@@ -24,12 +24,13 @@ type Organization struct {
 	Name        string `xorm:"varchar(100) notnull pk" json:"name"`
 	CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
 
-	DisplayName  string `xorm:"varchar(100)" json:"displayName"`
+	DisplayName   string `xorm:"varchar(100)" json:"displayName"`
-	WebsiteUrl   string `xorm:"varchar(100)" json:"websiteUrl"`
+	WebsiteUrl    string `xorm:"varchar(100)" json:"websiteUrl"`
-	Favicon      string `xorm:"varchar(100)" json:"favicon"`
+	Favicon       string `xorm:"varchar(100)" json:"favicon"`
-	PasswordType string `xorm:"varchar(100)" json:"passwordType"`
+	PasswordType  string `xorm:"varchar(100)" json:"passwordType"`
-	PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
+	PasswordSalt  string `xorm:"varchar(100)" json:"passwordSalt"`
-	PhonePrefix  string `xorm:"varchar(10)"  json:"phonePrefix"`
+	PhonePrefix   string `xorm:"varchar(10)"  json:"phonePrefix"`
+	DefaultAvatar string `xorm:"varchar(100)" json:"defaultAvatar"`
 }
 
 func GetOrganizations(owner string) []*Organization {

object/user.go

@@ -170,7 +170,9 @@ func UpdateUserForOriginal(user *User) bool {
 }
 
 func AddUser(user *User) bool {
-	user.Id = util.GenerateId()
+	if user.Id == "" {
+		user.Id = util.GenerateId()
+	}
 
 	organization := GetOrganizationByUser(user)
 	user.UpdateUserPassword(organization)

original/sync.go

@@ -58,11 +58,13 @@ func createUserFromOriginalUser(originalUser *User, affiliationMap map[int]strin
 		Avatar:        getFullAvatarUrl(originalUser.Avatar),
 		Email:         "",
 		Phone:         originalUser.Cellphone,
+		Address:       []string{},
 		Affiliation:   affiliation,
 		Score:         originalUser.SchoolId,
 		IsAdmin:       false,
 		IsGlobalAdmin: false,
 		IsForbidden:   originalUser.Deleted != 0,
+		Properties:    map[string]string{},
 	}
 	return user
 }

web/src/OrganizationEditPage.js

@@ -159,6 +159,33 @@ class OrganizationEditPage extends React.Component {
             }} />
           </Col>
         </Row>
+        <Row style={{marginTop: '20px'}} >
+          <Col style={{marginTop: '5px'}} span={2}>
+            {i18next.t("general:Default avatar")}:
+          </Col>
+          <Col span={22} >
+            <Row style={{marginTop: '20px'}} >
+              <Col style={{marginTop: '5px'}} span={1}>
+                URL:
+              </Col>
+              <Col span={23} >
+                <Input prefix={<LinkOutlined/>} value={this.state.organization.defaultAvatar} onChange={e => {
+                  this.updateOrganizationField('defaultAvatar', e.target.value);
+                }} />
+              </Col>
+            </Row>
+            <Row style={{marginTop: '20px'}} >
+              <Col style={{marginTop: '5px'}} span={1}>
+                {i18next.t("general:Preview")}:
+              </Col>
+              <Col span={23} >
+                <a target="_blank" rel="noreferrer" href={this.state.organization.defaultAvatar}>
+                  <img src={this.state.organization.defaultAvatar} alt={this.state.organization.defaultAvatar} height={90} style={{marginBottom: '20px'}}/>
+                </a>
+              </Col>
+            </Row>
+          </Col>
+        </Row>
       </Card>
     )
   }

web/src/OrganizationListPage.js

@@ -53,6 +53,7 @@ class OrganizationListPage extends React.Component {
       passwordType: "plain",
       PasswordSalt: "",
       phonePrefix: "86",
+      defaultAvatar: "https://casbin.org/img/casbin.svg",
     }
   }
 

web/src/locales/en.json

@@ -19,6 +19,7 @@
     "Display name": "Display name",
     "Personal name": "Personal name",
     "Avatar": "Avatar",
+    "Default avatar": "Default avatar",
     "URL": "URL",
     "Preview": "Preview",
     "User type": "User type",

web/src/locales/zh.json

@@ -19,6 +19,7 @@
     "Display name": "显示名称",
     "Personal name": "姓名",
     "Avatar": "头像",
+    "Default avatar": "默认头像",
     "URL": "链接",
     "Preview": "预览",
     "User type": "用户类型",