v1.3.1修复文件共享打开失败问题，支持对非域用户的唤醒

public/env.go

@@ -8,7 +8,7 @@ const	DaemonListen					string	= ":" + DaemonPort
 const	ADServerDaemon					string	= Host_adserver + DaemonListen
 const	WxwrokDaemon					string	= ":16823"
 const	RandMax							int		= 60
-const	Version							string	= "1.3.0"
+const	Version							string	= "1.3.1"
 
 
 // user //
@@ -88,6 +88,7 @@ const	Reg_Root_dc						int		= HKCU
 const	Reg_Path_home					string	= `SOFTWARE\ADControl`
 const	Reg_Path_home_ac				string	= Reg_Path_home + `\DomainComputer\`		// use for adserver,not for dc
 const	Reg_Path_home_du				string	= Reg_Path_home + `\DomainUsers\`		// use for adserver,not for dc
+const	Reg_Path_home_zhu				string	= Reg_Path_home + `\ZhiWeiUsers\`		// use for adserver,not for dc
 const	Reg_Name_TurnOnTime				string	= "TurnOnTime"
 const	Reg_Name_TurnOffTime			string	= "TurnOffTime"
 const	Reg_Name_LoginUserName			string	= "loginUser"

public/msg_deal.go

@@ -354,10 +354,16 @@ func (wxwork * MJwxwork)Msg_Deal() interface{}{
 	switch (wxwork.Instruction){
 	case Msg_Wxwork_UserWake:
 
+		var zhiweiuser bool
 		// 在注册表中查询记录
 		pc := wxwork.Reg_Query_ADUsers(Reg_Name_PrimayComputerName)
 		mac := wxwork.Reg_Query_ADUsers(Reg_Name_MACAddress)
 
+		if pc == "" || mac == ""{
+			pc = wxwork.Reg_Query_ZhiWeiUsers(Reg_Name_PrimayComputerName)
+			mac = wxwork.Reg_Query_ZhiWeiUsers(Reg_Name_MACAddress)
+			zhiweiuser = true
+		}
 		if  pc == "" || mac == ""{
 			wxwork.Text ="如果你不是情报部门，那么暂时还不支持该功能"
 			return wxwork
@@ -370,18 +376,31 @@ func (wxwork * MJwxwork)Msg_Deal() interface{}{
 			wxwork.Text = Error_WXWork_Down_STR
 			return wxwork
 		}
+
 		if status {
 			wxwork.Text = "已经开机了哦~"
 			return wxwork
-
 		}
 
+		// 只有域用户有效
 		// 写入被唤醒的ID用于判断是否是被企业微信唤醒
-		Reg_Write_ADDC(pc,Reg_Name_BeWakedID,wxwork.UserID)
+		if !zhiweiuser{
+			Reg_Write_ADDC(pc,Reg_Name_BeWakedID,wxwork.UserID)
+			go func(userid string){
+				for i:=0;i<10;i++{
+					Delay(30)
+					status,_ := PSTest_Connection(pc)	
+					if status {
+						SendWxworkTextToAUser(userid,"主机已启动！")
+					}
+				}
+			}(wxwork.UserID)
+		}
 
-		// 由于不能在5秒内回复消息，需要使用go关键词
-		go	Wol(mac)
-		
+		// 先回复，后唤醒
+		go Wol(mac)
+
+			
 		wxwork.Text = "开始唤醒，请等待~"
 	default:
 		wxwork.Text = ""

public/msg_init.go

@@ -308,4 +308,10 @@ func (wxwork * MJwxwork)Reg_Query_ADUsers(key string) string{
 		Reg_Root_ac,
 		Reg_Path_home_du + wxwork.Name,
 		key)
+}
+func (wxwork * MJwxwork) Reg_Query_ZhiWeiUsers(key string) string{
+	return Reg_query_key_one(
+		Reg_Root_ac,
+		Reg_Path_home_zhu + wxwork.Name,
+		key)
 }
\ No newline at end of file

users/menu.go

@@ -436,7 +436,10 @@ func menuInitFileShares(ni * walk.NotifyIcon){
 		}
 		deptshare := memberList.Name()
 		// 不在 其他共享 里 显示自己部门的共享
-		if deptshare == pub.SMB_ADMainDept{
+		if deptshare == pub.User_dept_desplay{
+			continue
+		}
+		if deptshare == "DfsrPrivate"{
 			continue
 		}
 		member,err := pub.ReadDir(pub.SMB_ADMain + `\` + deptshare)
@@ -525,7 +528,7 @@ func menuInitMyShares(ni * walk.NotifyIcon){
 		}
 
 		// 为子按钮 添加事件
-		na.Triggered().Attach(func(){pub.OpenWindow(pub.User_dept_desplay +`\`+ wokrer);return})
+		na.Triggered().Attach(func(){pub.OpenWindow(pub.SMB_ADMainDept +`\`+ wokrer);return})
 			
 		// 将 子按钮 添加到 菜单 
 		nm.Actions().Add(na)
@@ -541,5 +544,5 @@ func menuInitMyShares(ni * walk.NotifyIcon){
 	sysmenu.SetText(fa)
 	sysmenu.SetVisible(true)
 	sysmenu.SetEnabled(true)
-}
 
+}
\ No newline at end of file