feat：完善信息

app/enterprise/controller/config.go

@@ -1,15 +0,0 @@
-package controller
-
-import (
-	"SciencesServer/app/basic/config"
-)
-
-type Config struct{}
-
-func (c *Config) Identity() map[int]string {
-	return config.TenantUserIdentityData
-}
-
-func NewConfig() *Config {
-	return &Config{}
-}

app/enterprise/controller/config/instance.go

@@ -0,0 +1,50 @@
+package config
+
+import (
+	"SciencesServer/app/basic/config"
+	config2 "SciencesServer/config"
+)
+
+type Config struct{}
+
+// Basic 基础配置信息
+func (c *Config) Basic() {
+
+}
+
+// Config 配置信息
+func (c *Config) Config() {
+
+}
+
+// Identity 身份信息
+func (c *Config) Identity() map[int]string {
+	return config.TenantUserIdentityData
+}
+
+// Transaction 交易信息
+func (c *Config) Transaction() map[int]string {
+	return config.TechnologyTransactionData
+}
+
+// Industry 行业信息
+func (c *Config) Industry() {
+
+}
+
+// Research 研究领域信息
+func (c *Config) Research() {
+
+}
+
+// Area 区域信息
+func (c *Config) Area(key string) map[string]string {
+	if key == "" {
+		key = config2.DefaultChinaAreaCode
+	}
+	return config2.SettingAreaInfo[key]
+}
+
+func NewConfig() *Config {
+	return &Config{}
+}

app/enterprise/controller/user/instance.go

@@ -41,19 +41,19 @@ func (c *Instance) Info() *InstanceInfo {
 func (c *Instance) Detail() (*InstanceDetailInfo, error) {
 	resp := &InstanceDetailInfo{InstanceInfo: InstanceInfo{Name: c.Name, Identity: c.Identity, SelectIdentity: c.SelectIdentity}}
 
-	mUserTenant := model.NewUserTenant()
+	mUserManage := model.NewUserManage()
 
-	isExist, err := model2.FirstField(mUserTenant.UserTenant, []string{"id", "tenant_id", "uuid", "name",
+	isExist, err := model2.FirstField(mUserManage.UserManage, []string{"id", "tenant_id", "uuid", "name",
 		"email", "job", "fixed_phone", "other"},
 		model2.NewWhere("uid", c.UID), model2.NewWhere("identity", c.SelectIdentity))
 
 	if err != nil {
 		return nil, err
 	} else if isExist {
-		resp.Name = mUserTenant.Name
-		resp.Email = mUserTenant.Email
-		resp.Job = mUserTenant.Job
-		resp.FixedPhone = mUserTenant.FixedPhone
+		resp.Name = mUserManage.Name
+		resp.Email = mUserManage.Email
+		resp.Job = mUserManage.Job
+		resp.FixedPhone = mUserManage.FixedPhone
 	}
 	return resp, nil
 }
@@ -68,9 +68,9 @@ func (c *Instance) SwitchIdentity(identity int) error {
 	}
 	// 已存在相应的身份，更新最后
 	if c.Identity&identity > 0 {
-		mUserTenant := model.NewUserTenant()
+		mUserManage := model.NewUserManage()
 		// 查询用户身份
-		_, err := model2.FirstField(mUserTenant.UserTenant, []string{"id", "tenant_id", "name", "uuid"},
+		_, err := model2.FirstField(mUserManage.UserManage, []string{"id", "tenant_id", "name", "uuid"},
 			model2.NewWhere("uid", c.UID), model2.NewWhere("identity", identity))
 
 		if err != nil {
@@ -79,22 +79,22 @@ func (c *Instance) SwitchIdentity(identity int) error {
 		// 查询用户身份信息
 		now := time.Now()
 
-		if mUserTenant.ID > 0 {
+		if mUserManage.ID > 0 {
 			if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
-				if err = model2.UpdatesWhere(mUserTenant.UserTenant, map[string]interface{}{
-					"selected": model2.UserTenantSelectedForNo, "updated_at": now,
+				if err = model2.UpdatesWhere(mUserManage.UserManage, map[string]interface{}{
+					"selected": model2.UserManageSelectedForNo, "updated_at": now,
 				}, []*model2.ModelWhere{model2.NewWhere("uid", c.TenantUID)}, tx); err != nil {
 					return err
 				}
-				return model2.Updates(mUserTenant.UserTenant, map[string]interface{}{
-					"selected": model2.UserTenantSelectedForYes, "updated_at": now,
+				return model2.Updates(mUserManage.UserManage, map[string]interface{}{
+					"selected": model2.UserManageSelectedForYes, "updated_at": now,
 				}, tx)
 			}); err != nil {
 				return err
 			}
 		}
-		c.TenantID = mUserTenant.TenantID
-		c.TenantUID = mUserTenant.UUID
+		c.TenantID = mUserManage.TenantID
+		c.TenantUID = mUserManage.UUID
 	}
 	c.SelectIdentity = identity
 	service.Publish(config2.EventForAccountLoginProduce, config2.RedisKeyForAccount, c.UIDToString(), c.SessionEnterprise)