diff --git a/service.html b/service.html index 9303a1a70..86d4c2fd5 100644 --- a/service.html +++ b/service.html @@ -93,7 +93,10 @@ public final class _DynLocalUserService extends UserService { @Resource - private BsonConvert _redkale_convert; + private BsonConvert _redkale_bsonConvert; + + @Resource + private JsonConvert _redkale_jsonConvert; private Transport _redkale_sameGroupTransport; @@ -117,8 +120,8 @@ public void _redkale_register(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, UserInfo user) { if (selfrunnable) super.register(user); if (_redkale_client == null) return; - if (samerunnable) _redkale_client.remoteSameGroup(_redkale_convert, _redkale_sameGroupTransport, 0, true, false, false, user); - if (diffrunnable) _redkale_client.remoteDiffGroup(_redkale_convert, _redkale_diffGroupTransports, 0, true, true, false, user); + if (samerunnable) _redkale_client.remoteSameGroup(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_sameGroupTransport, 0, true, false, false, user); + if (diffrunnable) _redkale_client.remoteDiffGroup(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_diffGroupTransports, 0, true, true, false, user); } @Override @@ -130,8 +133,8 @@ public UserInfo _redkale_updateUsername(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, int userid, String username) { UserInfo rs = super.updateUsername(userid, username); if (_redkale_client == null) return null; - if (samerunnable) _redkale_client.remoteSameGroup(_redkale_convert, _redkale_sameGroupTransport, 1, true, false, false, userid, username); - if (diffrunnable) _redkale_client.remoteDiffGroup(_redkale_convert, _redkale_diffGroupTransports, 1, true, true, false, userid, username); + if (samerunnable) _redkale_client.remoteSameGroup(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_sameGroupTransport, 1, true, false, false, userid, username); + if (diffrunnable) _redkale_client.remoteDiffGroup(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_diffGroupTransports, 1, true, true, false, userid, username); return rs; } } @@ -178,7 +181,10 @@ public final class _DynRemoteUserService extends UserService { @Resource - private BsonConvert _redkale_convert; + private BsonConvert _redkale_bsonConvert; + + @Resource + private JsonConvert _redkale_jsonConvert; private Transport _redkale_transport; @@ -193,42 +199,42 @@ @SncpDyn(remote = false, index = 0) public void _redkale_register(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, UserInfo user) { - _redkale_client.remote(_redkale_convert, _redkale_transport, 0, selfrunnable, samerunnable, diffrunnable, user); + _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 0, selfrunnable, samerunnable, diffrunnable, user); } @SncpDyn(remote = false, index = 1) public UserInfo _redkale_updateUsername(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, int userid, String username) { - return _redkale_client.remote(_redkale_convert, _redkale_transport, 1, selfrunnable, samerunnable, diffrunnable, userid, username); + return _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 1, selfrunnable, samerunnable, diffrunnable, userid, username); } @Override public UserInfo findUserInfo(int userid) { - return _redkale_client.remote(_redkale_convert, _redkale_transport, 2, userid); + return _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 2, userid); } @Override public int findUserid(long mobile) { - return _redkale_client.remote(_redkale_convert, _redkale_transport, 3, mobile); + return _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 3, mobile); } @Override public RetResult<UserInfo> login(LoginBean bean) { - return _redkale_client.remote(_redkale_convert, _redkale_transport, 4, bean); + return _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 4, bean); } @Override public void putUserInfo(UserInfo user) { - _redkale_client.remote(_redkale_convert, _redkale_transport, 5, user); + _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 5, user); } @Override public void register(UserInfo user) { - _redkale_client.remote(_redkale_convert, _redkale_transport, 6, user); + _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 6, user); } @Override public UserInfo updateUsername(int userid, String username) { - return _redkale_client.remote(_redkale_convert, _redkale_transport, 7, userid, username); + return _redkale_client.remote(_redkale_bsonConvert, _redkale_jsonConvert, _redkale_transport, 7, userid, username); } } diff --git a/stylesheets/stylesheet.css b/stylesheets/stylesheet.css index 6c9f5120f..e42c52678 100644 --- a/stylesheets/stylesheet.css +++ b/stylesheets/stylesheet.css @@ -763,7 +763,7 @@ a:hover { @media screen and (min-width: 96em) { .main-content { max-width: 96rem; - padding: 2rem 6rem; + padding: 1rem 1rem; margin: 0 auto; font-size: 1.1rem; }