fix

Home/Common/pub_func.php

@@ -12,7 +12,7 @@
 		$rk->setLogLevel(LOG_DEBUG);
 		$rk->addBrokers("127.0.0.1");
 		$start = microtime(true);
-		$topic = $rk->newTopic($topic);
+		$topic_obj = $rk->newTopic($topic);
 		/********************* 初始化生产者配置项 end **************************/
 		if( empty($msg_data) ){
 			return;
@@ -20,8 +20,9 @@
 		if( is_array($msg_data) || is_object($msg_data) ){ // 对象、数组转换
 			$msg_data = json_encode($msg_data);
 		}
-		$topic->produce(RD_KAFKA_PARTITION_UA, 0, $msg_data);
-		var_dump($rk->poll(0));
+		$topic_obj->produce(RD_KAFKA_PARTITION_UA, 0, $msg_data);
+		$rk->poll(0);
+		echo 'produce a msg to topic: '.$topic. PHP_EOL;
 		
 	}
 	

Home/Conf/config.php

@@ -14,7 +14,8 @@ return array(
     'STOLEN_ALARM' 		    => 7, // 被盗告警
     'FENCE_ALARM' 			=> 8, // 电子围栏告警
     'BROADCASTING'			=> 9, // 广播
-
+    ######### 告警时间间隔 ########
+    'FENCE_ALARM_INTERVAL' 	=> 5, // 围栏告警时间间隔
     ######### 车主页 #########
     'DRIVING_STATISTICS_DAYS' => 5, //行驶数据统计默认5天
 );

Home/Lib/Action/ApiAction.class.php

