250930

fapp/ciyon_ap/App.vue

@@ -65,15 +65,15 @@
 			app.globalData.dupsec = 60;
 			app.globalData.storselect = '/';
 			app.globalData.storlist = {
-				'/': 'http://ciyon.ciy.cn/ud/',
+				'/': 'https://ciyon.ciy.cn/ud/',
 				'A': 'https://cf5.xinquanyou.cn/ud/'
 			};
 			app.globalData.stortransfer = ['/'];
 
 			if (process.env.NODE_ENV === 'development') {
 				//#ifdef H5
-				app.globalData.jsnurl.t = 'http://ciyon.local.ciy.cn/';
+				app.globalData.jsnurl.t = 'https://ciyon.local.ciy.cn/';
-				app.globalData.storlist['/'] = 'http://ciyon.local.ciy.cn/ud/';
+				app.globalData.storlist['/'] = 'https://ciyon.local.ciy.cn/ud/';
 
 				//golang
 				// app.globalData.jsnurl.t = 'http://ciyonhgo.local.ciy.cn/';

web/admin/develop/code_pc_php.php

@@ -819,14 +819,14 @@ function code_pc_php($post) {
             } else if ($cate == 'DATE') {
                 $codex .= "\n                if (\$field == '{$col}')";
                 if (strpos('H', $fld['data']) !== false)
-                    $codex .= "\n                    \$val = (\$val == 0 ? '--' : date('Y-m-d H:i', \$val));";
+                    $codex .= "\n                    \$val = (\$val <= 0 ? '--' : date('Y-m-d H:i', \$val));";
                 else
-                    $codex .= "\n                    \$val = (\$val == 0 ? '--' : date('Y-m-d', \$val));";
+                    $codex .= "\n                    \$val = (\$val <= 0 ? '--' : date('Y-m-d', \$val));";
             } else if ($cate == 'TIME') {
                 $codex .= "\n                if (\$field == '{$col}')";
                 if (strpos(':s', $fld['data']) !== false)
                     $ext = ', true';
-                $codex .= "\n                    \$val = (\$val == 0 ? '--' : totimepoint(\$val{$ext}));";
+                $codex .= "\n                    \$val = (\$val <= 0 ? '--' : totimepoint(\$val{$ext}));";
             } else if ($cate == 'WCNY') {
                 $codex .= "\n                if (\$field == '{$col}')";
                 $codex .= "\n                    \$val = number_format(\$val / 1000000, 3) . '万元';";

web/admin/index.html

@@ -119,6 +119,10 @@
             color: var(--txt9);
         }
 
+        .ciy-menu-nav>li>i {
+            filter: var(--invert);
+        }
+
         .ciy-menu-nav>li>ul>li>a {
             margin-left: 2.6em;
         }

web/jscss/style.css

@@ -90,6 +90,7 @@ Version: 0.7.0
     --man6: #83c1f1;
     --manz: #ffffff;
 
+    --invert: invert(1);
     --e-scroll: rgba(255, 255, 255, 0.4);
     --e-tabselect: #053243;
     --e-dialog: 2px 2px 30px -20px #ffffff;

web/jscss/web.css

@@ -70,6 +70,7 @@
     --s-box: 3px 3px 7px -2px #ffffff99;
     --s-box1: 4px 4px 20px -10px #ffffff;
     --s-txt: 1px 1px 1px #000000;
+    --invert: invert(1);
     color: #ffffff;
 }
 

zciyon/dbroute.go

@@ -5,6 +5,7 @@
 * Version: 0.1.0
 =================================================================================
 多读库路由	NewCiyDBRoute
+** 该路由库可能由HAProxy取代
 =================================================================================
 dbr, err = c.NewCiyDBRoute(dbn[]string, 最大连接数, 空闲连接数, 保活秒) //main初始化
 dbr.Takeout() //取出一个负载较低的数据库连接池

zciyphp/sql.php

@@ -86,14 +86,6 @@ class sql {
         $this->where .= $this->_query($query, $data);
         return $this;
     }
-    static public function datasql($rows, $cb) {
-        $newrows = array();
-        foreach ($rows as $row) {
-            if ($cb($row))
-                $newrows[] = $row;
-        }
-        return $newrows;
-    }
     static public function daterange($data, $type = 'date') {
         $ret = [-1, -1];
         if ($type == 'date') {