Skip to content

Commit abd7a5b

Browse files
committed
ui
1 parent 0faf52e commit abd7a5b

23 files changed

+234
-85
lines changed

.DS_Store

0 Bytes
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
https://blog.csdn.net/qq_39500817/article/details/116646471
2+
3+
提示内容: vs code This project targets .NET version that requires reference assemblies that do not ship with
4+
**
5+
解决办法:
6+
7+
找到vscode 的 Preferences
8+
搜索内容: omnisharp
9+
找到:Omnisharp: Use Global Mono 修改为always
10+
然后重新打开,或者直接右下角提示的确认
11+
————————————————
12+
版权声明:本文为CSDN博主「qq_39500817」的原创文章,遵循CC 4.0 BY-SA版权协议,转载请附上原文出处链接及本声明。
13+
原文链接:https://blog.csdn.net/qq_39500817/article/details/116646471

ProjectConfig/.DS_Store

0 Bytes
Binary file not shown.

ProjectConfig/CmdDefault/.DS_Store

0 Bytes
Binary file not shown.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
#! /bin/sh
3+
# 脚本文件的绝对路径存在了环境变量filepath中,可以用
4+
filepath=$(cd "$(dirname "$0")"; pwd)
5+
6+
# VMware 虚拟机共享目录里路径带空格 需要转换处理
7+
str1=$filepath
8+
str2="VMware"
9+
if [[ $str1 =~ $str2 ]]
10+
then
11+
echo "包含"
12+
#去除带空格的路径
13+
#filepath=${filepath// /\\ }
14+
filepath=${filepath#/Volumes/VMware Shared Folders/}
15+
cd /Volumes/VMware\ Shared\ Folders
16+
else
17+
echo "不包含"
18+
fi
19+
20+
21+
echo $filepath
22+
cd $filepath
23+
cd ../../../../../Common/PythonUnity/ProjectConfig/Script
24+
25+
python3 CodeConvert/CSharp2Ts.py $filepath
26+
27+
28+

ProjectConfig/Script/.DS_Store

0 Bytes
Binary file not shown.

ProjectConfig/Script/API/YoutubeDownload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
class YoutubeDownload():
5959
driver: None
6060
URL_HEAD = "http://47.242.56.146"
61-
URL_PORT = "5000"
61+
URL_PORT = "5001"
6262

6363

6464
#构造函数
@@ -93,7 +93,7 @@ def Download(self, url,savefilepath):
9393

9494

9595
def DownloadServer(self, url,savefilepath):
96-
# http://47.242.56.146:5000/YoutubDownload?keyid=rJ18V_NNq8g
96+
# http://47.242.56.146:5001/YoutubDownload?keyid=rJ18V_NNq8g
9797
idx = url.rfind("/")
9898
idx=idx+1
9999
keyid = url[idx:]
0 Bytes
Binary file not shown.

ProjectConfig/Script/AppStore/AppConnectApi.py

Lines changed: 8 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import gzip
1010
import requests
1111
import platform
12-
if 'Darwin' not in platform.system():
13-
import jwt
12+
1413
from Project.Resource import mainResource
1514
import time
1615
import sqlite3
@@ -19,7 +18,7 @@
1918
import json
2019
import base64
2120
from AppStore.UploadAssetApple import mainUploadAssetApple
22-
21+
from AppStore.JwtToken import mainJwtToken
2322

2423
o_path = os.getcwd() # 返回当前工作目录
2524
sys.path.append(o_path) # 添加自己指定的搜索路径
@@ -122,71 +121,16 @@ def GetKEY_PRIVATE(self):
122121
KEY_PRIVATE = FileUtil.GetFileString(filepath)
123122
return KEY_PRIVATE
124123

125-
126-
127-
def GetUrl(self, url):
128-
r = requests.get(url)
129-
return r.content.decode('utf-8',"ignore")
130-
131-
def GetTokenByWeb(self, key_id, user_id,key_private):
132-
key_private = self.GetKEY_PRIVATE()
133-
url = "http://47.242.56.146:5000/AppleJWTToken?keyid="+key_id+"&userid="+user_id+"&KEY_PRIVATE="+key_private
134-
# print("url=",url)
135-
result = self.GetUrl(url)
136-
# print("result=",result)
137-
return result
138-
124+
139125
def GetToken(self):
140126
return self.CreateJWTToken(self.API_KEY_ID,self.API_USER_ID)
141127

142-
def CreateJWTToken(self, keyid, userid):
143-
KEY_PRIVATE = self.GetKEY_PRIVATE()
144128

145-
# if len(self.KeyToken)==0:
146-
self.KeyToken = self.GetTokenByWeb(keyid,userid,KEY_PRIVATE)
147-
148-
return self.KeyToken
149-
150-
# 构造header
151-
152-
# headers = {
153-
# 'typ': 'jwt',
154-
# 'alg': 'HS256'
155-
# }
156-
157-
headers = {
158-
"alg": "ES256",
159-
# "kid": "MVG9NGFVX7",
160-
"kid": keyid,
161-
"typ": "JWT"
162-
}
163-
164-
# 构造payload
165-
# payload = {
166-
# 'user_id': 1, # 自定义用户ID
167-
# 'username': 'pig',
168-
# 'exp': datetime.datetime.utcnow() + datetime.timedelta(days=5)
169-
# }
170129

171-
now_timestamp = int(time.time())+60*10
172-
# print(str(now_timestamp))
173130

174-
payload = {
175-
# "iss": "69a6de89-f844-47e3-e053-5b8c7c11a4d1",
176-
"iss": userid,
177-
# 1528408800
178-
179-
"exp": now_timestamp,
180-
"aud": "appstoreconnect-v1"
181-
}
182-
# print(payload)
183-
184-
# print(KEY_PRIVATE)
185-
result = "result"
186-
result = jwt.encode(payload=payload, key=KEY_PRIVATE,
187-
algorithm='ES256', headers=headers).decode('utf8')
188-
# print("CreateJWTToken =",result)
189-
return result
131+
def CreateJWTToken(self, keyid, userid):
132+
KEY_PRIVATE = self.GetKEY_PRIVATE()
133+
return mainJwtToken.GetToken(keyid,userid,KEY_PRIVATE)
190134

191135
def GetApiUrlHead(self):
192136
token = self.CreateJWTToken(self.API_KEY_ID, self.API_USER_ID)
@@ -839,7 +783,8 @@ def CreateBundleID(self,package):
839783
# package = 'Y9ZUK2WTEE.com.moonma.poem'
840784
# name = 'com-moonma-poem'
841785
params = {'data':{'attributes':{'identifier':package,'name':name,'platform':'IOS','seedId':self.teamID},'type':'bundleIds'}}
842-
786+
print("CreateBundleID params=",params)
787+
print("CreateBundleID header=",header)
843788
mdl_rqt = requests.post(
844789
url,
845790
headers=header,

ProjectConfig/Script/AppStore/AppStoreApple.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,8 @@ def CreateBundleID(self,isHD):
749749
appid = mainAppInfo.GetAppId(isHD,Source.APPSTORE)
750750
package = mainAppInfo.GetAppPackage(Source.IOS,isHD)
751751
# package = "com.moonma.fillfood.pad2"
752+
# package = "1"+package
753+
# package = package.replace(" ","")
752754

753755
print("CreateBundleID package=",package," appid=",appid)
754756
mainAppConnectApi.CreateBundleID(package)

0 commit comments

Comments
 (0)