@@ -320,7 +320,8 @@ class ApiAction extends Action {
 		if( !$fence_info || !$plate){
 			json_fail('Missing param !');
 		}
-		
+		var_dump($fence_info );
+		var_dump($fenceData );exit;
 		$data = array(
 			'fenceStatus' => $fence_info['fenceAlarmEnable'] == 'true' ? true : false,
 			'fenceInfo' => $fenceData
@@ -542,8 +543,8 @@ class ApiAction extends Action {
 		if( !$gps_number || !$search_date){
 			json_fail('请检查GPS标签或者日期 !');
 		}
-		//$list = $this->getBTGpsRoute($search_date,'1');
-		$list = $this->getBTGpsRoute($search_date, $gps_number);  //test
+		//$list = $this->getBTGpsRoute($search_date,'1');//test
+		$list = $this->getBTGpsRoute($search_date, $gps_number); 
 		$lngLatAlter = new \Jms\Algo\Geometry();
 		$respData = array();
 		foreach($list as $v){
@@ -765,5 +766,14 @@ class ApiAction extends Action {
 		
 	}
 	
+ 
+	public  function get_cityinfo_by_cityid(  ){
+		$cityid = I('cityid');
+		$ids = M('jms_city')->field('ParentId,ProvinceId')->where(array('ID'=>$cityid))->find();
+		$result = $ids['ProvinceId'].','.($ids['ParentId']-100).','.($cityid-1000);
+		$this->api_success('成功',$result);
+		
+	}
+	
 
 }

Home/Lib/Action/CronAction.class.php

@@ -140,7 +140,7 @@ class CronAction extends Action {
 						 }
 						 $result = $this->produceAcrossAlarmData($route_info);
 						 if($result){
-							echo $result;
+							echo $result,PHP_EOL;
 						 }
 		            break;
 		        case RD_KAFKA_RESP_ERR__PARTITION_EOF:
@@ -167,6 +167,9 @@ class CronAction extends Action {
 		if( !$route_info['Latitude'] ){
 			return 'latitude is not exists.';
 		}
+		if( !$route_info['DeviceTime'] ){
+			return 'device time is not exists.';
+		}
 		// 从数据库中取出车牌号，缓存1天
 		if( S('plate-'.$route_info['DeviceId']) ){
 			$plate = S('plate-'.$route_info['DeviceId']);
@@ -180,14 +183,14 @@ class CronAction extends Action {
 		$fence = $rlfd_vehicle_fence->get($plate);
 		$fence = json_decode($fence, true);
 		if( empty($fence) ){
-			return false;
+			return '围栏信息不存在';
 		}
 		if( !$fence['fenceStatus'] ){
-			return false;
+			return '未启用围栏';
 		}
 		$fence_info = json_decode($fence['fenceInfo'], true);
 		if( empty($fence_info['data']) ){
-			return false;
+			return '围栏坐标数据不存在';
 		}
 		// 是否越界
 		$route_point = array(
@@ -197,21 +200,25 @@ class CronAction extends Action {
 		$result = true; // 默认在围栏内
 		if( $fence_info['type'] == 'circle' ){ // 圆形围栏
 			$distance = \Jms\Algo\Geometry::distanceBetween2BdPoints($fence_info['data']['center'], $route_point); //获取轨迹点到围栏中心点间距离,km
-			$result = $distance/1000 < $fence_info['data']['radius'];// 距离圆心大于半径说明越界了
+			$result = $distance*1000 < $fence_info['data']['radius'];// 距离圆心大于半径说明越界了
 		}elseif( $fence_info['type'] == 'polygon' ){ // 多边形围栏
 			$result = \Jms\Algo\Geometry::isInPolygon($fence_info['data']['vertex'], $route_point);
 		}else{
-			return false;
+			return '未知围栏类型';
 		}
 		if( !$result ){
 			$alarm_data = array(
 			  "type" => C('FENCE_ALARM'),
 			  "title" => "超出电子围栏",
-			  "content" => "您的车辆已超过设置的电子围栏范围，请前往停车处确认是否被盗。",
+			  "content" => "车辆 {$plate} 已超出设置的电子围栏范围，请前往停车处确认是否被盗。",
 			  "device_number" => $route_info['DeviceId']
 			);
 			kafkaProducer('gps_alarm_msg_queue', $alarm_data); // 添加到kafka
+			return '添加告警消息到 gps_alarm_msg_queue ';
 		}
+		
+		return '没有超出围栏';
+		
 	}
 	
  
@@ -220,7 +227,7 @@ class CronAction extends Action {
 			'DeviceId' => 110119120,
 			'State' => 1,
 			'Speed' => 1.2,
-			'Longitude' => 120.20638,
+			'Longitude' => 121.20638,
 			'Latitude' => 30.18852,
 			'DeviceTime' => date('Y-m-d H:i:s'),
 			'LBS' => 'LBS',

Home/Lib/Action/NoticeAction.class.php

@@ -81,7 +81,7 @@ class NoticeAction extends Action {
 						   // 使用极光推送消息
 							$jpush_client = new \JPush\Client( C('JPUSH_APP_KEY'), C('JPUSH_MASTER_SECRET') );
 							// 电子围栏告警，上锁车辆异动告警，低电量告警，被盗告警，广播消息推送
-							$this->jpushMsg( $jpush_client, $message->payload );
+							$this->jpushMsg( $jpush_client, $msg_data );
 						}
 		            break;
 		        case RD_KAFKA_RESP_ERR__PARTITION_EOF:
@@ -112,33 +112,36 @@ class NoticeAction extends Action {
 		  "content":"这是一个广播"
 		}'; 
 		*/ 
-		/*
-			 'OUTAGE_ALARM' 			=> 1, // 断电报警
-		    'SOS_ALARM' 			=> 2, // SOS报警
-		    'LOWWER_BATTERY_ALARM' 	=> 3, // 电池低电报警
-		    'SHAKE_ALARM' 			=> 4, // 震动报警
-		    'SHIFT_ALARM' 			=> 5, // 位移报警
-			 'LOCK_VEHICLE_ALARM'    => 6, // 上锁车辆异动告警
-		    'STOLEN_ALARM' 		    => 7, // 被盗告警
-		    'FENCE_ALARM' 			=> 8, // 电子围栏告警
-		    'BROADCASTING'			=> 9, // 广播
-		*/
 		$single_push_type = array(
+			C('OUTAGE_ALARM'),			// 1-断电报警
+			C('SOS_ALARM'),				// 2-SOS报警
+			C('LOWWER_BATTERY_ALARM'),  // 3-低电量告警
+			C('SHAKE_ALARM'),			// 4-震动报警
+			C('SHIFT_ALARM'),			// 5-位移报警
 			C('LOCK_VEHICLE_ALARM'),   // 6-锁车告警
 			C('STOLEN_ALARM'),       // 7-被盗告警
 			C('FENCE_ALARM'),        // 8-电子围栏告警
-			C('LOWWER_BATTERY_ALARM'),  // 3-低电量告警
 		);
-		$msg_data = json_decode($msg_data,true);
-		if(!$msg_data){
+		if(!is_array($msg_data)){
 			echo 'invalid message data format!'.$msg_data . PHP_EOL;
 			return;
 		}
-		// 通过传过来的车牌查出JgClientRegistrationId
+		
+		// 通过传过来的车牌查出 JgClientRegistrationId
 		if( empty($client) ){
 			$client = new \JPush\Client( C('JPUSH_APP_KEY'), C('JPUSH_MASTER_SECRET') );
 		}
 		if( in_array($msg_data['type'],$single_push_type) && $msg_data['device_number'] ){
+			// 判断是否在围栏告警时间间隔内
+			if( C('FENCE_ALARM_INTERVAL') && $msg_data['type'] == C('FENCE_ALARM') ){
+				$last_alarm_time = S('last_fence_alarm_'.$msg_data['device_number']);
+				$interval_time = C('FENCE_ALARM_INTERVAL')*60;
+				if( time() - $last_alarm_time < $interval_time ){
+					echo $msg_data['device_number'] . ' 围栏告警时间间隔:'.C('FENCE_ALARM_INTERVAL').'分钟，最后一次告警时间：'.$last_alarm_time . PHP_EOL;
+					return;
+				}
+			}
+			//  取车辆数据
 			$where = array('DeviceNumber|GpsDeviceNumber' => $msg_data['device_number']);
 			$fields= 'CityId,LicensePlate,FullName,JgClientRegistrationId';
 			
@@ -147,7 +150,11 @@ class NoticeAction extends Action {
 				S( 'jpush_vinfo_'.$msg_data['device_number'], $vehicle_info, 60 ); //缓存1分钟
 			}
 			$vehicle_info = S( 'jpush_vinfo_'.$msg_data['device_number'] ); //从缓存取
-			
+		}elseif( $msg_data['type'] == C('BROADCASTING') ){
+			//广播
+		}else{
+			echo '未知的告警类型:'.$msg_data['type'].PHP_EOL;
+			return;
 		}
 		// 推送平台
 		$platform = array('ios', 'android');
@@ -198,6 +205,12 @@ class NoticeAction extends Action {
 			 );
 			 $this->saveLog($msg_data);
 		    print_r($response);
+			if( $response['http_code'] == 200 ){ //如果成功了
+				if( C('FENCE_ALARM_INTERVAL') && $msg_data['type'] == C('FENCE_ALARM') ){
+					//设置最后围栏告警时间缓存
+					S('last_fence_alarm_'.$msg_data['device_number'], time(), C('FENCE_ALARM_INTERVAL')*60);
+				}
+			}
 		} catch (\JPush\Exceptions\APIConnectionException $e) {
 		    // try something here
 			$msg_data['response'] = array(

boke/boke.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>生成CSDN博客图片</title>
-
-    <link href="bootstrap/css/bootstrap.css" rel="stylesheet">
-</head>
-<body>
-
-<img src="demo.jpg" width="50%" style="margin:80px 25% 80px 25%;"/>
-
-<form class="form-horizontal" role="form" method="get" action=csdn.php>
-    <div class="form-group" >
-        <label class="col-sm-4 control-label">CSDN名称</label>
-        <div class="col-sm-5">
-            <input type="text" name="name" class="form-control" placeholder="请输入CSDN名字">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-4 control-label">访问人数</label>
-        <div class="col-sm-5">
-            <input type="text" name="people" class="form-control" placeholder="请输入访问人数">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-4 control-label">排名</label>
-        <div class="col-sm-5">
-            <input type="text" name="ranking" class="form-control" placeholder="请输入排名">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-4 control-label">积分</label>
-        <div class="col-sm-5">
-            <input type="text" name="integral" class="form-control" placeholder="请输入积分">
-        </div>
-    </div>
-
-    <div class="form-group" >
-        <div class="col-sm-offset-4 col-sm-5">
-            <button type="submit" class="btn btn-info btn-block" >提交生成</button>
-        </div>
-    </div>
-
-</form>
-
-</body>
-</html>

boke/bootstrap/css/bootstrap-theme.css

@@ -1,587 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn-default.disabled,
-.btn-primary.disabled,
-.btn-success.disabled,
-.btn-info.disabled,
-.btn-warning.disabled,
-.btn-danger.disabled,
-.btn-default[disabled],
-.btn-primary[disabled],
-.btn-success[disabled],
-.btn-info[disabled],
-.btn-warning[disabled],
-.btn-danger[disabled],
-fieldset[disabled] .btn-default,
-fieldset[disabled] .btn-primary,
-fieldset[disabled] .btn-success,
-fieldset[disabled] .btn-info,
-fieldset[disabled] .btn-warning,
-fieldset[disabled] .btn-danger {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn-default .badge,
-.btn-primary .badge,
-.btn-success .badge,
-.btn-info .badge,
-.btn-warning .badge,
-.btn-danger .badge {
-  text-shadow: none;
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-.btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
-  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #e0e0e0;
-  background-image: none;
-}
-.btn-primary {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #245580;
-}
-.btn-primary:hover,
-.btn-primary:focus {
-  background-color: #265a88;
-  background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #265a88;
-  border-color: #245580;
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #265a88;
-  background-image: none;
-}
-.btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-  background-color: #419641;
-  background-image: none;
-}
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #2aabd2;
-  background-image: none;
-}
-.btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #eb9316;
-  background-image: none;
-}
-.btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #c12e2a;
-  background-image: none;
-}
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background-color: #e8e8e8;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-color: #2e6da4;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-repeat: repeat-x;
-}
-.navbar-default {
-  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
-  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image:      -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
-  background-image:         linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
-}
-.navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image:      -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
-  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image:      -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
-  background-image:         linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-@media (max-width: 767px) {
-  .navbar .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-    background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-    background-repeat: repeat-x;
-  }
-}
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-}
-.alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
-}
-.alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
-}
-.alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-}
-.alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
-}
-.progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #286090 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #286090;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #2b669a;
-}
-.list-group-item.active .badge,
-.list-group-item.active:hover .badge,
-.list-group-item.active:focus .badge {
-  text-shadow: none;
-}
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-}
-.panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-}
-/*# sourceMappingURL=bootstrap-theme.css.map */

