Authored by yyq

Merge branch 'master' of http://git.dev.yoho.cn/web/yohobuy

@@ -24,7 +24,7 @@ class UdpLog @@ -24,7 +24,7 @@ class UdpLog
24 //influxdb measurement 24 //influxdb measurement
25 public static $measurement = 'php_log'; 25 public static $measurement = 'php_log';
26 26
27 - public static $filePath = '/Data/logs/'; 27 + public static $filePath = '/Data/logs/pc_pay';
28 28
29 const RECORD_MODE_FILE = 'FILE'; 29 const RECORD_MODE_FILE = 'FILE';
30 const RECORD_MODE_UDP = 'UDP'; 30 const RECORD_MODE_UDP = 'UDP';
@@ -71,7 +71,7 @@ class UdpLog @@ -71,7 +71,7 @@ class UdpLog
71 */ 71 */
72 private static function fileLog($level, $message) 72 private static function fileLog($level, $message)
73 { 73 {
74 - $filename = $level . '.log'; //日志文件 74 + $filename = $level .'-pc-' . date('Ymd', time()). '.log'; //日志文件
75 $logFile = self::createPath(self::$filePath, $filename); 75 $logFile = self::createPath(self::$filePath, $filename);
76 if (!file_exists(self::$filePath))//判断文件路径是否存在 76 if (!file_exists(self::$filePath))//判断文件路径是否存在
77 { 77 {
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <ul class="sub-nav-list"> 85 <ul class="sub-nav-list">
86 {{# subnav}} 86 {{# subnav}}
87 <li class="sub-nav-item"> 87 <li class="sub-nav-item">
88 - <a href="{{link}}">{{name}} 88 + <a href="{{link}}">{{name}}
89 {{#if is_new}} 89 {{#if is_new}}
90 <span class="newlogo"></span> 90 <span class="newlogo"></span>
91 {{/if}} 91 {{/if}}
@@ -137,10 +137,10 @@ @@ -137,10 +137,10 @@
137 </form> 137 </form>
138 </div> 138 </div>
139 <div class="gobuy float-left {{gobytype}}" id="miniCartBox"> 139 <div class="gobuy float-left {{gobytype}}" id="miniCartBox">
140 - 140 +
141 <span class="ic-infomation">0</span> 141 <span class="ic-infomation">0</span>
142 <div class="gobuy-wrapper"></div> 142 <div class="gobuy-wrapper"></div>
143 - 143 +
144 </div> 144 </div>
145 </div> 145 </div>
146 </div> 146 </div>
@@ -268,6 +268,10 @@ @@ -268,6 +268,10 @@
268 </script> 268 </script>
269 </div> 269 </div>
270 <input id="api-domain" type="hidden" value="{{apiDomain}}"> 270 <input id="api-domain" type="hidden" value="{{apiDomain}}">
271 -<script src="{{sysUserSession}}"></script> 271 +<script type="text/javascript">
  272 +if (typeof call === 'undefined' || typeof call !== 'function') {
  273 + function call() {}
  274 +}
  275 +</script>
  276 +<script async src="{{sysUserSession}}"></script>
272 {{/headerdata}} 277 {{/headerdata}}
273 -