From 34b11098598a4f7d2b4a3c0d5d476469548da41f Mon Sep 17 00:00:00 2001
From: qinzexin <“731344816@qq.com”>
Date: Tue, 13 May 2025 18:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A2=9E=E5=8A=A0cdn?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php        |  4 +-
 .../admin/controller/auth/Adminlog.php        | 15 +++++
 .../controller/school/activity/Activity.php   |  4 ++
 .../model/school/activity/order/OrderCode.php |  4 +-
 application/config.php                        |  2 +-
 application/extra/upload.php                  |  4 +-
 code_zip.php                                  | 60 +++++++++++++++++++
 7 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 code_zip.php

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index b68ecae..c570fea 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -80,12 +80,12 @@ class Index extends Backend
             $rule = [
                 'username'  => 'require|length:3,30',
                 'password'  => 'require|length:3,30',
-                '__token__' => 'require|token',
+//                '__token__' => 'require|token',
             ];
             $data = [
                 'username'  => $username,
                 'password'  => $password,
-                '__token__' => $token,
+//                '__token__' => $token,
             ];
             if (Config::get('fastadmin.login_captcha')) {
                 $rule['captcha'] = 'require|captcha';
diff --git a/application/admin/controller/auth/Adminlog.php b/application/admin/controller/auth/Adminlog.php
index 03c213f..bb74d61 100644
--- a/application/admin/controller/auth/Adminlog.php
+++ b/application/admin/controller/auth/Adminlog.php
@@ -5,6 +5,7 @@ namespace app\admin\controller\auth;
 use addons\csmtable\library\xcore\xcore\utils\XcAdminSessionUtils;
 use app\admin\model\AuthGroup;
 use app\common\controller\Backend;
+use bw\Common;
 
 /**
  * 管理员日志
@@ -43,9 +44,18 @@ class Adminlog extends Backend
      */
     public function index()
     {
+
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
+//            (Common::getQrcode([
+//                'text'           => time(),
+//                'size'           => 200,
+//            ]))['url'];
+
+
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $isSuperAdmin = $this->auth->isSuperAdmin();
             $childrenAdminIds = $this->childrenAdminIds;
@@ -64,6 +74,11 @@ class Adminlog extends Backend
 
             return json($result);
         }
+
+
+
+
+
         return $this->view->fetch();
     }
 
diff --git a/application/admin/controller/school/activity/Activity.php b/application/admin/controller/school/activity/Activity.php
index 86d84b9..ada94c9 100644
--- a/application/admin/controller/school/activity/Activity.php
+++ b/application/admin/controller/school/activity/Activity.php
@@ -19,6 +19,10 @@ use think\Url;
 class Activity extends Backend
 {
 
+    protected $noNeedLogin = ['miniqrcode'];
+
+
+
     /**
      * Activity模型对象
      * @var \app\admin\model\school\activity\Activity
diff --git a/application/common/model/school/activity/order/OrderCode.php b/application/common/model/school/activity/order/OrderCode.php
index 8d4f253..40b37f2 100644
--- a/application/common/model/school/activity/order/OrderCode.php
+++ b/application/common/model/school/activity/order/OrderCode.php
@@ -34,12 +34,12 @@ class OrderCode extends BaseModel
 
     public function getCodeimageAttr($value, $data)
     {
-        if (!empty($value)) return cdnurl($value, true);
+        if (!empty($value)) return cdnurl($value, request()->domain());
     }
 
     public function getCodeoneimageAttr($value, $data)
     {
-        if (!empty($value)) return cdnurl($value, true);
+        if (!empty($value)) return cdnurl($value, request()->domain());
     }
 
 
diff --git a/application/config.php b/application/config.php
index e7acc73..5e71bd5 100644
--- a/application/config.php
+++ b/application/config.php
@@ -310,7 +310,7 @@ return [
         //插件纯净模式，插件启用后是否删除插件目录的application、public和assets文件夹
         'addon_pure_mode'       => true,
         //允许跨域的域名,多个以,分隔
-        'cors_request_domain'   => 'localhost,127.0.0.1,testy1.hschool.com.cn',
+        'cors_request_domain'   => 'localhost,127.0.0.1,testy1.hschool.com.cn,qingchunta.hschool.com.cn',
         //版本号
         'version'               => '1.5.2.20240906',
         //API接口地址
diff --git a/application/extra/upload.php b/application/extra/upload.php
index f4b2d9e..d8bbcdc 100644
--- a/application/extra/upload.php
+++ b/application/extra/upload.php
@@ -9,8 +9,8 @@ return [
     /**
      * CDN地址
      */
-//    'cdnurl'    => 'https://testy1.hschool.com.cn',
-'cdnurl'    => '',
+    'cdnurl'    => 'https://qingchunta.hschool.com.cn',
+//'cdnurl'    => '',
     /**
      * 文件保存格式
      */
diff --git a/code_zip.php b/code_zip.php
new file mode 100644
index 0000000..16fee46
--- /dev/null
+++ b/code_zip.php
@@ -0,0 +1,60 @@
+<?php
+
+//本脚本为将特定目录下的所有源码文件去掉空格、空行，并在当前脚本所在位置生成一个docx文件，里面是所有源码字符串的集合，用来提供申请软著的源码文件。
+
+
+//源码文件路径(可多个)
+$paths = [
+    'F:\code_project\back_end\php\git_depository\new-diverse-youth-night-school-backend\NewDiverseYouthNightSchool\application\api\controller\school\newactivity',
+    'F:\code_project\back_end\php\git_depository\new-diverse-youth-night-school-backend\NewDiverseYouthNightSchool\application\api\controller\school\newworker',
+    'F:\code_project\back_end\php\git_depository\new-diverse-youth-night-school-backend\NewDiverseYouthNightSchool\application\api\controller\school\NewActivity.php',
+];
+//输出文件路径
+$out_path = '.\out.docx';
+//源码文件后缀数组
+$exts = ["php","js","html"];
+//过滤的正则
+//去掉空格、空行
+//$filter = '/\s(?=\s)/';
+//保留原格式，包括其他行的回车换行符，只去除无内容的行
+$filter = '/\s(?!\S)/';
+
+
+
+//遍历目录下所有文件（递归函数遍历文件数，不漏掉深层文件）
+function get_all_files($path)
+{
+    $files = array();
+    if (is_dir($path)) {
+        $fh = opendir($path);
+        while (false !== ($file = readdir($fh))) {
+            if ($file != '.' && $file != '..') {
+                if (is_dir($path . '/' . $file)) {
+                    $files = array_merge($files, get_all_files($path . '/' . $file));
+                } else {
+                    $files[] = $path . '/' . $file;
+                }
+            }
+        }
+    }
+    return $files;
+}
+//源码字符串
+$str = '';
+$files = [];
+foreach ($paths as $path) {
+    $files = array_merge($files, get_all_files($path));
+}
+//遍历目录下所有文件
+foreach ($files as $file) {
+    //判断文件后缀是否在数组中
+    if (in_array(substr(strrchr($file, '.'), 1), $exts)) {
+        //得到文件内容
+        $file_content = file_get_contents($file);
+        //去掉空格、空行
+        $file_content = preg_replace($filter, '', $file_content);
+        $str .= $file_content;
+    }
+}
+//写入文件
+if($str)file_put_contents($out_path, $str);