boke/bootstrap/js/npm.js

@@ -1,13 +0,0 @@
-// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
-require('../../js/transition.js')
-require('../../js/alert.js')
-require('../../js/button.js')
-require('../../js/carousel.js')
-require('../../js/collapse.js')
-require('../../js/dropdown.js')
-require('../../js/modal.js')
-require('../../js/tooltip.js')
-require('../../js/popover.js')
-require('../../js/scrollspy.js')
-require('../../js/tab.js')
-require('../../js/affix.js')

boke/csdn.php

@@ -1,58 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: 莫言情难忘
- * Date: 2018/11/21
- * Time: 21:10
- */
-//header("content-type:image/jpeg");
-$license_plate = $_GET['license_plate']?$_GET['license_plate']:"BJ88888888";
-$vehicle_color = $_GET['vehicle_color']?$_GET['vehicle_color']:"红色";
-$real_name = $_GET['real_name']?$_GET['real_name']:"张三";
-$address = $_GET['address']?$_GET['address']:"包头市青山区友谊大街195号";
-$cjh = $_GET['cjh']?$_GET['cjh']:"zsd123456789";
-$djh = $_GET['djh']?$_GET['djh']:"zsd123456789";
-$cph = $_GET['cph']?$_GET['cph']:"zsd123456789";
-$reg_date = $_GET['reg_date']?$_GET['reg_date']:"2019-04-15";
-$fz_date = $_GET['fz_date']?$_GET['fz_date']:"2019-04-15";
-$fz_org = $_GET['fz_org']?$_GET['fz_org']:"包头市公安局";
-
-$im = imagecreatetruecolor(500, 278);           // 设置画布
-//$bg = imagecreatefromjpeg('bg.jpg');   // 设置背景图片
-$bg = imagecreatefromjpeg('front_500x278.jpg');   // 设置背景图片
-imagecopy($im,$bg,0,0,0,0,500,278);             // 将背景图片拷贝到画布相应位置
-imagedestroy($bg);                              // 销毁背景图片
-$font = __DIR__ . '/stsong.ttf';               // 设置字体             // 设置字体，这里可以指向ttf文件
-$blacka = imagecolorallocate($im, 15, 23, 25);  // 颜色
-/*
-//lzm
-$bx = imagesx($im);
-$by = imagesy($im);
-$small = imagecreatefromgif('./tu3.gif');
-$sx = imagesx($small);
-$sy = imagesy($small);
-//3.执行图片水印处理
-imagecopymerge($im,$small,$bx-$sx,0,0,0,$sx,$sy,100);
-*/
-/* 写入内容 */
-imagettftext($im, 12, 0, 135, 66, $blacka, $font,$license_plate );       // 车牌号
-imagettftext($im, 12, 0, 335, 66, $blacka, $font,$vehicle_color );       // 车辆颜色
-imagettftext($im, 12, 0, 135, 96, $blacka, $font,$real_name );       // 姓名
-imagettftext($im, 12, 0, 135, 128, $blacka, $font,$address );       // 住址
-imagettftext($im, 12, 0, 135, 160, $blacka, $font,$cjh );       // 车架号
-imagettftext($im, 12, 0, 335, 160, $blacka, $font,$djh );       // 电机号
-imagettftext($im, 12, 0, 263, 192, $blacka, $font,$cph );       // 厂牌型号
-imagettftext($im, 11, 0, 260, 222, $blacka, $font,$reg_date );       // 注册日期
-imagettftext($im, 11, 0, 376, 222, $blacka, $font,$fz_date );       // 发证期
-imagettftext($im, 12, 0, 263, 255, $blacka, $font,$fz_org );       // 发证机关
-
-
-$img_file = "./images/myplate.jpg";
-$result = imagejpeg($im, $img_file);     // 生成jpeg格式图片
-imagedestroy($im);  // 销毁图片
-if(!$result){
-	echo "生成电子车牌失败";
-	exit;
-}
-
-echo '生成电子车牌完成';

