admin数据访问控制支持改动完毕
增加对member的访问控制
增加对product的访问控制
Signed-off-by: zxpbenson <zxpbenson@163.com>
Merge branch 'develop' of github.com:zxpbenson/shopxx into develop

Conflicts:
	WebRoot/html/article_content/201010/0340b92488ca464aa8d545fb899dcd25.html
	WebRoot/html/article_content/201010/070088f2df794b26b03bdf022565f1f2.html
	WebRoot/html/article_content/201010/390aed8de096473aa3fd928c25bf9fb9.html
	WebRoot/html/article_content/201010/47532f706bf94c9ebb23a87a99424072.html
	WebRoot/html/article_content/201010/47532f706bf94c9ebb23a87a99424072_2.html
	WebRoot/html/article_content/201010/47532f706bf94c9ebb23a87a99424072_3.html
	WebRoot/html/article_content/201010/5010509a555548939840a3103d3cea71.html
	WebRoot/html/article_content/201010/50588403d9dd494c9035fa763e49e112.html
	WebRoot/html/article_content/201010/82c2ffe3f0234a6ba2aed4727a75a19a.html
	WebRoot/html/article_content/201010/9028537042de4f8da39bf312ac43ba3b.html
	WebRoot/html/article_content/201010/90eb7634990341909027a5e20245b3e1.html
	WebRoot/html/article_content/201010/90eb7634990341909027a5e20245b3e1_2.html
	WebRoot/html/article_content/201010/90eb7634990341909027a5e20245b3e1_3.html
	WebRoot/html/article_content/201010/9102600e47b7401b843ad3722e1e9b70.html
	WebRoot/html/article_content/201010/ac6f0b7c351c41058dc800ea0091e26c.html
	WebRoot/html/article_content/201010/c55109104bb241c7a51605602b1531df.html
	WebRoot/html/article_content/201010/c55109104bb241c7a51605602b1531df_2.html
	WebRoot/html/article_content/201010/cb4b35cc2fd14ddbb20b49d7637fab2f.html
	WebRoot/html/article_content/201010/cb4b35cc2fd14ddbb20b49d7637fab2f_2.html
	WebRoot/html/article_content/201010/fd97e448663c4f5a8f033743328a8038.html
	WebRoot/html/product_content/201010/076dc53d2514416dafd189c6a5ac3b61.html
	WebRoot/html/product_content/201010/07bfa8affbe643f388e619d831c3148c.html
	WebRoot/html/product_content/201010/0a293605c4404ac8886cf585e15cd329.html
	WebRoot/html/product_content/201010/0d3aa93c99a8468e8d67d25d9d314032.html
	WebRoot/html/product_content/201010/149eb36f16934dbfaef4513b9302ded8.html
	WebRoot/html/product_content/201010/2fb8d7ff55b64525809779394697556a.html
	WebRoot/html/product_content/201010/37a29387674e471d93a434d3309ee9ed.html
	WebRoot/html/product_content/201010/3ba4738e316d4ad3a74fd3183b74fa1f.html
	WebRoot/html/product_content/201010/4345b17a65ca4b6aabf1f8a701f2aba0.html
	WebRoot/html/product_content/201010/487461b654234817a3b61ffb2fab52c6.html
	WebRoot/html/product_content/201010/4de5bce34cdf42f18badc87c99ef2b9d.html
	WebRoot/html/product_content/201010/4e0515ec5d3f4bf7820f45b19ff2e6e8.html
	WebRoot/html/product_content/201010/51b9223c405b43bd868c9697c2007452.html
	WebRoot/html/product_content/201010/55b028625122438f8b9d23e9503eb9ae.html
	WebRoot/html/product_content/201010/62f2fadcefdd40bd88e73620a48d8b77.html
	WebRoot/html/product_content/201010/6c838d1223ce426d992b264ffebb5010.html
	WebRoot/html/product_content/201010/7c179f618edb461d9d8c6eec87e76dcc.html
	WebRoot/html/product_content/201010/83372e892b524299bd318ab528c4bfc3.html
	WebRoot/html/product_content/201010/853e4d3f61104f478a0cfbd47e3d764e.html
	WebRoot/html/product_content/201010/8823782b7578485bafd3399f9c3b02d6.html
	WebRoot/html/product_content/201010/8a76c725d273444d92a3293d2ffdaf76.html
	WebRoot/html/product_content/201010/8d0177cfd1524332b2cb718debf471df.html
	WebRoot/html/product_content/201010/9247a7243b0847aea9d1d4d954f3cb98.html
	WebRoot/html/product_content/201010/975fcae6a1ab42ef98e4a9c8072d13f2.html
	WebRoot/html/product_content/201010/98d0aa750c9a4d2ca6d70a4cc76aa084.html
	WebRoot/html/product_content/201010/9fc522addeb64361b256e042e1f96aec.html
	WebRoot/html/product_content/201010/a0561935276b4e5a81243e11399bd590.html
	WebRoot/html/product_content/201010/a1d6a2d2a49143acb9a52f49e177cd48.html
	WebRoot/html/product_content/201010/a54c461332e54688ac7dbc34471fc68e.html
	WebRoot/html/product_content/201010/a57b6df1e1454bc0872d29c5d983dcf3.html
	WebRoot/html/product_content/201010/b0885f9027dc4a69933ca59cef4232b3.html
	WebRoot/html/product_content/201010/b3b268e12da948de86b68e2e56cff971.html
	WebRoot/html/product_content/201010/b6b3158e252c439fbc557189d04bfe93.html
	WebRoot/html/product_content/201010/bf555983d1cf4b1fbb1fb55e82dccabe.html
	WebRoot/html/product_content/201010/c71b9d0e0e1643f089dda97fa6442ac6.html
	WebRoot/html/product_content/201010/d1692a20d3e0414dbfca30e4088941f2.html
	WebRoot/html/product_content/201010/d1e76a45cbe342dab3c984f488eba14f.html
	WebRoot/html/product_content/201010/d6133758f03e4c119c368b47aff4b2a1.html
	WebRoot/html/product_content/201010/d6ca717fa2af4f90a7d0ee4814b1936e.html
	WebRoot/html/product_content/201010/dd17736a25294d19b721bfe28eafb69f.html
	WebRoot/html/product_content/201010/e21cd4464c854db3bd2355b9c31d565b.html
	WebRoot/html/product_content/201010/f1b7c2aedfec4ebb9832f7a435c0442b.html
	WebRoot/html/product_content/201010/f82d6264c5394306b5e42788b336f595.html
	WebRoot/html/product_content/201010/fdf9304db1684e59af51aa46ffbf9af5.html
	WebRoot/html/product_content/201010/ff00c3db01f4417196e75ec198449a52.html
	src/jdbc.properties
	src/shopxx.xml

Signed-off-by: zxpbenson <zxpbenson@163.com>