shadow/cdnflydadao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: shadow:c9c96e73cc5e209feedc11f9330c4d6c788c90ba
Branches Tags
shadow:main
shadow:CDN-MASTER shadow:CDN
...
compare: shadow:main
Branches Tags
shadow:main
shadow:CDN-MASTER shadow:CDN

12 Commits
c9c96e73cc ... main

Author SHA1 Message Date
Reaper
d0ba17e424 变更 2023-08-11 11:22:37 +08:00
Reaper
055a7ad212 变更 2023-08-11 11:22:15 +08:00
Reaper
10f3a8e03a 变更 2023-08-11 10:45:18 +08:00
Reaper
7e0bafa41c 变更 2023-07-24 01:15:29 +08:00
Reaper
9b1c4589e1 变更 2023-07-21 10:30:02 +08:00
Reaper
16dfd3d6d7 变更 2023-07-21 10:25:31 +08:00
Reaper
40d0ae90ff 变更 2023-07-21 10:20:47 +08:00
Reaper
87f00a7202 modify yungao git 2022-12-08 07:10:35 +08:00
Reaper
fa0761a9f1 add 2022-12-08 03:25:53 +08:00
Reaper
7483a4830b add 2022-12-07 23:57:42 +08:00
Reaper
5070a3c139 添加简介 2022-12-07 23:20:52 +08:00
Reaper
2c21d2ac74 添加简介 2022-12-07 23:19:58 +08:00
11 changed files with 128 additions and 8 deletions
Expand all files Collapse all files

8
.idea/cdnflydadao.iml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/cdnflydadao.iml" filepath="$PROJECT_DIR$/.idea/cdnflydadao.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

98
.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="变更" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings">
<execution />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://F:/我的电脑/Documents/WeChat Files/wxid_pj54dtlvkjzq11/FileStorage/File/2022-08/云高项目网络IP地址划分资料.xlsx" root0="SKIP_INSPECTION" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2IadvHdnu3Q2Svu1RFVmwDkBl7P" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;F:/我的电脑/Documents/WeChat Files/wxid_pj54dtlvkjzq11/FileStorage/File/2022-08&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<changelist id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="" />
<created>1670423856551</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1670423856551</updated>
<workItem from="1670423857731" duration="4364000" />
<workItem from="1670430386964" duration="2490000" />
<workItem from="1670454611831" duration="625000" />
<workItem from="1670768307449" duration="103000" />
<workItem from="1689905971667" duration="1234000" />
</task>
<task id="LOCAL-00001" summary="modify yungao git">
<created>1670424021829</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1670424021829</updated>
</task>
<task id="LOCAL-00002" summary="modify yungao git">
<created>1670454635337</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1670454635337</updated>
</task>
<task id="LOCAL-00003" summary="变更">
<created>1689906048020</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1689906048020</updated>
</task>
<task id="LOCAL-00004" summary="变更">
<created>1689906331181</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1689906331181</updated>
</task>
<task id="LOCAL-00005" summary="变更">
<created>1689906602120</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1689906602120</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="modify yungao git" />
<MESSAGE value="变更" />
<option name="LAST_COMMIT_MESSAGE" value="变更" />
</component>
</project>

4
README
View File

@@ -9,8 +9,8 @@
web目录为验证文件，请自行搭建
0.0.0.0改成(自己搭建的验证服务器Ip)
vi /etc/hosts
0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn
0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn
114.132.217.36 auth.cdnfly.cn monitor.cdnfly.cn
114.132.217.36 auth.cdnfly.cn monitor.cdnfly.cn
2.主控
v5.1.11版本安装脚本:
curl -fsSL https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es

4
agent/agent.sh
View File

@@ -219,7 +219,7 @@ else
second_part=$(printf "%02d\n" `echo $MASTER_VER | awk -F'.' '{print $2}'`)
third_part=$(printf "%02d\n" `echo $MASTER_VER | awk -F'.' '{print $3}'`)
version_num="$first_part$second_part$third_part"
agent_ver=`(curl -s -m 5 "http://auth.fikkey.com/master/upgrades?version_num=$version_num" || curl -s -m 5 "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/web/upgrades?version_num=$version_num") | grep -Po '"agent_ver":"\d+"' | grep -Po "\d+" || true`
agent_ver=`(curl -s -m 5 "http://auth.fikkey.com/master/upgrades?version_num=$version_num" || curl -s -m 5 "https://github.com/LoveesYe/cdnflydadao/raw/main/web/upgrades?version_num=$version_num") | grep -Po '"agent_ver":"\d+"' | grep -Po "\d+" || true`
if [[ "$agent_ver" == "" ]]; then
echo "无法获取agent版本"
exit 1
@@ -237,7 +237,7 @@ fi
cd /opt
download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/$tar_gz_name" "$tar_gz_name"
download "https://github.com/LoveesYe/cdnflydadao/raw/main/agent/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/agent/$tar_gz_name" "$tar_gz_name"
rm -rf $dir_name
tar xf $tar_gz_name

2
cdnfly/v5.1.13/agent/agent.sh
View File

@@ -236,7 +236,7 @@ fi
cd /opt
download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name"
download "https://kgithub.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://kgithub.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name"
rm -rf $dir_name
tar xf $tar_gz_name

BIN
cdnfly/v5.1.13/agent/cdnfly-agent-v5.1.16-centos-7.tar.gz
View File

Binary file not shown.

BIN
cdnfly/v5.1.13/master/cdnfly-master-v5.1.13-centos-7.tar.gz
View File

Binary file not shown.

BIN
master/cdnfly-master-v5.1.11-centos-7.tar.gz
View File

Binary file not shown.

6
master/master.sh
View File

@@ -196,7 +196,7 @@ done
if [[ $VER == "" ]]; then
# 获取最新版本
echo "获取最新版..."
latest_version=`curl -s 'http://auth.fikkey.com/master/upgrades?latest=1' | grep -Po 'v\d+\.\d+.\d+' || true`
latest_version=`curl -s 'http://fikkey.com/master/upgrades?latest=1' | grep -Po 'v\d+\.\d+.\d+' || true`
if [[ "$latest_version" == "" ]]; then
echo "获取最新版失败，请先登录官网填入主控IP"
exit 1
@@ -219,7 +219,7 @@ else
fi
cd /opt/
download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
download "https://kgithub.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://kgithub.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name
rm -rf cdnfly
@@ -231,7 +231,7 @@ chmod +x install.sh
./install.sh $@
if [ -f /opt/cdnfly/master/view/upgrade.so ]; then
sed -i "s/https:\/\/update.cdnfly.cn\//http:\/\/auth.cdnfly.cn\/\/\/\//g" /opt/cdnfly/master/view/upgrade.so
sed -i "s/https:\/\/update.cdnfly.cn\//http:\/\/cdnfly.cn\/\/\/\//g" /opt/cdnfly/master/view/upgrade.so
supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload
fi