同步源库

elunez · Jun 13, 2023 · 194973a · 194973a
1 parent 1a9b1f4
commit 194973a
Show file tree

Hide file tree

Showing 8 changed files with 316 additions and 175 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,22 @@
 ## Azure 管理
 
-原版：https://github.com/1injex/azure-manager
+在原版的基础上 去广告、汉化等。
 
-在原版的基础上 去广告、汉化。
+原版：https://github.com/1injex/azure-manager
 
 安装教程：https://www.ydyno.com/archives/1404.html
+
+### 安装依赖包
+
+pip3 install -r requirements.txt
+
+### 默认VM账号密码
+
+账号 : defaultuser
+密码 : Thisis.yourpassword1
+
+### 增加管理账户
+
+提取API参数：https://www.ydyno.com/archives/1394.html
+
+密码：appId|password|tenant|subscriptions
diff --git a/azure/app.py b/azure/app.py
@@ -143,10 +143,10 @@ def account_add():
  flash('You need login')
  return redirect(url_for('login'))
  account = request.form.get('account')
- client_id = request.form.get('client_id')
- client_secret = request.form.get('client_secret')
- tenant_id = request.form.get('tenant_id')
- subscription_id = request.form.get('subscription_id')
+ client_id = request.form.get('string').split("|")[0]
+ client_secret = request.form.get('string').split("|")[1]
+ tenant_id = request.form.get('string').split("|")[2]
+ subscription_id = request.form.get('string').split("|")[3]
  if not account or not client_id or not client_secret or not tenant_id or not subscription_id:
  flash('Incorrect input')
  return redirect(url_for('index'))
@@ -193,14 +193,15 @@ def create_vm(credential_id):
  custom = request.form.get('custom')
  acc = request.form.get('acc')
  disk = request.form.get('disk')
+ spot = request.form.get('spot')
  username = "defaultuser"
  password = "Thisis.yourpassword1"
  credential = function.create_credential_object(tenant_id, client_id, client_secret)
  for i in range(int(set)):
- name = (tag + str(i + 1))
+ name = (tag + "-" + str(i + 1))
  function.create_resource_group(subscription_id, credential, name, location)
  threading.Thread(target=function.create_or_update_vm, args=(
- subscription_id, credential, name, location, username, password, size, os, custom, acc, disk)).start()
+ subscription_id, credential, name, location, username, password, size, os, custom, acc, disk, spot)).start()
  flash('Creating VM, Be patient')
  info = Credential.query.all()
  credential = Credential.query.get_or_404(credential_id)

