ソースを参照

d06 Отказ от настольного клиента

user 2 年 前
コミット
2ad82b3b87
100 ファイル変更22 行追加2 行削除
  1. 1 1
      Makefile
  2. BIN
      app_serv/cmd/pwa.7z
  3. BIN
      app_serv/cmd/serv_old.zip
  4. BIN
      app_serv/cmd/serv_run.zip
  5. 0 0
      cmd/desk.zip
  6. 0 0
      cmd/desk/main.go
  7. 0 0
      cmd/server/main.go
  8. 0 0
      go.mod
  9. 0 0
      go.sum
  10. 21 1
      make.py
  11. 0 0
      pkg/alias/alias.go
  12. 0 0
      pkg/alias/msec.go
  13. 0 0
      pkg/bot/bot.go
  14. 0 0
      pkg/components/count_time.zip
  15. 0 0
      pkg/components/kernel/keeper/keeper.go
  16. 0 0
      pkg/components/kernel/keeper/keeper_test.go
  17. 0 0
      pkg/components/kernel/kernel.go
  18. 0 0
      pkg/components/kernel/kernel_test.go
  19. 0 0
      pkg/components/kernel/slog/slog.go
  20. 0 0
      pkg/components/kernel/slog/slog_file/slog_file.go
  21. 0 0
      pkg/components/kernel/slog/slog_file/slog_file_test.go
  22. 0 0
      pkg/components/kernel/slog/slog_term/slog_term.go
  23. 0 0
      pkg/components/kernel/slog/slog_term/slog_term_test.go
  24. 0 0
      pkg/components/kernel/slog/slog_test.go
  25. 0 0
      pkg/components/kernel/store/000001.log
  26. 0 0
      pkg/components/kernel/store/CURRENT
  27. 0 0
      pkg/components/kernel/store/LOCK
  28. 0 0
      pkg/components/kernel/store/LOG
  29. 0 0
      pkg/components/kernel/store/MANIFEST-000000
  30. 0 0
      pkg/components/kernel/store/store.go
  31. 0 0
      pkg/components/kernel/wgname/wgname.go
  32. 0 0
      pkg/components/kernel/wgname/wgname_test.go
  33. 0 0
      pkg/components/lst_string/lst_string.go
  34. 0 0
      pkg/components/parser_time/parse_hour/parse_hour.go
  35. 0 0
      pkg/components/parser_time/parse_hour/parse_hour_test.go
  36. 0 0
      pkg/components/parser_time/parse_min/parse_min.go
  37. 0 0
      pkg/components/parser_time/parse_min/parse_min_test.go
  38. 0 0
      pkg/components/parser_time/parse_sec/parse_sec.go
  39. 0 0
      pkg/components/parser_time/parse_sec/parse_sec_test.go
  40. 0 0
      pkg/components/parser_time/parser_time.go
  41. 0 0
      pkg/components/parser_time/parser_time_test.go
  42. 0 0
      pkg/components/product/product.go
  43. 0 0
      pkg/components/safe_bool/safe_bool.go
  44. 0 0
      pkg/components/safe_bool/safe_bool_test.go
  45. 0 0
      pkg/components/safe_int/safe_int.go
  46. 0 0
      pkg/components/safe_int/safe_int_test.go
  47. 0 0
      pkg/components/safe_string/safe_string.go
  48. 0 0
      pkg/components/safe_string/safe_string_test.go
  49. 0 0
      pkg/components/scene_net/netstat/netstat.go
  50. 0 0
      pkg/components/scene_net/scene_web_worker/scene_web_worker.go
  51. 0 0
      pkg/components/scene_net/section_net.go
  52. 0 0
      pkg/components/scene_net/web_worker/web_worker.go
  53. 0 0
      pkg/components/sound/sound.go
  54. 0 0
      pkg/components/wrag/wrag.go
  55. 0 0
      pkg/cons/cons.go
  56. 0 0
      pkg/mock/mock_env/mockenv.go
  57. 0 0
      pkg/mock/mock_env/mockenv_test.go
  58. 0 0
      pkg/mock/mockapp/mockapp.go
  59. 0 0
      pkg/mock/mockkernel/mockkernel.go
  60. 0 0
      pkg/mock/mockkernel/mockkernel_test.go
  61. 0 0
      pkg/net_struct/net_arsenal.go
  62. 0 0
      pkg/net_struct/net_mine.go
  63. 0 0
      pkg/net_struct/net_resource.go
  64. 0 0
      pkg/scene/scene.go
  65. 0 0
      pkg/scene/scene_mode/scene_mode.go
  66. 0 0
      pkg/section/down_time/down_time.go
  67. 0 0
      pkg/section/down_time/down_time_test.go
  68. 0 0
      pkg/section/section.go
  69. 0 0
      pkg/types/iangar.go
  70. 0 0
      pkg/types/iarsenal.go
  71. 0 0
      pkg/types/ibank.go
  72. 0 0
      pkg/types/ibankmode.go
  73. 0 0
      pkg/types/ibase.go
  74. 0 0
      pkg/types/ibase_basic.go
  75. 0 0
      pkg/types/ibase_fuel.go
  76. 0 0
      pkg/types/ibase_mine.go
  77. 0 0
      pkg/types/ibase_polygon.go
  78. 0 0
      pkg/types/ibattle_action.go
  79. 0 0
      pkg/types/ibattle_scene.go
  80. 0 0
      pkg/types/ibot.go
  81. 0 0
      pkg/types/ibot_cookie.go
  82. 0 0
      pkg/types/ibot_net.go
  83. 0 0
      pkg/types/iconvoy.go
  84. 0 0
      pkg/types/icounttime.go
  85. 0 0
      pkg/types/idesktop.go
  86. 0 0
      pkg/types/idict_bot.go
  87. 0 0
      pkg/types/idiv_war_action.go
  88. 0 0
      pkg/types/idiv_war_scene.go
  89. 0 0
      pkg/types/igui.go
  90. 0 0
      pkg/types/iis_shot.go
  91. 0 0
      pkg/types/ikernel.go
  92. 0 0
      pkg/types/ikernel_store.go
  93. 0 0
      pkg/types/imarket.go
  94. 0 0
      pkg/types/imissions.go
  95. 0 0
      pkg/types/inet_client.go
  96. 0 0
      pkg/types/inetangar.go
  97. 0 0
      pkg/types/inetbase.go
  98. 0 0
      pkg/types/inetmarket.go
  99. 0 0
      pkg/types/iparser_hour.go
  100. 0 0
      pkg/types/iparser_min.go

