Merge remote-tracking branch 'upstream/master'

sample/notify.js

@@ -689,7 +689,7 @@ function pushPlusNotify(text, desp) {
         topic: `${PUSH_PLUS_USER}`,
       };
       const options = {
-        url: `http://www.pushplus.plus/send`,
+        url: `https://www.pushplus.plus/send`,
         body: JSON.stringify(body),
         headers: {
           'Content-Type': ' application/json',

shell/update.sh

@@ -173,7 +173,7 @@ update_repo() {
     fi
     if [[ $exit_status -eq 0 ]]; then
         echo -e "\n更新${repo_path}成功...\n"
-        diff_scripts $repo_path $author $path $blackword $dependence
+        diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence"
     else
         echo -e "\n更新${repo_path}失败，请检查原因...\n"
     fi
@@ -205,6 +205,7 @@ update_raw() {
         )
         cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
         [[ -z $cron_name ]] && cron_name="$raw_file_name"
+        [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | xargs)
         [[ -z $cron_line ]] && cron_line="0 6 * * *"
         if [[ -z $cron_id ]]; then
             result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
@@ -314,7 +315,7 @@ diff_scripts() {
     local blackword="$4"
     local dependence="$5"
 
-    gen_list_repo $repo_path $author $path $blackword $dependence
+    gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence"
 
     local repo="${repo_path##*/}"
     local list_add="$dir_list_tmp/${repo}_add.list"
@@ -351,10 +352,10 @@ gen_list_repo() {
     cd ${repo_path}
     files=$(find . -name "*.js" | sed 's/^..//')
     if [[ $path ]]; then
-        files=$(find . -name "*.js" | sed 's/^..//' | egrep $path)
+        files=$(echo "$files" | egrep $path)
     fi
     if [[ $blackword ]]; then
-        files=$(find . -name "*.js" | sed 's/^..//' | egrep -v $blackword | egrep $path)
+        files=$(echo "$files" | egrep -v $blackword)
     fi
     if [[ $dependence ]]; then
         find . -name "*.js" | sed 's/^..//' | egrep $dependence | xargs -i cp {} $dir_scripts

src/layouts/index.tsx

@@ -14,6 +14,7 @@ import 'codemirror/mode/shell/shell.js';
 import { request } from '@/utils/http';
 import './index.less';
 import vhCheck from 'vh-check';
+import { version, changeLog } from '../version';
 
 export default function (props: any) {
   const logout = () => {
@@ -63,7 +64,16 @@ export default function (props: any) {
   return (
     <ProLayout
       selectedKeys={[props.location.pathname]}
-      title="控制面板"
+      title={
+        <>
+          控制面板
+          <a href={changeLog} target="_blank" rel="noopener noreferrer">
+            <span style={{ fontSize: 9, color: '#666', marginLeft: 5 }}>
+              {version}
+            </span>
+          </a>
+        </>
+      }
       menuItemRender={(menuItemProps: any, defaultDom: any) => {
         if (
           menuItemProps.isUrl ||

src/pages/crontab/logModal.tsx

@@ -100,7 +100,9 @@ const CronLogModal = ({
       onCancel={() => cancel()}
     >
       {!loading && value && (
-        <pre style={{ whiteSpace: 'break-spaces' }}>{value}</pre>
+        <pre style={{ whiteSpace: 'break-spaces', lineHeight: '17px' }}>
+          {value}
+        </pre>
       )}
     </Modal>
   );

src/version.ts

@@ -0,0 +1,2 @@
+export const version = 'v2.0.0-111';
+export const changeLog = 'https://t.me/jiaolongwang/101';