init from phab

base/base-biz/base-biz-service/src/main/java/com/usoftchina/saas/biz/mapper/ConfigsMapper.java

@@ -24,7 +24,7 @@ public interface ConfigsMapper {
 
     int updateByCodeSelective(Configs con);
 
-    int selectByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId);
+    int countByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId);
 
     String getConfigDataBycode(@Param("code") String code, @Param("companyId") Long companyId);
 

base/base-biz/base-biz-service/src/main/java/com/usoftchina/saas/biz/service/impl/ConfigsServiceImpl.java

@@ -21,14 +21,13 @@ import com.usoftchina.saas.finance.api.VoucherApi;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.storage.api.StockProdInOutApi;
-import com.usoftchina.saas.util.JsonUtils;
+import com.usoftchina.saas.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -165,10 +164,9 @@ public class ConfigsServiceImpl implements ConfigsService{
                     //初始化期间
                     int initperiod=endProductService.getInitPeriod(BaseContextHolder.getCompanyId());
                     //当前日期年月
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
-                    String nowyearmonth = sdf.format(new Date());
+                    int nowPeriod = DateUtils.getYearmonth();
                     //只能在初始化期间修改本位币
-                    if(Integer.parseInt(nowyearmonth)!=initperiod){
+                    if(nowPeriod != initperiod){
                         throw new BizException(BizExceptionCode.BIZ_CURRENCY_INIT.getCode(),BizExceptionCode.BIZ_CURRENCY_INIT.getMessage());
                     }
                     //检查初始化期间是否已结账
@@ -254,12 +252,16 @@ public class ConfigsServiceImpl implements ConfigsService{
 //                }
 //            }
             //参数配置不存在则生成对应参数配置
-            int num = configsMapper.updateByCodeSelective(con);
-            if(num == 0){
+            int existsCount = configsMapper.countByCodeAndCompanyId(con.getCode(), con.getCompanyId());
+            if (existsCount == 0){
                 con.setCreatorId(BaseContextHolder.getUserId());
                 con.setCreateTime(new Date());
                 con.setCreatorName(BaseContextHolder.getUserName());
                 configsMapper.insertSelective(con);
+            } else {
+                // 注意，不要用updateByCodeSelective的返回值来判断是否存在。
+                // 当update的数据与原数据一样的时候，是不会更新的，返回值也是0，此时不要做新增操作
+                configsMapper.updateByCodeSelective(con);
             }
         }
         DocBaseDTO baseDTO = new DocBaseDTO(null, "", "Configs");

base/base-biz/base-biz-service/src/main/resources/mapper/ConfigsMapper.xml

@@ -180,8 +180,8 @@
     </set>
     where code = #{code,jdbcType=VARCHAR} and companyid = #{companyId}
   </update>
-  <select id="selectByCodeAndCompanyId" resultType="int">
-    SELECT COUNT(*) FROM CONFIGS WHERE CODE = #{code} AND COMPANYID = #{companyId}
+  <select id="countByCodeAndCompanyId" resultType="int">
+    SELECT COUNT(1) FROM CONFIGS WHERE CODE = #{code} AND COMPANYID = #{companyId}
   </select>
 
   <select id="getConfigDataBycode" resultType="String">

build.gradle

@@ -88,6 +88,8 @@ subprojects { Project subproject ->
         archives sourcesJar
     }
 
+    // *-server不需要publish
+    if (subproject.name.matches(".*-(core|common|api|service|dto|client|sdk|starter|task)")) {
     publishing {
         publications {
             plugins(MavenPublication) {
@@ -105,4 +107,5 @@ subprojects { Project subproject ->
             }
         }
     }
+}
 }

frontend/saas-web/Dockerfile.make

@@ -2,4 +2,4 @@ FROM hub.c.163.com/library/nginx
 MAINTAINER USOFTCHINA <yingp@usoftchina.com>
 RUN rm /etc/nginx/conf.d/default.conf
 ADD runtime/nginx/default.conf /etc/nginx/conf.d/
-COPY build/production/make/ /usr/share/nginx/html/
+COPY build/testing/make/ /usr/share/nginx/html/

frontend/saas-web/Dockerfile.trade

@@ -2,4 +2,4 @@ FROM hub.c.163.com/library/nginx
 MAINTAINER USOFTCHINA <yingp@usoftchina.com>
 RUN rm /etc/nginx/conf.d/default.conf
 ADD runtime/nginx/default.conf /etc/nginx/conf.d/
-COPY build/production/trade/ /usr/share/nginx/html/
+COPY build/testing/trade/ /usr/share/nginx/html/

frontend/saas-web/packages/local/app-common/src/view/finance/ledger/EndController.js

@@ -159,7 +159,7 @@ Ext.define('saas.view.finance.ledger.EndController', {
                 period,
                 force
             },
-            timeout:60000
+            timeout: 600000
         }).then(res => {
             view.unmask();
             saas.util.BaseUtil.showSuccessToast('结账成功');

runtime/saas-server/build.gradle

@@ -32,7 +32,7 @@ dependencies {
 docker {
     springBootApplication {
         baseImage = 'java8-jce:latest'
-        ports = [9000]
+        ports = [29000]
         images = ["${dockerRegistry}/${dockerGroup}/${project.name}"]
         jvmArgs = ['-Xmx2048m', '-Duser.timezone=GMT+08', '-Dfile.encoding=UTF-8']
     }