+ 1 - 1
app_serv/Makefile → Makefile

@@ -45,7 +45,7 @@ test.run:
 mod:
 	clear
 	go get -u ./...
-	go mod tidy -compat=1.21.6
+	go mod tidy -compat=1.21
 	go mod vendor
 	go fmt ./...
 lint:

BIN
app_serv/cmd/pwa.7z


BIN
app_serv/cmd/serv_old.zip


BIN
app_serv/cmd/serv_run.zip


+ 0 - 0
app_serv/cmd/desk.zip → cmd/desk.zip


+ 0 - 0
app_serv/cmd/desk/main.go → cmd/desk/main.go


+ 0 - 0
app_serv/cmd/server/main.go → cmd/server/main.go


+ 0 - 0
app_serv/go.mod → go.mod


+ 0 - 0
app_serv/go.sum → go.sum


+ 21 - 1
app_work/make.py → make.py

@@ -20,6 +20,23 @@ def help() -> None:
     print(h)
 
 
+class Pwa:
+    """Класс сборки PWA
+    """
+
+    def __init__(self) -> None:
+        pass
+
+    def run(self) -> None:
+        print('build PWA')
+        os.chdir("../app_pwa")
+        cmd: str = 'GOARCH=wasm ' +\
+            'GOOS=js ' +\
+            'go build -o ' +\
+            '../app_work/bin/web/static/wasm/app.wasm ./cmd/client/main.go'
+        os.system(cmd)
+
+
 class Build:
     """Класс сборки
     """
@@ -129,14 +146,17 @@ class Dev:
         print("format")
         os.system("go fmt ./...")
         print("build")
-        cmd: str = """go build -race """ +\
+        cmd: str = """go build """ +\
             '-o ../app_work/bin/server.exe ./cmd/server/main.go'
         print(cmd)
         os.system(cmd)
+        pwa: Pwa = Pwa()
+        pwa.run()
         os.chdir("../app_work/bin")
         os.unsetenv('STAGE')
         os.putenv('STAGE', 'local')
         os.system('./server.exe')
+        os.chdir('../..')
 
 
 if __name__ == '__main__':

+ 0 - 0
app_serv/pkg/alias/alias.go → pkg/alias/alias.go


+ 0 - 0
app_serv/pkg/alias/msec.go → pkg/alias/msec.go


+ 0 - 0
app_serv/pkg/bot/bot.go → pkg/bot/bot.go


+ 0 - 0
app_serv/pkg/components/count_time.zip → pkg/components/count_time.zip


+ 0 - 0
app_serv/pkg/components/kernel/keeper/keeper.go → pkg/components/kernel/keeper/keeper.go


+ 0 - 0
app_serv/pkg/components/kernel/keeper/keeper_test.go → pkg/components/kernel/keeper/keeper_test.go


+ 0 - 0
app_serv/pkg/components/kernel/kernel.go → pkg/components/kernel/kernel.go


