MoneyQ 部署微服务应用 [ibiz-uaa，UAA鉴权]

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Papi
-      cd ibzuaa-provider/ibzuaa-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzuaa-app/ibzuaa-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30002
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web-k8s.yaml

@@ -22,7 +22,34 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8080
+        - containerPort: 30002
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "30002"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.100.243:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.100.243"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_A_5d9d78509"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "@6dEfb3@"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_A_5d9d78509"
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -42,9 +69,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8080
-    targetPort: 8080
-    nodePort: 8080
+    port: 30002
+    targetPort: 30002
+    nodePort: 30002
     protocol: TCP
   selector:
     app: ibzuaa-app-web

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,9 +3,23 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysUserService.java

@@ -39,10 +39,12 @@ public interface ISysUserService extends IService<SysUser> {
     SysUser getDraft(SysUser et);
     boolean checkKey(SysUser et);
     SysUser deleteSysUser(SysUser et);
+    boolean deleteSysUserBatch(List<SysUser> etList);
     boolean save(SysUser et);
     @CacheEvict(value = "sysuser",allEntries = true)
     void saveBatch(List<SysUser> list);
     SysUser saveSysUser(SysUser et);
+    boolean saveSysUserBatch(List<SysUser> etList);
     Page<SysUser> searchDefault(SysUserSearchContext context);
     /**
      *自定义查询SQL

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java

@@ -129,6 +129,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
          return et ;
     }
 
+    @Override
+    @Transactional
+    public boolean deleteSysUserBatch(List<SysUser> etList) {
+        for(SysUser et : etList) {
+            deleteSysUser(et);
+        }
+        return true;
+    }
+
     @Override
     @Transactional
     public boolean save(SysUser et) {
@@ -195,6 +204,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
          return et ;
     }
 
+    @Override
+    @Transactional
+    public boolean saveSysUserBatch(List<SysUser> etList) {
+        for(SysUser et : etList) {
+            saveSysUser(et);
+        }
+        return true;
+    }
+
 
 
     /**

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api-k8s.yaml

@@ -22,36 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 40002
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "40002"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: IBIZ_OAUTH2_ENABLE
-          value: "true"      
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8081
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -71,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 40002
-    targetPort: 40002
-    nodePort: 40002
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: ibzuaa-provider-api

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,24 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - IBIZ_OAUTH2_ENABLE=true
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysUserResource.java

@@ -131,6 +131,14 @@ public class SysUserResource {
         sysuserdto = sysuserMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(sysuserdto);
     }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-DeleteSysUser-all')")
+    @ApiOperation(value = "批量处理[删除用户信息]", tags = {"系统用户" },  notes = "批量处理[删除用户信息]")
+	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/deletesysuserbatch")
+    public ResponseEntity<Boolean> deleteSysUserBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
+        List<SysUser> domains = sysuserMapping.toDomain(sysuserdtos);
+        boolean result = sysuserService.deleteSysUserBatch(domains);
+        return ResponseEntity.status(HttpStatus.OK).body(result);
+    }
 
     @ApiOperation(value = "保存系统用户", tags = {"系统用户" },  notes = "保存系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/save")
@@ -157,6 +165,14 @@ public class SysUserResource {
         sysuserdto = sysuserMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(sysuserdto);
     }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-SaveSysUser-all')")
+    @ApiOperation(value = "批量处理[保存用户信息]", tags = {"系统用户" },  notes = "批量处理[保存用户信息]")
+	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/savesysuserbatch")
+    public ResponseEntity<Boolean> saveSysUserBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
+        List<SysUser> domains = sysuserMapping.toDomain(sysuserdtos);
+        boolean result = sysuserService.saveSysUserBatch(domains);
+        return ResponseEntity.status(HttpStatus.OK).body(result);
+    }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-searchDefault-all') and hasPermission(#context,'ibzuaa-SysUser-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"系统用户" } ,notes = "获取DEFAULT")

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFallback.java

@@ -24,10 +24,6 @@ public class IBZUAAFallback implements IBZUAAFeignClient {
         return null;
     }
 
-    @Override
-    public Object getToken(MultiValueMap<String, String> map){
-        return null;
-    }
     @Override
     public String getPublicKey() {
         return null;

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java

@@ -27,13 +27,6 @@ public interface IBZUAAFeignClient
 	@PostMapping(value = "/uaa/login")
 	AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin);
 
-    /**
-	 * oauth2认证
-	 * @param 校验信息
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.POST, value = "/oauth/token")
-	Object getToken(@RequestBody MultiValueMap<String,String> map);
 
 	@PostMapping(value = "/uaa/loginbyusername")
 	AuthenticationUser loginByUsername(@RequestBody String username);

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
      * 租户
      */
     private String srfdcid;
+    /**
+     * 系统标识
+     */
+    private String srfsystemid;
+	/**
     /**
      * 动态实例标识
      */
@@ -254,6 +259,7 @@ public class AuthenticationUser implements UserDetails
 		if(this.sessionParams==null)
 		{
 			sessionParams = getUserSessionParam();
+			sessionParams.put("srfsystemid",this.getSrfsystemid());
 			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());