Ken 1 周之前
父节点
当前提交
316ad3d259

+ 10 - 18
app/Http/Controllers/admin/Bet.php

@@ -11,15 +11,7 @@ use Exception;
 
 class Bet extends Controller
 {
-    /**
-     * @description: 分页数据
-     * @return {*}
-     *
-     * @apiParam {String} [start_time] 开始时间
-     * - 格式:`yyyy-mm-dd`
-     * @apiParam {String} [end_time] 截止时间
-     * - 格式:`yyyy-mm-dd`
-     */
+
     function index()
     {
         try {
@@ -57,8 +49,8 @@ class Bet extends Controller
     }
 
     // /**
-    //  * @description: 修改|新增
-    //  * @return {*}
+    //  *  修改|新增
+    //  *
     //  */    
     // public function store()
     // {
@@ -87,8 +79,8 @@ class Bet extends Controller
     // }
 
     // /**
-    //  * @description: 开始
-    //  * @return {*}
+    //  *开始
+    //  *
     //  */    
     // public function betting()
     // {
@@ -104,8 +96,8 @@ class Bet extends Controller
     // }
 
     // /**
-    //  * @description: 关闭
-    //  * @return {*}
+    //  * 关闭
+    //  *
     //  */    
     // public function close()
     // {
@@ -120,8 +112,8 @@ class Bet extends Controller
     //     return $this->success([], $ret['msg']);
     // }
     // /**
-    //  * @description: 开奖
-    //  * @return {*}
+    //  *  开奖
+    //  *
     //  */    
     // public function lotteryDraw()
     // {
@@ -146,7 +138,7 @@ class Bet extends Controller
     // }
 
     // /**
-    //  * @description: 删除
+    //  * 删除
     //  */
     // public function destroy()
     // {

+ 5 - 5
app/Http/Controllers/admin/Config.php

@@ -19,8 +19,8 @@ class Config extends Controller
 {
 
     /**
-     * @description: 分页数据
-     * @return {*}
+     *  分页数据
+     *
      */
     function index()
     {
@@ -41,8 +41,8 @@ class Config extends Controller
     }
 
     /**
-     * @description: 修改|新增
-     * @return {*}
+     *  修改|新增
+     *
      */
     public function store()
     {
@@ -81,7 +81,7 @@ class Config extends Controller
     }
 
     /**
-     * @description: 删除
+     *  删除
      */
     public function destroy()
     {

+ 10 - 4
package.json

@@ -1,18 +1,24 @@
 {
     "private": true,
     "scripts": {
-        "dev": "vite",
-        "build": "vite build"
+        "dev": "webpack",
+        "build": "webpack build"
     },
     "devDependencies": {
         "axios": "^1.1.2",
+        "jquery": "^3.7.1",
         "laravel-vite-plugin": "^0.7.2",
         "lodash": "^4.17.19",
         "postcss": "^8.1.14",
-        "vite": "^4.0.0"
+        "webpack-cli": "^6.0.1"
     },
     "dependencies": {
+        "bootstrap": "^5.3.8",
+        "diff-match-patch": "^1.0.5",
+        "esbuild": "0.25.0",
         "esbuild-loader": "^2.21.0",
-        "jquery": "^3.7.1"
+        "handlebars": "^4.7.8",
+        "prismjs": "^1.30.0",
+        "semver": "^7.7.3"
     }
 }

文件差异内容过多而无法显示
+ 0 - 0
public/doc/assets/main.bundle.js


+ 16 - 17
public/doc/index.html

@@ -4,21 +4,21 @@
 <!--suppress HtmlUnknownTarget -->
 <!--suppress HtmlFormInputWithoutLabel -->
 <!--suppress XmlDuplicatedId -->
-<html lang="zh">
+<html lang="en">
 <head>
     <title>API文档</title>
     <meta name="description" content="Bot">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link href="assets/bootstrap.min.css?v=1764038345718" rel="stylesheet" media="screen">
-    <link href="assets/prism.css?v=1764038345718" rel="stylesheet"/>
-    <link href="assets/prism-toolbar.css?v=1764038345718" rel="stylesheet"/>
-    <link href="assets/prism-diff-highlight.css?v=1764038345718" rel="stylesheet"/>
-    <link href="assets/main.css?v=1764038345718" rel="stylesheet" media="screen, print">
-    <link href="assets/favicon.ico?v=1764038345718" rel="icon" type="image/x-icon">
-    <link href="assets/apple-touch-icon.png?v=1764038345718" rel="apple-touch-icon" sizes="180x180">
-    <link href="assets/favicon-32x32.png?v=1764038345718" rel="icon" type="image/png" sizes="32x32">
-    <link href="assets/favicon-16x16.png?v=1764038345718" rel="icon" type="image/png" sizes="16x16">
+    <link href="assets/bootstrap.min.css?v=1764054365817" rel="stylesheet" media="screen">
+    <link href="assets/prism.css?v=1764054365817" rel="stylesheet"/>
+    <link href="assets/prism-toolbar.css?v=1764054365817" rel="stylesheet"/>
+    <link href="assets/prism-diff-highlight.css?v=1764054365817" rel="stylesheet"/>
+    <link href="assets/main.css?v=1764054365817" rel="stylesheet" media="screen, print">
+    <link href="assets/favicon.ico?v=1764054365817" rel="icon" type="image/x-icon">
+    <link href="assets/apple-touch-icon.png?v=1764054365817" rel="apple-touch-icon" sizes="180x180">
+    <link href="assets/favicon-32x32.png?v=1764054365817" rel="icon" type="image/png" sizes="32x32">
+    <link href="assets/favicon-16x16.png?v=1764054365817" rel="icon" type="image/png" sizes="16x16">
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -285,18 +285,17 @@
             </button>
         </div>
         <div class="sidenav-search">
-            <input class="form-control search" data-action='filter-search' type="text" placeholder='{{__ "Filter..."}}'/>
+            <input class="form-control search" data-action='filter-search' type="text" placeholder='{{__ " Filter..."}}'/>
             <span class="search-reset">x</span>
         </div>
-        <ul class="sidenav nav nav-list list layui-menu-ul">
+        <ul class="sidenav nav nav-list list">
             {{#each nav}}
             {{#if title}}
             {{#if isHeader}}
             {{#if isFixed}}
             <li class="nav-fixed nav-header navbar-btn nav-list-item" data-group="{{group}}"><a href="#api-{{group}}" data-name="show-api-{{group}}" class="show-api api-{{group}}-init">{{underscoreToSpace title}}</a></li>
             {{else}}
-            <li class="nav-header nav-list-item" data-group="{{group}}"><a href="#api-{{group}}" data-group="show-api-{{group}}" class="show-group api-{{group}}-init">{{underscoreToSpace
-                title}}</a><i class="layui-icon layui-icon-down layui-nav-more"></i></li>
+            <li class="nav-header nav-list-item" data-group="{{group}}"><a href="#api-{{group}}" data-group="show-api-{{group}}" class="show-group api-{{group}}-init">{{underscoreToSpace title}}</a><i class="layui-icon layui-icon-down layui-nav-more"></i></li>
             {{/if}}
             {{else}}
             <li class="{{#if hidden}}hide {{/if}}" data-group="{{group}}" data-name="{{name}}" data-version="{{version}}">
@@ -760,7 +759,7 @@
                 {{#if article.parameter.fields}}
                 <h5>{{__ "Parameters"}}</h5>
                 {{#each article.parameter.fields}}
-                <div style="width: 100%;display: none;" class="col-md-3">
+                <div style="width: 100%;" class="col-md-3">
                     <select name="{{../id}}-sample-header-content-type" class="{{../id}}-sample-request-param-select sample-header-content-type sample-header-content-type-switch">
                         <option value="auto" selected>ajax-auto</option>
                         <option value="json">json</option>
@@ -1600,7 +1599,7 @@
 </div>
 
 
-<script src="assets/main.bundle.js?v=1764038345718"></script>
+<script src="assets/main.bundle.js?v=1764054365817"></script>
 <!--suppress JSJQueryEfficiency, JSStringConcatenationToES6Template, JSStringConcatenationToES6Template, JSStringConcatenationToES6Template -->
 <script>
 
@@ -1622,7 +1621,7 @@
         }
         if(aa.data.im){
             if(aa.data.im.authToken)
-            $('input[data-name="Im-Token"]').val(aa.data.im.authToken);
+                $('input[data-name="Im-Token"]').val(aa.data.im.authToken);
         }
     }
 

+ 0 - 15
public/nginx.htaccess

@@ -1,15 +0,0 @@
-location / {
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-        add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization';
-        add_header 'Access-Control-Allow-Credentials' 'true';
-        add_header 'Access-Control-Max-Age' 3600;
-
-        if ($request_method = 'OPTIONS') {
-            # OPTIONS 请求直接返回 200
-            return 204;
-        } 
-
-        try_files $uri $uri/ /index.php?$query_string;        
-      
-}

+ 1 - 0
routes/admin.php

@@ -142,6 +142,7 @@ Route::middleware(['admin.jwt'])->group(function () {
         Route::prefix('/user')->group(function () {
             Route::get('/', [User::class, 'index']);
             Route::get('/address', [User::class, 'address']);
+            Route::post('/merge',[User::class, 'merge']);
 
 
         });

部分文件因为文件数量过多而无法显示