Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

兼容 7.2 代码改进 #22

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open

兼容 7.2 代码改进 #22

wants to merge 41 commits into from

Conversation

weijer
Copy link

@weijer weijer commented Jun 24, 2019

No description provided.

weijer and others added 30 commits June 4, 2019 15:46
修改代码明显错误

See merge request jgy/jgy_72crm!1
…o dev_xs

# Conflicts:
#	application/admin/model/User.php
Dev xs

See merge request jgy/jgy_72crm!2
增加Options请求判断
去除cache自动续期
…o dev_weijer

# Conflicts:
#	application/admin/controller/Base.php
移除session

See merge request jgy/jgy_72crm!4
…o dev_weijer

# Conflicts:
#	application/admin/controller/Base.php
weijer and others added 11 commits June 6, 2019 14:56
…o dev_weijer

# Conflicts:
#	application/admin/controller/Base.php
…o dev_weijer

# Conflicts:
#	application/admin/controller/Base.php
同步更新

See merge request jgy/jgy_72crm!5
…o 7.2

# Conflicts:
#	application/admin/model/User.php
7.2

See merge request jgy/jgy_72crm!6
string_random 函数

See merge request jgy/jgy_72crm!7
…o dev_xs

# Conflicts:
#	application/admin/model/User.php
Dev xs

See merge request jgy/jgy_72crm!8
@mingzhanghui
Copy link

现在能支持php7吗?

@weijer
Copy link
Author

weijer commented Aug 16, 2019

现在能支持php7吗?

你可以用我改的分支,跑了快两个月了,没啥问题!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants