ibizdev提交

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd im-app/im-app-web
-      mvn clean package -Pprod
+      cd im-boot
+      mvn clean package
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D/im-app-web.jar >>/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D/im_appim 业务应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im.jar root@172.16.102.61:/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im.jar >>/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im_apiim 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java

@@ -239,18 +239,32 @@ public class WFASService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfas.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java

@@ -239,18 +239,32 @@ public class WFBCService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfbc.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java

@@ -239,18 +239,32 @@ public class WFBMService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfbm.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java

@@ -239,18 +239,32 @@ public class WFIMService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfim.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/resources/application-wfweb.yml

 server:
-  devmode: false
-  port: 8202
+  devmode: true
+  port: 8080
   servlet:
     session:
       cookie:
@@ -17,11 +17,11 @@ spring:
 security:
   cas:
     server:
-      host: https://passport.ibizlab.cn
+      host: http://passportcs.ibizlab.cn
       login: ${security.cas.server.host}/login
       logout: ${security.cas.server.host}/logout
     service:
-      host: http://172.16.102.61:${server.port}
+      host: http://localhost:${server.port}
       login: /login/cas
       logout: /logout
 
@@ -36,7 +36,7 @@ logging:
 
 app:
   web:
-    url: http://172.16.102.61:${server.port}
+    url: http://localhost:${server.port}
     wfstarturl: /#/%s/null/editview
 #    wfviewurl: /#/dewfdataredirectview
     wfviewurl: /#/appwfdataredirectview

im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml

 server:
-  devmode: false
-  port: 8202
+  devmode: true
+  port: 8080
   servlet:
     session:
       cookie:
@@ -17,11 +17,11 @@ spring:
 security:
   cas:
     server:
-      host: https://passport.ibizlab.cn
+      host: http://passportcs.ibizlab.cn
       login: ${security.cas.server.host}/login
       logout: ${security.cas.server.host}/logout
     service:
-      host: http://172.16.102.61:${server.port}
+      host: http://localhost:${server.port}
       login: /login/cas
       logout: /logout
 
@@ -36,7 +36,7 @@ logging:
 
 app:
   web:
-    url: http://172.16.102.61:${server.port}
+    url: http://localhost:${server.port}
     wfstarturl: /#/%s/null/editview
 #    wfviewurl: /#/dewfdataredirectview
     wfviewurl: /#/appwfdataredirectview

im-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 8101
 
 spring:
   application:

im-core/src/main/resources/rules/IMGetMPRule.drl

@@ -19,7 +19,7 @@ rule "deaction1"
 ruleflow-group "imgetmpdeaction1"
     when
     then
-                imservice.getMP(imgetmpdefault);
+    imservice.getMP(imgetmpdefault);
     update(imgetmpdefault);//更新fact中变量值
     end
 

im-mybatis/src/main/java/com/ibiz/mybatis/config/MybatisConfiguration.java

 package com.ibiz.mybatis.config;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
+import com.ibiz.util.helper.UniqueNameGenerator;
+
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
@@ -15,7 +17,7 @@ import java.util.Properties;
  * mybatis全局配置类
  */
 @Configuration
-@MapperScan("com.ibiz.mybatis.*.mapper")
+@MapperScan(value="com.ibiz.mybatis.*.mapper",nameGenerator = UniqueNameGenerator.class)
 public class MybatisConfiguration {
 
     /**

im-util/src/main/java/com/ibiz/util/log/LogAspect.java

@@ -26,6 +26,10 @@ import static com.ibiz.util.log.LogMessage.*;
  */
 @Aspect
 @Component
+/**
+ * 不支持private方法切入。
+ */
+@Deprecated
 public class LogAspect {
     @Pointcut("execution(public * com.ibiz..*.*(..))")
     private void pointCut() {

im-util/src/main/java/com/ibiz/util/log/LoggerUtil.java

+package com.ibiz.util.log;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.ibiz.util.log.LogMessage.*;
+
+public class LoggerUtil {
+    public static ThreadLocal<Long> startSet = new ThreadLocal<>();
+
+    /**
+     * 打印日志：开始方法（业务调用）
+     *
+     * @param params 调用原方法入参
+     */
+    public static void startLog(Object... params) {
+        String loggerName = getClassName();
+        Logger log = LoggerFactory.getLogger(loggerName);
+        log.info(LogMessage.Function_Start, loggerName);
+        log.debug(LogMessage.Params, getStr(params));
+        startSet.set(System.currentTimeMillis());
+    }
+
+    /**
+     * 打印日志：结束方法（业务调用）
+     *
+     * @param params 调用工具类的原方法返回值。
+     */
+    public static void endLog(Object... params) {
+        Long start = startSet.get();
+        String loggerName = getClassName();
+        Logger log = LoggerFactory.getLogger(loggerName);
+        log.info(Function_End, loggerName);
+        log.debug(ReturnedValue, getStr(params));
+
+        if (start != null) {
+            startSet.remove();
+            log.debug(TimeCost, System.currentTimeMillis() - start);
+        }
+    }
+
+    public static void error(String msg) {
+        LoggerFactory.getLogger(getClassName()).error(msg);
+    }
+
+    public static void error(String msg, Object... obj) {
+        LoggerFactory.getLogger(getClassName()).error(msg, obj);
+    }
+
+    public static void warn(String msg) {
+        LoggerFactory.getLogger(getClassName()).error(msg);
+    }
+
+    public static void warn(String msg, Object... obj) {
+        LoggerFactory.getLogger(getClassName()).error(msg, obj);
+    }
+
+    public static void info(String msg) {
+        LoggerFactory.getLogger(getClassName()).info(msg);
+    }
+
+    public static void info(String msg, Object... obj) {
+        LoggerFactory.getLogger(getClassName()).info(msg, obj);
+    }
+
+    public static void debug(String msg) {
+        LoggerFactory.getLogger(getClassName()).debug(msg);
+    }
+
+    public static void debug(String msg, Object... obj) {
+        LoggerFactory.getLogger(getClassName()).debug(msg, obj);
+    }
+
+    /**
+     * 获取调用 LoggerUtil工具静态类的类名
+     *
+     * @return 长类名.方法名(行数)
+     * ps: 获取【行数】影响性能，生产环境中不建议打印行数。
+     */
+    private static String getClassName() {
+        StackTraceElement element = Thread.currentThread().getStackTrace()[3];
+        //从程序栈中获取定位信息
+        String className = element.getClassName();
+        String methodName = element.getMethodName();
+        int lineNum = element.getLineNumber();
+//        return className + "." + methodName;
+        return String.format("%s.%s(%s)",className ,methodName,lineNum);
+    }
+
+}
\ No newline at end of file