Merge branch 'pool/xy_login' into debug

# Conflicts:
#	services/user_login.go

controllers/sys_user.go

@@ -377,3 +377,38 @@ func (this *SysUserController) AuthCodeLogin() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// SystemConfig
+// @Title 系统配置列表
+// @Description 系统配置列表
+// @Success 200 {object} []system.BusinessConf
+// @router /public_config [get]
+func (this *SysUserController) SystemConfig() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	list := make([]system.BusinessConf, 0)
+
+	// 获取基础配置, 若未配置则直接返回
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取基础配置失败, Err: " + e.Error()
+		return
+	}
+
+	list = append(list, system.BusinessConf{
+		ConfKey: "LoginUrl",
+		ConfVal: conf["LoginUrl"],
+	})
+
+	br.Data = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

routers/commentsRouter.go

@@ -7855,6 +7855,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:SysUserController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:SysUserController"],
+        beego.ControllerComments{
+            Method: "SystemConfig",
+            Router: `/public_config`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:SysUserController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:SysUserController"],
         beego.ControllerComments{
             Method: "Uuid",

services/user_login.go

@@ -243,6 +243,14 @@ func LdapUserCheck(userName, password string) (pass bool, err error) {
 	return
 }
 
+// ThirdLogin
+// @Description: 第三方登录（换取token）
+// @author: Roc
+// @datetime 2024-01-30 16:09:18
+// @param req map[string]interface{}
+// @return data GetCrmTokenData
+// @return err error
+// @return errMsg string
 func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, errMsg string) {
 	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 		authCode, ok := req["code"]
@@ -270,7 +278,13 @@ func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, er
 	return
 }
 
-// ThirdCodeLoginFromMiddleServer 中间服务-编码登录
+// ThirdCodeLoginFromMiddleServer
+// @Description:  第三方登录（向桥接服务换取token）
+// @author: Roc
+// @datetime 2024-01-30 16:09:35
+// @param param map[string]interface{}
+// @return tokenResp GetCrmTokenData
+// @return err error
 func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp GetCrmTokenData, err error) {
 	data, e := json.Marshal(param)
 	if e != nil {