Commit 512c708e by 陶腾飞

2022/04/23 v2.5.2

parent 4df62a5a
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
- 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号提醒新人创建个人账号 - 2022/04/23 v2.5.1 每月10号和25号提醒新人创建个人账号
- 2022/04/23 v2.5.2 添加知微运维平台的"账号管理功能"
## 四、其他说明 ## 四、其他说明
......
...@@ -11,6 +11,7 @@ require ( ...@@ -11,6 +11,7 @@ require (
github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
github.com/go-ldap/ldap/v3 v3.4.2 // indirect github.com/go-ldap/ldap/v3 v3.4.2 // indirect
github.com/gookit/color v1.5.0 // indirect github.com/gookit/color v1.5.0 // indirect
github.com/mozillazg/go-pinyin v0.19.0 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 // indirect golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 // indirect
......
...@@ -10,6 +10,8 @@ github.com/go-ldap/ldap/v3 v3.4.2 h1:zFZKcXKLqZpFMrMQGHeHWKXbDTdNCmhGY9AK41zPh+8 ...@@ -10,6 +10,8 @@ github.com/go-ldap/ldap/v3 v3.4.2 h1:zFZKcXKLqZpFMrMQGHeHWKXbDTdNCmhGY9AK41zPh+8
github.com/go-ldap/ldap/v3 v3.4.2/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg= github.com/go-ldap/ldap/v3 v3.4.2/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw= github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw=
github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
github.com/mozillazg/go-pinyin v0.19.0 h1:p+J8/kjJ558KPvVGYLvqBhxf8jbZA2exSLCs2uUVN8c=
github.com/mozillazg/go-pinyin v0.19.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
......
...@@ -11,7 +11,7 @@ const SymbolHostname = "-" ...@@ -11,7 +11,7 @@ const SymbolHostname = "-"
// AD-Control // // AD-Control //
const Version string = "2.5.1" const Version string = "2.5.2"
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"
......
...@@ -234,7 +234,11 @@ func (rep *MJreport) MsgDeal() interface{} { ...@@ -234,7 +234,11 @@ func (rep *MJreport) MsgDeal() interface{} {
break break
} }
LOG(INFO, rep.Instruction, dept+name+" 移动成功") LOG(INFO, rep.Instruction, dept+name+" 移动成功")
rep.SendWXwork("处理完成") rep.SendWXwork("个人账号创建完成\n" +
"账号名:姓名拼音小写\n" +
"初始密码:1Q2W3e4r\n" +
"首次登录后需要重置密码,密码规则大小写+数字+至少8位,不包含用户名\n" +
"个人账号支持通过“知微运维平台”远程唤醒主机!")
} }
default: default:
...@@ -424,7 +428,7 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -424,7 +428,7 @@ func (wxwork *MJwxwork) MsgDealSend() {
switch wxwork.Instruction { switch wxwork.Instruction {
// 芝麻开机 // 电源管理 芝麻开机
case WXEK_zwDevopsPowerWake: case WXEK_zwDevopsPowerWake:
wxwork.SendText("收到唤醒指令,正在处理!") wxwork.SendText("收到唤醒指令,正在处理!")
...@@ -480,7 +484,7 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -480,7 +484,7 @@ func (wxwork *MJwxwork) MsgDealSend() {
wxwork.Result = "开始唤醒,请等待~" wxwork.Result = "开始唤醒,请等待~"
// 芝麻重启 // 电源管理 芝麻重启
case WXEK_zwDevopsPowerReboot: case WXEK_zwDevopsPowerReboot:
wxwork.SendText("收到重启指令,正在处理") wxwork.SendText("收到重启指令,正在处理")
...@@ -539,7 +543,7 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -539,7 +543,7 @@ func (wxwork *MJwxwork) MsgDealSend() {
}(wxwork.Name, wxwork.UserID) }(wxwork.Name, wxwork.UserID)
wxwork.Result = "开始重启,请等待~" wxwork.Result = "开始重启,请等待~"
// 芝麻关机 // 电源管理 芝麻关机
case WXEK_zwDevopsPowerTurnOFF: case WXEK_zwDevopsPowerTurnOFF:
wxwork.SendText("收到关机指令,正在处理!") wxwork.SendText("收到关机指令,正在处理!")
...@@ -596,7 +600,7 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -596,7 +600,7 @@ func (wxwork *MJwxwork) MsgDealSend() {
} }
}(wxwork.Name, wxwork.UserID) }(wxwork.Name, wxwork.UserID)
wxwork.Result = "开始关机,请等待~" wxwork.Result = "开始关机,请等待~"
// 电源状态 // 电源管理 电源状态
case WXEK_zwDevopsPowerStatus: case WXEK_zwDevopsPowerStatus:
wxwork.SendText("收到查询指令,正在处理!") wxwork.SendText("收到查询指令,正在处理!")
...@@ -637,8 +641,10 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -637,8 +641,10 @@ func (wxwork *MJwxwork) MsgDealSend() {
wxwork.Result = "主机已关闭" wxwork.Result = "主机已关闭"
} }
// 获取远程信息 // 主机管理 获取主机信息
case WXEK_zwDevopsPemoteGetinfo: case WXEK_zwDevopsHostGetinfo:
LOG(INFO, wxwork.Instruction, fmt.Sprintf("%s 获取主机信息", wxwork.Name))
if c, err := LDAP_ExistAccount(wxwork.Name); err != nil { if c, err := LDAP_ExistAccount(wxwork.Name); err != nil {
LOG(ERROR, wxwork.Instruction, err) LOG(ERROR, wxwork.Instruction, err)
} else { } else {
...@@ -662,7 +668,18 @@ func (wxwork *MJwxwork) MsgDealSend() { ...@@ -662,7 +668,18 @@ func (wxwork *MJwxwork) MsgDealSend() {
return return
} }
wxwork.Result = fmt.Sprintf("您的主机IP地址为%s", ip) wxwork.Result = fmt.Sprintf("您的主机IP地址为%s", ip)
// 账号管理 获取个人账号
case WXEK_zwDevopsAccountSelf:
LOG(INFO, wxwork.Instruction, fmt.Sprintf("%s 获取个人账号", wxwork.Name))
wxwork.Result = "登录名:姓名拼音小写\n" +
"完整登录名:姓名拼音小写@zhiweireach.com"
// 账号管理 获取公共账号
case WXEK_zwDevopsAccountPublic:
LOG(INFO, wxwork.Instruction, fmt.Sprintf("%s 获取公共账号", wxwork.Name))
wxwork.Result = "登录名:组名首字母小写zhiwei\n" +
"例,巨量:jlzhiwei,报告研究中心:bgyjzxzhiwei\n" +
"密码:1Q2W3e4r"
default: default:
if wxwork.Name == "陶腾飞" || wxwork.Name == "边爽" { if wxwork.Name == "陶腾飞" || wxwork.Name == "边爽" {
......
...@@ -75,7 +75,9 @@ const WXEK_zwDevopsPowerWake string = "zwdevops_power_wake" ...@@ -75,7 +75,9 @@ const WXEK_zwDevopsPowerWake string = "zwdevops_power_wake"
const WXEK_zwDevopsPowerTurnOFF string = "zwdevops_power_turnoff" const WXEK_zwDevopsPowerTurnOFF string = "zwdevops_power_turnoff"
const WXEK_zwDevopsPowerReboot string = "zwdevops_power_reboot" const WXEK_zwDevopsPowerReboot string = "zwdevops_power_reboot"
const WXEK_zwDevopsPowerStatus string = "zwdevops_power_status" const WXEK_zwDevopsPowerStatus string = "zwdevops_power_status"
const WXEK_zwDevopsPemoteGetinfo string = "zwdevops_remote_getinfo" const WXEK_zwDevopsHostGetinfo string = "zwdevops_host_getinfo"
const WXEK_zwDevopsAccountSelf string = "zwdevops_account_self"
const WXEK_zwDevopsAccountPublic string = "zwdevops_account_public"
// Registry Root // Registry Root
const ( const (
......
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