app-ht

1. F 后台管理日志功能调整

app-ht
1. F 后台管理日志功能调整
xu
1 parent 4f37eeab
Showing 6 changed files with 44 additions and 11 deletions Show diff stats
app-ht/config/params.php
app-ht/modules/system/controllers/AdminLogController.php
app-ht/modules/system/views/admin-log/index.php
app-ht/views/layouts/routes.php
console/controllers/TestController.php
domain/DBHelper.php
 <?php
 return [
-    'MANUFACTURE_ROLE_ID' => 1,
-    'VERSION'             => 'v1.8.6 build 15',
+
+    'VERSION'             => 'v1.8.6 build 16',
 ];
 \ No newline at end of file
@@ -78,11 +78,11 @@ class AdminLogController extends BaseController
          */
         $pageSize = $request->get("pageSize") ? (int)$request->get("pageSize") : 50;
         $pages = new Pagination(['totalCount' => $query->count(), 'pageSize' => $pageSize]);
-        $adminLog = $query->offset($pages->offset)->limit($pages->limit)->all();
-        $model = $query->asArray()->all();
+        $adminLog = $query->offset($pages->offset)->limit($pages->limit)->asArray()->all();
+        //$model = $query->asArray()->all();
         return $this->render('index', array(
-            'adminLog'  => $model,
+            'adminLog'  => $adminLog,
             'pages'     => $pages,
             'sysUser'   => $sysUser,
             'gets'      => $get
@@ -18,7 +18,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                         <select  class="form-control" name="user_id">
                             <option value="0">全部</option>
                             <?php foreach ($sysUser as $item): ?>
-                                <option value="<?php echo $item->id ?>" <?php if ($gets['user_id'] == $item->id) { echo "selected"; } ?>><?php echo $item->username . '(' . $item->profile->realname . ')' ?></option>
+                                <?php if(isset($item->id)) {?>
+                                <option value="<?php echo $item->id ?>" <?php if ($gets['user_id'] == $item->id) { echo "selected"; } ?>><?php echo isset($item->username)?$item->username:'' ?></option>
+                                <?php }?>
                             <?php endforeach; ?>
                         </select>
                     </td>
@@ -130,6 +130,7 @@ if (isset($user-&gt;is_manufacture) &amp;&amp; $user-&gt;is_manufacture == 1) {
                 ],
                 ['label' => '角色管理', 'path' => '/system/role/index'],
                 ['label' => '账号管理', 'path' => '/system/account/index'],
+                ['label' => '系统操作日志', 'path' => '/system/admin-log/index'],
             ]
         ]
     ];
@@ -389,12 +389,12 @@ echo $randKey.&quot;\r\n&quot;;
     }
     public function actionB()
     {
+        $username = '3TestNull3';
-        $deviceModel = DeviceRepository::findBatchRandOne(2);
-        if ($deviceModel) {
-            echo $deviceModel->id;
-            $deviceModel->device_id = '000000000012';
-            $deviceModel->save();
+        if (preg_match("/^[a-zA-Z0-9]{6,12}$/", $username)){
+            echo "ok";
+        } else {
+            echo "no";
         }
     }
 }
@@ -0,0 +1,30 @@
+<?php
+
+namespace domain;
+
+/**
+ * 数据库助手类
+ * Class DBHelper
+ * @package common\models
+ */
+class DBHelper
+{
+    /**
+     * 获取指定数据库连接中的数据库名称
+     * @return string
+     */
+    public static function getDbName($dbConnection)
+    {
+        if (isset($dbConnection->masters) && isset($dbConnection->masters->dsn)) {
+            $dsn = $dbConnection->masters->dsn;
+        } elseif (isset($dbConnection->dsn)) {
+            $dsn = $dbConnection->dsn;
+        } else {
+            return 'jiwork';
+        }
+
+        // 'mysql:host=localhost;dbname=jiwork'
+        $dbName = substr($dsn, strpos($dsn, 'dbname=') + strlen('dbname='));
+        return $dbName;
+    }
+}
 \ No newline at end of file
1	<?php	1	<?php
2	return [	2	return [
3	- 'MANUFACTURE_ROLE_ID' => 1,
4	- 'VERSION' => 'v1.8.6 build 15',	3	+
		4	+ 'VERSION' => 'v1.8.6 build 16',
5	];	5	];
6	\ No newline at end of file	6	\ No newline at end of file
	@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
		1	+<?php
		2	+
		3	+namespace domain;
		4	+
		5	+/**
		6	+ * 数据库助手类
		7	+ * Class DBHelper
		8	+ * @package common\models
		9	+ */
		10	+class DBHelper
		11	+{
		12	+ /**
		13	+ * 获取指定数据库连接中的数据库名称
		14	+ * @return string
		15	+ */
		16	+ public static function getDbName($dbConnection)
		17	+ {
		18	+ if (isset($dbConnection->masters) && isset($dbConnection->masters->dsn)) {
		19	+ $dsn = $dbConnection->masters->dsn;
		20	+ } elseif (isset($dbConnection->dsn)) {
		21	+ $dsn = $dbConnection->dsn;
		22	+ } else {
		23	+ return 'jiwork';
		24	+ }
		25	+
		26	+ // 'mysql:host=localhost;dbname=jiwork'
		27	+ $dbName = substr($dsn, strpos($dsn, 'dbname=') + strlen('dbname='));
		28	+ return $dbName;
		29	+ }
		30	+}
0	\ No newline at end of file	31	\ No newline at end of file