Commit 4df62a5a by 陶腾飞

2022/04/23 v2.5.1

parent b22648bb
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
- 2022/04/11 v2.3.3 修复用户注销的值错误、企业微信唤醒704局域网失败修复 - 2022/04/11 v2.3.3 修复用户注销的值错误、企业微信唤醒704局域网失败修复
- 2022/04/20 v2.4.0 添加知微运维平台的"远程登录"的获取远程信息功能 - 2022/04/20 v2.4.0 添加知微运维平台的"远程登录"的获取远程信息功能
- 2022/04/22 v2.5.0 添加人事账号管理功能 - 2022/04/22 v2.5.0 添加人事账号管理功能
- 2022/04/23 v2.5.1 每月10号和25号提醒新人创建个人账号
## 四、其他说明 ## 四、其他说明
......
...@@ -11,7 +11,7 @@ const SymbolHostname = "-" ...@@ -11,7 +11,7 @@ const SymbolHostname = "-"
// AD-Control // // AD-Control //
const Version string = "2.5.0" const Version string = "2.5.1"
const Host_adserver string = "ADSERVER" const Host_adserver string = "ADSERVER"
const Host_adserver_ip string = "192.168.0.20" const Host_adserver_ip string = "192.168.0.20"
const Host_thserver string = "THSERVER" const Host_thserver string = "THSERVER"
......
...@@ -18,7 +18,6 @@ func DealMsgEnter(w http.ResponseWriter, r *http.Request) { ...@@ -18,7 +18,6 @@ func DealMsgEnter(w http.ResponseWriter, r *http.Request) {
LOG(ERROR, NULL, err) LOG(ERROR, NULL, err)
w.Write([]byte("")) w.Write([]byte(""))
} }
w.Write(DealMsg(msgtype, url, unmsg)) w.Write(DealMsg(msgtype, url, unmsg))
} }
...@@ -27,6 +26,7 @@ func DealMsg(msgtype, url string, unmsg []byte) []byte { ...@@ -27,6 +26,7 @@ func DealMsg(msgtype, url string, unmsg []byte) []byte {
var ret []byte var ret []byte
switch msgtype { switch msgtype {
// 报告 消息 // 报告 消息
case Msg_Report: case Msg_Report:
var msg MJreport var msg MJreport
...@@ -147,11 +147,12 @@ func (rep *MJreport) MsgDeal() interface{} { ...@@ -147,11 +147,12 @@ func (rep *MJreport) MsgDeal() interface{} {
MsgBox(rep.DataStr) MsgBox(rep.DataStr)
} }
} }
// 注册账号 // 注册账号
case Msg_Report_SignUPUser: case Msg_Report_SignUPUser:
switch rep.Status { switch rep.Status {
case Msg_status_commit: case Msg_status_commit:
SendWxworkTextToAdmins(rep.DataStr) SendWxworkTextToHR(rep.DataStr)
case Msg_status_deal: case Msg_status_deal:
msg := strings.Split(rep.DataStr, "\n") msg := strings.Split(rep.DataStr, "\n")
//region := strings.Split(msg[1], "\n")[1] //region := strings.Split(msg[1], "\n")[1]
......
...@@ -49,7 +49,13 @@ func GetHour() int { ...@@ -49,7 +49,13 @@ func GetHour() int {
return time.Now().Hour() return time.Now().Hour()
} }
// 输出当前小时 // 输出当前 day
func GetDay() int {
_, _, d := time.Now().Date()
return d
}
// 输出当前 day和hour
func GetDateHour() (int, int) { func GetDateHour() (int, int) {
t := time.Now() t := time.Now()
_, _, d := t.Date() _, _, d := t.Date()
......
...@@ -4,7 +4,6 @@ import ( ...@@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings" "strings"
"time"
pub "git.zhiweidata.top/taotengfei/AD-Control-Golang/public" pub "git.zhiweidata.top/taotengfei/AD-Control-Golang/public"
reg "git.zhiweidata.top/taotengfei/AD-Control-Golang/registry" reg "git.zhiweidata.top/taotengfei/AD-Control-Golang/registry"
...@@ -15,7 +14,7 @@ import ( ...@@ -15,7 +14,7 @@ import (
const Reg_Signup string = "t_signup" const Reg_Signup string = "t_signup"
const Reg_RemoteTerminal string = "t_remoteterminal" const Reg_RemoteTerminal string = "t_remoteterminal"
const timeout int = 1 const timeout int = 30
func menuInitName(ni *walk.NotifyIcon) { func menuInitName(ni *walk.NotifyIcon) {
...@@ -30,8 +29,6 @@ func menuInitName(ni *walk.NotifyIcon) { ...@@ -30,8 +29,6 @@ func menuInitName(ni *walk.NotifyIcon) {
} }
} }
// Power --------------------------------------------------
// 电源管理 // 电源管理
func menuInitPower(ni *walk.NotifyIcon) { func menuInitPower(ni *walk.NotifyIcon) {
fa := "电源管理" fa := "电源管理"
...@@ -185,9 +182,9 @@ func tAccountManagerSignUP() { ...@@ -185,9 +182,9 @@ func tAccountManagerSignUP() {
} }
} }
func (signUp *signUpStruct) signUpPush() { func (signUp *signUpStruct) signUpPush() {
var Reg_target string = Reg_Signup var Reg_target string = Reg_Signup
var t time.Time
var exec bool var exec bool
name := signUp.Name.Text() name := signUp.Name.Text()
...@@ -207,8 +204,7 @@ func (signUp *signUpStruct) signUpPush() { ...@@ -207,8 +204,7 @@ func (signUp *signUpStruct) signUpPush() {
if reg_t := reg.Query_ADPC(Reg_target); reg_t == "" { if reg_t := reg.Query_ADPC(Reg_target); reg_t == "" {
exec = true exec = true
} else { } else {
t = pub.UnixTimeParseTimeFromString(reg_t) exec = pub.IfBeforeMin(pub.UnixTimeParseTimeFromString(reg_t), timeout)
exec = pub.IfBeforeMin(t, timeout)
} }
if !exec { if !exec {
Msg(`暂时无法使用,稍后重试!`) Msg(`暂时无法使用,稍后重试!`)
...@@ -293,14 +289,12 @@ func tHostManagerBind() { ...@@ -293,14 +289,12 @@ func tHostManagerBind() {
// 主机管理 请求终端 // 主机管理 请求终端
func tHostManagerTerminal() { func tHostManagerTerminal() {
var Reg_target string = Reg_RemoteTerminal var Reg_target string = Reg_RemoteTerminal
var t time.Time
var exec bool var exec bool
if reg_t := reg.Query_ADPC(Reg_target); reg_t == "" { if reg_t := reg.Query_ADPC(Reg_target); reg_t == "" {
exec = true exec = true
} else { } else {
t = pub.UnixTimeParseTimeFromString(reg_t) exec = pub.IfBeforeMin(pub.UnixTimeParseTimeFromString(reg_t), timeout)
exec = pub.IfBeforeMin(t, timeout)
} }
if !exec { if !exec {
Msg(`暂时无法使用,稍后重试!`) Msg(`暂时无法使用,稍后重试!`)
...@@ -315,8 +309,6 @@ func tHostManagerTerminal() { ...@@ -315,8 +309,6 @@ func tHostManagerTerminal() {
} }
// Kinds of Tools ---------------------------------------------------------------
// 工具集合 // 工具集合
func menuInitTools(ni *walk.NotifyIcon) { func menuInitTools(ni *walk.NotifyIcon) {
fa := "工具集合" fa := "工具集合"
...@@ -438,6 +430,21 @@ func tHideShowIcon() { ...@@ -438,6 +430,21 @@ func tHideShowIcon() {
pub.LOG(INFO, "USERS_TOOLS", "执行 工具集合-隐藏/显示桌面图标") pub.LOG(INFO, "USERS_TOOLS", "执行 工具集合-隐藏/显示桌面图标")
} }
type MyMainWindow struct {
*walk.MainWindow
model *EnvModel
lb *walk.ListBox
}
type EnvItem struct {
name string
}
type EnvModel struct {
walk.ListModelBase
items []EnvItem
}
func HideShowIconModel() *EnvModel { func HideShowIconModel() *EnvModel {
r, err := pub.PSCommandOutput(`Get-ChildItem -Force -Filter *.lnk C:\Users\Public\Desktop -Name`) r, err := pub.PSCommandOutput(`Get-ChildItem -Force -Filter *.lnk C:\Users\Public\Desktop -Name`)
...@@ -546,20 +553,3 @@ func menuInitFileShares(ni *walk.NotifyIcon) { ...@@ -546,20 +553,3 @@ func menuInitFileShares(ni *walk.NotifyIcon) {
sysmenu.SetVisible(true) sysmenu.SetVisible(true)
sysmenu.SetEnabled(true) sysmenu.SetEnabled(true)
} }
// Windows Menu Deal ----------------------------------------------
type MyMainWindow struct {
*walk.MainWindow
model *EnvModel
lb *walk.ListBox
}
type EnvItem struct {
name string
}
type EnvModel struct {
walk.ListModelBase
items []EnvItem
}
...@@ -93,9 +93,12 @@ func isActive() { ...@@ -93,9 +93,12 @@ func isActive() {
} }
} }
// 用户环境初始化(对于新用户) // 用户环境初始化
func userEnvInit() { func userEnvInit() {
d := pub.GetDay()
if (d == 10 || d == 25) && pub.PublicUser() {
go Msg("温馨提示\n如您已转正,请从任务栏托盘的小工具-“账号管理”-“申请个人账号”继续注册账号。\n提交申请后,如审核通过,其结果将在企业微信的“知微运维平台”中通知。")
}
// 关闭保护视图 // 关闭保护视图
// if pub.Reg_Query_DC(pub.Reg_Name_CloseView) != pub.Reg_Value_ON { // if pub.Reg_Query_DC(pub.Reg_Name_CloseView) != pub.Reg_Value_ON {
// pub.Execcmd_nowait(pub.Cmd_c + pub.SMB_ADSoftTool + `【修复】关闭excel和word保护视图.bat`) // pub.Execcmd_nowait(pub.Cmd_c + pub.SMB_ADSoftTool + `【修复】关闭excel和word保护视图.bat`)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment