Merge branch 'test' into release

application/admin/controller/Basestation.php

@@ -484,13 +484,13 @@ class Basestation extends  Base
     public function basestation_map(Request $request){
         $id= $request->get('station_name');
         $db = Db::connect([
-            'type'            => 'mysql',
-            'hostname'        => '127.0.0.1',
-            'database'        => 'jzdb',
-            'username'        => 'root',
-            'password'        => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
-            'hostport'        => '10036',
-            'charset'         => 'utf8',
+            'type'            => config('jz.jztype'),
+            'hostname'        => config('jz.jzhostname'),
+            'database'        => config('jz.jzdatabase'),
+            'username'        => config('jz.jzusername'),
+            'password'        => config('jz.jzpassword'),
+            'hostport'        =>config('jz.jzhostport'),
+            'charset'         => config('jz.jzcharset'),
         ]);
         $data=$db->table('jz_message')->field('business_id')->where(['jz_name'=>$id])->find();
         $this->assign('data',$data['business_id']);
@@ -499,13 +499,13 @@ class Basestation extends  Base
 
     public function basestation_region(Request $request){
         $db = Db::connect([
-            'type'            => 'mysql',
-            'hostname'        => '127.0.0.1',
-            'database'        => 'jzdb',
-            'username'        => 'root',
-            'password'        => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
-            'hostport'        => '10036',
-            'charset'         => 'utf8',
+            'type'            => config('jz.jztype'),
+            'hostname'        => config('jz.jzhostname'),
+            'database'        => config('jz.jzdatabase'),
+            'username'        => config('jz.jzusername'),
+            'password'        => config('jz.jzpassword'),
+            'hostport'        =>config('jz.jzhostport'),
+            'charset'         => config('jz.jzcharset'),
         ]);
         $data['business_id']= $request->get('station_id');
         if(empty($data['business_id'])){

application/admin/view/staff/role.html

@@ -60,7 +60,11 @@
       <script src="dist/js/md5.js"></script>
       <script src="dist/js/sha1.js"></script>
       <script src="dist/js/util.js"></script>
+<<<<<<< HEAD
       <!--<script src="dist/js/getUserToken.js"></script>-->
+=======
+      <!-- <script src="dist/js/getUserToken.js"></script> -->
+>>>>>>> test
     <script>
       layui.use(['laydate','form','upload'], function(){
         upload  = layui.upload;

route/admin.php

@@ -147,6 +147,10 @@ Route::get('useage/:useage_id','em/useage/detail');
 Route::get('useage_add/:id','em/useage/create');
 Route::post('useage_add','em/useage/store');
 Route::post('useage_del','em/useage/del');
+<<<<<<< HEAD
+=======
+
+>>>>>>> test
 Route::get('useage_update/:useage_id','em/useage/update');
 Route::post('upFile','em/UploadFile/upFile');