Merge branch 'master' of http://git.shengws.com/zhangbj/sso into sso_branch

conf/app.conf

 appname = 酷医
 httpport = 8091
-runmode = dev
+runmode = prod
 copyrequestbody = true
 
 is_sso_use_session_id_key = true
 submodule_domain_patient_manage = "https://test1.sgjyun.com"
 submodule_domain_dialysis_manage = "http://xt.test.sgjyun.com"
 submodule_domain_mall_manage = "https://mall.test.sgjyun.com"
-submodule_domain_cdm_manage = "https://cdm.test.sgjyun.com"
+submodule_domain_cdm_manage = "http://cdm.test.sgjyun.com"
 
 # httpdomain = http://sso.kuyicloud.com
 # cookie_rootdomain = ".kuyicloud.com"

controllers/mobile_regist_controller.go

 		ModifyTime:   time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall, user_name) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	createErr := service.CreateOrg(&org, user_name, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

controllers/org_controller.go

 		this.ServeJSON()
 		return
 	}
-	user_name := this.GetString("user_name")
 
 	name := this.GetString("name")
 	shortName := name // this.GetString("short_name")
 	openCDM, _ := this.GetBool("open_cdm")
 	openSCRM, _ := this.GetBool("open_scrm")
 	openMall, _ := this.GetBool("open_mall")
+	user_name := this.GetString("user_name")
 	if len(name) == 0 || len(shortName) == 0 || len(contactName) == 0 || len(address) == 0 || province <= 0 || city <= 0 || district <= 0 || category <= 0 || (!openXT && !openCDM && !openSCRM && !openMall) {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		this.ServeJSON()
 	businessTime := this.GetString("business_time")
 	businessState, _ := this.GetInt64("business_state")
 	orgPics := this.GetString("org_pics")
-	//orgPics := this.GetString("name")
 
 	if len(orgPhone) > 0 {
 		if utils.PhoneRegexp().MatchString(orgPhone) == false {
 		ModifyTime:      time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall, user_name) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	fmt.Print("user_name ------------------------------------------------------------------", user_name)
+
+	createErr := service.CreateOrg(&org, user_name, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		InitRoleAndPurviews(&org)
 		//初始化设备管理org
 		InitEquitMentInformation(&org)
+		//初始化显示配置和打印模版
+		InitShowConfig(&org)
 
 		redirectURL := beego.AppConfig.String("submodule_domain_dialysis_manage")
 		//} else if openCDM {
 	}
 	service.CreatedTreateMode(&treatmentmodefive)
 }
+
+func InitShowConfig(org *models.Org) {
+	service.BatchInsertFiledSystemConfig(int64(org.Id))
+	template := &models.VMGobalTemplate{
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		OrgId:      int64(org.Id),
+		TemplateId: 2,
+	}
+	service.CreateVMPrintTemplate(template)
+}

controllers/patient.json

       "nation": "汉",
       "native_place": "广东深圳",
       "marital_status": 1,
-      "id_card_no": "431230199808081111",
+      "id_card_no": "999999190001019999",
       "birthday": -312537600,
       "reimbursement_way_id": 7,
       "health_care_type": 0,
       "nation": "汉",
       "native_place": "广东深圳",
       "marital_status": 1,
-      "id_card_no": "4312301999090952222",
+      "id_card_no": "999999190001018888",
       "birthday": -312537600,
       "reimbursement_way_id": 7,
       "health_care_type": 0,

controllers/role.json

       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102,83,94",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
       "status": 1,
       "is_system": 3,
       "number": 9997,
-      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
-    },
-    {
+      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76,83,94",
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052,20012"
+    },{
       "role_name": "库存",
       "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
       "is_super_admin": false,
       "status": 1,
       "is_system": 0,
       "number": 9996,
-      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84",
+      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84,83,94",
       "func_ids": ""
 
 
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201,83,94",
       "func_ids": ""
 
 

controllers/verify_token_controller.go

 	// 	this.ServeJSON()
 	// 	return
 	// }
-	app_type = 3
+	//app_type = 3
 	if url := service.GetAppURLWithAppType(app_type); len(url) == 0 {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		this.ServeJSON()
 			//appIds = append(appIds, strconv.Itoa(app.Id))
 			//app_to_org_ids[strconv.Itoa(app.Id)] = strconv.Itoa(org.Id)
 
+			appJSON_b, _ := json.Marshal(app)
+			appJSONStr := string(appJSON_b)
+			appJSONs[strconv.Itoa(app.Id)] = appJSONStr
+			appIds = append(appIds, strconv.Itoa(app.Id))
+			//app_to_org_ids[strconv.Itoa(app.Id)] = strconv.Itoa(org.Id)
+			fmt.Println(app.AppType)
 			if adminUser.IsSuperAdmin {
 				urlfors, purviews, getPurviewErr := service.GetSuperAdminUsersPurviewTreeAndUrlfors(app.AppType)
+
 				if getPurviewErr != nil {
 					utils.ErrorLog("数据错误：查找超级管理员的类型为%v的应用的权限时错误：%v", app.AppType, getPurviewErr)
 					return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}

models/org_models.go

 func (OrgGallery) TableName() string {
 	return "sgj_user_org_gallery"
 }
+
+type SgjUserAdminRole struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+}
+
+func (SgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}

models/vm_models.go

 func (VMUserRoleAndPurview) TableName() string {
 	return "sgj_user_role"
 }
+
+type VMGobalTemplate struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	TemplateId int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (VMGobalTemplate) TableName() string {
+	return "xt_gobal_template"
+}

service/org_service.go

 	"github.com/jinzhu/gorm"
 )
 
-func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSCRM bool, openMall bool, user_name string) error {
+func CreateOrg(org *models.Org, user_name string, openXT bool, openCDM bool, openSCRM bool, openMall bool) error {
 	now := time.Now()
 	tx_admin := writeUserDb.Begin()
 	if err := tx_admin.Create(org).Error; err != nil {
 	return nil
 }
 
+func GetLastName(creator int64) (models.Org, error) {
+	org := models.Org{}
+	err := readUserDb.Model(&org).Where("creator = ? and status = 1").Last(&org).Error
+	return org, err
+}
+
 func GetOrgWithAdminUserID(adminUserID int) (*models.Org, error) {
 	var org models.Org
 	err := readUserDb.Where("creator = ? AND status <> 0", adminUserID).First(&org).Error

service/vm_service.go

 	err = writeUserDb.Create(&purview).Error
 	return
 }
+
+func BatchInsertFiledSystemConfig(org_id int64) (err error) {
+	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442  AND sys_module = 2", org_id).Error
+	return
+}
+
+func CreateVMPrintTemplate(template *models.VMGobalTemplate) (err error) {
+	err = writeDb.Model(&models.VMGobalTemplate{}).Create(template).Error
+	return
+}

static/js/create_org.js

             open_cdm: open_cdm,
             open_scrm: open_scrm,
             open_mall: open_mall,
+            user_name:$("#user_name").val()
         }
         postRequest("/org/create/submit", postData, doSuccess, doFail);
 

static/js/create_org_old.js

     }
 
     $("#province_select").change(function() {
-        
+
         $("#city_select option").remove();
         $("#district_select option").remove();
         $("#city_select").append("<option value='0'>市</option>");
     });
 
     $("#city_select").change(function() {
-        
+
         $("#district_select option").remove();
         $("#district_select").append("<option value='0'>区/县</option>");
         var city = $("#city_select option:selected").val();
         }
 
         var ills = new Array();
-        $("input[name='ill_checkbox']:checkbox:checked").each(function(){ 
+        $("input[name='ill_checkbox']:checkbox:checked").each(function(){
             ills.push($(this).val());
         });
         var illstr = ills.join(",");
             business_time: $("#org_business_time").val(),
             business_state: $("input[name='org_business_state']:checked").val(),
             org_pics: picsStr,
+            user_name:$("#user_name").val()
         }
         postRequest("/org/create/submit", postData, doSuccess, doFail);
 
             var wname = $(this).attr('data-name');
             business_week.push({ "id": wid, "name": wname });
         });
