后:iam

src/dashoo.cn/backend/api/business/iamlogin/IamLoginService.go

@@ -1,6 +1,7 @@
 package iamlogin
 
 import (
+	"dashoo.cn/utils"
 	"encoding/json"
 	"io/ioutil"
 	"log"
@@ -29,8 +30,8 @@ type iam struct {
 
 func (s *IamLoginService) HandleIamLogin(appCode string, secret string, code string) iam {
 
-	//ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
-	Url := "http://iam.api.dgyt.petrochina/api/iam/loginex"
+	Url := utils.Cfg.MustValue("Iam", "iamUrl")
+	//Url := "http://iam.api.dgyt.petrochina/api/iam/loginex"
 
 	v := make(url.Values)
 	v.Add("appCode", appCode)

src/dashoo.cn/backend/api/conf/app.conf

@@ -87,4 +87,7 @@ callbackHost=http://localhost:10091/api
 msgUrl=http://api.dgyt.petrochina/jcfw/duanxin/v1.0/sendmsg
 
 [PtrUrl]
-ptrUrl=http://api.dgyt.petrochina/jcfw/ptr/v1.0/ptr
+ptrUrl=http://api.dgyt.petrochina/jcfw/ptr/v1.0/ptr
+
+[Iam]
+iamUrl=http://iam.api.dgyt.petrochina/api/iam/loginex

src/dashoo.cn/backend/api/controllers/iamlogin/iamLogin.go

@@ -41,7 +41,9 @@ func (this *IamLoginController) IamLogin() {
 	//userToken, err := models.CreateToken("rongjiya")
 
 	iamJson := iamLoginSvc.HandleIamLogin(iam.AppCode, iam.Secret, iam.Code)
+	iamString, _ := json.Marshal(iamJson)
 	log.Println("appCode= ", iam.AppCode)
+	log.Println("iamString= ", string(iamString))
 
 	svc := auth.GetAuthServic(utils.DBE)
 	var user userRole.Base_User

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -41,7 +41,7 @@
           <!--</el-col>-->
           <el-col :span="6">
             <el-form-item label="类型" prop="Type" :rules="{ required: true, message: '类型不能为空', trigger: 'change'}">
-              <el-select ref="Type" v-model="formData.Type" placeholder="请选择复审人" style="width: 100%" filterable
+              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable
                           default-first-option :disabled="formData.Status > 0">
                 <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">
                 </el-option>