zr

0fc3f5b2 · 赵然 · 16762587 · 0fc3f5b2 · 0fc3f5b2 · 0fc3f5b2
Commit 0fc3f5b2 authored Jan 24, 2019 by 赵然
24 changed files
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -8,6 +8,7 @@
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/CoderModule.java" charset="GBK" />
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/CollectModule.java" charset="GBK" />
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/CreatUrlModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/HbaseModule.java" charset="GBK" />
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/HelloWorld.java" charset="GBK" />
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/RedModule.java" charset="GBK" />
    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/SignModule.java" charset="GBK" />

--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/AutoTable.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/AutoTable.html
@@ -356,6 +356,7 @@
                    <li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/CardCommon.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/CardCommon.html
@@ -177,6 +177,7 @@ $(document).ready(function(){
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/CollectCard.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/CollectCard.html
@@ -226,6 +226,7 @@ $(document).ready(function(){
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/Hbase.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/Hbase.html
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/common/HbaseService.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/common/HbaseService.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/handlers/HbaseModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/handlers/HbaseModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/package/b612andriod.apk
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/package/b612andriod.apk
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/package/b612ios.ipa
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/package/b612ios.ipa
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/activity.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/activity.html
@@ -255,6 +255,7 @@
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/bury.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/bury.html
@@ -285,6 +285,7 @@
                    <li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li class="active"><a href="#" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/creatUrl.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/creatUrl.html
@@ -198,6 +198,7 @@ $(document).ready(function(){
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li  class="active">
                    	<a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>
@@ -301,47 +302,48 @@ $(document).ready(function(){
                                    </div>
                                </div>
+                                <p></p>
 								<div class="mws-form-row" id="line" style="display:none">
-                                    <label>===================高级设置===================</label>
+                                    <h6>高级设置（选填）:</h6>
                                </div>
                                <div class="mws-form-row" id="redirect_v" style="display:none">
-                                    <label>redirect（非必填）</label>
+                                    <label>redirect</label>
                                    <div class="mws-form-item small">
                                        <input type="text" class="mws-textinput" name="redirect" id="redirect"/>
                                    </div>
                                </div>
 								<div class="mws-form-row" id="phone_v" style="display:none">
-                                    <label>电话号码（非必填）</label>
+                                    <label>电话号码</label>
                                    <div class="mws-form-item small">
                                        <input type="number" class="mws-textinput" name="appkey" id="phone"/>
                                    </div>
                                </div>
                                <div class="mws-form-row" id="alipay_v" style="display:none">
-                                    <label>支付宝（非必填）</label>
+                                    <label>支付宝账号</label>
                                    <div class="mws-form-item small">
                                        <input type="text" class="mws-textinput" name="appkey" id="alipay"/>
                                    </div>
                                </div>
                                <div class="mws-form-row" id="realName_v" style="display:none">
-                                    <label>真实姓名（非必填）</label>
+                                    <label>真实姓名</label>
                                    <div class="mws-form-item small">
                                        <input type="text" class="mws-textinput" name="appkey" id="realName"/>
                                    </div>
                                </div>
                                <div class="mws-form-row" id="qq_v" style="display:none">
-                                    <label>QQ号（非必填）</label>
+                                    <label>QQ号</label>
                                    <div class="mws-form-item small">
                                        <input type="number" class="mws-textinput" name="appkey" id="qq"/>
                                    </div>
                                </div>
                                <div class="mws-form-row" id="vip_v" style="display:none">
-                                    <label>vip 等级（非必填）</label>
+                                    <label>vip 等级</label>
                                    <div class="mws-form-item small">
                                        <input type="number" class="mws-textinput" name="appkey" id="vip"/>
                                    </div>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/dashboard.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/dashboard.html
@@ -285,6 +285,7 @@
                    <li class="active"><a href="#" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/duiba.zip
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/duiba.zip
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/encoder.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/encoder.html
@@ -302,6 +302,7 @@
                    <li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li class="active"><a href="#" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/package.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/package.html
@@ -285,6 +285,7 @@
                    <li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>
@@ -411,6 +412,18 @@
                                <td>*.apk</td>
                                <td><a href="http://172.16.80.141:8080/download?fileName=meipai.apk">下载</a></td>
                            </tr>
+                            <tr>
+                                <td>b612相机</td>
+                                <td>Andriod</td>
+                                <td>*.apk</td>
+                                <td><a href="http://172.16.80.141:8080/download?fileName=b612andriod.apk">下载</a></td>
+                            </tr>
+                            <tr>
+                                <td>b612相机</td>
+                                <td>iOS</td>
+                                <td>*.ipa</td>
+                                <td><a href="http://172.16.80.141:8080/download?fileName=b612ios.ipa">下载</a></td>
+                            </tr>
                            </tbody>
                        </table>
                    </div>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/red.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/red.html
@@ -218,6 +218,7 @@ $(document).ready(function(){
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/sign.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/sign.html
@@ -254,6 +254,7 @@
                	<li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                	<li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+					<li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
 					<li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
 					<li>
 						<a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/success.html
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/success.html
@@ -252,6 +252,7 @@
                    <li><a href="dashboard.html" class="mws-i-24 i-home">主页</a></li>
                    <li><a href="http://172.16.80.141:9999" class="mws-i-24 i-chart" target='_BLANK'>代理工具</a></li>
                    <li><a href="encoder.html" class="mws-i-24 i-cog">转码工具</a></li>
+                    <li><a href="Hbase.html" class="mws-i-24 i-refresh-3">Hbase查改</a></li>
                    <li><a href="bury.html" class="mws-i-24 i-eyedropper">埋点工具</a></li>
                    <li>
                        <a href="#" class="mws-i-24 i-iphone-4">积分商城助手</a>

--- a/target/classes/main/com/atguigu/springmvc/common/HbaseService.class
+++ b/target/classes/main/com/atguigu/springmvc/common/HbaseService.class
--- a/target/classes/main/com/atguigu/springmvc/handlers/HbaseModule.class
+++ b/target/classes/main/com/atguigu/springmvc/handlers/HbaseModule.class
--- a/webapp/Hbase.html
+++ b/webapp/Hbase.html
@@ -70,11 +70,12 @@ $(document).ready(function(){
        e.preventDefault();
        var select = $("#select").val();
-        var reverse = $("#reverse").val();
+        var reverse = $("input[name='reverse']:checked").val();
+        var hashkey = $("input[name='hashkey']:checked").val();
        var key = $("#key_v").val();
        var value = $("#value_v").val();
-        $.post("doHbase", {"select":select,"reverse":reverse,"key":key,"value":value},function(data, status){
+        $.post("doHbase", {"select":select,"reverse":reverse,"hashkey":hashkey,"key":key,"value":value},function(data, status){
            var result = JSON.stringify(JSON.parse(data.message), null, 2);//将字符串转换成json对象
@@ -98,6 +99,14 @@ $(document).ready(function(){
 		document.getElementById('checkbox1').checked = false;
 		}
 	}
+function check2(obj){
+    if(obj.id == 'checkbox3' && obj.checked == true){
+        document.getElementById('checkbox4').checked = false;
+    }
+    else if(obj.id == 'checkbox4' && obj.checked == true){
+        document.getElementById('checkbox3').checked = false;
+    }
+}
 function selectOnchang(obj){  
        var value = obj.options[obj.selectedIndex].value;
@@ -269,10 +278,20 @@ $(document).ready(function(){
 								<div class="mws-form-row">
                    				<label>是否反转</label>
-                    				<div class="mws-form-item clearfix" id="reverse">
+                    				<div class="mws-form-item clearfix" >
-                    					<ul class="mws-form-list inline">
+                    					<ul class="mws-form-list inline" id="reverse">
-                    						<li><input type="checkbox"  value="false" checked="checked" id="checkbox1" onclick = 'check(this)'/> <label>否</label></li>
+                    						<li><input type="checkbox"  name="reverse" value="false" checked="checked" id="checkbox1" onclick = 'check(this)'/> <label>否</label></li>
-                    						<li><input type="checkbox"  value="true" id="checkbox2" onclick = 'check(this)'/> <label>是</label></li>
+                    						<li><input type="checkbox"  name="reverse" value="true" id="checkbox2" onclick = 'check(this)'/> <label>是</label></li>
+                    					</ul>
+                    				</div>
+                    			</div>
+                                <div class="mws-form-row">
+                                    <label>是否hashkey</label>
+                                    <div class="mws-form-item clearfix" >
+                                        <ul class="mws-form-list inline" id="hashkey">
+                                            <li><input type="checkbox"  name="hashkey" value="1" checked="checked" id="checkbox3" onclick = 'check2(this)'/> <label>否</label></li>
+                                            <li><input type="checkbox"  name="hashkey" value="2" id="checkbox4" onclick = 'check2(this)'/> <label>是</label></li>
                                        </ul>
                                    </div>
                                </div>

--- a/webapp/userInfo.html
+++ b/webapp/userInfo.html