diff --git a/azure/function.py b/azure/function.py
diff --git a/azure/static/favicon.ico b/azure/static/favicon.ico
diff --git a/azure/static/style.css b/azure/static/style.css
@@ -113,7 +113,6 @@ nav li a:hover {
 
 .float-right {
  float: right;
- margin-top: -5px;
 }
 
 .go {
@@ -124,12 +123,4 @@ nav li a:hover {
  background: #F5C518;
  border-radius: 5px;
  padding: 3px 5px;
-}
-
-input[type=submit] {
- cursor: pointer;
-}
-
-a {
- cursor: pointer;
 }
diff --git a/azure/templates/account.html b/azure/templates/account.html
@@ -4,10 +4,7 @@
  <p>{{ Credentials|length }} Accounts</p>
  <form method="post">
  <p>邮箱 <input type="text" name="account" autocomplete="off" required></p>
- <p>名称 <input type="text" name="client_id" autocomplete="off" required></p>
- <p>密码 <input type="text" name="client_secret" autocomplete="off" required></p>
- <p>租户 <input type="text" name="tenant_id" autocomplete="off" required></p>
- <p>订阅 <input type="text" name="subscription_id" autocomplete="off" required></p>
- <input class="btn" type="submit" name="submit" value="添加">
+ <p>密码 <input type="text" name="string" placeholder="appId|password|tenant|subs" autocomplete="off" required></p>
+ <input class="btn" type="submit" name="submit" value="Add">
  </form>
 {% endblock %}
diff --git a/azure/templates/base.html b/azure/templates/base.html
@@ -19,11 +19,13 @@ <h2>
  <nav>
  <ul>
  <li><a href="{{ url_for('index') }}">主页</a></li>
- <li><a href="{{ url_for('account_add') }}">增加管理账户</a></li> 
+ <li><a href="{{ url_for('account_add') }}">增加管理账户</a></li>
+ </ul>
  </nav>
  {% block content %}{% endblock %}
  <footer>
- <small>&copy; 2021 Powered by 1injex</small>
+ <small>&copy; 2023 Powered by <a style="text-decoration:none;
+color:#888;" href="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/elunez/azure-manager">elunez/azure-manager</a></small>
  </footer>
 </body>
 </html>
diff --git a/azure/templates/createvm.html b/azure/templates/createvm.html
@@ -6,60 +6,64 @@
  <div>
  <p><label>标签(英文数字组合) <input type="text" name="tag" autocomplete="off" required></label></p>
  <p><label>区域 <select name="location" required>
+ <option value="eastasia">香港</option>
+ <option value="southeastasia">新加坡</option>
+ <option value="japanwest">日本大阪</option>
+ <option value="japaneast">日本东京</option>
+ <option value="koreacentral">韩国中部</option>
+ <option value="koreasouth">韩国南部</option>
+ <option value="northcentralus">美国中北部</option>
  <option value="westus2">美国西2</option>
  <option value="westus3">美国西3</option>
- <option value="centralus">美国中</option>
- <option value="eastus">美国东</option>
- <option value="southeastasia">新加坡</option>
- <option value="eastasia">香港</option>
- <option value="japanwest">日本西</option>
- <option value="japaneast">日本东</option>
- <option value="koreacentral">韩国中</option>
- <option value="koreasouth">韩国南</option>
- <option value="australiaeast">澳洲南</option>
- <option value="northeurope">欧洲北</option>
- <option value="uksouth">英国南</option>
- <option value="southafricanorth">南非北</option>
- <option value="canadacentral">加拿大中</option>
- <option value="francecentral">法国中</option>
- <option value="germanywestcentral">德国中西</option>
- <option value="norwayeast">挪威东</option>
- <option value="switzerlandnorth">瑞典北</option>
- <option value="uaenorth">阿联酋北</option>
- <option value="australiacentral">澳洲中</option>
- <option value="australiasoutheast">澳洲东南</option>
- <option value="southindia">印度南</option>
- <option value="westindia">印度西</option>
- <option value="ukwest">英国西</option>
- <option value="canadaeast">加拿大东</option>
+ <option value="centralus">美国中部</option>
+ <option value="westcentralus">美国中西部</option>
+ <option value="eastus">美国东部</option>
+ <option value="eastus2">美国东部2</option>
+ <option value="southcentralus">美国中南部</option>
+ <option value="australiaeast">澳洲南部</option>
+ <option value="northeurope">欧洲北部</option>
+ <option value="uksouth">英国南部</option>
+ <option value="southafricanorth">南非北部</option>
+ <option value="canadacentral">加拿大中部</option>
+ <option value="francecentral">法国中部</option>
+ <option value="germanywestcentral">德国中西部</option>
+ <option value="norwayeast">挪威东部</option>
+ <option value="switzerlandnorth">瑞典北部</option>
+ <option value="uaenorth">阿联酋北部</option>
+ <option value="qatarcentral">卡塔尔中部</option>
+ <option value="brazilsouth">巴西南部</option>
+ <option value="australiacentral">澳洲中部</option>
+ <option value="australiasoutheast">澳洲东南部</option>
+ <option value="southindia">印度南部</option>
+ <option value="westindia">印度西部</option>
+ <option value="ukwest">英国西部</option>
+ <option value="canadaeast">加拿大东部</option>
  </select></label></p>
  <p><label>型号 <select name="size" required>
- <option value="Standard_B1s">B1s - 1C1G</option>
- <option value="Standard_B1ms">B1ms - 1C2G</option>
- <option value="Standard_B2s">B2s - 2C4G</option>
- <option value="Standard_B2ms">B2ms - 2C8G</option>
- <option value="Standard_D2s_v3">D2s - 2C8G</option>
- <option value="Standard_D4s_v3">D4s - 4C16G</option>
- <option value="Standard_F2s">F2s - 2C4G - 更好的性能</option>
- <option value="Standard_F4s">F4s - 4G8G - 更好的性能</option>
+ <option value="Standard_B1s">B1s(1C1G)</option>
+ <option value="Standard_B1ms">B1ms(1C2G)</option>
+ <option value="Standard_B2s">B2s(2C4G)</option>
+ <option value="Standard_B2ms">B2ms(2C8G)</option>
  </select></label></p>
  <p><label>数量 <select name="set" required>
  <option value="1">创建1台</option>
  <option value="2">创建2台</option>
  <option value="3">创建3台</option>
- <option value="4">创建5台</option>
+ <option value="4">创建4台</option>
  <option value="5">创建5台</option>
  </select></label></p>
  <p><label>系统 <select name="os" required>
- <option value="debian10">Debian 10</option>
- <option value="ubuntu20">Ubuntu 20.04 LTS</option>
- <option value="ubuntu18">Ubuntu 18.04 LTS</option>
- <option value="ubuntu16">Ubuntu 16.04</option>
- <option value="centos">CentOS 7.5</option>
- <option value="windows">WindowsServer2019</option>
+ <option value="Debian_11">Debian 11</option>
+ <option value="Debian_10">Debian 10</option>
+ <option value="Ubuntu_20_04">Ubuntu 20.04</option>
+ <option value="Ubuntu_18_04">Ubuntu 18.04</option>
+ <option value="Ubuntu_16_04">Ubuntu 16.04</option>
+ <option value="WinData_2022">WinData_2022</option>
+ <option value="WinData_2019">WinData_2019</option>
+ <option value="WinData_2019">WinData_2016</option>
+ <option value="WinData_2012">WinData_2012</option>
  </select></label></p>
  <p><label>硬盘大小 <select name="disk" required>
- <option value="32">32 GB</option>
  <option value="64">64 GB</option>
  <option value="64">100 GB</option>
  <option value="128">128 GB</option>
@@ -75,6 +79,10 @@
  <option value="False">默认不开启</option>
  <option value="True">开启</option>
  </select></label></p>
+ <p><label>Spot实例<select name="spot" required>
+ <option value="False">默认不开启</option>
+ <option value="True">开启</option>
+ </select></label></p>
  <input class="btn" type="submit" name="submit" value="添加">
  </div>
  </form>