-  
+
         if (business_week.length == 0) {
             $("#org_business_week").val('');
         } else if (business_week.length == 1) {
                     break;
                 }
             }
-  
+
             if (btrue) {
                 var week_show = business_week[0]["name"] + ' — ' + business_week[lastindex]["name"];
                 $("#org_business_week").val(week_show);
             }
         }
     });
-  
+
     $('input[name=time_checkbox_s], input[name=time_checkbox_x]').change(function () {
         if ($("input[name='time_checkbox_s']:checked").length == 0 || $("input[name='time_checkbox_x']:checked").length == 0) {
             return;
         return "请填写地址";
     }
     var selectIll = false;
-    $("input[name='ill_checkbox']:checkbox:checked").each(function(){ 
+    $("input[name='ill_checkbox']:checkbox:checked").each(function(){
         selectIll = true;
         return false;
     });
 
 function doFail(res) {
     serverErrorMsg(res);
-}
+}

static/js/login_by_code.js

 
     //获取验证码
     $("#get_code").click(function() {
-        
+
         var phone = $("#phone").val();
         var aespass = $('#aespass').val();
 
             phone: phone,
             aespass: aespass,
         }
-        $("#get_code").attr("disabled", true);
+        $("#get_code").attr("disabled", false);
         changeNum(60);
 
         postRequest("/getcode", postData, doSuccess, doFail);
 
         function doSuccess(res) {
-            
+
             if (res.state == 0) {
                 serverErrorMsg(res);
                 return;
 
     //确定
     $("#submit").click(function() {
-        
+
         var code = $("#code").val();
         if (code != null && code != undefined && code != "") {
             var mobile = $("#phone").val();
                     returnurl: $("#return_url").val(),
                     app_type: $("#app_type").val(),
                 }
-                
+
                 setCookie("login_mobile", mobile);
 
                 postRequest("/login/code/submit", postData, doSuccess, doFail);
 
 function getCookie(name){
     var arr = document.cookie.match(new RegExp("(^| )" + name + "=([^;]*)(;|$)"));
-    if (arr != null) 
-        return unescape(arr[2]); 
+    if (arr != null)
+        return unescape(arr[2]);
     return null;
-}
+}

static/js/register.js

 $(function() {
     //获取验证码
     $("#get_code").click(function() {
-        
+
         var phone = $("#phone").val();
         var aespass = $('#aespass').val();
 
             aespass: aespass,
         }
         $("#get_code").attr("disabled", true);
-        changeNum(60);
+
 
         postRequest("/getregistcode", postData, doSuccess, doFail);
 
         function doSuccess(res) {
-            
-            if (res.state == 0) {
-                serverErrorMsg(res);
-                return;
+            if (res.state == 1) {
+               changeNum(60);
+
+            }else{
+              serverErrorMsg(res);
+              return;
             }
             layer.msg(res.data.msg);
         }
             changeNum(num);
         } else {
             $('#get_code').html("发送验证码");
-            $("#get_code").attr("disabled", false);
+            $("#get_code").attr("disabled", true);
         }
     }, 1000);
-}
+}

views/home/manage_app.html

         <div class="head white-bg clearfix">
             <div class="logo fl">
                 <a href="/">
-                    <img src="/static/images/logo.png" alt="" />
+                    <img src="/static/images/logo5.png" alt="" />
                     <!-- <span>酷医</span> -->
                 </a>
             </div>
     </script> -->
 </body>
 
-</html>
+</html>

views/home/register.html

     <link href="/static/font-awesome/css/font-awesome.css?v=4.3.0" rel="stylesheet">
     <link href="/static/css/style.css?v=2.4.2" rel="stylesheet">
     <link href="/static/iconfont/iconfont.css" rel="stylesheet">
-    
+
 </head>
 
 <body>
     <script src="/static/js/layer.js"></script>
     <script src="/static/js/md5.js"></script>
     <script src="/static/js/common.js"></script>
-    <script src="/static/js/register.js?v=0.1.0"></script>
+    <script src="/static/js/register.js?v=0.2.0"></script>
 </body>
 
-</html>
+</html>

views/mobile_site/create_org.html

         (function() {
           var hm = document.createElement("script");
           hm.src = "https://hm.baidu.com/hm.js?7577c975fa7ae685efd61deb009d1b5b";
-          var s = document.getElementsByTagName("script")[0]; 
+          var s = document.getElementsByTagName("script")[0];
           s.parentNode.insertBefore(hm, s);
         })();
         </script>
                 open_scrm: open_scrm,
                 open_mall: open_mall,
             }
-            
+
             $.showLoading("加载中");
 
             $.ajax({
         });
     });
 
-    function getCookie(name) { 
+    function getCookie(name) {
         var arr,reg=new RegExp("(^| )"+name+"=([^;]*)(;|$)");
         if(arr=document.cookie.match(reg))
-            return unescape(arr[2]); 
-        else 
-            return null; 
-    } 
+            return unescape(arr[2]);
+        else
+            return null;
+    }
 
     function checkInfoFull() {
         if ($("#org_name").val().length == 0) {
     }
 </script>
 
-</html>
+</html>

views/new_main/create_org.html

         <div class="head white-bg clearfix">
             <div class="logo fl">
                 <a href="/">
-                    <img src="/static/images/logo.png" alt="" />
+                    <img src="/static/images/logo5.png" alt="" />
                 </a>
             </div>
 
             <div class="steward_content">
                 <p class="tips">请正确填写以下信息，后续可在账号设置中修改</p>
                 <div class="cell clearfix">
-                    <label class="cell_tit fl">用户名称</label>
-                    <input id="user_name" type="text" class="cell_input" maxlength="10" />
+                  <label class="cell_tit fl">您的姓名</label>
+                  <input id="user_name" type="text" class="cell_input" maxlength="10" />
                 </div>
                 <div class="cell clearfix">
                     <label class="cell_tit fl">机构名称</label>
                     <label class="cell_tit fl">机构简称</label>
                     <input id="org_short_name" type="text" class="cell_input" maxlength="50" />
                 </div> -->
+
                 <div class="cell clearfix">
                     <label class="cell_tit fl">机构类型</label>
                     <div class="city fl">

views/new_main/register.html

             <div class="eis-login-bg" id="login-bgImg" style="background-image: url(/static/images/login_bg02.jpg);">
             </div>
             <div class="eis-login-right">
-                <div class="eis-login-form  eis-login-center"> 
+                <div class="eis-login-form  eis-login-center">
                     <div class="eis-logo"><p>注册账户</p></div>
                     <div class="eis-login-info">
                         <div class="eis-form" style="display:block;">
                                     <input name="password" type="password" id="password" autocomplete="off" placeholder="密码" class="eis-form-control">
                                 </div>
                             </div>
-                            
+
                             <div class="eis-login-button" id="forget_panel">
                                 <input name="submit" type="button" id="submit" style="letter-spacing: 0px;" class="submit" value="即刻开始">
                             </div>
     <script src="/static/js/common.js"></script>
     <script src="/static/js/register.js?v=0.1.2"></script>
 </body>
-</html>
+</html>