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

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseBasicInfo.vue

@@ -51,7 +51,7 @@
           </span>
       </el-form-item>
       <el-form-item label="注册时间">
-        <div v-text="showRegisteDate(enterpriseInfo.registerDate)">2017-06-11 12:51:44</div>
+        <div v-text="showRegisterDate(enterpriseInfo.registerDate)">2017-06-11 12:51:44</div>
       </el-form-item>
       <el-form-item>
         <div class="action-form-item">
@@ -108,8 +108,8 @@
         }
         this.$message.info('该企业没有上传营业执照附件')
       },
-      showRegisteDate (timestamp) {
-        formatDate(null, null, timestamp)
+      showRegisterDate (timestamp) {
+        return formatDate(null, null, timestamp)
       }
     },
     mounted () {

sso-manage-console/src/main/java/com/uas/sso/sso/backend/config/SecurityConfiguration.java

@@ -37,8 +37,10 @@ public class SecurityConfiguration extends WebMvcConfigurerAdapter {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(securityInterceptor)
-                .addPathPatterns("/**");
+        // TODO 暂时注释管理员登录功能
+        /*registry.addInterceptor(securityInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/login/**");*/
     }
 
     @Override

sso-manage-console/src/main/java/com/uas/sso/sso/backend/config/SecurityInterceptor.java

@@ -53,7 +53,6 @@ public class SecurityInterceptor extends AbstractSSOInterceptor {
 
     @Override
     protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        System.out.println(request.getRequestedSessionId());
         System.out.println(request.getRequestURL().toString());
         boolean cross = SSOHelper.isCrossDomain(request);
         if (cross) {
@@ -66,7 +65,6 @@ public class SecurityInterceptor extends AbstractSSOInterceptor {
             } else {
                 returnUrl = SSOHelper.getRedirectLoginUrl(request, returnUrl);
             }
-            System.out.println(returnUrl);
 
             baseUrl = baseUrl + "/login/other";
             response.sendRedirect(returnUrl + "&baseUrl=" + baseUrl);

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

@@ -5,15 +5,15 @@ import com.uas.sso.dao.UserDao;
 import com.uas.sso.dao.UserspaceDao;
 import com.uas.sso.entity.Appeal;
 import com.uas.sso.entity.User;
-import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.sso.backend.dao.AdminChangeRecordDao;
+import com.uas.sso.sso.backend.dto.AddNewUserInfo;
 import com.uas.sso.sso.backend.entity.AdminChangeRecord;
 import com.uas.sso.sso.backend.entity.AdminChangeType;
 import com.uas.sso.sso.backend.exceptions.ValidationFailedException;
 import com.uas.sso.sso.backend.service.AppealService;
+import com.uas.sso.sso.backend.service.UserBackendService;
 import com.uas.sso.sso.backend.util.JacksonUtils;
-import com.uas.sso.support.SystemSession;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,13 +61,16 @@ public class AppealServiceImpl implements AppealService {
 
     private final AdminChangeRecordDao recordDao;
 
+    private final UserBackendService userService;
+
     @Autowired
     public AppealServiceImpl(AppealDao appealDao, UserDao userDao,
-            UserspaceDao spaceDao, AdminChangeRecordDao recordDao) {
+                             UserspaceDao spaceDao, AdminChangeRecordDao recordDao, UserBackendService userService) {
         this.appealDao = appealDao;
         this.userDao = userDao;
         this.spaceDao = spaceDao;
         this.recordDao = recordDao;
+        this.userService = userService;
     }
 
     @Override
@@ -124,9 +127,9 @@ public class AppealServiceImpl implements AppealService {
         Assert.notNull(isPass, "审核状态不能为空");
         Appeal appeal = assertAppealExist(appealId);
 
-        UserAccount account = SystemSession.getUserAccount();
+        // UserAccount account = SystemSession.getUserAccount();
 
-        appeal.setAuditor(account.getVipName());
+        appeal.setAuditor("系统管理员");
         appeal.setAuditDate(new Timestamp(System.currentTimeMillis()));
         appeal.setStatus((short) (isPass ? 2 : 3));
         appealDao.save(appeal);
@@ -160,8 +163,12 @@ public class AppealServiceImpl implements AppealService {
             Userspace space = assertSpaceExist(spaceUU);
             User user = userDao.findByMobile(appeal.getMobile());
             if (user == null) {
-                throw new ValidationFailedException(
-                        String.format("拥有手机号[%s]的用户不存在", appeal.getMobile()));
+                AddNewUserInfo newUserInfo = new AddNewUserInfo();
+                newUserInfo.setVipName(appeal.getContactName());
+                newUserInfo.setEmail(appeal.getContactEmail());
+                newUserInfo.setMobile(appeal.getContactTel());
+                newUserInfo.setPassword("123456");
+                user = userService.addNewUser(newUserInfo);
             }
 
             // 记录管理员更换记录
@@ -175,9 +182,9 @@ public class AppealServiceImpl implements AppealService {
             record.setOldAdminName(oldAdmin.getVipName());
             record.setOldAdminTel(oldAdmin.getMobile());
 
-            UserAccount accountUser = SystemSession.getUserAccount();
+            // UserAccount accountUser = SystemSession.getUserAccount();
 
-            record.setAuditorName(accountUser.getVipName());
+            record.setAuditorName("系统管理员");
             record.setAuditorTel("123456789");
             record.setAuditTime(new Date());
             record.setNewAdminName(user.getVipName());

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

@@ -164,8 +164,8 @@ public class UserSpaceServiceImpl implements UserSpaceService {
         record.setSpaceUU(spaceUu);
 
         User oldAdmin = space.getAdmin();
-        UserAccount account = SystemSession.getUserAccount();
-        record.setSponsorName(account.getVipName());
+        // UserAccount account = SystemSession.getUserAccount();
+        record.setSponsorName("系统管理员");
         record.setSponsorTel("123456789");
         if (oldAdmin != null) {
             record.setOldAdminName(oldAdmin.getVipName());
@@ -173,7 +173,7 @@ public class UserSpaceServiceImpl implements UserSpaceService {
         }
         record.setLaunchTime(new Date());
 
-        record.setAuditorName(account.getVipName());
+        record.setAuditorName("系统管理员");
         record.setAuditorTel("123456789");
         record.setAuditTime(new Date());
         record.setNewAdminName(admin.getVipName());
@@ -201,7 +201,7 @@ public class UserSpaceServiceImpl implements UserSpaceService {
     public Userspace authEnterpriseInfo(@NotNull Long spaceUu, @NotNull Boolean isPass,
             String reason) {
         Userspace space = assertSpaceExist(spaceUu);
-        UserAccount account = SystemSession.getUserAccount();
+        // UserAccount account = SystemSession.getUserAccount();
 
         if (isPass) {
             space.setValidCode((short) Status.AUTHENTICATED.getCode());
@@ -216,7 +216,7 @@ public class UserSpaceServiceImpl implements UserSpaceService {
         }
 
         for (UserspaceValid valid : validList) {
-            valid.setAuditor(account.getVipName());
+            valid.setAuditor("系统管理员");
 
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             valid.setValidDate(dateFormat.format(new Date()));