Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -414,9 +414,9 @@ public class AccountController {
     public Result enableAccount(@RequestParam long accountId) {
         accountService.enable(accountId);
         //同步到优软云
-        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
-        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
-        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
+//        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
+//        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
+//        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
         accountService.clearCache(accountId);
         return Result.success();
     }

base-servers/account/account-server/src/main/resources/application.yml

@@ -53,7 +53,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 server:
   port: 8580
   tomcat:
@@ -82,7 +82,8 @@ mybatis:
 auth:
   public-key: auth/pub.key
 sso:
-  base-url: https://sso.ubtob.com
+#  base-url: https://sso.ubtob.com
+  base-url: http://192.168.253.12:32323
 ribbon:
   ReadTimeout: 6000
   ConnectTimeout: 2000

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -60,9 +60,6 @@ public interface SsoUserApi {
     @PostMapping("")
     String unbind(@RequestParam("_operate") String _operate, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
 
-    @PostMapping("")
-    String bind(@RequestParam("_operate") String _operate, @RequestParam("appId") String appId, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
-
     @Component
     class DefaultFallback implements SsoUserApi{
         @Override
@@ -85,10 +82,5 @@ public interface SsoUserApi {
             return null;
         }
 
-        @Override
-        public String bind(String _operate, String appId, Long userUU, Long spaceUU) {
-            return null;
-        }
-
     }
 }

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -448,7 +448,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     isDirty: function () {
         var me = this,
-        formItems = me.formItems,
+        formItems = me.formItems || [],
         detailGrids = me.query('detailGridField'),
         dirty = false;