+ 0 - 0
app_serv/pkg/components/kernel/kernel_test.go → pkg/components/kernel/kernel_test.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog.go → pkg/components/kernel/slog/slog.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog_file/slog_file.go → pkg/components/kernel/slog/slog_file/slog_file.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog_file/slog_file_test.go → pkg/components/kernel/slog/slog_file/slog_file_test.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog_term/slog_term.go → pkg/components/kernel/slog/slog_term/slog_term.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog_term/slog_term_test.go → pkg/components/kernel/slog/slog_term/slog_term_test.go


+ 0 - 0
app_serv/pkg/components/kernel/slog/slog_test.go → pkg/components/kernel/slog/slog_test.go


+ 0 - 0
app_serv/pkg/components/kernel/store/000001.log → pkg/components/kernel/store/000001.log


+ 0 - 0
app_serv/pkg/components/kernel/store/CURRENT → pkg/components/kernel/store/CURRENT


+ 0 - 0
app_serv/pkg/components/kernel/store/LOCK → pkg/components/kernel/store/LOCK


+ 0 - 0
app_serv/pkg/components/kernel/store/LOG → pkg/components/kernel/store/LOG


+ 0 - 0
app_serv/pkg/components/kernel/store/MANIFEST-000000 → pkg/components/kernel/store/MANIFEST-000000


+ 0 - 0
app_serv/pkg/components/kernel/store/store.go → pkg/components/kernel/store/store.go


+ 0 - 0
app_serv/pkg/components/kernel/wgname/wgname.go → pkg/components/kernel/wgname/wgname.go


+ 0 - 0
app_serv/pkg/components/kernel/wgname/wgname_test.go → pkg/components/kernel/wgname/wgname_test.go


+ 0 - 0
app_serv/pkg/components/lst_string/lst_string.go → pkg/components/lst_string/lst_string.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_hour/parse_hour.go → pkg/components/parser_time/parse_hour/parse_hour.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_hour/parse_hour_test.go → pkg/components/parser_time/parse_hour/parse_hour_test.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_min/parse_min.go → pkg/components/parser_time/parse_min/parse_min.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_min/parse_min_test.go → pkg/components/parser_time/parse_min/parse_min_test.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_sec/parse_sec.go → pkg/components/parser_time/parse_sec/parse_sec.go


+ 0 - 0
app_serv/pkg/components/parser_time/parse_sec/parse_sec_test.go → pkg/components/parser_time/parse_sec/parse_sec_test.go


+ 0 - 0
app_serv/pkg/components/parser_time/parser_time.go → pkg/components/parser_time/parser_time.go


+ 0 - 0
app_serv/pkg/components/parser_time/parser_time_test.go → pkg/components/parser_time/parser_time_test.go


+ 0 - 0
app_serv/pkg/components/product/product.go → pkg/components/product/product.go


+ 0 - 0
app_serv/pkg/components/safe_bool/safe_bool.go → pkg/components/safe_bool/safe_bool.go


+ 0 - 0
app_serv/pkg/components/safe_bool/safe_bool_test.go → pkg/components/safe_bool/safe_bool_test.go


+ 0 - 0
app_serv/pkg/components/safe_int/safe_int.go → pkg/components/safe_int/safe_int.go


+ 0 - 0
app_serv/pkg/components/safe_int/safe_int_test.go → pkg/components/safe_int/safe_int_test.go


+ 0 - 0
app_serv/pkg/components/safe_string/safe_string.go → pkg/components/safe_string/safe_string.go


+ 0 - 0
app_serv/pkg/components/safe_string/safe_string_test.go → pkg/components/safe_string/safe_string_test.go


+ 0 - 0
app_serv/pkg/components/scene_net/netstat/netstat.go → pkg/components/scene_net/netstat/netstat.go


+ 0 - 0
app_serv/pkg/components/scene_net/scene_web_worker/scene_web_worker.go → pkg/components/scene_net/scene_web_worker/scene_web_worker.go


+ 0 - 0
app_serv/pkg/components/scene_net/section_net.go → pkg/components/scene_net/section_net.go


+ 0 - 0
app_serv/pkg/components/scene_net/web_worker/web_worker.go → pkg/components/scene_net/web_worker/web_worker.go


+ 0 - 0
app_serv/pkg/components/sound/sound.go → pkg/components/sound/sound.go


+ 0 - 0
app_serv/pkg/components/wrag/wrag.go → pkg/components/wrag/wrag.go


+ 0 - 0
app_serv/pkg/cons/cons.go → pkg/cons/cons.go


+ 0 - 0
app_serv/pkg/mock/mock_env/mockenv.go → pkg/mock/mock_env/mockenv.go


+ 0 - 0
app_serv/pkg/mock/mock_env/mockenv_test.go → pkg/mock/mock_env/mockenv_test.go


