Merge branch 'ICP' into debug

# Conflicts:
#	controllers/user_login.go
#	routers/commentsRouter.go

controllers/user_login.go

@@ -1005,12 +1005,12 @@ func (this *UserLoginController) CheckUserLdap() {
 	br.Msg = "操作成功"
 }
 
-// ICPlicense
+// ICPLicense
 // @Title icp备案信息
 // @Description icp备案信息
 // @Success 200 Ret=200 获取成功
 // @router /icp_license [get]
-func (this *UserLoginController) ICPlicense() {
+func (this *UserLoginController) ICPLicense() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -1021,7 +1021,7 @@ func (this *UserLoginController) ICPlicense() {
 	}()
 
 
-	item, e := models.GetBusinessConfByKey("ICPlicense")
+	item, e := models.GetBusinessConfByKey("ICPLicense")
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()

routers/commentsRouter.go

@@ -8460,7 +8460,7 @@ func init() {
             
     beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
         beego.ControllerComments{
-            Method: "ICPlicense",
+            Method: "ICPLicense",
             Router: `/icp_license`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),