update app_token

src/main/java/cn/com/qmth/examcloud/app/core/config/InterceptorConfig.java

@@ -31,7 +31,7 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter {
         // 拦截器PathPatterns通配符为两个"*"
         registry.addInterceptor(accessInterceptor())
                 .addPathPatterns("/api/**")
-                .excludePathPatterns("/", "/swagger-resources");
+                .excludePathPatterns("/", "/swagger-resources", "/api/app-api/device/record/list");
     }
 
 }

src/main/java/cn/com/qmth/examcloud/app/core/config/TokenFilter.java

@@ -17,8 +17,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 
-import javax.servlet.*;
 import javax.servlet.FilterConfig;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -70,15 +70,15 @@ public class TokenFilter implements Filter {
     }
 
     private CustomHttpServletRequest initCustomRequest(HttpServletRequest request) {
-        String key = request.getHeader(Constants.PARAM_KEY);
-        String appToken = request.getHeader(Constants.PARAM_TOKEN);
-        if (StringUtils.isBlank(key) || StringUtils.isBlank(appToken)) {
+        String appKey = request.getHeader(Constants.PARAM_APP_KEY);
+        String appToken = request.getHeader(Constants.PARAM_APP_TOKEN);
+        if (StringUtils.isBlank(appKey) || StringUtils.isBlank(appToken)) {
             //key,token为空，则不用处理
             return null;
         }
 
         //通过key获取原始登录信息
-        LoginInfo loginInfo = userAuthService.getLoginInfo(key);
+        LoginInfo loginInfo = userAuthService.getLoginInfo(appKey);
         if (loginInfo == null) {
             //原始登录信息为空，则代表尚未登录不用处理
             return null;
@@ -101,6 +101,7 @@ public class TokenFilter implements Filter {
         }
 
         //将App Token替换为原始登录Token到request请求中
+        customRequest.addHeader(Constants.PARAM_KEY, loginInfo.getKey());
         customRequest.addHeader(Constants.PARAM_TOKEN, loginInfo.getToken());
 
         //初始化内部接口请求鉴权

src/main/java/cn/com/qmth/examcloud/app/model/Constants.java

@@ -45,6 +45,8 @@ public interface Constants {
     /* 默认请求的Header参数 */
     String PARAM_KEY = "key";
     String PARAM_TOKEN = "token";
+    String PARAM_APP_KEY = "app_key";
+    String PARAM_APP_TOKEN = "app_token";
     String PARAM_DEVICE_ID = "deviceId";
     String PARAM_TRACE_ID = "TRACE_ID";
     String PARAM_CLIENT = "$spring_cloud_client";

src/main/java/cn/com/qmth/examcloud/app/service/impl/UserAuthServiceImpl.java

@@ -17,7 +17,6 @@ import cn.com.qmth.examcloud.app.service.PropertyService;
 import cn.com.qmth.examcloud.app.service.RedisService;
 import cn.com.qmth.examcloud.app.service.UserAuthService;
 import okhttp3.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,7 +118,7 @@ public class UserAuthServiceImpl implements UserAuthService {
                 .build();
         return HttpUtils.doPut(requestUrl, formBody, key, token);
     }
-    
+
     @Override
     public Result resetStudentPassword(String key, String token, String newPassword) throws Exception {
         //封装请求参数
@@ -139,22 +138,22 @@ public class UserAuthServiceImpl implements UserAuthService {
                 .build();
         return HttpUtils.doPost(requestUrl, formBody, key, token);
     }
-    
+
     @Override
-	public Result code4Student(String phone, Boolean bound) throws Exception {
-    	//封装请求参数
-    	final String requestUrl = String.format("%s/api/ecs_core/auth/sendVerificationCode4Student", propertyService.getUserAuthUrl());
-    	RequestBody formBody = new FormBody.Builder()
-    			.add("phone", phone)
-		        .add("bound", bound.toString())
-		        .build();
-    	Request request = new Request.Builder()
-		        .url(requestUrl)
-		        .post(formBody)
-		        .build();
-		//执行请求
-    	return HttpUtils.call(request);
-	}
+    public Result code4Student(String phone, Boolean bound) throws Exception {
+        //封装请求参数
+        final String requestUrl = String.format("%s/api/ecs_core/auth/sendVerificationCode4Student", propertyService.getUserAuthUrl());
+        RequestBody formBody = new FormBody.Builder()
+                .add("phone", phone)
+                .add("bound", bound.toString())
+                .build();
+        Request request = new Request.Builder()
+                .url(requestUrl)
+                .post(formBody)
+                .build();
+        //执行请求
+        return HttpUtils.call(request);
+    }
 
     @Override
     public Result userBindingPhone(String key, String token, String phone, String code) throws Exception {

src/main/resources/logback-spring.xml

@@ -59,6 +59,7 @@
     <logger name="springfox.documentation" level="WARN"/>
     <logger name="cn.afterturn.easypoi" level="WARN"/>
     <logger name="org.apache" level="WARN"/>
+    <logger name="freemarker" level="WARN"/>
     <logger name="cn.com.qmth.examcloud.app" level="DEBUG"/>
 
     <root level="DEBUG">

src/main/resources/templates/deviceRecord/list.ftl

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
-    <link href="${base}/styles/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="${base}/api/app-api/styles/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
     <style type="text/css">
         input {
             margin-bottom: 10px;
@@ -83,10 +83,10 @@
     </div>
 </div>
 
-<script src="${base}/styles/jquery/jquery-1.9.1.min.js"></script>
-<script src="${base}/page.js?v=20180801"></script>
+<script src="${base}/api/app-api/styles/jquery/jquery-1.9.1.min.js"></script>
+<script src="${base}/api/app-api/page.js?v=20180801"></script>
 <script type="text/javascript">
-    var basePath = '${base!}';
+    var basePath = '${base!}/api/app-api';
     var curPageSize = 10;
 
     $(function () {

src/main/resources/templates/error.ftl

@@ -23,7 +23,7 @@
             </#if>
         </#if>
     </h3>
-    <p><a href="${base}/">返回首页</a></p>
+    <p><a href="${base}/api/app-api">返回首页</a></p>
     <#if status??>
         <#if status==500>
             <p><i>${errMsg!}</i></p>