xignzi006 发布系统代码

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-provider-centralapi.jar
 
-EXPOSE 10310
+EXPOSE 8081
 
 ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-provider-centralapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
     ports:
-      - "10310:10310"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10310
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/IBZUAAUserService.java

+package cn.ibizlab.businesscentral.util.service;
+
+import com.alibaba.fastjson.JSONObject;
+import cn.ibizlab.businesscentral.util.client.IBZOUFeignClient;
+import cn.ibizlab.businesscentral.util.errors.BadRequestAlertException;
+import cn.ibizlab.businesscentral.util.client.IBZUAAFeignClient;
+import cn.ibizlab.businesscentral.util.security.AuthenticationUser;
+import cn.ibizlab.businesscentral.util.security.AuthorizationLogin;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+
+/**
+ * 实体[IBZUSER] 服务对象接口实现
+ */
+@Service("IBZUAAUserService")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
+public class IBZUAAUserService implements AuthenticationUserService{
+
+	@Autowired
+	private IBZUAAFeignClient uaaFeignClient;
+
+	@Override
+	public AuthenticationUser loadUserByUsername(String username) {
+
+		AuthenticationUser user=uaaFeignClient.loginByUsername(username);
+		if(user==null)
+			throw new BadRequestAlertException("登录失败","IBZUAAUser",username);
+		return user;
+	}
+
+	@Override
+	public AuthenticationUser loadUserByLogin(String username, String password) {
+		String[] data=username.split("[|]");
+		String loginname=username;
+		String domains="";
+
+		if(data.length==2) {
+			loginname=data[0].trim();
+			domains=data[1].trim();
+		}
+		AuthorizationLogin logininfo = new AuthorizationLogin();
+		logininfo.setDomain(domains);
+		logininfo.setLoginname(loginname);
+		logininfo.setPassword(password);
+		AuthenticationUser user=uaaFeignClient.login(logininfo);
+		if(user==null)
+			throw new BadRequestAlertException("登录失败","IBZUAAUser",username);
+		return user;
+	}
+
+
+	@Override
+	public void resetByUsername(String username) {
+
+	}
+
+}

businesscentral-util/src/main/resources/application-sys.yml

+#缓存、数据源
+spring:
+  cache:
+    redis:
+      time-to-live: 3600
+    caffeine:
+      spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
+  redis:
+    host: 172.16.240.110
+    port: 6379
+    password:
+    database: 0
+    lettuce:
+      pool:
+        max-active: 32
+        max-wait: 300ms
+        max-idle: 16
+        min-idle: 8
+  datasource:
+    username: a_LAB01_e85d8801c
+    password: 'b1@@@772'
+    url: jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
+    isSyncDBSchema: false
+    defaultSchema: a_LAB01_e85d8801c
+    conf: classpath:liquibase/master.xml
+
+#Mybatis-plus配置
+mybatis-plus:
+  global-config:
+    refresh-mapper: true
+    db-config:
+      # 全局逻辑已删除默认值
+      logic-delete-value: 0
+      # 全局逻辑未删除默认值
+      logic-not-delete-value: 1
+  mapper-locations: classpath*:/mapper/*/*/*.xml
+  configuration:
+    jdbc-type-for-null: 'null'
+    map-underscore-to-camel-case: false
+
+#阿里sentinel熔断器
+feign:
+  httpclient:
+    enabled: true
+  sentinel:
+    enabled: true
+  compression:
+    request:
+      enabled: true
+      mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+      min-response-size: 10240
+    response:
+      enabled: true
+
+#Log配置
+logging:
+  level:
+    cn.ibizlab.businesscentral: debug
+    org.springframework.boot.autoconfigure: ERROR
+
+#zuul网关超时设置
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
+#系统是否开启权限验证、是否开启缓存
+#缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
+ibiz:
+  enablePermissionValid: true
+  cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
+
+### jobs
+jobs:
+  #admin-address: http://127.0.0.1:40005
+  app-name: iBizBusinessCentral
+  app-port: 9999
+  #app-ip: 127.0.0.1
+
+### 启用Gzip压缩
+server:
+  compression:
+    enabled: true
+    mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 10240
+

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pcentralapi
-      cd businesscentral-provider/businesscentral-provider-centralapi
-      mvn -Pcentralapi docker:build
-      mvn -Pcentralapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-provider-centralapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>