lab_gzf 部署微服务接口

businesscentral-app/businesscentral-app-businesscentral/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-app-businesscentral.jar
 
-EXPOSE 10320
+EXPOSE 8080
 
 ADD businesscentral-app-businesscentral.jar /businesscentral-app-businesscentral.jar

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-app-businesscentral:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
     ports:
-      - "10320:10320"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10320
-      - 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-app/businesscentral-app-businesscentral/src/main/resources/application-businesscentral-prod.yml

@@ -75,6 +75,10 @@ zuul:
       path: /leads/**
       serviceId: ${ibiz.ref.service.ibizbusinesscentral-centralapi:ibizbusinesscentral-centralapi}
       stripPrefix: false
+    languagelocale:
+      path: /languagelocales/**
+      serviceId: ${ibiz.ref.service.ibizbusinesscentral-centralapi:ibizbusinesscentral-centralapi}
+      stripPrefix: false
     incident:
       path: /incidents/**
       serviceId: ${ibiz.ref.service.ibizbusinesscentral-centralapi:ibizbusinesscentral-centralapi}

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -140,6 +140,14 @@
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {
+    "dename":"LanguageLocale",
+    "delogicname":"语言",
+    "sysmoudle":{"id":"BASE","name":"基础"},
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+     }
+    ,    {
     "dename":"Incident",
     "delogicname":"案例",
     "sysmoudle":{"id":"SERVICE","name":"服务"},

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 8081
+EXPOSE 10310
 
 ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar

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

@@ -3,9 +3,23 @@ services:
   businesscentral-provider-centralapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
     ports:
-      - "8081:8081"
+      - "10310:10310"
     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-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/LanguageLocaleDTO.java

+package cn.ibizlab.businesscentral.centralapi.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.ibizlab.businesscentral.util.domain.DTOBase;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[LanguageLocaleDTO]
+ */
+@Data
+public class LanguageLocaleDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [CREATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+
+    /**
+     * 属性 [LANGUAGELOCALEID]
+     *
+     */
+    @JSONField(name = "languagelocaleid")
+    @JsonProperty("languagelocaleid")
+    private String languagelocaleid;
+
+    /**
+     * 属性 [LANGUAGELOCALENAME]
+     *
+     */
+    @JSONField(name = "languagelocalename")
+    @JsonProperty("languagelocalename")
+    private String languagelocalename;
+
+    /**
+     * 属性 [LOCALEID]
+     *
+     */
+    @JSONField(name = "localeid")
+    @JsonProperty("localeid")
+    private Integer localeid;
+
+    /**
+     * 属性 [LANGUAGE]
+     *
+     */
+    @JSONField(name = "language")
+    @JsonProperty("language")
+    private String language;
+
+    /**
+     * 属性 [VERSIONNUMBER]
+     *
+     */
+    @JSONField(name = "versionnumber")
+    @JsonProperty("versionnumber")
+    private BigInteger versionnumber;
+
+    /**
+     * 属性 [UPDATEMAN]
+     *
+     */
+    @JSONField(name = "updateman")
+    @JsonProperty("updateman")
+    private String updateman;
+
+    /**
+     * 属性 [UPDATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
+
+    /**
+     * 属性 [CREATEMAN]
+     *
+     */
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
+
+    /**
+     * 属性 [CODE]
+     *
+     */
+    @JSONField(name = "code")
+    @JsonProperty("code")
+    private String code;
+
+    /**
+     * 属性 [STATUSCODE]
+     *
+     */
+    @JSONField(name = "statuscode")
+    @JsonProperty("statuscode")
+    private Integer statuscode;
+
+    /**
+     * 属性 [STATECODE]
+     *
+     */
+    @JSONField(name = "statecode")
+    @JsonProperty("statecode")
+    private Integer statecode;
+
+    /**
+     * 属性 [REGION]
+     *
+     */
+    @JSONField(name = "region")
+    @JsonProperty("region")
+    private String region;
+
+
+    /**
+     * 设置 [LANGUAGELOCALENAME]
+     */
+    public void setLanguagelocalename(String  languagelocalename){
+        this.languagelocalename = languagelocalename ;
+        this.modify("languagelocalename",languagelocalename);
+    }
+
+    /**
+     * 设置 [LOCALEID]
+     */
+    public void setLocaleid(Integer  localeid){
+        this.localeid = localeid ;
+        this.modify("localeid",localeid);
+    }
+
+    /**
+     * 设置 [LANGUAGE]
+     */
+    public void setLanguage(String  language){
+        this.language = language ;
+        this.modify("language",language);
+    }
+
+    /**
+     * 设置 [VERSIONNUMBER]
+     */
+    public void setVersionnumber(BigInteger  versionnumber){
+        this.versionnumber = versionnumber ;
+        this.modify("versionnumber",versionnumber);
+    }
+
+    /**
+     * 设置 [CODE]
+     */
+    public void setCode(String  code){
+        this.code = code ;
+        this.modify("code",code);
+    }
+
+    /**
+     * 设置 [STATUSCODE]
+     */
+    public void setStatuscode(Integer  statuscode){
+        this.statuscode = statuscode ;
+        this.modify("statuscode",statuscode);
+    }
+
+    /**
+     * 设置 [STATECODE]
+     */
+    public void setStatecode(Integer  statecode){
+        this.statecode = statecode ;
+        this.modify("statecode",statecode);
+    }
+
+    /**
+     * 设置 [REGION]
+     */
+    public void setRegion(String  region){
+        this.region = region ;
+        this.modify("region",region);
+    }
+
+
+}
+

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/mapping/LanguageLocaleMapping.java

+package cn.ibizlab.businesscentral.centralapi.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.base.domain.LanguageLocale;
+import cn.ibizlab.businesscentral.centralapi.dto.LanguageLocaleDTO;
+import cn.ibizlab.businesscentral.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="CentralApiLanguageLocaleMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface LanguageLocaleMapping extends MappingBase<LanguageLocaleDTO, LanguageLocale> {
+
+
+}
+

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pbusinesscentral
-      cd businesscentral-app/businesscentral-app-businesscentral
-      mvn -Pbusinesscentral docker:build
-      mvn -Pbusinesscentral docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-businesscentral.yaml iBizEE --with-registry-auth
+      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>