Unverified 提交 8f5dc5d6 authored 作者: JarvanMo's avatar JarvanMo 提交者: GitHub

Merge pull request #576 from naivetoby/feat-add-ios-ignore_security

feat: add ios ignore_security
...@@ -58,13 +58,18 @@ if cfg['fluwx'] && cfg['fluwx']['app_id'] ...@@ -58,13 +58,18 @@ if cfg['fluwx'] && cfg['fluwx']['app_id']
app_id = cfg['fluwx']['app_id'] app_id = cfg['fluwx']['app_id']
end end
ignore_security = ''
if cfg['fluwx'] && cfg['fluwx']['ios'] && cfg['fluwx']['ios']['ignore_security'] == true
ignore_security = '-i'
end
Pod::UI.puts "ignore_security: #{ignore_security}"
if cfg['fluwx'] && (cfg['fluwx']['ios'] && cfg['fluwx']['ios']['universal_link']) if cfg['fluwx'] && (cfg['fluwx']['ios'] && cfg['fluwx']['ios']['universal_link'])
universal_link = cfg['fluwx']['ios']['universal_link'] universal_link = cfg['fluwx']['ios']['universal_link']
if app_id.nil? if app_id.nil?
system("ruby #{current_dir}/wechat_setup.rb -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj") system("ruby #{current_dir}/wechat_setup.rb #{ignore_security} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj")
else else
system("ruby #{current_dir}/wechat_setup.rb -a #{app_id} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj") system("ruby #{current_dir}/wechat_setup.rb #{ignore_security} -a #{app_id} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj")
end end
else else
abort("required values:[universal_link] are missing. Please add them in pubspec.yaml:\nfluwx:\n \nios:\nuniversal_link: https://${applinks domain}/universal_link/${example_app}/wechat/\n") abort("required values:[universal_link] are missing. Please add them in pubspec.yaml:\nfluwx:\n \nios:\nuniversal_link: https://${applinks domain}/universal_link/${example_app}/wechat/\n")
......
...@@ -24,6 +24,10 @@ OptionParser.new do |options| ...@@ -24,6 +24,10 @@ OptionParser.new do |options|
options_dict[:project_name] = name options_dict[:project_name] = name
end end
options.on("-i", "--ignoreSecurity", "Ignore modifying NSAppTransportSecurity") do |opts|
options_dict[:ignore_security] = true
end
options.on("-a", "--appId=APPID", String, "App ID for Wechat") do |opts| options.on("-a", "--appId=APPID", String, "App ID for Wechat") do |opts|
options_dict[:app_id] = opts options_dict[:app_id] = opts
end end
...@@ -103,6 +107,7 @@ project.targets.each do |target| ...@@ -103,6 +107,7 @@ project.targets.each do |target|
end end
File.write(infoplistFile, Plist::Emit.dump(result)) File.write(infoplistFile, Plist::Emit.dump(result))
end end
if !options_dict[:ignore_security]
security = result["NSAppTransportSecurity"] security = result["NSAppTransportSecurity"]
if !security if !security
security = {} security = {}
...@@ -117,6 +122,7 @@ project.targets.each do |target| ...@@ -117,6 +122,7 @@ project.targets.each do |target|
File.write(infoplistFile, Plist::Emit.dump(result)) File.write(infoplistFile, Plist::Emit.dump(result))
end end
end end
end
sectionObject.build_configurations.each do |config| sectionObject.build_configurations.each do |config|
codeSignEntitlements = config.build_settings["CODE_SIGN_ENTITLEMENTS"] codeSignEntitlements = config.build_settings["CODE_SIGN_ENTITLEMENTS"]
if !codeSignEntitlements if !codeSignEntitlements
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论