Merge remote-tracking branch 'origin/dev' into dev2

sso-manage-console-web/src/assets/js/axios.js

@@ -27,7 +27,7 @@ instance.interceptors.response.use(function (response) {
     const response = error.response
 
     if (response.status === 401) {
-      window.location.href = response.data.data
+      window.location.href = window.location.origin + '/login'
     }
     err = response.data && response.data.message ? response.data.message : response
   } else if (error.request) {

sso-manage-console-web/src/components/accounts/appeals/AppealHome.vue

@@ -21,7 +21,7 @@
       </el-select>
 
       <!-- 申诉来源 -->
-      <!--<label>申诉来源</label>
+      <label>申诉来源</label>
       <el-select v-model="pageParams.fromApp" clearable placeholder="不限" @change="handleRefreshData">
         <el-option
           v-for="item in fromAppOptions"
@@ -29,7 +29,7 @@
           :label="item.label"
           :value="item.value">
         </el-option>
-      </el-select>-->
+      </el-select>
 
       <!-- 申诉状态 -->
       <label>申诉状态</label>
@@ -94,11 +94,12 @@
           <span v-else>{{scope.row.type}}</span>
         </template>
       </el-table-column>
-      <!--<el-table-column
+      <el-table-column
         prop="fromApp"
         label="申诉来源"
+        :formatter="getAppNameFromMap"
         width="100">
-      </el-table-column>-->
+      </el-table-column>
       <el-table-column
         prop="submitDate"
         label="申诉时间"
@@ -292,12 +293,12 @@
               <div class="message-value" v-text="selectedAppeal.newAdminMobile"></div>
             </div>
           </div>
-          <div class="row">
+         <!-- <div class="row">
             <div class="col-lg-6">
               <div class="message-label">新管理员邮箱</div>
               <div class="message-value" v-text="selectedAppeal.newAdminEmail"></div>
             </div>
-          </div>
+          </div>-->
         </div>
         <!-- 联系人 -->
         <div style="border-bottom: 1px solid #E5E5E5;padding: 26px 0;">
@@ -475,6 +476,9 @@
       },
       fromAppOptions () {
         return this.$store.getters.fromAppOptions
+      },
+      uidAppNameMap () {
+        return this.$store.getters.uidAppNameMap || {}
       }
     },
     methods: {
@@ -518,6 +522,9 @@
         if (appeal.type === 'changeAdmin' && !this.selectedAppeal.userspace) {
           this.selectedAppeal.userspace = {}
         }
+        if (appeal.type === 'changeAdmin' && !this.selectedAppeal.userspace.admin) {
+          this.selectedAppeal.userspace.admin = {}
+        }
         console.log('appeal', this.selectedAppeal)
       },
       approveRequest (appeal) {
@@ -544,6 +551,12 @@
         }
 
         approveAppealRequest(appealId, isPass, success, this.showErrorMessage)
+      },
+      getAppNameFromMap (row, column, uid) {
+        if (uid && uid !== '') {
+          return this.uidAppNameMap[uid]
+        }
+        return ''
       }
     },
     created () {

sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/LoginController.java

@@ -3,17 +3,14 @@ package com.uas.sso.sso.backend.api;
 import com.uas.sso.sso.backend.entity.Admin;
 import com.uas.sso.sso.backend.service.AdminService;
 import com.uas.sso.sso.backend.support.MD5Utils;
-import com.uas.sso.sso.backend.support.ResultBean;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class LoginController {
@@ -25,11 +22,20 @@ public class LoginController {
         this.adminService = adminService;
     }
 
+    /**
+     * 管理员登录接口，兼容测试环境和发布环境
+     *
+     * @param userName  管理员账号
+     * @param password  密码
+     * @param request   Http请求
+     */
     @RequestMapping(method = {RequestMethod.POST, RequestMethod.GET}, path = "/api/login", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public String login(String userName, String password, HttpServletRequest request) {
+        String origin = request.getHeader("origin");
+
         try {
             if ("GET".equals(request.getMethod())) {
-                return "redirect:/login";
+                return String.format("redirect:%s/login", origin);
             }
 
             Assert.hasText(userName, "用户名不能为空");
@@ -42,11 +48,11 @@ public class LoginController {
 
             if (status) {
                 request.getSession(true).setAttribute("account", admin);
-                return "redirect:/index";
+                return String.format("redirect:%s/index", origin);
             }
-            return "redirect:/login";
+            return String.format("redirect:%s/login", origin);
         } catch (Exception e) {
-            return "redirect:/login";
+            return String.format("redirect:%s/login", origin);
         }
     }
 }

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/AppealServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.core.Const;
-import com.uas.sso.core.ICallable;
 import com.uas.sso.dao.AppDao;
 import com.uas.sso.dao.AppealDao;
 import com.uas.sso.dao.UserDao;
@@ -147,9 +146,11 @@ public class AppealServiceImpl implements AppealService {
 
         if (appealPage.hasContent()) {
             for (Appeal appeal : appealPage.getContent()) {
-                User appealUser = userDao.findByUserUU(appeal.getSubmitterUU());
-                if (appealUser != null) {
-                    appeal.setAppealName(appealUser.getVipName());
+                if (StringUtils.hasText(appeal.getSubmitterName())) {
+                    appeal.setAppealName(appeal.getSubmitterName());
+                } else {
+                    User appealUser = userDao.findByUserUU(appeal.getSubmitterUU());
+                    appeal.setAppealName(appealUser != null ? appealUser.getVipName() : null);
                 }
             }
         }
@@ -240,8 +241,10 @@ public class AppealServiceImpl implements AppealService {
             record.setSponsorName(appeal.getContactName());
             record.setSponsorTel(appeal.getContactTel());
             record.setLaunchTime(new Date());
-            record.setOldAdminName(oldAdmin.getVipName());
-            record.setOldAdminTel(oldAdmin.getMobile());
+            if (oldAdmin != null) {
+                record.setOldAdminName(oldAdmin.getVipName());
+                record.setOldAdminTel(oldAdmin.getMobile());
+            }
 
             record.setAuditorName("系统管理员");
             record.setAuditorTel("123456789");