boke/index.php

@@ -1,15 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: 莫言情难忘
- * Date: 2018/11/21
- * Time: 21:32
- */
-
-if(isset($_GET['name'])){           // 如果用户已经输入信息，拼接生成图片
-    $url = "csdn.php?name=".$_GET['name']."&people=".$_GET['people']."&ranking=".$_GET['ranking']
-        ."&integral=".$_GET['integral'];
-    include 'put.html';  // 引入生成图片页面
-}else{
-    include 'boke.html';       // 引入填写表单页面
-}

boke/put.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>生成成功</title>
-</head>
-<body>
-<img src="<?php echo $url ?>" />
-</body>
-</html>

boke/test.php

@@ -1,36 +0,0 @@
-<?php 
-    /*
-    步骤：
-        1.分别创建大小图画布并获取它们的宽高
-        2.添加文字水印
-        3.执行图片水印处理
-        4.输出
-        5.销毁画布
-     */
-    //1.分别创建大小图画布并获取它们的宽高
-    $big = imagecreatefromjpeg('./bg.jpg');
-    $bx = imagesx($big);
-    $by = imagesy($big);
-
-    $small = imagecreatefrompng('./tu2.png');
-    $sx = imagesx($small);
-    $sy = imagesy($small);
-
-
-    //2.添加水印文字
-    $blue = imagecolorallocate($big,0,0,255);
-    imagettftext($big,16,0,100,100,$blue,'./stsong.ttf','骄傲的少年');
-
-    //3.执行图片水印处理
-    imagecopymerge($big,$small,$bx-$sx,0,0,0,$sx,$sy,37);
-
-    //4.输出到浏览器
-    header('content-type: image/jpeg');
-    imagejpeg($big);
-
-    //5.销毁画布
-    imagedestroy($big);
-    imagedestroy($small);
-
-    
- ?>

czapp

@@ -1 +1 @@
-Subproject commit 36b5a9aa527c25689173485af2480c8b97d1b001
+Subproject commit 5a6ebd9d469d940e6edd84f85035bd6153597d6f