baishaojie 1 mês atrás
pai
commit
7fcf2ce25e
41 arquivos alterados com 28 adições e 23 exclusões
  1. 1 0
      apiserver/model/http/upkeep.go
  2. 1 0
      apiserver/model/spotcheck.go
  3. 1 0
      apiserver/routers/upkeep.go
  4. 1 0
      apiserver/service/upkeep.go
  5. 15 14
      cmd/conf/app.ini
  6. 9 9
      cmd/conf/conf.toml
  7. BIN
      cmd/dist-现代牧业-测试20240815-2.zip
  8. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/datas/myMap.json
  9. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/favicon.ico
  10. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/index.html
  11. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/css/app.608a4910.css
  12. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/css/chunk-elementUI.45ab9bc1.css
  13. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/css/chunk-libs.2e418612.css
  14. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/fonts/element-icons.535877f5.woff
  15. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/fonts/element-icons.732389de.ttf
  16. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/1.1ddf085a.png
  17. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/404.a57b6f31.png
  18. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/404_cloud.0f4bc32b.png
  19. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/cow.3495de2a.jpg
  20. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-bg1.1f1602f0.jpg
  21. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-l.92a8b1dc.jpg
  22. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-r.9830302c.jpg
  23. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/login.92c368ad.png
  24. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/logo1.d2343c0f.png
  25. BIN
      cmd/dist-现代牧业-测试20240815-2/dist/static/img/logo_u3.34a9ffae.png
  26. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/app.e98d5ed6.js
  27. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-581b2547.4a582b7c.js
  28. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-d159a5f0.cecbaf4c.js
  29. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-d17f893e.5976e797.js
  30. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-elementUI.1e8908f6.js
  31. 0 0
      cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-libs.c26c123b.js
  32. 0 0
      cmd/dist/index.html
  33. 0 0
      cmd/dist/static/css/app.358c125d.css
  34. 0 0
      cmd/dist/static/css/app.608a4910.css
  35. 0 0
      cmd/dist/static/js/app.3fd91dd5.js
  36. 0 0
      cmd/dist/static/js/app.e98d5ed6.js
  37. 0 0
      cmd/dist/static/js/chunk-581b2547.4a582b7c.js
  38. 0 0
      cmd/dist/static/js/chunk-d17f893e.5976e797.js
  39. 0 0
      cmd/dist/static/js/chunk-libs.c26c123b.js
  40. 0 0
      cmd/dist/static/js/chunk-libs.f5a7c3c5.js
  41. BIN
      cmd/sh/eqserver

+ 1 - 0
apiserver/model/http/upkeep.go

@@ -0,0 +1 @@
+package http

+ 1 - 0
apiserver/model/spotcheck.go

@@ -0,0 +1 @@
+package model

+ 1 - 0
apiserver/routers/upkeep.go

@@ -0,0 +1 @@
+package restful

+ 1 - 0
apiserver/service/upkeep.go

@@ -0,0 +1 @@
+package service

+ 15 - 14
cmd/conf/app.ini

@@ -71,8 +71,8 @@ EasUrl = http://60.174.151.11:6888
 
 
 [database]
-DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
-; ####DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local
+; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
+DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local
@@ -80,17 +80,17 @@ DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc
 
 Type = mysql
 #####本地
-#User = root
-#Password = kepaiteng!QAZ
-#Host = 222.73.129.15:31306
-#Name = eq230508
+User = root
+Password = kepaiteng!QAZ
+Host = 222.73.129.15:31306
+Name = eq230508
 
 #####线上
-User = eq
-Password = Xdmy@1234
-Host = 192.168.61.42:3306
-Name = eq
-#TablePrefix =
+#User = eq
+#Password = Xdmy@1234
+#Host = 192.168.61.42:3306
+#Name = eq
+TablePrefix =
 
 #####现代牧业测试线
 #User = eq
@@ -117,9 +117,9 @@ MinimumReadSize = 0
 
 
 [sqlserver]
-Host = 1.13.1.127
+Host = 124.223.159.131
 User = lims
-Password = 123456
+Password = lims@1234
 Name = lims
 
 
@@ -129,4 +129,5 @@ ClientId = "fTBm64I4k3kqHYtoFTUpvirCDxxCfx7I"
 ClientSecret = "t4Kn8LIUiYZnk92kvZLnCUzY5ruvG3PeaQBMJURGLIQQ5ie7bO1nxernJrDacmpf"
 Url = "https://id.xiandaimuye.com"
 ##单点登录 1 正常登录 0
-IsDaaS = 0
+IsDaaS = 0
+

+ 9 - 9
cmd/conf/conf.toml

@@ -1,7 +1,7 @@
 [db]
 #dsn = "root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local"
-#dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local"
-dsn = "eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
+dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local"
+#dsn = "eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local"
 
@@ -10,18 +10,18 @@ idle_timeout = 3600
 [http]
 timeout =600
 ###sap测试线密码
-#sapname ="zinf_sheb"
-#sappwd ="zinf_sheb@1234"
+sapname ="zinf_sheb"
+sappwd ="zinf_sheb@1234"
 
 ###sap正式线密码
-sapname ="zinf_sheb"
-sappwd ="n4mJj^BVMs"
+#sapname ="zinf_sheb"
+#sappwd ="n4mJj^BVMs"
 #srmname= "PEC"
 #srmpwd = "3FxnFswa0hYb8y4nh6dzTtAS4kQYh0xP"
-###正式线
-routing = "http://192.168.61.117/SAPP0"
+##正式线
+#routing = "http://192.168.61.117/SAPP0"
 ##Q系统
-#routing = "http://192.168.61.117/SAPQ0"
+routing = "http://192.168.61.117/SAPQ0"
 
 
 

BIN
cmd/dist-现代牧业-测试20240815-2.zip


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/datas/myMap.json


BIN
cmd/dist-现代牧业-测试20240815-2/dist/favicon.ico


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/index.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/css/app.608a4910.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/css/chunk-elementUI.45ab9bc1.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/css/chunk-libs.2e418612.css


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/fonts/element-icons.535877f5.woff


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/fonts/element-icons.732389de.ttf


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/1.1ddf085a.png


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/404.a57b6f31.png


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/404_cloud.0f4bc32b.png


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/cow.3495de2a.jpg


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-bg1.1f1602f0.jpg


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-l.92a8b1dc.jpg


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/login-r.9830302c.jpg


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/login.92c368ad.png


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/logo1.d2343c0f.png


BIN
cmd/dist-现代牧业-测试20240815-2/dist/static/img/logo_u3.34a9ffae.png


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/app.e98d5ed6.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-581b2547.4a582b7c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-d159a5f0.cecbaf4c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-d17f893e.5976e797.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-elementUI.1e8908f6.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist-现代牧业-测试20240815-2/dist/static/js/chunk-libs.c26c123b.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/index.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/css/app.358c125d.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/css/app.608a4910.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/app.3fd91dd5.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/app.e98d5ed6.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/chunk-581b2547.4a582b7c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/chunk-d17f893e.5976e797.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/chunk-libs.c26c123b.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
cmd/dist/static/js/chunk-libs.f5a7c3c5.js


BIN
cmd/sh/eqserver


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff