Skip to content

Commit fe6592b

Browse files
shuajeshuaje
committed
服务接口分离
1 parent 6496164 commit fe6592b

118 files changed

Lines changed: 1796 additions & 1403 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎iBase4J-Biz-Facade/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.ibase4j</groupId>
66
<artifactId>iBase4J</artifactId>
7-
<version>1.2.0</version>
7+
<version>1.3.0</version>
88
</parent>
99
<artifactId>iBase4J-Biz-Facade</artifactId>
1010

‎iBase4J-Biz-Facade/src/main/java/org/ibase4j/provider/IBizProvider.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎iBase4J-Biz-Facade/src/main/java/org/ibase4j/service/IMemberService.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.ibase4j.service;
2+
3+
import java.util.Map;
4+
5+
import org.ibase4j.bean.Member;
6+
import org.ibase4j.model.TMember;
7+
8+
import top.ibase4j.core.base.IBaseService;
9+
10+
/**
11+
* @author ShenHuaJie
12+
* @since 2018年4月24日 上午10:45:11
13+
*/
14+
public interface IMemberService extends IBaseService<TMember> {
15+
public Member getBaseInfo(Long id);
16+
17+
public TMember getInfo(Long id);
18+
19+
public Object updataphone(Map<String, Object> map);
20+
21+
public Object authentication(Map<String, Object> map);// 实名认证
22+
}

‎iBase4J-Biz-Service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.ibase4j</groupId>
66
<artifactId>iBase4J</artifactId>
7-
<version>1.2.0</version>
7+
<version>1.3.0</version>
88
</parent>
99
<artifactId>iBase4J-Biz-Service</artifactId>
1010
<packaging>war</packaging>

‎iBase4J-Biz-Service/src/main/java/org/ibase4j/core/BizProviderImpl.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

iBase4J-Biz-Service/src/main/java/org/ibase4j/service/MemberService.java renamed to iBase4J-Biz-Service/src/main/java/org/ibase4j/service/impl/MemberServiceImpl.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package org.ibase4j.service;
1+
package org.ibase4j.service.impl;
22

33
import java.io.File;
44
import java.util.Map;
55

66
import org.ibase4j.bean.Member;
7+
import org.ibase4j.mapper.TMemberMapper;
78
import org.ibase4j.model.TMember;
9+
import org.ibase4j.service.IMemberService;
810
import org.springframework.cache.annotation.CacheConfig;
911
import org.springframework.stereotype.Service;
1012
import org.springframework.transaction.annotation.Transactional;
@@ -27,9 +29,7 @@
2729
*/
2830
@Service
2931
@CacheConfig(cacheNames = "member")
30-
public class MemberService extends BaseService<TMember> {
31-
32-
private final TMember MEMBER = new TMember();
32+
public class MemberServiceImpl extends BaseService<TMember, TMemberMapper> implements IMemberService {
3333

3434
@Transactional
3535
public TMember update(TMember record) {
@@ -95,6 +95,7 @@ public Object updataphone(Map<String, Object> map) {
9595
}
9696

9797
public Object authentication(Map<String, Object> map) {// 实名认证
98+
TMember MEMBER = new TMember();
9899
MEMBER.setId(Long.parseLong((String)map.get("memberId")));
99100
TMember selectOne = super.selectOne(MEMBER);
100101
selectOne.setRealName((String)map.get("realName"));

‎iBase4J-Biz-Service/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040

4141
<loggers>
4242
<logger name="org.slf4j" level="info" />
43+
<logger name="springfox" level="error" />
44+
<logger name="io.swagger" level="info" />
4345
<logger name="org.quartz" level="warn" />
4446
<logger name="org.redisson" level="info" />
4547
<logger name="com.atomikos" level="warn" />
@@ -50,6 +52,7 @@
5052
<logger name="org.mybatis.spring" level="info" />
5153
<logger name="org.apache.zookeeper" level="warn" />
5254
<logger name="org.springframework.web" level="debug" />
55+
<logger name="org.springframework.web.servlet.handler" level="info" />
5356
<Logger name="top.ibase4j" level="info">
5457
<AppenderRef ref="ProductLog" />
5558
</Logger>

‎iBase4J-Biz-Web/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.ibase4j</groupId>
66
<artifactId>iBase4J</artifactId>
7-
<version>1.2.0</version>
7+
<version>1.3.0</version>
88
</parent>
99
<artifactId>iBase4J-Biz-Web</artifactId>
1010
<packaging>war</packaging>

‎iBase4J-Biz-Web/src/main/java/org/ibase4j/core/config/WebConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import top.ibase4j.core.config.WebMvcConfig;
99
import top.ibase4j.core.filter.TokenFilter;
10-
import top.ibase4j.core.interceptor.provider.EventInterceptor;
10+
import top.ibase4j.core.interceptor.EventInterceptor;
1111

1212
/**
1313
* @author ShenHuaJie

‎iBase4J-Biz-Web/src/main/java/org/ibase4j/web/LoginController.java‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.apache.commons.lang3.StringUtils;
1111
import org.apache.commons.net.util.Base64;
1212
import org.ibase4j.model.TMember;
13-
import org.ibase4j.provider.IBizProvider;
13+
import org.ibase4j.service.IMemberService;
1414
import org.springframework.http.MediaType;
1515
import org.springframework.ui.ModelMap;
1616
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,8 +22,7 @@
2222
import io.swagger.annotations.ApiOperation;
2323
import top.ibase4j.core.Constants;
2424
import top.ibase4j.core.Constants.MSGCHKTYPE;
25-
import top.ibase4j.core.base.provider.AppBaseController;
26-
import top.ibase4j.core.base.provider.Parameter;
25+
import top.ibase4j.core.base.AppBaseController;
2726
import top.ibase4j.core.exception.LoginException;
2827
import top.ibase4j.core.support.Assert;
2928
import top.ibase4j.core.support.context.Resources;
@@ -45,12 +44,7 @@
4544
@RestController
4645
@RequestMapping("/app/")
4746
@Api(value = "APP登录注册接口", description = "APP-登录注册接口")
48-
public class LoginController extends AppBaseController<IBizProvider> {
49-
50-
public String getService() {
51-
return "memberService";
52-
}
53-
47+
public class LoginController extends AppBaseController<TMember, IMemberService> {
5448
@PostMapping("secret.api")
5549
@ApiOperation(value = "APP获取私钥", produces = MediaType.APPLICATION_JSON_VALUE)
5650
@ApiImplicitParam(name = "UUID", defaultValue = "1", paramType = "header")
@@ -84,8 +78,7 @@ public Object login(Login user, HttpServletRequest request, HttpServletResponse
8478
Map<String, Object> params = new HashMap<String, Object>();
8579
params.put("enable", 1);
8680
params.put("loginKey", user.getAccount()); // 登录帐号/手机号/邮箱
87-
Parameter parameter = new Parameter(getService(), "queryList", params);
88-
List<?> list = provider.execute(parameter).getResultList();
81+
List<?> list = service.queryList(params);
8982
TMember member = null;
9083
if (list.size() == 1) {
9184
member = (TMember)list.get(0);
@@ -95,8 +88,7 @@ public Object login(Login user, HttpServletRequest request, HttpServletResponse
9588
}
9689
member.setIsOnline(1);
9790
member.setUuid(uuid);
98-
parameter = new Parameter(getService(), "update").setParam(member);
99-
provider.execute(parameter);
91+
service.update(member);
10092

10193
try {
10294
/* RongCloud rongCloud = RongCloud.getInstance(getSysParam("APP-KEY"), getSysParam("APP-SECRET"));
@@ -119,8 +111,7 @@ public Object login(Login user, HttpServletRequest request, HttpServletResponse
119111
param.setAvatar(PropertiesUtil.getString("ui.file.uri.prefix") + "extends/img/dftAvatar.png");
120112
param.setIsOnline(1);
121113
param.setUuid(uuid);
122-
parameter = new Parameter(getService(), "update").setParam(param);
123-
member = (TMember)provider.execute(parameter).getResult();
114+
member = service.update(param);
124115
member.setPassword(null);
125116
}
126117
request.setAttribute("msg", "[" + user.getAccount() + "]登录成功.");
@@ -146,8 +137,7 @@ public Object logout(HttpServletRequest request) {
146137
TMember member = new TMember();
147138
member.setId(getCurrUser(request));
148139
member.setIsOnline(0);
149-
Parameter parameter = new Parameter(getService(), "update").setParam(member);
150-
provider.execute(parameter);
140+
service.update(member);
151141
}
152142
ModelMap modelMap = new ModelMap();
153143
return setSuccessModelMap(modelMap);
@@ -161,8 +151,7 @@ public Object chkAccount(Login user, HttpServletRequest request, HttpServletResp
161151

162152
Map<String, Object> params = new HashMap<String, Object>();
163153
params.put("loginKey", user.getAccount()); // 登录帐号/手机号/邮箱
164-
Parameter parameter = new Parameter(getService(), "queryList", params);
165-
List<?> pageInfo = provider.execute(parameter).getResultList();
154+
List<?> pageInfo = service.queryList(params);
166155

167156
ModelMap modelMap = new ModelMap();
168157
if (pageInfo.size() > 1) {

0 commit comments

Comments
 (0)