申述添加提交人名称字段

sso-common/src/test/java/test/Test.java

@@ -3,8 +3,12 @@ package test;
 import com.alibaba.fastjson.JSON;
 import com.uas.sso.ResultWrap;
 import com.uas.sso.common.util.HttpUtil;
+import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserView;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
+import java.io.UnsupportedEncodingException;
 
 import static com.alibaba.fastjson.JSON.parseObject;
 
@@ -15,22 +19,30 @@ import static com.alibaba.fastjson.JSON.parseObject;
  **/
 public class Test {
 
-    public static void main(String[] args) throws Exception {
-        String url = "http://10.1.51.50:8081/api/user";
-        url = url + "/info";
-        ModelMap data = new ModelMap();
-        data.put("userUU", 10000L);
-        HttpUtil.ResponseWrap res = HttpUtil.doGet(url, data);
-        if (!res.isSuccess()) {
-            throw new Exception(res.getContent());
-        } else {
-            ResultWrap result = parseObject(res.getContent(), ResultWrap.class);
-            if (!result.isSuccess()) {
-                throw new Exception(result.getErrMsg());
-            } else if (result.getContent() != null) {
-                UserView userView =  JSON.parseObject(result.getContent().toString(), UserView.class);
-                System.out.println(userView);
-            }
-        }
+//    public static void main(String[] args) throws Exception {
+//        String url = "http://10.1.51.37:3001/api/user";
+//        if (!StringUtils.isEmpty(url)) {
+//            url = url + "/info";
+//            ModelMap data = new ModelMap();
+//            data.put("userUU", 10316L);
+//            HttpUtil.ResponseWrap res = HttpUtil.doGet(url, data);
+//            if (!res.isSuccess()) {
+//                throw new Exception(res.getContent());
+//            } else {
+//                ResultWrap result = JSON.parseObject(res.getContent(), ResultWrap.class);
+//                if (!result.isSuccess()) {
+//                    throw new Exception(result.getErrMsg());
+//                } else if (result.getContent() != null) {
+//                    UserView userView = JSON.parseObject(result.getContent().toString(), UserView.class);
+//                    System.out.println(userView.getName());
+//                }
+//            }
+//        }
+//    }
+
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        String url = "鍑虹幇寮傚父";
+        System.out.println(new String(url.getBytes("GBK"), "utf-8"));
     }
+
 }

sso-server/src/main/java/com/uas/sso/SSOConfiguration.java

@@ -35,9 +35,7 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
         /**
          * SSO过滤, 这个地方拦截配置
          */
-        registry.addInterceptor(ssoInterceptor).addPathPatterns("/**").
-                excludePathPatterns("/sso/*/register/**", "/sso/login/**", "/api/user/**", "/api/userspace/**",
-                        "/sso/resetPwd/**", "/appeal/resetPwd", "/api/partners", "/appeal/**");
+        registry.addInterceptor(ssoInterceptor).addPathPatterns("/**");
 
     }
 

sso-server/src/main/java/com/uas/sso/controller/AppealController.java

@@ -162,7 +162,6 @@ public class AppealController extends BaseController {
         checkMobileCode(token, appeal.getMobile(), code);
 
         // 保存申述信息
-        appeal.setSubmitterUU(userAccount.getUserUU());
         appealService.submitValidAccount(appeal, password);
         return success();
     }

sso-server/src/main/java/com/uas/sso/entity/Appeal.java

@@ -57,6 +57,12 @@ public class Appeal implements Serializable {
     @Column(name = "submitter_uu")
     private Long submitterUU;
 
+    /**
+     * 申请人uu号
+     */
+    @Column(name = "submitter_name")
+    private String submitterName;
+
     /**
      * 联系人
      */
@@ -148,6 +154,14 @@ public class Appeal implements Serializable {
         this.submitterUU = submitterUU;
     }
 
+    public String getSubmitterName() {
+        return submitterName;
+    }
+
+    public void setSubmitterName(String submitterName) {
+        this.submitterName = submitterName;
+    }
+
     public String getContactName() {
         return contactName;
     }

sso-server/src/main/java/com/uas/sso/filter/SSOInterceptor.java

@@ -23,6 +23,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 
     @Override
     protected boolean onAuthenticateFailed(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        SystemSession.clear();
         return true;
     }
 

sso-server/src/main/java/com/uas/sso/service/impl/AppealServiceImpl.java

@@ -9,6 +9,7 @@ import com.uas.sso.entity.Userspace;
 import com.uas.sso.service.AppealService;
 import com.uas.sso.service.UserService;
 import com.uas.sso.service.UserspaceService;
+import com.uas.sso.support.SystemSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
@@ -84,6 +85,8 @@ public class AppealServiceImpl implements AppealService {
         appeal.setSubmitInfo(JSON.toJSONString(data));
         appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
         appeal.setType(Appeal.Type.VALID_ACCOUNT.getDesc());
+        appeal.setSubmitterUU(SystemSession.getUserAccount().getUserUU());
+        appeal.setSubmitterName(SystemSession.getUserAccount().getVipName());
 
         // 保存申述信息
         appealDao.save(appeal);