+ 0 - 0
app_serv/pkg/mock/mockapp/mockapp.go → pkg/mock/mockapp/mockapp.go


+ 0 - 0
app_serv/pkg/mock/mockkernel/mockkernel.go → pkg/mock/mockkernel/mockkernel.go


+ 0 - 0
app_serv/pkg/mock/mockkernel/mockkernel_test.go → pkg/mock/mockkernel/mockkernel_test.go


+ 0 - 0
app_serv/pkg/net_struct/net_arsenal.go → pkg/net_struct/net_arsenal.go


+ 0 - 0
app_serv/pkg/net_struct/net_mine.go → pkg/net_struct/net_mine.go


+ 0 - 0
app_serv/pkg/net_struct/net_resource.go → pkg/net_struct/net_resource.go


+ 0 - 0
app_serv/pkg/scene/scene.go → pkg/scene/scene.go


+ 0 - 0
app_serv/pkg/scene/scene_mode/scene_mode.go → pkg/scene/scene_mode/scene_mode.go


+ 0 - 0
app_serv/pkg/section/down_time/down_time.go → pkg/section/down_time/down_time.go


+ 0 - 0
app_serv/pkg/section/down_time/down_time_test.go → pkg/section/down_time/down_time_test.go


+ 0 - 0
app_serv/pkg/section/section.go → pkg/section/section.go


+ 0 - 0
app_serv/pkg/types/iangar.go → pkg/types/iangar.go


+ 0 - 0
app_serv/pkg/types/iarsenal.go → pkg/types/iarsenal.go


+ 0 - 0
app_serv/pkg/types/ibank.go → pkg/types/ibank.go


+ 0 - 0
app_serv/pkg/types/ibankmode.go → pkg/types/ibankmode.go


+ 0 - 0
app_serv/pkg/types/ibase.go → pkg/types/ibase.go


+ 0 - 0
app_serv/pkg/types/ibase_basic.go → pkg/types/ibase_basic.go


+ 0 - 0
app_serv/pkg/types/ibase_fuel.go → pkg/types/ibase_fuel.go


+ 0 - 0
app_serv/pkg/types/ibase_mine.go → pkg/types/ibase_mine.go


+ 0 - 0
app_serv/pkg/types/ibase_polygon.go → pkg/types/ibase_polygon.go


+ 0 - 0
app_serv/pkg/types/ibattle_action.go → pkg/types/ibattle_action.go


+ 0 - 0
app_serv/pkg/types/ibattle_scene.go → pkg/types/ibattle_scene.go


+ 0 - 0
app_serv/pkg/types/ibot.go → pkg/types/ibot.go


+ 0 - 0
app_serv/pkg/types/ibot_cookie.go → pkg/types/ibot_cookie.go


+ 0 - 0
app_serv/pkg/types/ibot_net.go → pkg/types/ibot_net.go


+ 0 - 0
app_serv/pkg/types/iconvoy.go → pkg/types/iconvoy.go


+ 0 - 0
app_serv/pkg/types/icounttime.go → pkg/types/icounttime.go


+ 0 - 0
app_serv/pkg/types/idesktop.go → pkg/types/idesktop.go


+ 0 - 0
app_serv/pkg/types/idict_bot.go → pkg/types/idict_bot.go


+ 0 - 0
app_serv/pkg/types/idiv_war_action.go → pkg/types/idiv_war_action.go


+ 0 - 0
app_serv/pkg/types/idiv_war_scene.go → pkg/types/idiv_war_scene.go


+ 0 - 0
app_serv/pkg/types/igui.go → pkg/types/igui.go


+ 0 - 0
app_serv/pkg/types/iis_shot.go → pkg/types/iis_shot.go


+ 0 - 0
app_serv/pkg/types/ikernel.go → pkg/types/ikernel.go


+ 0 - 0
app_serv/pkg/types/ikernel_store.go → pkg/types/ikernel_store.go


+ 0 - 0
app_serv/pkg/types/imarket.go → pkg/types/imarket.go


+ 0 - 0
app_serv/pkg/types/imissions.go → pkg/types/imissions.go


+ 0 - 0
app_serv/pkg/types/inet_client.go → pkg/types/inet_client.go


+ 0 - 0
app_serv/pkg/types/inetangar.go → pkg/types/inetangar.go


+ 0 - 0
app_serv/pkg/types/inetbase.go → pkg/types/inetbase.go


+ 0 - 0
app_serv/pkg/types/inetmarket.go → pkg/types/inetmarket.go


+ 0 - 0
app_serv/pkg/types/iparser_hour.go → pkg/types/iparser_hour.go


+ 0 - 0
app_serv/pkg/types/iparser_min.go → pkg/types/iparser_min.go


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません